sr-dev June 2018

sr-dev@lists.kamailio.org

26 participants
320 discussions

git:master:bb14964d: jsonrpcc: init and update cfg framework for io handler process

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: bb14964dd8337d0946c7e233ff3cc81f22e8e1bb URL: https://github.com/kamailio/kamailio/commit/bb14964dd8337d0946c7e233ff3cc81… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-22T19:54:51+02:00 jsonrpcc: init and update cfg framework for io handler process - GH #1520 --- Modified: src/modules/jsonrpcc/jsonrpc_io.c Modified: src/modules/jsonrpcc/jsonrpcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bb14964dd8337d0946c7e233ff3cc81… Patch: https://github.com/kamailio/kamailio/commit/bb14964dd8337d0946c7e233ff3cc81… --- diff --git a/src/modules/jsonrpcc/jsonrpc_io.c b/src/modules/jsonrpcc/jsonrpc_io.c index cae18322ba..ebb93348ba 100644 --- a/src/modules/jsonrpcc/jsonrpc_io.c +++ b/src/modules/jsonrpcc/jsonrpc_io.c @@ -33,6 +33,8 @@ #include "../../core/route.h" #include "../../core/route_struct.h" #include "../../core/lvalue.h" +#include "../../core/cfg/cfg_struct.h" + #include "../tm/tm_load.h" #include "jsonrpc_io.h" @@ -156,6 +158,8 @@ void cmd_pipe_cb(int fd, short event, void *arg) return; } + cfg_update(); + params = json_tokener_parse(cmd->params); if (cmd->notify_only) { diff --git a/src/modules/jsonrpcc/jsonrpcc_mod.c b/src/modules/jsonrpcc/jsonrpcc_mod.c index 903b278447..2c3cce22db 100644 --- a/src/modules/jsonrpcc/jsonrpcc_mod.c +++ b/src/modules/jsonrpcc/jsonrpcc_mod.c @@ -28,6 +28,8 @@ #include "../../core/mod_fix.h" #include "../../core/trim.h" #include "../../core/sr_module.h" +#include "../../core/cfg/cfg_struct.h" + #include "../tm/tm_load.h" #include "jsonrpc_request.h" @@ -139,6 +141,9 @@ static int child_init(int rank) if(pid==0){ /* child */ close(pipe_fds[1]); + /* initialize the config framework */ + if (cfg_child_init()) + return -1; return jsonrpc_io_child_process(pipe_fds[0], servers_param); } return 0;

5 years, 10 months

git:master:3e7ff1f3: app_python: support for more combinations of functions with 4 params

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3e7ff1f3613db1c5de559bbf259a621647a5424b URL: https://github.com/kamailio/kamailio/commit/3e7ff1f3613db1c5de559bbf259a621… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-22T13:30:09+02:00 app_python: support for more combinations of functions with 4 params --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/3e7ff1f3613db1c5de559bbf259a621… Patch: https://github.com/kamailio/kamailio/commit/3e7ff1f3613db1c5de559bbf259a621… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index 6a1d62d932..7110912b92 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -583,14 +583,46 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) ret = ((sr_kemi_fmssnn_f)(ket->func))(lmsg, &vps[0].s, &vps[1].s, vps[2].n, vps[3].n); return sr_kemi_apy_return_int(ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_STR + && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_INT) { + /* snnn */ + ret = ((sr_kemi_fmsnnn_f)(ket->func))(lmsg, + &vps[0].s, vps[1].n, vps[2].n, vps[3].n); + return sr_kemi_apy_return_int(ket, ret); } else if(ket->ptypes[0]==SR_KEMIP_INT && ket->ptypes[1]==SR_KEMIP_STR && ket->ptypes[2]==SR_KEMIP_STR && ket->ptypes[3]==SR_KEMIP_STR) { - /* ssnn */ + /* nsss */ ret = ((sr_kemi_fmnsss_f)(ket->func))(lmsg, vps[0].n, &vps[1].s, &vps[2].s, &vps[3].s); return sr_kemi_apy_return_int(ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_INT + && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR) { + /* nnss */ + ret = ((sr_kemi_fmnnss_f)(ket->func))(lmsg, + vps[0].n, vps[1].n, &vps[2].s, &vps[3].s); + return sr_kemi_apy_return_int(ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_INT + && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_STR) { + /* nnns */ + ret = ((sr_kemi_fmnnns_f)(ket->func))(lmsg, + vps[0].n, vps[1].n, vps[2].n, &vps[3].s); + return sr_kemi_apy_return_int(ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_INT + && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_INT) { + /* nnnn */ + ret = ((sr_kemi_fmnnnn_f)(ket->func))(lmsg, + vps[0].n, vps[1].n, vps[2].n, vps[3].n); + return sr_kemi_apy_return_int(ket, ret); } else { LM_ERR("invalid parameters for: %.*s\n", fname.len, fname.s);

