sr-dev November 2018

sr-dev@lists.kamailio.org

22 participants
298 discussions

git:5.2:6da8a5b4: textops: docs - notes that msg_apply_changes() may be required for multi-part operations
by Daniel-Constantin Mierla 27 Nov '18

27 Nov '18

Module: kamailio Branch: 5.2 Commit: 6da8a5b4cb1f9b97aa2f92bc5d97786443712099 URL: https://github.com/kamailio/kamailio/commit/6da8a5b4cb1f9b97aa2f92bc5d97786… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-27T20:03:55+01:00 textops: docs - notes that msg_apply_changes() may be required for multi-part operations - GH #1719 (cherry picked from commit 5460db2e59341f143d607de744faa8413216afd5) --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6da8a5b4cb1f9b97aa2f92bc5d97786… Patch: https://github.com/kamailio/kamailio/commit/6da8a5b4cb1f9b97aa2f92bc5d97786… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 8e0f350056..d348ccf6be 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -1638,6 +1638,7 @@ if (starts_with("$rU", "+358")) set_body_multipart("test", "text/plain", "delimiter"); msg_apply_changes(); append_body_part(...); +msg_apply_changes(); ... @@ -1690,12 +1691,17 @@ text The core will take care of the last boundary ending "--". Detecting wich one is the last and fixing the others if needed. </para> + <para> + Note: it may be required that msg_apply_changes() from textopsx module + has to be executed if there are other operations over the new body. + </para> <example> <title><function>append_body_part</function> usage</title> <programlisting format="linespecific"> ... $var(b) = "7e Od 04 55 75 69 20 4d 61 6b 65 43 61 6c 6c"; append_body_part("$var(b)", "application/vnd.cirpack.isdn-ext", "signal;handling=required"); +msg_apply_changes(); ... # Will append this to the body: @@ -1721,6 +1727,7 @@ Content-Disposition: signal;handling=required ... $var(b) = "<info>active</info>"; append_body_part("$var(b)", "application/xml\r\nX-Header: xyz"); +msg_apply_changes(); ... # Will append this to the body: @@ -1773,12 +1780,17 @@ Content-Disposition: signal;handling=required The core will take care of the last boundary ending "--". Detecting wich one is the last and fixing the others if needed. </para> + <para> + Note: it may be required that msg_apply_changes() from textopsx module + has to be executed if there are other operations over the new body. + </para> <example> <title><function>append_body_part_hex</function> usage</title> <programlisting format="linespecific"> ... $var(b) = "6b 61 6d 61 69 6c 69 6f"; append_body_part_hex("$var(b)", "application/my-custom-ext"); +msg_apply_changes(); ... # Will append this to the body: @@ -1894,11 +1906,16 @@ get_body_part("application/vnd.cirpack.isdn-ext", "$var(hbody)"); The core will take care of the last boundary ending "--". Detecting wich one is the last and fixing the others if needed. </para> + <para> + Note: it may be required that msg_apply_changes() from textopsx module + has to be executed if there are other operations over the new body. + </para> <example> <title><function>remove_body_part</function> usage</title> <programlisting format="linespecific"> ... remove_body_part("application/vnd.cirpack.isdn-ext"); +msg_apply_changes(); ... </programlisting> </example>

1 0

git:5.2:0041d684: misc/examples: use core reply_route inside the anycast example
by Daniel-Constantin Mierla 27 Nov '18

27 Nov '18

