sr-dev June 2020

sr-dev@lists.kamailio.org

24 participants
396 discussions

[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

← Newer
1
...
18
19
20
21
22
23
24
...
40
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2020