5 years, 11 months

git:master:8ff9f0dc: app_lua: support for more combinations of functions with 4 params

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8ff9f0dc0c00e80ad3a9add41823ca3dc101b94e URL: https://github.com/kamailio/kamailio/commit/8ff9f0dc0c00e80ad3a9add41823ca3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-22T13:30:08+02:00 app_lua: support for more combinations of functions with 4 params --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/8ff9f0dc0c00e80ad3a9add41823ca3… Patch: https://github.com/kamailio/kamailio/commit/8ff9f0dc0c00e80ad3a9add41823ca3… --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index c98830da5c..a72e657279 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -1702,6 +1702,13 @@ int sr_kemi_lua_exec_func_ex(lua_State* L, sr_kemi_t *ket, int pdelta) ret = ((sr_kemi_fmssnn_f)(ket->func))(env_L->msg, &vps[0].s, &vps[1].s, vps[2].n, vps[3].n); return sr_kemi_lua_return_int(L, ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_STR + && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_INT) { + ret = ((sr_kemi_fmsnnn_f)(ket->func))(env_L->msg, + &vps[0].s, vps[1].n, vps[2].n, vps[3].n); + return sr_kemi_lua_return_int(L, ket, ret); } else if(ket->ptypes[0]==SR_KEMIP_INT && ket->ptypes[1]==SR_KEMIP_STR && ket->ptypes[2]==SR_KEMIP_STR @@ -1709,6 +1716,27 @@ int sr_kemi_lua_exec_func_ex(lua_State* L, sr_kemi_t *ket, int pdelta) ret = ((sr_kemi_fmnsss_f)(ket->func))(env_L->msg, vps[0].n, &vps[1].s, &vps[2].s, &vps[3].s); return sr_kemi_lua_return_int(L, ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_INT + && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR) { + ret = ((sr_kemi_fmnnss_f)(ket->func))(env_L->msg, + vps[0].n, vps[1].n, &vps[2].s, &vps[3].s); + return sr_kemi_lua_return_int(L, ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_INT + && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_STR) { + ret = ((sr_kemi_fmnnns_f)(ket->func))(env_L->msg, + vps[0].n, vps[1].n, vps[2].n, &vps[3].s); + return sr_kemi_lua_return_int(L, ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_INT + && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_INT) { + ret = ((sr_kemi_fmnnnn_f)(ket->func))(env_L->msg, + vps[0].n, vps[1].n, vps[2].n, vps[3].n); + return sr_kemi_lua_return_int(L, ket, ret); } else { LM_ERR("invalid parameters for: %.*s\n", fname->len, fname->s);

5 years, 11 months