Module: kamailio Branch: 5.2 Commit: 0041d6840e0d1dba76239f4f9e46a01efaedbc09 URL: https://github.com/kamailio/kamailio/commit/0041d6840e0d1dba76239f4f9e46a01… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-27T20:03:43+01:00 misc/examples: use core reply_route inside the anycast example (cherry picked from commit 71a88b1d30b3bff5d6e8e1785ddeae08b3bfe4f2) --- Modified: misc/examples/mixed/kamailio-minimal-anycast.cfg --- Diff: https://github.com/kamailio/kamailio/commit/0041d6840e0d1dba76239f4f9e46a01… Patch: https://github.com/kamailio/kamailio/commit/0041d6840e0d1dba76239f4f9e46a01… --- diff --git a/misc/examples/mixed/kamailio-minimal-anycast.cfg b/misc/examples/mixed/kamailio-minimal-anycast.cfg index 812695d919..0c7c6027f0 100644 --- a/misc/examples/mixed/kamailio-minimal-anycast.cfg +++ b/misc/examples/mixed/kamailio-minimal-anycast.cfg @@ -300,17 +300,24 @@ route[WITHINDLG] { exit; } -# Manage outgoing branches +# TM manage for outgoing branches branch_route[MANAGE_BRANCH] { xdbg("new branch [$T_branch_idx] to $ru\n"); } -# Manage incoming replies +# TM manage for incoming replies onreply_route[MANAGE_REPLY] { xdbg("incoming reply\n"); +} - if($si != IPADDR_MAINSRV) { +# TM manage for failure routing cases +failure_route[MANAGE_FAILURE] { + if (t_is_canceled()) exit; +} +# Core handling for incoming replies +reply_route { + if($si != IPADDR_MAINSRV) { if($si == IPADDR_PAIRNODE) { # receiving a transparent proxied request from pair server if(is_present_hf("X-Src-Addr")) { @@ -338,8 +345,3 @@ onreply_route[MANAGE_REPLY] { } # from now on, the usual sip response processing } - -# Manage failure routing cases -failure_route[MANAGE_FAILURE] { - if (t_is_canceled()) exit; -}

1 0

git:5.2:0387df55: xmlrpc: docs for event_callback parameter
by Daniel-Constantin Mierla 27 Nov '18

27 Nov '18

Module: kamailio Branch: 5.2 Commit: 0387df55d08c435e8ee4d8dde41c260f2ddb839b URL: https://github.com/kamailio/kamailio/commit/0387df55d08c435e8ee4d8dde41c260… Author: Surendra Tiwari <surendratiwari3(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-27T20:03:34+01:00 xmlrpc: docs for event_callback parameter - GH #1736 (cherry picked from commit d74d67976905c9d0c49f00485046117bc2581e65) --- Modified: src/modules/xmlrpc/doc/xmlrpc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0387df55d08c435e8ee4d8dde41c260… Patch: https://github.com/kamailio/kamailio/commit/0387df55d08c435e8ee4d8dde41c260… --- diff --git a/src/modules/xmlrpc/doc/xmlrpc_admin.xml b/src/modules/xmlrpc/doc/xmlrpc_admin.xml index 381a1feff7..a61d63e6db 100644 --- a/src/modules/xmlrpc/doc/xmlrpc_admin.xml +++ b/src/modules/xmlrpc/doc/xmlrpc_admin.xml @@ -60,7 +60,7 @@ modparam("xmlrpc", "route", "route_for_xmlrpcs") <section id="autoconversion"> <title><varname>autoconversion</varname> (string)</title> <para> - Enable or disable automatic parameter type conversion globally, + Enable or disable automatic parameter type conversion globally, for all the methods parameters. If on, a type mismatch in a method parameter will not cause a fault if it is possible to automatically @@ -192,6 +192,45 @@ modparam("xmlrpc", "url_match", "^/RPC2") </programlisting> </example> </section> + <section id="event_callback"> + <title><varname>event_callback</varname> (string)</title> + <para> + The name of the function in the kemi configuration file (embedded + scripting language such as Lua, Python, ...) to be executed instead + of route blocks defined by route parameter for xmlrpc request. + </para> + <para> + This route will be called only for HTTP messages whose method is + either GET or POST. The message visible inside the route + will be a HTTP request converted to SIP (the uri will be fixed and + a fake via will be added). + </para> + <para> + The route should perform additional security checks to + ensure the client is authorized to execute management/RPC functions + and then it should call the <function>dispatch_rpc()</function>. + </para> + <example> + <title>Set <varname>event_callback</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("xmlrpc", "event_callback", "ksr_xmlrpc_event") +... +-- event callback function implemented in Lua +function ksr_xmlrpc_event(evname) + KSR.info("===== xmlrpc triggered event: " .. evname .. "\n"); + local rpc_method = KSR.pv.get("$rm") or "" + if ((rpc_method == "POST" or rpc_method == "GET")) then + if (KSR.xmlrpc.dispatch_rpc() < 0) then + KSR.err("error while executing xmlrpc event") + end + end + return 1; +end +... +</programlisting> + </example> + </section> </section> <section>

1 0

git:5.2:260ac297: xmlrpc: added event_callback parameter
by Daniel-Constantin Mierla 27 Nov '18

27 Nov '18

