June 2020 - sr-dev - kamailio.org

[kamailio/kamailio] registrar: expires_range should not make expires < min_expires (#2365)
by Kristian Høgh 19 Jun '20

19 Jun '20

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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 - [x] 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  expires_range should not make expires smaller than min_expires. A valid value might be made to small, which triggers 423 when min_expires_mode is set to 1 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2365 -- Commit Summary -- * registrar: expires_range should not make expires < min_expires -- File Changes -- M src/modules/registrar/sip_msg.c (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2365.patch https://github.com/kamailio/kamailio/pull/2365.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/2365

2 3

git:master:95992d29: Merge pull request #2365 from khoegh/423-expires-range
by GitHub 19 Jun '20

19 Jun '20

Module: kamailio Branch: master Commit: 95992d29c4ab2b8863f1301f0259f295468c5301 URL: https://github.com/kamailio/kamailio/commit/95992d29c4ab2b8863f1301f0259f29… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-06-19T13:12:32+02:00 Merge pull request #2365 from khoegh/423-expires-range registrar: expires_range should not make expires < min_expires --- Modified: src/modules/registrar/sip_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/95992d29c4ab2b8863f1301f0259f29… Patch: https://github.com/kamailio/kamailio/commit/95992d29c4ab2b8863f1301f0259f29… --- diff --git a/src/modules/registrar/sip_msg.c b/src/modules/registrar/sip_msg.c index d2dfba0aee..802435865f 100644 --- a/src/modules/registrar/sip_msg.c +++ b/src/modules/registrar/sip_msg.c @@ -277,10 +277,6 @@ void calc_contact_expires(struct sip_msg* _m, param_t* _ep, int* _e, int novaria if ( *_e != 0 ) { - if (!novariation) { - *_e = randomize_expires( *_e, range ); - } - if (*_e < cfg_get(registrar, registrar_cfg, min_expires)) { if(reg_min_expires_mode) { rerrno = R_LOW_EXP; @@ -290,6 +286,13 @@ void calc_contact_expires(struct sip_msg* _m, param_t* _ep, int* _e, int novaria } } + if (!novariation) { + *_e = randomize_expires( *_e, range ); + if (*_e < cfg_get(registrar, registrar_cfg, min_expires)) { + *_e = cfg_get(registrar, registrar_cfg, min_expires); + } + } + if (cfg_get(registrar, registrar_cfg, max_expires) && (*_e > cfg_get(registrar, registrar_cfg, max_expires))) { *_e = cfg_get(registrar, registrar_cfg, max_expires); }

1 0

git:master:c753932e: registrar: expires_range should not make expires < min_expires
by Kristian F. HÃ¸gh 19 Jun '20

19 Jun '20

Module: kamailio Branch: master Commit: c753932ebfa055d923c92b916937eec99cd14d23 URL: https://github.com/kamailio/kamailio/commit/c753932ebfa055d923c92b916937eec… Author: Kristian F. HÃ¸gh <kfh(a)uni-tel.dk> Committer: Kristian F. HÃ¸gh <kfh(a)uni-tel.dk> Date: 2020-06-19T11:22:20+02:00 registrar: expires_range should not make expires < min_expires --- Modified: src/modules/registrar/sip_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/c753932ebfa055d923c92b916937eec… Patch: https://github.com/kamailio/kamailio/commit/c753932ebfa055d923c92b916937eec… --- diff --git a/src/modules/registrar/sip_msg.c b/src/modules/registrar/sip_msg.c index d2dfba0aee..802435865f 100644 --- a/src/modules/registrar/sip_msg.c +++ b/src/modules/registrar/sip_msg.c @@ -277,10 +277,6 @@ void calc_contact_expires(struct sip_msg* _m, param_t* _ep, int* _e, int novaria if ( *_e != 0 ) { - if (!novariation) { - *_e = randomize_expires( *_e, range ); - } - if (*_e < cfg_get(registrar, registrar_cfg, min_expires)) { if(reg_min_expires_mode) { rerrno = R_LOW_EXP; @@ -290,6 +286,13 @@ void calc_contact_expires(struct sip_msg* _m, param_t* _ep, int* _e, int novaria } } + if (!novariation) { + *_e = randomize_expires( *_e, range ); + if (*_e < cfg_get(registrar, registrar_cfg, min_expires)) { + *_e = cfg_get(registrar, registrar_cfg, min_expires); + } + } + if (cfg_get(registrar, registrar_cfg, max_expires) && (*_e > cfg_get(registrar, registrar_cfg, max_expires))) { *_e = cfg_get(registrar, registrar_cfg, max_expires); }

1 0

git:master:773ecfc9: tools/kemi: add support for invoking function pointers
by Torrey Searle 19 Jun '20

19 Jun '20

Module: kamailio Branch: master Commit: 773ecfc9ceec5bbbe6c7f5fd72399baacfd74c0a URL: https://github.com/kamailio/kamailio/commit/773ecfc9ceec5bbbe6c7f5fd72399ba… Author: Torrey Searle <tsearle(a)voxbone.com> Committer: Torrey Searle <tsearle(a)voxbone.com> Date: 2020-06-19T11:06:09+02:00 tools/kemi: add support for invoking function pointers also add a flag to allow generated version of code to be compatible with older versions of python3 --- Modified: misc/tools/kemi/python_mock/README.md Modified: misc/tools/kemi/python_mock/kemi_mock.py Modified: misc/tools/kemi/python_mock/test.py --- Diff: https://github.com/kamailio/kamailio/commit/773ecfc9ceec5bbbe6c7f5fd72399ba… Patch: https://github.com/kamailio/kamailio/commit/773ecfc9ceec5bbbe6c7f5fd72399ba…

1 0

git:master:39a58ebf: pkg/kamailio/deb: version set 5.4.0~pre0
by Victor Seva 19 Jun '20

19 Jun '20

Module: kamailio Branch: master Commit: 39a58ebf3648bc8d21ba9688a4f1407852399528 URL: https://github.com/kamailio/kamailio/commit/39a58ebf3648bc8d21ba9688a4f1407… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-06-19T10:03:33+02:00 pkg/kamailio/deb: version set 5.4.0~pre0 * clean previous entries --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/39a58ebf3648bc8d21ba9688a4f1407… Patch: https://github.com/kamailio/kamailio/commit/39a58ebf3648bc8d21ba9688a4f1407…

1 0

Development for v5.4.x is frozen
by Daniel-Constantin Mierla 19 Jun '20

19 Jun '20

Hello, the formal notification that the development for the next major version 5.4.0 is now frozen. The focus has to be on testing the master branch. Also, the master branch should not get commits with new features till the branch 5.4 is created, expected to happen in 2-4 weeks, a matter of how testing goes on. Meanwhile, the commits with new features in the C code can be pushed to personal branches, pull requests can still be done, but they will be merged after branching 5.4. Can still be done commits with documentation improvements, enhancements to related tool (e.g., kamctl, kamcmd), exporting missing KEMI functions and completing the functionality of the new modules added in 5.4. Once the branch 5.4 is created, new features can be pushed again to master branch as usual. From that moment, the v5.3.0 should be out very soon, time used for further testing but also preparing the release of packages. If someone is not sure if a commit brings a new feature, just make a pull request and it can be discussed there on github portal or via sr-dev mailing list. A summary of what is new in upcoming 5.4 is going to be built at: * https://www.kamailio.org/wiki/features/new-in-5.4.x Upgrade guidelines will be collected at: * https://www.kamailio.org/wiki/install/upgrade/5.3.x-to-5.4.0 Everyone is more than welcome to contribute to the above wiki pages, especially to the upgrade guidelines, to help everyone else during the migration process from v5.3.x to 5.4.x. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

git:master:f1773b1f: Makefile.defs: version set to 5.4.0-pre0
by Daniel-Constantin Mierla 19 Jun '20

19 Jun '20

Module: kamailio Branch: master Commit: f1773b1fd8662aa0e80949c88d38d48db14981f0 URL: https://github.com/kamailio/kamailio/commit/f1773b1fd8662aa0e80949c88d38d48… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-19T08:19:34+02:00 Makefile.defs: version set to 5.4.0-pre0 - start of pre-release phase for 5.4.x series --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/f1773b1fd8662aa0e80949c88d38d48… Patch: https://github.com/kamailio/kamailio/commit/f1773b1fd8662aa0e80949c88d38d48… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index c79cc792ef..d9535ac451 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 4 SUBLEVEL = 0 -EXTRAVERSION = -dev6 +EXTRAVERSION = -pre0 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:909de965: Makefile.defs: version set to 5.4.0-dev6
by Daniel-Constantin Mierla 19 Jun '20

19 Jun '20

Module: kamailio Branch: master Commit: 909de965a4843169255635839e4d9dc6948c2578 URL: https://github.com/kamailio/kamailio/commit/909de965a4843169255635839e4d9dc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-19T08:18:12+02:00 Makefile.defs: version set to 5.4.0-dev6 - marking end of development for 5.4.x series --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/909de965a4843169255635839e4d9dc… Patch: https://github.com/kamailio/kamailio/commit/909de965a4843169255635839e4d9dc… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index ac41fb432b..c79cc792ef 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 4 SUBLEVEL = 0 -EXTRAVERSION = -dev5 +EXTRAVERSION = -dev6 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:1acd2a10: tm: execute core event SREV_SIP_REPLY_OUT on local reply
by Daniel-Constantin Mierla 18 Jun '20

18 Jun '20

Module: kamailio Branch: master Commit: 1acd2a1097d0ccfcf85657f7a1e50d0c95f7f2e1 URL: https://github.com/kamailio/kamailio/commit/1acd2a1097d0ccfcf85657f7a1e50d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-18T21:52:52+02:00 tm: execute core event SREV_SIP_REPLY_OUT on local reply --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/1acd2a1097d0ccfcf85657f7a1e50d0… Patch: https://github.com/kamailio/kamailio/commit/1acd2a1097d0ccfcf85657f7a1e50d0… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index fd11d517b9..fee04e671f 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -582,7 +582,8 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len, _tm_local_response_sent_lookup = 1; } } - if ((rt >= 0 && event_rt.rlist[rt] != NULL) || (keng != NULL)) { + if ((rt >= 0 && event_rt.rlist[rt] != NULL) || (keng != NULL) + || sr_event_enabled(SREV_SIP_REPLY_OUT)) { if (likely(build_sip_msg_from_buf(&pmsg, buf, len, inc_msg_no()) == 0)) { struct onsend_info onsnd_info; @@ -591,14 +592,28 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len, onsnd_info.send_sock=trans->uas.response.dst.send_sock; onsnd_info.buf=buf; onsnd_info.len=len; - p_onsend=&onsnd_info; + if(sr_event_enabled(SREV_SIP_REPLY_OUT)) { + sr_event_param_t evp; + memset(&evp, 0, sizeof(sr_event_param_t)); + evp.obuf.s = buf; + evp.obuf.len = len; + evp.rcv = &trans->uas.request->rcv; + evp.dst = &trans->uas.response.dst; + evp.req = trans->uas.request; + evp.rpl = &pmsg; + evp.rplcode = code; + evp.mode = 2; + sr_event_exec(SREV_SIP_REPLY_OUT, &evp); + } + + p_onsend=&onsnd_info; backup_rt = get_route_type(); set_route_type(LOCAL_ROUTE); init_run_actions_ctx(&ctx); - if(keng == NULL) { + if(rt >= 0 && event_rt.rlist[rt] != NULL) { run_top_route(event_rt.rlist[rt], &pmsg, 0); - } else { + } else if(keng != NULL) { bctx = sr_kemi_act_ctx_get(); sr_kemi_act_ctx_set(&ctx); (void)sr_kemi_route(keng, &pmsg, EVENT_ROUTE,

1 0

git:master:72d830ce: dlgs: register callback for core event SREV_SIP_REPLY_OUT
by Daniel-Constantin Mierla 18 Jun '20

18 Jun '20

Module: kamailio Branch: master Commit: 72d830ce66b40c0f3bd6589b24835d378dda64e5 URL: https://github.com/kamailio/kamailio/commit/72d830ce66b40c0f3bd6589b24835d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-18T18:45:58+02:00 dlgs: register callback for core event SREV_SIP_REPLY_OUT --- Modified: src/modules/dlgs/dlgs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/72d830ce66b40c0f3bd6589b24835d3… Patch: https://github.com/kamailio/kamailio/commit/72d830ce66b40c0f3bd6589b24835d3… --- diff --git a/src/modules/dlgs/dlgs_mod.c b/src/modules/dlgs/dlgs_mod.c index 499de84563..c2f1a8146c 100644 --- a/src/modules/dlgs/dlgs_mod.c +++ b/src/modules/dlgs/dlgs_mod.c @@ -30,6 +30,7 @@ #include "../../core/mod_fix.h" #include "../../core/ut.h" #include "../../core/kemi.h" +#include "../../core/events.h" #include "../../core/utils/sruid.h" #include "../../core/timer_proc.h" @@ -58,6 +59,8 @@ static int w_dlgs_tags_add(sip_msg_t *msg, char *ptags, char *p2); static int w_dlgs_tags_rm(sip_msg_t *msg, char *ptags, char *p2); static int w_dlgs_tags_count(sip_msg_t *msg, char *ptags, char *p2); +static int dlgs_sip_reply_out(sr_event_param_t *evp); + /* clang-format off */ static cmd_export_t cmds[]={ {"dlgs_init", (cmd_function)w_dlgs_init, 3, fixup_spve_all, @@ -125,6 +128,8 @@ static int mod_init(void) return -1; } + sr_event_register_cb(SREV_SIP_REPLY_OUT, dlgs_sip_reply_out); + if(dlgs_init()<0) { return -1; } @@ -261,6 +266,17 @@ static int w_dlgs_tags_count(sip_msg_t *msg, char *ptags, char *p2) return 1; } +/** + * + */ +static int dlgs_sip_reply_out(sr_event_param_t *evp) +{ + if(evp->rpl!=NULL) { + dlgs_update_item(evp->rpl); + } + return 0; +} + /** * */

1 0

git:master:700261df: sl: execute core event SREV_SIP_REPLY_OUT
by Daniel-Constantin Mierla 18 Jun '20

18 Jun '20

Module: kamailio Branch: master Commit: 700261dff422693fb78dbe5062998bed3eddb397 URL: https://github.com/kamailio/kamailio/commit/700261dff422693fb78dbe5062998be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-18T18:45:58+02:00 sl: execute core event SREV_SIP_REPLY_OUT --- Modified: src/modules/sl/sl_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/700261dff422693fb78dbe5062998be… Patch: https://github.com/kamailio/kamailio/commit/700261dff422693fb78dbe5062998be… --- diff --git a/src/modules/sl/sl_funcs.c b/src/modules/sl/sl_funcs.c index c832f4fb09..e6f643c861 100644 --- a/src/modules/sl/sl_funcs.c +++ b/src/modules/sl/sl_funcs.c @@ -214,7 +214,8 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) mhomed=backup_mhomed; keng = sr_kemi_eng_get(); - if (_sl_evrt_local_response >= 0 || keng!=NULL) + if (_sl_evrt_local_response >= 0 || keng!=NULL + || sr_event_enabled(SREV_SIP_REPLY_OUT)) { if (likely(build_sip_msg_from_buf(&pmsg, buf.s, buf.len, inc_msg_no()) == 0)) @@ -226,10 +227,8 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) onsnd_info.send_sock=dst.send_sock; onsnd_info.buf=buf.s; onsnd_info.len=buf.len; - p_onsend=&onsnd_info; - if (unlikely(!IS_SIP(msg))) - { + if (unlikely(!IS_SIP(msg))) { /* This is an HTTP reply... So fudge in a CSeq into * the parsed message message structure so that $rm will * work in the route */ @@ -293,6 +292,20 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) } } + if(IS_SIP(msg) && sr_event_enabled(SREV_SIP_REPLY_OUT)) { + sr_event_param_t evp; + memset(&evp, 0, sizeof(sr_event_param_t)); + evp.obuf = buf; + evp.rcv = &msg->rcv; + evp.dst = &dst; + evp.req = msg; + evp.rpl = &pmsg; + evp.rplcode = code; + evp.mode = 1; + sr_event_exec(SREV_SIP_REPLY_OUT, &evp); + } + + p_onsend=&onsnd_info; backup_rt = get_route_type(); set_route_type(LOCAL_ROUTE); init_run_actions_ctx(&ctx);

1 0

git:master:936a49a1: core: events - added out buffer field to event structure
by Daniel-Constantin Mierla 18 Jun '20

18 Jun '20

Module: kamailio Branch: master Commit: 936a49a11ea88425bec4ad9b9e6ec69549e0fe34 URL: https://github.com/kamailio/kamailio/commit/936a49a11ea88425bec4ad9b9e6ec69… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-18T18:45:58+02:00 core: events - added out buffer field to event structure --- Modified: src/core/events.h --- Diff: https://github.com/kamailio/kamailio/commit/936a49a11ea88425bec4ad9b9e6ec69… Patch: https://github.com/kamailio/kamailio/commit/936a49a11ea88425bec4ad9b9e6ec69… --- diff --git a/src/core/events.h b/src/core/events.h index f13c64a83a..2208d8038d 100644 --- a/src/core/events.h +++ b/src/core/events.h @@ -43,6 +43,7 @@ typedef struct sr_event_param { void *data; + str obuf; receive_info_t* rcv; dest_info_t *dst; sip_msg_t *req;

1 0

git:master:13329ce0: modules: readme files regenerated - corex ... [skip ci]
by Kamailio Dev 18 Jun '20

18 Jun '20

Module: kamailio Branch: master Commit: 13329ce04a6c082920b959e47d49bee1b8171e70 URL: https://github.com/kamailio/kamailio/commit/13329ce04a6c082920b959e47d49bee… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-06-18T17:16:17+02:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/13329ce04a6c082920b959e47d49bee… Patch: https://github.com/kamailio/kamailio/commit/13329ce04a6c082920b959e47d49bee…

1 0

git:master:5e9a0dba: corex: docs for evcb_reply_out param and event_route[corex:reply-out]
by Daniel-Constantin Mierla 18 Jun '20

18 Jun '20

Module: kamailio Branch: master Commit: 5e9a0dba1f1f12222c807332ef6fc8df233fc7ab URL: https://github.com/kamailio/kamailio/commit/5e9a0dba1f1f12222c807332ef6fc8d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-18T17:09:50+02:00 corex: docs for evcb_reply_out param and event_route[corex:reply-out] --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5e9a0dba1f1f12222c807332ef6fc8d… Patch: https://github.com/kamailio/kamailio/commit/5e9a0dba1f1f12222c807332ef6fc8d… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index 203ada5d2f..96c6fe4ae3 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -147,6 +147,26 @@ modparam("corex", "alias_subdomains", "udp:sip-router.org:5060") modparam("corex", "dns_cache", "type=A;name=kamailio.org;addr=193.22.119.66;ttl=3600000;flags=0") modparam("corex", "dns_cache", "type=AAAA;name=kamailio.org;addr=2a00:d60:0:400::2;ttl=3600000;flags=0") ... +</programlisting> + </example> + </section> + <section id="corex.p.evcb_reply_out"> + <title><varname>evcb_reply_out</varname> (string)</title> + <para> + Name of KEMI callback function to be executed instead of + event_route[corex:reply-out]. + </para> + <para> + <emphasis> + Default value is <quote>NULL</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>evcb_reply_out</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("corex", "evcb_reply_out", "ksr_corex_reply_out") +... </programlisting> </example> </section> @@ -953,7 +973,7 @@ event_route[dispatcher:dst-down] { <section> <title>Event Routes</title> - <section id="async.evr.network_io"> + <section id="corex.evr.network_msg"> <title> <function moreinfo="none">event_route[network:msg]</function> </title> @@ -981,6 +1001,14 @@ event_route[dispatcher:dst-down] { no module functions or pseudo variables are available in this event route. </para> </section> + <section id="corex.evr.reply_out"> + <title> + <function moreinfo="none">event_route[corex:reply-out]</function> + </title> + <para> + Event route block to be executed when a SIP reply is sent out. + </para> + </section> </section> <section>

1 0

git:master:35360a5f: corex: event route when a sip reply is sent out
by Daniel-Constantin Mierla 18 Jun '20

18 Jun '20

Module: kamailio Branch: master Commit: 35360a5f99eb96d57d7bdab9d32f1f7db6dc0006 URL: https://github.com/kamailio/kamailio/commit/35360a5f99eb96d57d7bdab9d32f1f7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-18T16:40:37+02:00 corex: event route when a sip reply is sent out --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/35360a5f99eb96d57d7bdab9d32f1f7… Patch: https://github.com/kamailio/kamailio/commit/35360a5f99eb96d57d7bdab9d32f1f7… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index b8b5de0046..8d0e649548 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -31,6 +31,8 @@ #include "../../core/pvar.h" #include "../../core/fmsg.h" #include "../../core/kemi.h" +#include "../../core/events.h" +#include "../../core/onsend.h" #include "../../core/dns_cache.h" #include "../../core/parser/parse_uri.h" #include "../../core/parser/parse_param.h" @@ -69,6 +71,8 @@ static int w_is_faked_msg(sip_msg_t *msg, char *p1, char *p2); static int fixup_file_op(void** param, int param_no); static sr_kemi_xval_t _sr_kemi_corex_xval = {0}; +static str corex_evcb_reply_out = STR_NULL; +static int corex_evrt_reply_out_no = -1; int corex_alias_subdomains_param(modparam_t type, void *val); int corex_dns_cache_param(modparam_t type, void *val); @@ -77,6 +81,8 @@ static int mod_init(void); static int child_init(int); static void mod_destroy(void); +static int corex_sip_reply_out(sr_event_param_t *evp); + static pv_export_t mod_pvs[] = { { {"cfg", (sizeof("cfg")-1)}, PVT_OTHER, pv_get_cfg, 0, pv_parse_cfg_name, 0, 0, 0 }, @@ -151,6 +157,7 @@ static param_export_t params[]={ {"nio_intercept", INT_PARAM, &nio_intercept}, {"nio_min_msg_len", INT_PARAM, &nio_min_msg_len}, {"nio_msg_avp", PARAM_STR, &nio_msg_avp_param}, + {"evcb_reply_out", PARAM_STR, &corex_evcb_reply_out}, {0, 0, 0} }; @@ -193,6 +200,11 @@ static int mod_init(void) return -1; } + corex_evrt_reply_out_no = route_lookup(&event_rt, "corex:reply-out"); + + if(corex_evrt_reply_out_no>=0 || corex_evcb_reply_out.len>0) { + sr_event_register_cb(SREV_SIP_REPLY_OUT, corex_sip_reply_out); + } return 0; } @@ -1090,6 +1102,25 @@ static int w_is_faked_msg(sip_msg_t *msg, char *p1, char *p2) return -1; } +/** + * + */ +static int corex_sip_reply_out(sr_event_param_t *evp) +{ + onsend_info_t sndinfo; + str evname = str_init("corex:reply-out"); + + memset(&sndinfo, 0, sizeof(onsend_info_t)); + + if(corex_evrt_reply_out_no>=0 || corex_evcb_reply_out.len>0) { + run_onsend_evroute(&sndinfo, corex_evrt_reply_out_no, + &corex_evcb_reply_out, &evname); + } + + return 0; +} + + /** * */

1 0

git:master:05e87e66: core: c code for executing route blocks on send out events moved to onsend.c
by Daniel-Constantin Mierla 18 Jun '20

18 Jun '20

Module: kamailio Branch: master Commit: 05e87e66cdb398ea9fe5aecc09d521a25a4f5c8e URL: https://github.com/kamailio/kamailio/commit/05e87e66cdb398ea9fe5aecc09d521a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-18T16:14:14+02:00 core: c code for executing route blocks on send out events moved to onsend.c - helper functions for executing event_route blocks for send out cases --- Added: src/core/onsend.c Modified: src/core/action.c Modified: src/core/onsend.h --- Diff: https://github.com/kamailio/kamailio/commit/05e87e66cdb398ea9fe5aecc09d521a… Patch: https://github.com/kamailio/kamailio/commit/05e87e66cdb398ea9fe5aecc09d521a…

1 0

git:master:b49b5661: core: extend onsend structure to include runtime mode and reply code
by Daniel-Constantin Mierla 18 Jun '20

18 Jun '20

Module: kamailio Branch: master Commit: b49b56614db5e5d32ba415755bdac75478cc08f2 URL: https://github.com/kamailio/kamailio/commit/b49b56614db5e5d32ba415755bdac75… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-18T15:38:53+02:00 core: extend onsend structure to include runtime mode and reply code - runtime mode to be set to local or network traffic on specific cases --- Modified: src/core/onsend.h --- Diff: https://github.com/kamailio/kamailio/commit/b49b56614db5e5d32ba415755bdac75… Patch: https://github.com/kamailio/kamailio/commit/b49b56614db5e5d32ba415755bdac75… --- diff --git a/src/core/onsend.h b/src/core/onsend.h index e435a27f0a..7913e7dda4 100644 --- a/src/core/onsend.h +++ b/src/core/onsend.h @@ -42,6 +42,8 @@ typedef struct onsend_info{ char* buf; /* outgoing buffer */ int len; /* outgoing buffer len */ sip_msg_t *msg; /* original sip msg struct */ + int rmode; /* runtime execution mode */ + int rplcode; /* reply code */ } onsend_info_t; extern onsend_info_t* p_onsend;

1 0

git:master:93ab0791: core: event hook for sip reply out
by Daniel-Constantin Mierla 18 Jun '20

18 Jun '20

Module: kamailio Branch: master Commit: 93ab0791b409b9a708a1c7ac5cc4f94f7537d2ca URL: https://github.com/kamailio/kamailio/commit/93ab0791b409b9a708a1c7ac5cc4f94… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-18T13:18:39+02:00 core: event hook for sip reply out --- Modified: src/core/events.c Modified: src/core/events.h --- Diff: https://github.com/kamailio/kamailio/commit/93ab0791b409b9a708a1c7ac5cc4f94… Patch: https://github.com/kamailio/kamailio/commit/93ab0791b409b9a708a1c7ac5cc4f94… --- diff --git a/src/core/events.c b/src/core/events.c index 70d7179697..ebe47ee4b1 100644 --- a/src/core/events.c +++ b/src/core/events.c @@ -180,6 +180,15 @@ int sr_event_register_cb(int type, sr_event_cb_f f) _sr_events_list.net_data_send = f; else return -1; break; + case SREV_SIP_REPLY_OUT: + for(i=0; i<SREV_CB_LIST_SIZE; i++) { + if(_sr_events_list.sip_reply_out[i]==0) { + _sr_events_list.sip_reply_out[i] = f; + break; + } + } + if(i==SREV_CB_LIST_SIZE) return -1; + break; default: return -1; } @@ -317,6 +326,15 @@ int sr_event_exec(int type, sr_event_param_t *evp) ret = _sr_events_list.net_data_send(evp); return ret; } else return 1; + case SREV_SIP_REPLY_OUT: + if(unlikely(_sr_events_list.net_data_in[0]!=0)) + { + ret = 0; + for(i=0; i<SREV_CB_LIST_SIZE + && _sr_events_list.sip_reply_out[i]; i++) { + ret |= _sr_events_list.sip_reply_out[i](evp); + } + } else return 1; default: return -1; } @@ -358,6 +376,8 @@ int sr_event_enabled(int type) return (_sr_events_list.net_data_recv!=0)?1:0; case SREV_NET_DATA_SEND: return (_sr_events_list.net_data_send!=0)?1:0; + case SREV_SIP_REPLY_OUT: + return (_sr_events_list.sip_reply_out[0]!=0)?1:0; } return 0; } diff --git a/src/core/events.h b/src/core/events.h index df8a313055..f13c64a83a 100644 --- a/src/core/events.h +++ b/src/core/events.h @@ -37,6 +37,7 @@ #define SREV_TCP_CLOSED 13 #define SREV_NET_DATA_RECV 14 #define SREV_NET_DATA_SEND 15 +#define SREV_SIP_REPLY_OUT 16 #define SREV_CB_LIST_SIZE 8 @@ -44,6 +45,10 @@ typedef struct sr_event_param { void *data; receive_info_t* rcv; dest_info_t *dst; + sip_msg_t *req; + sip_msg_t *rpl; + int rplcode; + int mode; } sr_event_param_t; typedef int (*sr_event_cb_f)(sr_event_param_t *evp); @@ -64,6 +69,7 @@ typedef struct sr_event_cb { sr_event_cb_f tcp_closed; sr_event_cb_f net_data_recv; sr_event_cb_f net_data_send; + sr_event_cb_f sip_reply_out[SREV_CB_LIST_SIZE]; } sr_event_cb_t; void sr_event_cb_init(void);

1 0

git:master:7e402da2: pv: use SIP_REQUEST/SIP_REPLY for value of $mt
by Daniel-Constantin Mierla 18 Jun '20

18 Jun '20

Module: kamailio Branch: master Commit: 7e402da261e1ced56019037d3dce9e72b5b2b0ea URL: https://github.com/kamailio/kamailio/commit/7e402da261e1ced56019037d3dce9e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-18T10:31:38+02:00 pv: use SIP_REQUEST/SIP_REPLY for value of $mt --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/7e402da261e1ced56019037d3dce9e7… Patch: https://github.com/kamailio/kamailio/commit/7e402da261e1ced56019037d3dce9e7… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 7b28fb966e..f7af431341 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -188,9 +188,9 @@ int pv_get_msgtype(struct sip_msg *msg, pv_param_t *param, return -1; if(msg->first_line.type == SIP_REQUEST) - type = 1; + type = SIP_REQUEST; /* 1 */ else if(msg->first_line.type == SIP_REPLY) - type = 2; + type = SIP_REPLY; /* 2 */ return pv_get_uintval(msg, param, res, type); }

1 0

git:master:339f24be: modules: readme files regenerated - siputils ... [skip ci]
by Kamailio Dev 18 Jun '20

18 Jun '20

Module: kamailio Branch: master Commit: 339f24be1b28a2ab9702ae19dcc8d09f747ea77b URL: https://github.com/kamailio/kamailio/commit/339f24be1b28a2ab9702ae19dcc8d09… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-06-18T09:01:28+02:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/339f24be1b28a2ab9702ae19dcc8d09… Patch: https://github.com/kamailio/kamailio/commit/339f24be1b28a2ab9702ae19dcc8d09…

1 0

git:master:65119d91: siputils: docs for uri_param_any(param)
by Daniel-Constantin Mierla 18 Jun '20

18 Jun '20

Module: kamailio Branch: master Commit: 65119d916fcd3bf42dff21718e6a4a18c2d5b16e URL: https://github.com/kamailio/kamailio/commit/65119d916fcd3bf42dff21718e6a4a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-18T08:34:14+02:00 siputils: docs for uri_param_any(param) --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/65119d916fcd3bf42dff21718e6a4a1… Patch: https://github.com/kamailio/kamailio/commit/65119d916fcd3bf42dff21718e6a4a1… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index 8dd72319c0..67e7d1e6c8 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -446,6 +446,34 @@ if (uri_param("param1","value1")) { ... }; ... +</programlisting> + </example> + </section> + <section> + <title id="siputils.f.uri_param_any"> + <function moreinfo="none">uri_param_any(param)</function> + </title> + <para> + Find if Request URI has a given parameter with or without value. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>param</emphasis> - parameter name to look for. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from REQUEST_ROUTE. + </para> + <example> + <title><function>uri_param_any</function> usage</title> + <programlisting format="linespecific"> +... +if (uri_param_any("param1")) { + ... +} +... </programlisting> </example> </section>

1 0

git:master:3467291d: siputils: new function uri_param_any(param)
by Daniel-Constantin Mierla 18 Jun '20

18 Jun '20

Module: kamailio Branch: master Commit: 3467291d80dba021e8684d203c50fb5a6b546bd8 URL: https://github.com/kamailio/kamailio/commit/3467291d80dba021e8684d203c50fb5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-18T08:33:27+02:00 siputils: new function uri_param_any(param) - check if r-uri has the param, with or without value --- Modified: src/modules/siputils/checks.c Modified: src/modules/siputils/checks.h Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/3467291d80dba021e8684d203c50fb5… Patch: https://github.com/kamailio/kamailio/commit/3467291d80dba021e8684d203c50fb5… --- diff --git a/src/modules/siputils/checks.c b/src/modules/siputils/checks.c index 0c6b545abb..3e01eb9782 100644 --- a/src/modules/siputils/checks.c +++ b/src/modules/siputils/checks.c @@ -289,6 +289,73 @@ int ki_uri_param(sip_msg_t *_msg, str *sparam) return ki_uri_param_value(_msg, sparam, NULL); } +/* + * Check if param with or without value exists in Request URI + */ +int ki_uri_param_any(sip_msg_t *msg, str *sparam) +{ + str t; + str ouri; + sip_uri_t puri; + param_hooks_t hooks; + param_t* params, *pit; + + if((msg->new_uri.s == NULL) || (msg->new_uri.len == 0)) { + ouri = msg->first_line.u.request.uri; + if(ouri.s == NULL) { + LM_ERR("r-uri not found\n"); + return -1; + } + } else { + ouri = msg->new_uri; + } + + if (parse_uri(ouri.s, ouri.len, &puri) < 0) { + LM_ERR("failed to parse r-uri [%.*s]\n", ouri.len, ouri.s); + return -1; + } + if(puri.sip_params.len>0) { + t = puri.sip_params; + } else if(puri.params.len>0) { + t = puri.params; + } else { + LM_DBG("no uri params [%.*s]\n", ouri.len, ouri.s); + return -1; + } + + if (parse_params(&t, CLASS_ANY, &hooks, &params) < 0) { + LM_ERR("ruri parameter parsing failed\n"); + return -1; + } + + for (pit = params; pit; pit = pit->next) { + if ((pit->name.len == sparam->len) + && (strncasecmp(pit->name.s, sparam->s, sparam->len) == 0)) { + break; + } + } + if(pit==NULL) { + free_params(params); + return -1; + } + + free_params(params); + return 1; +} + +/* + * Find if Request URI has a given parameter with or without value + */ +int w_uri_param_any(struct sip_msg* _msg, char* _param, char* _str2) +{ + str sparam; + if(fixup_get_svalue(_msg, (gparam_t*)_param, &sparam)<0) { + LM_ERR("failed to get parameter\n"); + return -1; + } + return ki_uri_param_any(_msg, &sparam); +} + /* * Adds a new parameter to Request URI */ diff --git a/src/modules/siputils/checks.h b/src/modules/siputils/checks.h index 202ca47ed2..2a05bdd53d 100644 --- a/src/modules/siputils/checks.h +++ b/src/modules/siputils/checks.h @@ -157,4 +157,8 @@ int ki_uri_param_rm(sip_msg_t *msg, str *sparam); int w_uri_param_rm(struct sip_msg* _msg, char* _param, char* _str2); +int ki_uri_param_any(sip_msg_t *msg, str *sparam); + +int w_uri_param_any(struct sip_msg* _msg, char* _param, char* _str2); + #endif /* CHECKS_H */ diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index abeeb98eaf..33a3c40a61 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -137,6 +137,8 @@ static cmd_export_t cmds[]={ 0, REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE}, {"uri_param", (cmd_function)uri_param_2, 2, fixup_spve_spve, 0, REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE}, + {"uri_param_any", (cmd_function)w_uri_param_any, 1, fixup_spve_null, + 0, REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE}, {"add_uri_param", (cmd_function)add_uri_param, 1, fixup_str_null, 0, REQUEST_ROUTE}, {"get_uri_param", (cmd_function)get_uri_param, 2, fixup_get_uri_param, @@ -589,6 +591,11 @@ static sr_kemi_t sr_kemi_siputils_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("siputils"), str_init("uri_param_any"), + SR_KEMIP_INT, ki_uri_param_any, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("siputils"), str_init("uri_param_rm"), SR_KEMIP_INT, ki_uri_param_rm, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

[kamailio/kamailio] dispatcher : better distribution when using hash and destination is not available (#2362)
by Kalki70 17 Jun '20

17 Jun '20

#### Pre-Submission Checklist    - [ X] Commit message has the format required by CONTRIBUTING guide - [ X] Commits are split per component (core, individual modules, libs, utils, ...) - [ X] Each component has a single commit (if not, squash them into one commit) - [ X] 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) - [X ] 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 - [ X] Tested changes locally - [ X] Related to issue #2361 #### Description When a destination is selected using one of the hash algorithms (over Call-ID, From, etc.) and destination is not available, then the next is selected. This causes the following problem : All messages to the unavailable destination will be sent to the same unique destination. This will cause that one destination will receive double load and the rest will continue with the same. Solution : To better distribute messages, while also guaranteeing the same distribution of the hash, a re-hash of the hash is made. As the rehash could select the same or other failed destination, it can rehash several times. The number of rehashes made is controlled by : modparam("dispatcher", "ds_rehash_max", -1) Which can take the following values : -1 : The total count of destinations is used 0 : Disabled. Reverts to original implementation. Positive number. Maximum number of rehashes. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2362 -- Commit Summary -- * dispatcher : better distribution when using hash and destination is not available. -- File Changes -- M src/modules/dispatcher/dispatch.c (192) M src/modules/dispatcher/dispatcher.c (103) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2362.patch https://github.com/kamailio/kamailio/pull/2362.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/2362

1 3

git:master:b31c885e: modules: readme files regenerated - siputils ... [skip ci]
by Kamailio Dev 17 Jun '20

17 Jun '20

Module: kamailio Branch: master Commit: b31c885e5cb5331963f7d02d8a9d4cde9c6b57ef URL: https://github.com/kamailio/kamailio/commit/b31c885e5cb5331963f7d02d8a9d4cd… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-06-17T08:31:23+02:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/b31c885e5cb5331963f7d02d8a9d4cd… Patch: https://github.com/kamailio/kamailio/commit/b31c885e5cb5331963f7d02d8a9d4cd…

1 0

Freezing development for Kamailio v5.4.0
by Daniel-Constantin Mierla 17 Jun '20

17 Jun '20

Hello, based on the discussions during the last online devel meeting, the plan is to release the next major version (Kamailio v5.4.0) around the mid of this summer. Therefore I propose to freeze the development on Thursday, June 18, 2020. Then we will have about 4-6 weeks of testing before the release is out. Master will be unfrozen when the branch 5.4 is created (usually that was done after 3-4 weeks in the testing phase). If you are planning to introduce new features in the 5.4 release series, be sure you push them to master branch or create a pull request till the freezing date. If anyone else wants a different time line for 5.4.0 release, let us know and we can discuss to match the best for everyone. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Funding: https://www.paypal.me/dcmierla

1 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2020