[kamailio/kamailio] t_relay() sending packets from the wrong TCP socket (#1532)

by Jared Hull

### Description Kamailio is using the wrong source port when relaying INVITE packets with t_relay(). Another interesting thing is that while doing this, Kamailio reports to Homer via HEPv2 that it sent the packet from port 4242, but a tcpdump on the server shows this to be false so maybe homer was just looking at the R-URI port? There is a somewhat random element to this, so it is very difficult to reproduce. I will provide the scenario which led to this problem. #### Reproduction This is the code block which is responsible for relaying INVITEs to phone from our PBX servers, it is also the only instance of port 5062 being inserted into a SIP message. ``` if(is_method("INVITE")) { if(lookup("location", "sip:$rU@location")) { remove_hf("Contact"); append_hf("Contact: <sip:$sel(cfg_get.global.publicIP):5062>\r\n"); //A vendor's SIPIS server doesn't work on port 4242, does changing this port break SIP compliance? rtpproxy_manage("cow"); t_relay(); exit; } } ``` - Kamailio listens for UDP+TCP on ports 5060,5062, and 4242. - Phone A registers to tcp:KamailioIP:4242 from tcp:CustomerIP:10042 - Phone B registers to tcp:KamailioIP:4242 from tcp:CustomerIP:11042 - These phones have been re-registering from and to the same ports for a long time without problems with the same REGISTER callID (same transaction so nothing about the connection has changed). - At this point we have TCP connections `tcp:CustomerIP:10042 -> tcp:KamailioIP:4242` and `tcp:CustomerIP:11042 -> tcp:KamailioIP:4242` - Kamailio sends INVITEs from tcp:KamailioIP:4242 to the address of the registered phone with a contact header that tells the phones to send responses to tcp:KamailioIP:5062 (as seen in the above code block). This causes a new TCP connection to be made from the customer's router to Kamailio, just for this transaction. - All is well until phone A sends a response and the customer's router, by pure chance, decides to use port 11042 for the new TCP connection. `tcp:CustomerIP:11042 -> tcp:KamailioIP:5062` - From this point on Kamailio begins to route INVITEs, that were meant for phone B, to phone A using this TCP connection `tcp:CustomerIP:11042 -> tcp:KamailioIP:5062` (source port 5062!) rather than the connection that phone B is actually registered to `tcp:CustomerIP:11042 -> tcp:KamailioIP:4242`. - The customer's router sends packets from this TCP socket to phone A because the connection identified by the Kamailio source port had been created by phone A. - Kamailio is still routing other types of packets to phone B from port 4242 like NOTIFY in response to a subscription and OPTIONs keep alives, but INVITEs (which are an entirely new SIP transaction) are being sent from the wrong source port. ### Possible ~Solutions~ Problems I have the default tcp_accept_aliases=0, so ;alias in a Via header is not a problem. We are also not using force_send_socket. I've tried to figure out how Kamailio works, and I am wondering if this function might be adding the new TCP connection from phone A to port 5062 as an alias of the already existing TCP connection from phone B to port 4242. https://github.com/kamailio/kamailio/blob/cb7810c939da9c8f4385b530539487528… I also found these comments interesting. https://github.com/kamailio/kamailio/blob/52111974b4571e0562e8e731df80f48db… https://github.com/kamailio/kamailio/blob/52111974b4571e0562e8e731df80f48db… ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.0.5 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, 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_LISTEN 16, 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 04:38:13 Feb 2 2018 with gcc 4.8.5 ``` * **Operating System**: ``` Linux dallas-sip1-int 3.10.0-514.16.1.el7.x86_64 #1 SMP Wed Apr 12 15:04:24 UTC 2017 x86_64 x86_64 x86_64 GNU/Linux ``` -- 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/1532

5 years, 11 months

git:master:13457759: modules: readme files regenerated - tm ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 134577590f1d3b18508119449198fb03d5c19b4f URL: https://github.com/kamailio/kamailio/commit/134577590f1d3b18508119449198fb0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-06-22T10:46:55+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/134577590f1d3b18508119449198fb0… Patch: https://github.com/kamailio/kamailio/commit/134577590f1d3b18508119449198fb0…

5 years, 11 months

[kamailio/kamailio] tm: add relay_100 config parameter to support stateless operation (#1534)

by Armen Babikyan

#### 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/1534 -- Commit Summary -- * tm: add relay_100 config parameter to support stateless operation -- File Changes -- M src/modules/tm/config.c (5) M src/modules/tm/config.h (1) M src/modules/tm/t_reply.c (2) M src/modules/tm/tm.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1534.patch https://github.com/kamailio/kamailio/pull/1534.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/1534

5 years, 11 months

git:master:8a12e15b: Merge pull request #1534 from armenb/armenb/relay_100

by GitHub

Module: kamailio Branch: master Commit: 8a12e15b7a7c597f39a69f5bfdb265e42d5a778d URL: https://github.com/kamailio/kamailio/commit/8a12e15b7a7c597f39a69f5bfdb265e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-06-22T10:34:45+02:00 Merge pull request #1534 from armenb/armenb/relay_100 tm: add relay_100 config parameter to support stateless operation --- Modified: src/modules/tm/config.c Modified: src/modules/tm/config.h Modified: src/modules/tm/doc/params.xml Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/8a12e15b7a7c597f39a69f5bfdb265e… Patch: https://github.com/kamailio/kamailio/commit/8a12e15b7a7c597f39a69f5bfdb265e… --- diff --git a/src/modules/tm/config.c b/src/modules/tm/config.c index 00f86b12b1..b5494fea50 100644 --- a/src/modules/tm/config.c +++ b/src/modules/tm/config.c @@ -93,8 +93,9 @@ struct cfg_group_tm default_tm_cfg = { 0, /* local_ack_mode, default 0 (rfc3261 conformant) */ 1, /* local_cancel_reason -- add Reason header to locally generated CANCELs; on by default */ - 1 /* e2e_cancel_reason -- copy the Reason headers from incoming CANCELs + 1, /* e2e_cancel_reason -- copy the Reason headers from incoming CANCELs into the corresp. hop-by-hop CANCELs, on by default */ + 0 /* relay_100 -- by default, assume stateful proxy and do not relay SIP 100 */ }; void *tm_cfg = &default_tm_cfg; @@ -204,5 +205,7 @@ cfg_def_t tm_cfg_def[] = { {"e2e_cancel_reason", CFG_VAR_INT | CFG_ATOMIC, 0, 1, 0, 0, "if set to 1, Reason headers from received CANCELs are copied into" " the corresponding generated hop-by-hop CANCELs"}, + {"relay_100", CFG_VAR_INT | CFG_ATOMIC, 0, 1, 0, 0, + "if set to 1, relay SIP 100 messages as a stateless proxy"}, {0, 0, 0, 0, 0, 0} }; diff --git a/src/modules/tm/config.h b/src/modules/tm/config.h index 963fea6ea0..d46f71f9f6 100644 --- a/src/modules/tm/config.h +++ b/src/modules/tm/config.h @@ -135,6 +135,7 @@ struct cfg_group_tm { int local_ack_mode; int local_cancel_reason; int e2e_cancel_reason; + unsigned int relay_100; }; extern struct cfg_group_tm default_tm_cfg; diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index d787447c40..3692dab0d4 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -1454,6 +1454,33 @@ function ksr_tm_event(evname) return 1; end ... +</programlisting> + </example> + </section> + + <section id="tm.p.relay_100"> + <title><varname>relay_100</varname> (str)</title> + <para> + This parameter controls whether or not a SIP 100 response is proxied. + Note that this is not valid behavior when operating in stateful mode + per RFC 3261 Section 21.1.1, and therefore is useful only when + operating as a stateless proxy. + When using this feature, it is possible to control which 100 responses + are proxied and which are not by detecting whether they are part of + an existing transaction and setting up the appropriate logic in + onreply_route. + </para> + <para> + <emphasis> + Default value is 0 (disabled). + </emphasis> + </para> + <example> + <title>Set <varname>relay_100</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("tm", "relay_100", 1) +... </programlisting> </example> </section> diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 8b94cec624..474851aa7c 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -1494,9 +1494,10 @@ static enum rps t_should_relay_response( struct cell *Trans , int new_code, #else *should_store=0; #endif - /* 1xx and 2xx except 100 will be relayed */ + /* By default, 1xx and 2xx (except 100) will be relayed. 100 relaying can be + * controlled via relay_100 parameter */ Trans->uac[branch].last_received=new_code; - *should_relay= new_code==100? -1 : branch; + *should_relay= (new_code==100 && !cfg_get(tm, tm_cfg, relay_100)) ? -1 : branch; if (new_code>=200 ) { prepare_to_cancel( Trans, &cancel_data->cancel_bitmap, 0); #ifdef CANCEL_REASON_SUPPORT diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 426898f314..68df52b5c1 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -474,6 +474,7 @@ static param_export_t params[]={ #endif /* CANCEL_REASON_SUPPORT */ {"xavp_contact", PARAM_STR, &ulattrs_xavp_name }, {"event_callback", PARAM_STR, &tm_event_callback }, + {"relay_100", PARAM_INT, &default_tm_cfg.relay_100 }, {0,0,0} };

5 years, 11 months

git:master:926fbc97: tm: add relay_100 config parameter to support stateless operation

by Armen Babikyan

Module: kamailio Branch: master Commit: 926fbc97643364f79d09bde290c39faa357d3a6f URL: https://github.com/kamailio/kamailio/commit/926fbc97643364f79d09bde290c39fa… Author: Armen Babikyan <armen(a)firespotter.com> Committer: Armen Babikyan <armen(a)firespotter.com> Date: 2018-06-21T23:50:09-07:00 tm: add relay_100 config parameter to support stateless operation --- Modified: src/modules/tm/config.c Modified: src/modules/tm/config.h Modified: src/modules/tm/doc/params.xml Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/926fbc97643364f79d09bde290c39fa… Patch: https://github.com/kamailio/kamailio/commit/926fbc97643364f79d09bde290c39fa… --- diff --git a/src/modules/tm/config.c b/src/modules/tm/config.c index 00f86b12b1..b5494fea50 100644 --- a/src/modules/tm/config.c +++ b/src/modules/tm/config.c @@ -93,8 +93,9 @@ struct cfg_group_tm default_tm_cfg = { 0, /* local_ack_mode, default 0 (rfc3261 conformant) */ 1, /* local_cancel_reason -- add Reason header to locally generated CANCELs; on by default */ - 1 /* e2e_cancel_reason -- copy the Reason headers from incoming CANCELs + 1, /* e2e_cancel_reason -- copy the Reason headers from incoming CANCELs into the corresp. hop-by-hop CANCELs, on by default */ + 0 /* relay_100 -- by default, assume stateful proxy and do not relay SIP 100 */ }; void *tm_cfg = &default_tm_cfg; @@ -204,5 +205,7 @@ cfg_def_t tm_cfg_def[] = { {"e2e_cancel_reason", CFG_VAR_INT | CFG_ATOMIC, 0, 1, 0, 0, "if set to 1, Reason headers from received CANCELs are copied into" " the corresponding generated hop-by-hop CANCELs"}, + {"relay_100", CFG_VAR_INT | CFG_ATOMIC, 0, 1, 0, 0, + "if set to 1, relay SIP 100 messages as a stateless proxy"}, {0, 0, 0, 0, 0, 0} }; diff --git a/src/modules/tm/config.h b/src/modules/tm/config.h index 963fea6ea0..d46f71f9f6 100644 --- a/src/modules/tm/config.h +++ b/src/modules/tm/config.h @@ -135,6 +135,7 @@ struct cfg_group_tm { int local_ack_mode; int local_cancel_reason; int e2e_cancel_reason; + unsigned int relay_100; }; extern struct cfg_group_tm default_tm_cfg; diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index d787447c40..3692dab0d4 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -1454,6 +1454,33 @@ function ksr_tm_event(evname) return 1; end ... +</programlisting> + </example> + </section> + + <section id="tm.p.relay_100"> + <title><varname>relay_100</varname> (str)</title> + <para> + This parameter controls whether or not a SIP 100 response is proxied. + Note that this is not valid behavior when operating in stateful mode + per RFC 3261 Section 21.1.1, and therefore is useful only when + operating as a stateless proxy. + When using this feature, it is possible to control which 100 responses + are proxied and which are not by detecting whether they are part of + an existing transaction and setting up the appropriate logic in + onreply_route. + </para> + <para> + <emphasis> + Default value is 0 (disabled). + </emphasis> + </para> + <example> + <title>Set <varname>relay_100</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("tm", "relay_100", 1) +... </programlisting> </example> </section> diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 9958e70333..00691c0ff8 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -1492,9 +1492,10 @@ static enum rps t_should_relay_response( struct cell *Trans , int new_code, #else *should_store=0; #endif - /* 1xx and 2xx except 100 will be relayed */ + /* By default, 1xx and 2xx (except 100) will be relayed. 100 relaying can be + * controlled via relay_100 parameter */ Trans->uac[branch].last_received=new_code; - *should_relay= new_code==100? -1 : branch; + *should_relay= (new_code==100 && !cfg_get(tm, tm_cfg, relay_100)) ? -1 : branch; if (new_code>=200 ) { prepare_to_cancel( Trans, &cancel_data->cancel_bitmap, 0); #ifdef CANCEL_REASON_SUPPORT diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 426898f314..68df52b5c1 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -474,6 +474,7 @@ static param_export_t params[]={ #endif /* CANCEL_REASON_SUPPORT */ {"xavp_contact", PARAM_STR, &ulattrs_xavp_name }, {"event_callback", PARAM_STR, &tm_event_callback }, + {"relay_100", PARAM_INT, &default_tm_cfg.relay_100 }, {0,0,0} };

5 years, 11 months

git:master:752e875f: Merge pull request #1563 from surendratiwari3/evapi_async_relay_kemi

by GitHub

Module: kamailio Branch: master Commit: 752e875faece8233d39f8c91d7d553517ee94cd6 URL: https://github.com/kamailio/kamailio/commit/752e875faece8233d39f8c91d7d5535… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-06-22T10:32:49+02:00 Merge pull request #1563 from surendratiwari3/evapi_async_relay_kemi Modules: Evapi async_relay export to kemi --- Modified: src/modules/evapi/evapi_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/752e875faece8233d39f8c91d7d5535… Patch: https://github.com/kamailio/kamailio/commit/752e875faece8233d39f8c91d7d5535… --- diff --git a/src/modules/evapi/evapi_mod.c b/src/modules/evapi/evapi_mod.c index 7673cb262e..9ed8bd6d9a 100644 --- a/src/modules/evapi/evapi_mod.c +++ b/src/modules/evapi/evapi_mod.c @@ -591,6 +591,56 @@ static int ki_evapi_relay(sip_msg_t *msg, str *sdata) return evapi_relay(sdata); } +/** + * + */ +static int ki_evapi_async_relay(sip_msg_t *msg, str *sdata) +{ + unsigned int tindex; + unsigned int tlabel; + tm_cell_t *t = 0; + + + if(tmb.t_suspend==NULL) { + LM_ERR("evapi async relay is disabled - tm module not loaded\n"); + return -1; + } + + t = tmb.t_gett(); + if (t==NULL || t==T_UNDEFINED) + { + if(tmb.t_newtran(msg)<0) + { + LM_ERR("cannot create the transaction\n"); + return -1; + } + t = tmb.t_gett(); + if (t==NULL || t==T_UNDEFINED) + { + LM_ERR("cannot lookup the transaction\n"); + return -1; + } + } + if(tmb.t_suspend(msg, &tindex, &tlabel)<0) + { + LM_ERR("failed to suspend request processing\n"); + return -1; + } + + LM_DBG("transaction suspended [%u:%u]\n", tindex, tlabel); + + if(sdata->s==NULL || sdata->len == 0) { + LM_ERR("invalid data parameter\n"); + return -1; + } + + if(evapi_relay(sdata)<0) { + LM_ERR("failed to relay event: %.*s\n", sdata->len, sdata->s); + return -2; + } + return 1; +} + /** * */ @@ -637,7 +687,11 @@ static sr_kemi_t sr_kemi_evapi_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - + { str_init("evapi"), str_init("async_relay"), + SR_KEMIP_INT, ki_evapi_async_relay, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; /* clang-format on */

5 years, 11 months

git:master:99472814: Modules: Evapi async_relay export to kemi

by surendratiwari3

Module: kamailio Branch: master Commit: 99472814b19f50e30beda1840c5e969938027cac URL: https://github.com/kamailio/kamailio/commit/99472814b19f50e30beda1840c5e969… Author: surendratiwari3 <surendratiwari3(a)gmail.com> Committer: surendratiwari3 <surendratiwari3(a)gmail.com> Date: 2018-06-13T03:08:52Z Modules: Evapi async_relay export to kemi --- Modified: src/modules/evapi/evapi_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/99472814b19f50e30beda1840c5e969… Patch: https://github.com/kamailio/kamailio/commit/99472814b19f50e30beda1840c5e969… --- diff --git a/src/modules/evapi/evapi_mod.c b/src/modules/evapi/evapi_mod.c index 7673cb262e..9ed8bd6d9a 100644 --- a/src/modules/evapi/evapi_mod.c +++ b/src/modules/evapi/evapi_mod.c @@ -591,6 +591,56 @@ static int ki_evapi_relay(sip_msg_t *msg, str *sdata) return evapi_relay(sdata); } +/** + * + */ +static int ki_evapi_async_relay(sip_msg_t *msg, str *sdata) +{ + unsigned int tindex; + unsigned int tlabel; + tm_cell_t *t = 0; + + + if(tmb.t_suspend==NULL) { + LM_ERR("evapi async relay is disabled - tm module not loaded\n"); + return -1; + } + + t = tmb.t_gett(); + if (t==NULL || t==T_UNDEFINED) + { + if(tmb.t_newtran(msg)<0) + { + LM_ERR("cannot create the transaction\n"); + return -1; + } + t = tmb.t_gett(); + if (t==NULL || t==T_UNDEFINED) + { + LM_ERR("cannot lookup the transaction\n"); + return -1; + } + } + if(tmb.t_suspend(msg, &tindex, &tlabel)<0) + { + LM_ERR("failed to suspend request processing\n"); + return -1; + } + + LM_DBG("transaction suspended [%u:%u]\n", tindex, tlabel); + + if(sdata->s==NULL || sdata->len == 0) { + LM_ERR("invalid data parameter\n"); + return -1; + } + + if(evapi_relay(sdata)<0) { + LM_ERR("failed to relay event: %.*s\n", sdata->len, sdata->s); + return -2; + } + return 1; +} + /** * */ @@ -637,7 +687,11 @@ static sr_kemi_t sr_kemi_evapi_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - + { str_init("evapi"), str_init("async_relay"), + SR_KEMIP_INT, ki_evapi_async_relay, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; /* clang-format on */

5 years, 11 months

← Newer
1
...
7
8
9
10
11
12
13
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2018