Module: kamailio Branch: 5.2 Commit: 260ac29706ce64f857959732831b685e0012cede URL: https://github.com/kamailio/kamailio/commit/260ac29706ce64f857959732831b685… Author: Surendra Tiwari <surendratiwari3(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-27T20:03:26+01:00 xmlrpc: added event_callback parameter - specify the name of KEMI function to be executed for xmlrpc requests (cherry picked from commit d3a3e28dd20d731939f9a53c28fb231206268890) --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/260ac29706ce64f857959732831b685… Patch: https://github.com/kamailio/kamailio/commit/260ac29706ce64f857959732831b685… --- diff --git a/src/modules/xmlrpc/xmlrpc.c b/src/modules/xmlrpc/xmlrpc.c index 4985639134..793b2d2db2 100644 --- a/src/modules/xmlrpc/xmlrpc.c +++ b/src/modules/xmlrpc/xmlrpc.c @@ -416,6 +416,7 @@ static regex_t xmlrpc_url_match_regexp; static char* xmlrpc_url_skip = NULL; static regex_t xmlrpc_url_skip_regexp; +static str xmlrpc_event_callback = STR_NULL; /* * Exported functions @@ -438,6 +439,7 @@ static param_export_t params[] = { {"mode", PARAM_INT, &xmlrpc_mode}, {"url_match", PARAM_STRING, &xmlrpc_url_match}, {"url_skip", PARAM_STRING, &xmlrpc_url_skip}, + {"event_callback", PARAM_STR, &xmlrpc_event_callback}, {0, 0, 0} }; @@ -2294,7 +2296,11 @@ static int em_receive_request(sip_msg_t* orig_msg, { int ret; sip_msg_t tmp_msg, *msg; + int backup_rt; struct run_act_ctx ra_ctx; + str evrtname = str_init("xmlrpc:request"); + backup_rt = get_route_type(); + sr_kemi_eng_t *keng = NULL; ret=0; if (new_buf && new_len) { @@ -2328,10 +2334,22 @@ static int em_receive_request(sip_msg_t* orig_msg, } /* exec routing script */ init_run_actions_ctx(&ra_ctx); - if (run_actions(&ra_ctx, main_rt.rlist[xmlrpc_route_no], msg) < 0) { - ret=-1; - DBG("xmlrpc: error while trying script\n"); - goto end; + if(xmlrpc_route_no>=0) { + if (run_actions(&ra_ctx, main_rt.rlist[xmlrpc_route_no], msg) < 0) { + ret=-1; + DBG("xmlrpc: error while trying script\n"); + goto end; + } + }else{ + keng = sr_kemi_eng_get(); + if(keng!=NULL) { + if(keng->froute(msg, EVENT_ROUTE, + &xmlrpc_event_callback, &evrtname)<0) { + LM_ERR("error running event route kemi callback\n"); + } + } else { + LM_ERR("no event route or kemi callback found for execution\n"); + } } end: exec_post_script_cb(msg, REQUEST_CB_TYPE); /* needed for example if tm is used */ @@ -2339,6 +2357,7 @@ static int em_receive_request(sip_msg_t* orig_msg, if (msg != orig_msg) { /* avoid double free (freed from receive_msg too) */ free_sip_msg(msg); } + set_route_type(backup_rt); return ret; error: return -1; @@ -2583,22 +2602,31 @@ static int mod_init(void) { struct nonsip_hook nsh; int route_no; + sr_kemi_eng_t *keng = NULL; /* try to fix the xmlrpc route */ - if (xmlrpc_route){ - route_no=route_get(&main_rt, xmlrpc_route); - if (route_no==-1){ - ERR("xmlrpc: failed to fix route \"%s\": route_get() failed\n", - xmlrpc_route); + if(xmlrpc_event_callback.s!=NULL && xmlrpc_event_callback.len>0) { + keng = sr_kemi_eng_get(); + if(keng==NULL) { + LM_ERR("failed to find kemi engine\n"); return -1; } - if (main_rt.rlist[route_no]==0){ - WARN("xmlrpc: xmlrpc route \"%s\" is empty / doesn't exist\n", - xmlrpc_route); + xmlrpc_route_no=-1; + } else { + if (xmlrpc_route) { + route_no=route_get(&main_rt, xmlrpc_route); + if (route_no==-1) { + ERR("xmlrpc: failed to fix route \"%s\": route_get() failed\n", + xmlrpc_route); + return -1; + } + if (main_rt.rlist[route_no]==0) { + WARN("xmlrpc: xmlrpc route \"%s\" is empty / doesn't exist\n", + xmlrpc_route); + } + xmlrpc_route_no=route_no; } - xmlrpc_route_no=route_no; } - /* bind the SL API */ if (sl_load_api(&slb)!=0) { LM_ERR("cannot bind to SL API\n");

1 0

[kamailio/kamailio] set_body_multipart produce broken body (#1719)
by sergey-safarov 27 Nov '18

27 Nov '18

### Description I want convert INVITE message with SDP body to multypart body. To do this is used patch for reference kamailio.cfg ``` [root@safarov-dell kamailio]# diff -u kamailio.cfg kamailio2.cfg --- kamailio.cfg 2018-11-09 18:28:36.000000000 +0300 +++ kamailio2.cfg 2018-11-10 22:49:43.604132033 +0300 @@ -1,5 +1,10 @@ #!KAMAILIO # +#!define WITH_DEBUG +#!define WITH_MYSQL +#!define WITH_AUTH +#!define WITH_USRLOCDB +# # Kamailio (OpenSER) SIP Server v5.2 - default configuration script # - web: https://www.kamailio.org # - git: https://github.com/kamailio/kamailio @@ -286,6 +291,8 @@ loadmodule "debugger.so" #!endif +loadmodule "textopsx.so" + # ----------------- setting module-specific parameters --------------- @@ -495,6 +502,10 @@ # account only INVITEs if (is_method("INVITE")) { setflag(FLT_ACC); # do accounting + set_body_multipart("test", "text/plain", "delimiter"); + msg_apply_changes(); + # # $var(b) = "7e Od 04 55 75 69 20 4d 61 6b 65 43 61 6c 6c"; + # # append_body_part("$var(b)", "application/vnd.cirpack.isdn-ext", "signal;handling=required"); } # dispatch requests to foreign domains ``` After `msg_apply_changes` kamailio send INVITE without original SDP and without trailing delimiter. ``` INVITE sip:safarov@192.168.100.28:43749;transport=tcp SIP/2.0 Record-Route: <sip:192.168.100.31;transport=tcp;r2=on;lr> Record-Route: <sip:192.168.100.31;r2=on;lr> Via: SIP/2.0/TCP 192.168.100.31;branch=z9hG4bK9a1.9a042f2f4fe26e1e0fa9b65185f3a733.0 Via: SIP/2.0/UDP 192.168.100.31:35060;received=192.168.100.31;rport=35060;branch=z9hG4bK1985869670 From: <sip:safarov@aio.kazoo>;tag=988293340 To: <sip:safarov@aio.kazoo> Call-ID: 1851253425 CSeq: 21 INVITE Contact: <sip:safarov@192.168.100.31:35060> Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, NOTIFY, MESSAGE, SUBSCRIBE, INFO Max-Forwards: 69 User-Agent: Linphone/3.6.1 (eXosip2/3.6.0) Subject: Phone call Content-Length: 60 Content-Type: multipart/mixed;boundary="delimiter" Mime-Version: 1.0 --delimiter Content-Type: text/plain test --delimiter ``` ### Troubleshooting NA #### Reproduction 1) Need to apply patch provided above; 2) create any sip account; 3) register SIP client using auth data for created sip account; 4) place call for created account. #### Debugging Data NA #### Log Messages [kamailio.log](https://github.com/kamailio/kamailio/files/2568706/kamailio.l… #### SIP Traffic [kamailio.pcapng.gz](https://github.com/kamailio/kamailio/files/2568707/kama… ### Possible Solutions Not known ### Additional Information * **Kamailio Version** - output of `kamailio -v` Tested current master ``` version: kamailio 5.3.0-dev0 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 14:49:40 Nov 9 2018 with gcc 8.2.0 ``` * **Operating System**: ``` /etc/kamailio # cat /etc/os-release NAME="Alpine Linux" ID=alpine VERSION_ID=3.8.0 PRETTY_NAME="Alpine Linux v3.8" HOME_URL="http://alpinelinux.org" BUG_REPORT_URL="http://bugs.alpinelinux.org" /etc/kamailio # ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1719

3 17

git:master:5460db2e: textops: docs - notes that msg_apply_changes() may be required for multi-part operations
by Daniel-Constantin Mierla 27 Nov '18

27 Nov '18

Module: kamailio Branch: master Commit: 5460db2e59341f143d607de744faa8413216afd5 URL: https://github.com/kamailio/kamailio/commit/5460db2e59341f143d607de744faa84… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-27T17:53:30+01:00 textops: docs - notes that msg_apply_changes() may be required for multi-part operations - GH #1719 --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5460db2e59341f143d607de744faa84… Patch: https://github.com/kamailio/kamailio/commit/5460db2e59341f143d607de744faa84… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 8e0f350056..d348ccf6be 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -1638,6 +1638,7 @@ if (starts_with("$rU", "+358")) set_body_multipart("test", "text/plain", "delimiter"); msg_apply_changes(); append_body_part(...); +msg_apply_changes(); ... @@ -1690,12 +1691,17 @@ text The core will take care of the last boundary ending "--". Detecting wich one is the last and fixing the others if needed. </para> + <para> + Note: it may be required that msg_apply_changes() from textopsx module + has to be executed if there are other operations over the new body. + </para> <example> <title><function>append_body_part</function> usage</title> <programlisting format="linespecific"> ... $var(b) = "7e Od 04 55 75 69 20 4d 61 6b 65 43 61 6c 6c"; append_body_part("$var(b)", "application/vnd.cirpack.isdn-ext", "signal;handling=required"); +msg_apply_changes(); ... # Will append this to the body: @@ -1721,6 +1727,7 @@ Content-Disposition: signal;handling=required ... $var(b) = "<info>active</info>"; append_body_part("$var(b)", "application/xml\r\nX-Header: xyz"); +msg_apply_changes(); ... # Will append this to the body: @@ -1773,12 +1780,17 @@ Content-Disposition: signal;handling=required The core will take care of the last boundary ending "--". Detecting wich one is the last and fixing the others if needed. </para> + <para> + Note: it may be required that msg_apply_changes() from textopsx module + has to be executed if there are other operations over the new body. + </para> <example> <title><function>append_body_part_hex</function> usage</title> <programlisting format="linespecific"> ... $var(b) = "6b 61 6d 61 69 6c 69 6f"; append_body_part_hex("$var(b)", "application/my-custom-ext"); +msg_apply_changes(); ... # Will append this to the body: @@ -1894,11 +1906,16 @@ get_body_part("application/vnd.cirpack.isdn-ext", "$var(hbody)"); The core will take care of the last boundary ending "--". Detecting wich one is the last and fixing the others if needed. </para> + <para> + Note: it may be required that msg_apply_changes() from textopsx module + has to be executed if there are other operations over the new body. + </para> <example> <title><function>remove_body_part</function> usage</title> <programlisting format="linespecific"> ... remove_body_part("application/vnd.cirpack.isdn-ext"); +msg_apply_changes(); ... </programlisting> </example>

1 0

[kamailio/kamailio] Modules:xmlrpc event_callback added for ksr routes (#1736)
by Surendra Tiwari 27 Nov '18

27 Nov '18

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1736 -- Commit Summary -- * Merge pull request #1 from kamailio/master * Modules:XMLRPC event_route callback added for ksr -- File Changes -- M src/modules/xmlrpc/xmlrpc.c (56) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1736.patch https://github.com/kamailio/kamailio/pull/1736.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1736

2 9

git:master:71a88b1d: misc/examples: use core reply_route inside the anycast example
by Daniel-Constantin Mierla 27 Nov '18

27 Nov '18

Module: kamailio Branch: master Commit: 71a88b1d30b3bff5d6e8e1785ddeae08b3bfe4f2 URL: https://github.com/kamailio/kamailio/commit/71a88b1d30b3bff5d6e8e1785ddeae0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-27T12:52:13+01:00 misc/examples: use core reply_route inside the anycast example --- Modified: misc/examples/mixed/kamailio-minimal-anycast.cfg --- Diff: https://github.com/kamailio/kamailio/commit/71a88b1d30b3bff5d6e8e1785ddeae0… Patch: https://github.com/kamailio/kamailio/commit/71a88b1d30b3bff5d6e8e1785ddeae0… --- diff --git a/misc/examples/mixed/kamailio-minimal-anycast.cfg b/misc/examples/mixed/kamailio-minimal-anycast.cfg index 812695d919..0c7c6027f0 100644 --- a/misc/examples/mixed/kamailio-minimal-anycast.cfg +++ b/misc/examples/mixed/kamailio-minimal-anycast.cfg @@ -300,17 +300,24 @@ route[WITHINDLG] { exit; } -# Manage outgoing branches +# TM manage for outgoing branches branch_route[MANAGE_BRANCH] { xdbg("new branch [$T_branch_idx] to $ru\n"); } -# Manage incoming replies +# TM manage for incoming replies onreply_route[MANAGE_REPLY] { xdbg("incoming reply\n"); +} - if($si != IPADDR_MAINSRV) { +# TM manage for failure routing cases +failure_route[MANAGE_FAILURE] { + if (t_is_canceled()) exit; +} +# Core handling for incoming replies +reply_route { + if($si != IPADDR_MAINSRV) { if($si == IPADDR_PAIRNODE) { # receiving a transparent proxied request from pair server if(is_present_hf("X-Src-Addr")) { @@ -338,8 +345,3 @@ onreply_route[MANAGE_REPLY] { } # from now on, the usual sip response processing } - -# Manage failure routing cases -failure_route[MANAGE_FAILURE] { - if (t_is_canceled()) exit; -}

1 0

git:master:d74d6797: xmlrpc: docs for event_callback parameter
by Daniel-Constantin Mierla 27 Nov '18

27 Nov '18

Module: kamailio Branch: master Commit: d74d67976905c9d0c49f00485046117bc2581e65 URL: https://github.com/kamailio/kamailio/commit/d74d67976905c9d0c49f00485046117… Author: Surendra Tiwari <surendratiwari3(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-27T12:47:40+01:00 xmlrpc: docs for event_callback parameter - GH #1736 --- Modified: src/modules/xmlrpc/doc/xmlrpc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d74d67976905c9d0c49f00485046117… Patch: https://github.com/kamailio/kamailio/commit/d74d67976905c9d0c49f00485046117… --- diff --git a/src/modules/xmlrpc/doc/xmlrpc_admin.xml b/src/modules/xmlrpc/doc/xmlrpc_admin.xml index 381a1feff7..a61d63e6db 100644 --- a/src/modules/xmlrpc/doc/xmlrpc_admin.xml +++ b/src/modules/xmlrpc/doc/xmlrpc_admin.xml @@ -60,7 +60,7 @@ modparam("xmlrpc", "route", "route_for_xmlrpcs") <section id="autoconversion"> <title><varname>autoconversion</varname> (string)</title> <para> - Enable or disable automatic parameter type conversion globally, + Enable or disable automatic parameter type conversion globally, for all the methods parameters. If on, a type mismatch in a method parameter will not cause a fault if it is possible to automatically @@ -192,6 +192,45 @@ modparam("xmlrpc", "url_match", "^/RPC2") </programlisting> </example> </section> + <section id="event_callback"> + <title><varname>event_callback</varname> (string)</title> + <para> + The name of the function in the kemi configuration file (embedded + scripting language such as Lua, Python, ...) to be executed instead + of route blocks defined by route parameter for xmlrpc request. + </para> + <para> + This route will be called only for HTTP messages whose method is + either GET or POST. The message visible inside the route + will be a HTTP request converted to SIP (the uri will be fixed and + a fake via will be added). + </para> + <para> + The route should perform additional security checks to + ensure the client is authorized to execute management/RPC functions + and then it should call the <function>dispatch_rpc()</function>. + </para> + <example> + <title>Set <varname>event_callback</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("xmlrpc", "event_callback", "ksr_xmlrpc_event") +... +-- event callback function implemented in Lua +function ksr_xmlrpc_event(evname) + KSR.info("===== xmlrpc triggered event: " .. evname .. "\n"); + local rpc_method = KSR.pv.get("$rm") or "" + if ((rpc_method == "POST" or rpc_method == "GET")) then + if (KSR.xmlrpc.dispatch_rpc() < 0) then + KSR.err("error while executing xmlrpc event") + end + end + return 1; +end +... +</programlisting> + </example> + </section> </section> <section>

1 0

git:master:d3a3e28d: xmlrpc: added event_callback parameter
by Daniel-Constantin Mierla 27 Nov '18

27 Nov '18

Module: kamailio Branch: master Commit: d3a3e28dd20d731939f9a53c28fb231206268890 URL: https://github.com/kamailio/kamailio/commit/d3a3e28dd20d731939f9a53c28fb231… Author: Surendra Tiwari <surendratiwari3(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-27T12:46:49+01:00 xmlrpc: added event_callback parameter - specify the name of KEMI function to be executed for xmlrpc requests --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/d3a3e28dd20d731939f9a53c28fb231… Patch: https://github.com/kamailio/kamailio/commit/d3a3e28dd20d731939f9a53c28fb231… --- diff --git a/src/modules/xmlrpc/xmlrpc.c b/src/modules/xmlrpc/xmlrpc.c index 4985639134..793b2d2db2 100644 --- a/src/modules/xmlrpc/xmlrpc.c +++ b/src/modules/xmlrpc/xmlrpc.c @@ -416,6 +416,7 @@ static regex_t xmlrpc_url_match_regexp; static char* xmlrpc_url_skip = NULL; static regex_t xmlrpc_url_skip_regexp; +static str xmlrpc_event_callback = STR_NULL; /* * Exported functions @@ -438,6 +439,7 @@ static param_export_t params[] = { {"mode", PARAM_INT, &xmlrpc_mode}, {"url_match", PARAM_STRING, &xmlrpc_url_match}, {"url_skip", PARAM_STRING, &xmlrpc_url_skip}, + {"event_callback", PARAM_STR, &xmlrpc_event_callback}, {0, 0, 0} }; @@ -2294,7 +2296,11 @@ static int em_receive_request(sip_msg_t* orig_msg, { int ret; sip_msg_t tmp_msg, *msg; + int backup_rt; struct run_act_ctx ra_ctx; + str evrtname = str_init("xmlrpc:request"); + backup_rt = get_route_type(); + sr_kemi_eng_t *keng = NULL; ret=0; if (new_buf && new_len) { @@ -2328,10 +2334,22 @@ static int em_receive_request(sip_msg_t* orig_msg, } /* exec routing script */ init_run_actions_ctx(&ra_ctx); - if (run_actions(&ra_ctx, main_rt.rlist[xmlrpc_route_no], msg) < 0) { - ret=-1; - DBG("xmlrpc: error while trying script\n"); - goto end; + if(xmlrpc_route_no>=0) { + if (run_actions(&ra_ctx, main_rt.rlist[xmlrpc_route_no], msg) < 0) { + ret=-1; + DBG("xmlrpc: error while trying script\n"); + goto end; + } + }else{ + keng = sr_kemi_eng_get(); + if(keng!=NULL) { + if(keng->froute(msg, EVENT_ROUTE, + &xmlrpc_event_callback, &evrtname)<0) { + LM_ERR("error running event route kemi callback\n"); + } + } else { + LM_ERR("no event route or kemi callback found for execution\n"); + } } end: exec_post_script_cb(msg, REQUEST_CB_TYPE); /* needed for example if tm is used */ @@ -2339,6 +2357,7 @@ static int em_receive_request(sip_msg_t* orig_msg, if (msg != orig_msg) { /* avoid double free (freed from receive_msg too) */ free_sip_msg(msg); } + set_route_type(backup_rt); return ret; error: return -1; @@ -2583,22 +2602,31 @@ static int mod_init(void) { struct nonsip_hook nsh; int route_no; + sr_kemi_eng_t *keng = NULL; /* try to fix the xmlrpc route */ - if (xmlrpc_route){ - route_no=route_get(&main_rt, xmlrpc_route); - if (route_no==-1){ - ERR("xmlrpc: failed to fix route \"%s\": route_get() failed\n", - xmlrpc_route); + if(xmlrpc_event_callback.s!=NULL && xmlrpc_event_callback.len>0) { + keng = sr_kemi_eng_get(); + if(keng==NULL) { + LM_ERR("failed to find kemi engine\n"); return -1; } - if (main_rt.rlist[route_no]==0){ - WARN("xmlrpc: xmlrpc route \"%s\" is empty / doesn't exist\n", - xmlrpc_route); + xmlrpc_route_no=-1; + } else { + if (xmlrpc_route) { + route_no=route_get(&main_rt, xmlrpc_route); + if (route_no==-1) { + ERR("xmlrpc: failed to fix route \"%s\": route_get() failed\n", + xmlrpc_route); + return -1; + } + if (main_rt.rlist[route_no]==0) { + WARN("xmlrpc: xmlrpc route \"%s\" is empty / doesn't exist\n", + xmlrpc_route); + } + xmlrpc_route_no=route_no; } - xmlrpc_route_no=route_no; } - /* bind the SL API */ if (sl_load_api(&slb)!=0) { LM_ERR("cannot bind to SL API\n");

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2018