- sr-dev - kamailio.org

git:master:cd8f551f: dispatcher: docs for ds_oc_set_rate(...) function
by Daniel-Constantin Mierla 07 Jun '24

07 Jun '24

Module: kamailio Branch: master Commit: cd8f551f40c6d3a3c30d7bb9d96e601c0c3087ae URL: https://github.com/kamailio/kamailio/commit/cd8f551f40c6d3a3c30d7bb9d96e601… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-07T12:18:21+02:00 dispatcher: docs for ds_oc_set_rate(...) function --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cd8f551f40c6d3a3c30d7bb9d96e601… Patch: https://github.com/kamailio/kamailio/commit/cd8f551f40c6d3a3c30d7bb9d96e601… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 979b59798af..cdd1ebc896e 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -2011,6 +2011,42 @@ onreply_route { ds_dsg_fetch("1"); xinfo("set id: 1 - all: $dsg(count); active: $dsg(active)\n"); ... +</programlisting> + </example> + </section> + <section id="dispatcher.f.ds_oc_set_rate"> + <title> + <function moreinfo="none">ds_oc_set_rate(setid, uri, val)</function> + </title> + <para> + Sets the overload control rate for the destination (setid, uri). + </para> + <para>Description of parameters:</para> + <itemizedlist> + <listitem> + <para><emphasis>setid</emphasis> - the set (group) id. The parameter + can be an integer or a variable holding an integer value. + </para> + </listitem> + <listitem> + <para><emphasis>uri</emphasis> - the URI of the destination.</para> + </listitem> + <listitem> + <para><emphasis>val</emphasis> - the valie of the overload control + rate (from 1 to 100) - how many times to skip using this destination + in 100 selections.</para> + </listitem> + </itemizedlist> + + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>ds_oc_set_rate()</function> usage</title> + <programlisting format="linespecific"> +... + ds_oc_set_rate("1", "sip:127.0.0.1:5080", "30"); +... </programlisting> </example> </section>

1 0

git:master:55f82b77: dispatcher: use ds_oc_set_rate() function name
by Daniel-Constantin Mierla 07 Jun '24

07 Jun '24

Module: kamailio Branch: master Commit: 55f82b772e53910d94c100903fc5c2c147aa91ea URL: https://github.com/kamailio/kamailio/commit/55f82b772e53910d94c100903fc5c2c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-07T12:10:25+02:00 dispatcher: use ds_oc_set_rate() function name - suggests better its purpose --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/55f82b772e53910d94c100903fc5c2c… Patch: https://github.com/kamailio/kamailio/commit/55f82b772e53910d94c100903fc5c2c… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index d3ddb81ee82..20fb6f7e85b 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -447,7 +447,7 @@ void ds_oc_prepare(ds_dest_t *dp) /** * */ -int ds_oc_set(sip_msg_t *msg, int setid, str *duri, int ival) +int ds_oc_set_rate(sip_msg_t *msg, int setid, str *duri, int ival) { int i = 0; int ret = -1; diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index 074771c54c6..f38cd56f255 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -300,5 +300,5 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate); ds_rctx_t *ds_get_rctx(void); unsigned int ds_get_hash(str *x, str *y); -int ds_oc_set(sip_msg_t *msg, int setid, str *uri, int ival); +int ds_oc_set_rate(sip_msg_t *msg, int setid, str *uri, int ival); #endif diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 1d838eee818..d8e81f0855a 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -185,7 +185,7 @@ static int w_ds_reload(struct sip_msg* msg, char*, char*); static int w_ds_is_active(sip_msg_t *msg, char *pset, char *p2); static int w_ds_is_active_uri(sip_msg_t *msg, char *pset, char *puri); static int w_ds_dsg_fetch(sip_msg_t *msg, char *pset, char *p2); -static int w_ds_oc_set(sip_msg_t*, char*, char*, char*); +static int w_ds_oc_set_rate(sip_msg_t*, char*, char*, char*); static int fixup_ds_is_from_list(void** param, int param_no); static int fixup_ds_list_exist(void** param,int param_no); @@ -262,7 +262,7 @@ static cmd_export_t cmds[]={ 0, 0, 0}, {"ds_reload", (cmd_function)w_ds_reload, 0, 0, 0, ANY_ROUTE}, - {"ds_oc_set", (cmd_function)w_ds_oc_set, 3, + {"ds_oc_set_rate", (cmd_function)w_ds_oc_set_rate, 3, fixup_isi, fixup_free_isi, ANY_ROUTE}, {"ds_dsg_fetch", (cmd_function)w_ds_dsg_fetch, 1, fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, @@ -1392,7 +1392,7 @@ static int w_ds_dsg_fetch(sip_msg_t *msg, char *pset, char *p2) /** * */ -static int w_ds_oc_set(sip_msg_t *msg, char *pset, char *puri, char *pval) +static int w_ds_oc_set_rate(sip_msg_t *msg, char *pset, char *puri, char *pval) { int iset; str suri; @@ -1411,7 +1411,7 @@ static int w_ds_oc_set(sip_msg_t *msg, char *pset, char *puri, char *pval) return -1; } - return ds_oc_set(msg, iset, &suri, ival); + return ds_oc_set_rate(msg, iset, &suri, ival); } /**

1 0

git:master:c2bde271: dispatcher: docs for algorithm 64 - round robin with overload control
by Daniel-Constantin Mierla 07 Jun '24

07 Jun '24

Module: kamailio Branch: master Commit: c2bde271f9d606e6cef987a223f746092c59d306 URL: https://github.com/kamailio/kamailio/commit/c2bde271f9d606e6cef987a223f7460… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-07T12:02:04+02:00 dispatcher: docs for algorithm 64 - round robin with overload control --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c2bde271f9d606e6cef987a223f7460… Patch: https://github.com/kamailio/kamailio/commit/c2bde271f9d606e6cef987a223f7460… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 83ef06285a0..979b59798af 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1418,6 +1418,13 @@ With congestion control the formula becomes : </programlisting> </example> </listitem> + <listitem> + <para> + <quote>64</quote> - round-robin (next destination) with over + load control (destination record is skipped based on over + load control rate). + </para> + </listitem> <listitem> <para> <quote>X</quote> - if the algorithm is not implemented, the @@ -2388,6 +2395,14 @@ kamctl rpc dispatcher.hash 4 bob server.com <listitem> <para>'latency' - latency_stats initialization in ms.</para> </listitem> + <listitem> + <para>'ocmin' - minimum limit for over load control rate + (value between 0 and 100, default 10).</para> + </listitem> + <listitem> + <para>'ocrate' - over load control rate + (value between 0 and 100, default 100).</para> + </listitem> </itemizedlist> </para> </section>

1 0

git:master:199f7cc4: dispatcher: set DS_ALG_OVERLOAD to 64 to be able to use as a flag
by Daniel-Constantin Mierla 07 Jun '24

07 Jun '24

Module: kamailio Branch: master Commit: 199f7cc4f29e6bab5f462d0db1942a8a583f8a67 URL: https://github.com/kamailio/kamailio/commit/199f7cc4f29e6bab5f462d0db1942a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-07T11:40:17+02:00 dispatcher: set DS_ALG_OVERLOAD to 64 to be able to use as a flag --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/199f7cc4f29e6bab5f462d0db1942a8… Patch: https://github.com/kamailio/kamailio/commit/199f7cc4f29e6bab5f462d0db1942a8… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 0466f09d9d4..d3ddb81ee82 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -79,7 +79,7 @@ #define DS_ALG_RELWEIGHT 11 #define DS_ALG_PARALLEL 12 #define DS_ALG_LATENCY 13 -#define DS_ALG_OVERLOAD 14 +#define DS_ALG_OVERLOAD 64 /* 2^6 - can be also used as a flag */ #define DS_HN_SIZE 256 @@ -2618,7 +2618,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) return -1; xavp_filled = 1; break; - case DS_ALG_OVERLOAD: /* 14 - round robin with overload control */ + case DS_ALG_OVERLOAD: /* 64 - round robin with overload control */ lock_get(&idx->lock); hash = idx->last; idx->last = (idx->last + 1) % idx->nr;

1 0

git:master:42998ac2: dispatcher: function to set oc rate for destination records
by Daniel-Constantin Mierla 07 Jun '24

07 Jun '24

Module: kamailio Branch: master Commit: 42998ac2b33ec9fd47d3b1491b48f4d75d842e55 URL: https://github.com/kamailio/kamailio/commit/42998ac2b33ec9fd47d3b1491b48f4d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-07T11:09:58+02:00 dispatcher: function to set oc rate for destination records --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/42998ac2b33ec9fd47d3b1491b48f4d… Patch: https://github.com/kamailio/kamailio/commit/42998ac2b33ec9fd47d3b1491b48f4d…

1 0

git:master:b7d7c6e2: core: fixup helpers for int-str-int params
by Daniel-Constantin Mierla 07 Jun '24

07 Jun '24

Module: kamailio Branch: master Commit: b7d7c6e24a906ed4f58bda603ec4574786919caf URL: https://github.com/kamailio/kamailio/commit/b7d7c6e24a906ed4f58bda603ec4574… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-07T10:50:28+02:00 core: fixup helpers for int-str-int params --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/b7d7c6e24a906ed4f58bda603ec4574… Patch: https://github.com/kamailio/kamailio/commit/b7d7c6e24a906ed4f58bda603ec4574… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index bba3a469028..ec4e016ed88 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -1029,3 +1029,35 @@ int fixup_free_ssii(void **param, int param_no) return E_UNSPEC; } } + +/** + * + */ +int fixup_isi(void **param, int param_no) +{ + switch(param_no) { + case 1: + case 3: + return fixup_igp_null(param, 1); + case 2: + return fixup_spve_null(param, 1); + default: + return E_UNSPEC; + } +} + +/** + * + */ +int fixup_free_isi(void **param, int param_no) +{ + switch(param_no) { + case 1: + case 3: + return fixup_free_igp_null(param, 1); + case 2: + return fixup_free_spve_null(param, 1); + default: + return E_UNSPEC; + } +} diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index d3f954fb1c2..aafb3a4cbff 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -184,4 +184,7 @@ int fixup_free_sssi(void **param, int param_no); int fixup_ssii(void **param, int param_no); int fixup_free_ssii(void **param, int param_no); +int fixup_isi(void **param, int param_no); +int fixup_free_isi(void **param, int param_no); + #endif

1 0

git:master:f900e332: dispatcher: round robin with overload control algorithm
by Daniel-Constantin Mierla 07 Jun '24

07 Jun '24

Module: kamailio Branch: master Commit: f900e3325eb80ce8a266663e5fc251537436d449 URL: https://github.com/kamailio/kamailio/commit/f900e3325eb80ce8a266663e5fc2515… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-07T07:44:33+02:00 dispatcher: round robin with overload control algorithm --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/f900e3325eb80ce8a266663e5fc2515… Patch: https://github.com/kamailio/kamailio/commit/f900e3325eb80ce8a266663e5fc2515… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 8a225f35418..02e1f6e4a83 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -421,6 +421,25 @@ void ds_oc_prepare(ds_dest_t *dp) shuffle_uint100array(dp->ocdist); } +/** + * + */ +static inline int ds_oc_skip(ds_set_t *dsg, int alg, int n) +{ + int ret = 0; + + if(alg != DS_ALG_OVERLOAD) { + return 0; + } + + if(dsg->dlist[n].ocdist[dsg->dlist[n].ocidx] == 1) { + ret = 0; + } + dsg->dlist[n].ocidx = (dsg->dlist[n].ocidx + 1) % 100; + + return ret; +} + /** * */ @@ -2556,6 +2575,14 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) return -1; xavp_filled = 1; break; + case DS_ALG_OVERLOAD: /* 14 - round robin with overload control */ + lock_get(&idx->lock); + hash = idx->last; + idx->last = (idx->last + 1) % idx->nr; + vlast = idx->last; + lock_release(&idx->lock); + ulast = 1; + break; default: LM_WARN("algo %d not implemented - using first entry...\n", rstate->alg); @@ -2571,7 +2598,9 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) i = hash; /* if selected address is inactive, find next active */ - while(!xavp_filled && ds_skip_dst(idx->dlist[i].flags)) { + while(!xavp_filled + && (ds_skip_dst(idx->dlist[i].flags) + || ds_oc_skip(idx, rstate->alg, i))) { if(ds_use_default != 0 && idx->nr != 1) i = (i + 1) % (idx->nr - 1); else @@ -2580,7 +2609,8 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) /* back to start -- looks like no active dst */ if(ds_use_default != 0) { i = idx->nr - 1; - if(ds_skip_dst(idx->dlist[i].flags)) + if(ds_skip_dst(idx->dlist[i].flags) + || ds_oc_skip(idx, rstate->alg, i)) return -1; break; } else {

1 0

git:master:f7c41e66: dispatcher: prepare oc-based distribution
by Daniel-Constantin Mierla 06 Jun '24

06 Jun '24

Module: kamailio Branch: master Commit: f7c41e6602f397987470d4ff8a50b51ff16dd521 URL: https://github.com/kamailio/kamailio/commit/f7c41e6602f397987470d4ff8a50b51… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-06T20:32:36+02:00 dispatcher: prepare oc-based distribution --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/f7c41e6602f397987470d4ff8a50b51… Patch: https://github.com/kamailio/kamailio/commit/f7c41e6602f397987470d4ff8a50b51… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index d22188ada1f..8a225f35418 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -409,6 +409,18 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) return 0; } +/** + * + */ +void ds_oc_prepare(ds_dest_t *dp) +{ + int i; + for(i = 0; i < dp->attrs.ocrate; i++) { + dp->ocdist[i] = 1; + } + shuffle_uint100array(dp->ocdist); +} + /** * */ @@ -562,6 +574,8 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs, int dload) } } + ds_oc_prepare(dp); + return dp; err: if(dp != NULL) {

1 0

git:master:b6cd84b9: dispatcher: new set of attributes oc-based routing
by Daniel-Constantin Mierla 06 Jun '24

06 Jun '24

Module: kamailio Branch: master Commit: b6cd84b999030acb2db03ce9ff9d3de4d942fff9 URL: https://github.com/kamailio/kamailio/commit/b6cd84b999030acb2db03ce9ff9d3de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-06T20:32:36+02:00 dispatcher: new set of attributes oc-based routing - ocmin, ocmax and ocrate --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h --- Diff: https://github.com/kamailio/kamailio/commit/b6cd84b999030acb2db03ce9ff9d3de… Patch: https://github.com/kamailio/kamailio/commit/b6cd84b999030acb2db03ce9ff9d3de… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 9e27f998c25..d22188ada1f 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -79,6 +79,7 @@ #define DS_ALG_RELWEIGHT 11 #define DS_ALG_PARALLEL 12 #define DS_ALG_LATENCY 13 +#define DS_ALG_OVERLOAD 14 #define DS_HN_SIZE 256 @@ -376,8 +377,33 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) } else if(pit->name.len == 7 && strncasecmp(pit->name.s, "obproxy", 7) == 0) { dest->attrs.obproxy = pit->body; + } else if(pit->name.len == 5 + && strncasecmp(pit->name.s, "ocmin", 5) == 0) { + str2int(&pit->body, &dest->attrs.ocmin); + } else if(pit->name.len == 5 + && strncasecmp(pit->name.s, "ocmax", 5) == 0) { + str2int(&pit->body, &dest->attrs.ocmax); + } else if(pit->name.len == 6 + && strncasecmp(pit->name.s, "ocrate", 6) == 0) { + str2int(&pit->body, &dest->attrs.ocmin); } } + if(dest->attrs.ocmax <= 0 || dest->attrs.ocmax > 100) { + dest->attrs.ocmax = 100; + } + if(dest->attrs.ocmin <= 0 || dest->attrs.ocmin > 100) { + dest->attrs.ocmin = 10; + } + if(dest->attrs.ocrate <= 0 || dest->attrs.ocrate > 100) { + dest->attrs.ocrate = 10; + } + if(dest->attrs.ocrate < dest->attrs.ocmin) { + dest->attrs.ocrate = dest->attrs.ocmin; + } + if(dest->attrs.ocrate > dest->attrs.ocmax) { + dest->attrs.ocrate = dest->attrs.ocmax; + } + if(params_list) free_params(params_list); return 0; diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index a887c555932..296097b7e97 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -204,6 +204,9 @@ typedef struct _ds_attrs { str ping_from; str obproxy; int rpriority; + uint32_t ocmin; + uint32_t ocmax; + uint32_t ocrate; } ds_attrs_t; typedef struct _ds_latency_stats { @@ -236,6 +239,8 @@ typedef struct _ds_dest { unsigned short int proto; /*!< protocol of the URI */ int message_count; struct timeval dnstime; + uint32_t ocidx; + uint32_t ocdist[100]; struct _ds_dest *next; } ds_dest_t;

1 0

git:master:388cc4fc: modules: readme files regenerated - p_usrloc ... [skip ci]
by Kamailio Dev 06 Jun '24

06 Jun '24

Module: kamailio Branch: master Commit: 388cc4fc7531f803cdd401384b9d6baaa0d81054 URL: https://github.com/kamailio/kamailio/commit/388cc4fc7531f803cdd401384b9d6ba… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-06-06T11:46:10+02:00 modules: readme files regenerated - p_usrloc ... [skip ci] --- Modified: src/modules/p_usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/388cc4fc7531f803cdd401384b9d6ba… Patch: https://github.com/kamailio/kamailio/commit/388cc4fc7531f803cdd401384b9d6ba… --- diff --git a/src/modules/p_usrloc/README b/src/modules/p_usrloc/README index ae0702db5bd..335d02e2efd 100644 --- a/src/modules/p_usrloc/README +++ b/src/modules/p_usrloc/README @@ -631,6 +631,7 @@ modparam("p_usrloc", "default_db_type", "cluster") * 0 uses the old style using aor, contact and call-id * 1 uses ruid value * 2 uses the new style using aor, contact and call-id + * 3 uses contact uniq value + ruid value Default value is 0

1 0

[kamailio/kamailio] p_usrloc: Add update/delete based on uniq (PR #3865)
by Stefan Mititelu 06 Jun '24

06 Jun '24

#### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Add a new update/delete function based on contact's uniq uniq. Some devices may use same uniq for multiple contacts, so I needed to restrain it further based on ruid value. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3865 -- Commit Summary -- * p_usrloc: Add update/delete based on uniq -- File Changes -- M src/modules/p_usrloc/doc/p_usrloc_admin.xml (5) M src/modules/p_usrloc/ucontact.c (307) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3865.patch https://github.com/kamailio/kamailio/pull/3865.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3865 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3865(a)github.com>

2 2

git:master:8b6b3881: p_usrloc: Add update/delete based on uniq
by Stefan Mititelu 06 Jun '24

06 Jun '24

Module: kamailio Branch: master Commit: 8b6b3881594b4f2ac1b50b9c83cd0e1dac3ec321 URL: https://github.com/kamailio/kamailio/commit/8b6b3881594b4f2ac1b50b9c83cd0e1… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)govoip.ro> Date: 2024-06-06T12:34:14+03:00 p_usrloc: Add update/delete based on uniq --- Modified: src/modules/p_usrloc/doc/p_usrloc_admin.xml Modified: src/modules/p_usrloc/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/8b6b3881594b4f2ac1b50b9c83cd0e1… Patch: https://github.com/kamailio/kamailio/commit/8b6b3881594b4f2ac1b50b9c83cd0e1…

1 0

[kamailio/kamailio] pdb: make 'timeout' runtime configurable (PR #3850)
by Stefan Mititelu 05 Jun '24

05 Jun '24

#### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Make timeout modparam runtime configurable. Also update timout execeded logs from NOTICE to ERR and add more info to them. Also update utils/pdbt.c query tool to allow 0 carrier id. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3850 -- Commit Summary -- * pdb: make 'timeout' runtime configurable -- File Changes -- A src/modules/pdb/config.c (42) A src/modules/pdb/config.h (37) M src/modules/pdb/pdb.c (40) M utils/pdbt/pdbt.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3850.patch https://github.com/kamailio/kamailio/pull/3850.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3850 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3850(a)github.com>

3 5

git:master:fc07aad0: pdbt: Allow to return carrier id 0
by Henning Westerholt 05 Jun '24

05 Jun '24

Module: kamailio Branch: master Commit: fc07aad0beaae9e133ca3252b088afd9eece0c53 URL: https://github.com/kamailio/kamailio/commit/fc07aad0beaae9e133ca3252b088afd… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-06-05T21:43:02+02:00 pdbt: Allow to return carrier id 0 --- Modified: utils/pdbt/pdbt.c --- Diff: https://github.com/kamailio/kamailio/commit/fc07aad0beaae9e133ca3252b088afd… Patch: https://github.com/kamailio/kamailio/commit/fc07aad0beaae9e133ca3252b088afd… --- diff --git a/utils/pdbt/pdbt.c b/utils/pdbt/pdbt.c index be670eeb7f8..d9fa0bca45d 100644 --- a/utils/pdbt/pdbt.c +++ b/utils/pdbt/pdbt.c @@ -628,15 +628,14 @@ int query_server(char *number, char *comment, void *data) { carrierid = query_udp(number, sdata->timeout, &(sdata->pfds), &(sdata->dstaddr), sdata->dstaddrlen); - if (carrierid<=0) { + if(carrierid < 0) { LINFO("%s: not_found: comment='%s', result=%d\n", number, comment, carrierid); if (carrierid < 0) { result = carrierid; } else { result = PDB_NOT_IN_PDB; } - } - else { + } else { LINFO("%s:%ld:%s\n", number, (long int)carrierid, carrierid2name(carrierid)); result = PDB_OK; }

1 0

git:master:f57be803: pdb: make 'timeout' runtime configurable
by Henning Westerholt 05 Jun '24

05 Jun '24

Module: kamailio Branch: master Commit: f57be8030834cdeb0bb509d0d25afc89f3cca6e8 URL: https://github.com/kamailio/kamailio/commit/f57be8030834cdeb0bb509d0d25afc8… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-06-05T21:43:02+02:00 pdb: make 'timeout' runtime configurable Also modify logs related to timeout from NOTICE to ERR and add a bit more info to them. --- Added: src/modules/pdb/config.c Added: src/modules/pdb/config.h Modified: src/modules/pdb/pdb.c --- Diff: https://github.com/kamailio/kamailio/commit/f57be8030834cdeb0bb509d0d25afc8… Patch: https://github.com/kamailio/kamailio/commit/f57be8030834cdeb0bb509d0d25afc8…

1 0

git:master:77cb0050: modules: readme files regenerated - siputils ... [skip ci]
by Kamailio Dev 05 Jun '24

05 Jun '24

Module: kamailio Branch: master Commit: 77cb0050b0e60bf42b28b77f09e6bd00d57481dd URL: https://github.com/kamailio/kamailio/commit/77cb0050b0e60bf42b28b77f09e6bd0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-06-05T20:46:10+02:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/77cb0050b0e60bf42b28b77f09e6bd0… Patch: https://github.com/kamailio/kamailio/commit/77cb0050b0e60bf42b28b77f09e6bd0…

1 0

git:master:d1ec2972: siputils: docs for is_sip() function
by Daniel-Constantin Mierla 05 Jun '24

05 Jun '24

Module: kamailio Branch: master Commit: d1ec29726484026c27902832a3daa052d5d68c3d URL: https://github.com/kamailio/kamailio/commit/d1ec29726484026c27902832a3daa05… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-05T20:30:20+02:00 siputils: docs for is_sip() function --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d1ec29726484026c27902832a3daa05… Patch: https://github.com/kamailio/kamailio/commit/d1ec29726484026c27902832a3daa05… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index ad30a1a9f6e..dbbba7a6db6 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -1131,6 +1131,27 @@ if (is_reply()) { ... } ... +</programlisting> + </example> + </section> + <section id="siputils.f.is_sip"> + <title> + <function moreinfo="none">is_sip()</function> + </title> + <para> + Return true if it is a SIP message. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>is_sip</function> usage</title> + <programlisting format="linespecific"> +... +if (is_sip()) { + ... +} +... </programlisting> </example> </section>

1 0

git:master:d2ff3dd3: siputils: added function is_sip()
by Daniel-Constantin Mierla 05 Jun '24

05 Jun '24

Module: kamailio Branch: master Commit: d2ff3dd39766e4ee859c115f1fc5bf93d72abed9 URL: https://github.com/kamailio/kamailio/commit/d2ff3dd39766e4ee859c115f1fc5bf9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-05T20:25:20+02:00 siputils: added function is_sip() - return true if it is a SIP message --- 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/d2ff3dd39766e4ee859c115f1fc5bf9… Patch: https://github.com/kamailio/kamailio/commit/d2ff3dd39766e4ee859c115f1fc5bf9… --- diff --git a/src/modules/siputils/checks.c b/src/modules/siputils/checks.c index 2822e24b7c8..7caeb809b2f 100644 --- a/src/modules/siputils/checks.c +++ b/src/modules/siputils/checks.c @@ -101,6 +101,36 @@ int is_reply(struct sip_msg *msg) } +/** + * return 1 (true) if it is a SIP message + */ +int w_is_sip(sip_msg_t *msg, char *foo, char *bar) +{ + if(msg == NULL) + return -1; + + if(msg->first_line.flags & FLINE_FLAG_PROTO_SIP) { + return 1; + } + + return -1; +} + +/** + * return 1 (true) if it is a SIP message + */ +int is_sip(sip_msg_t *msg) +{ + if(msg == NULL) + return -1; + + if(msg->first_line.flags & FLINE_FLAG_PROTO_SIP) { + return 1; + } + + return -1; +} + /* * Checks if From includes a To-tag -- good to identify * if a request creates a new dialog diff --git a/src/modules/siputils/checks.h b/src/modules/siputils/checks.h index 5aa67295ba5..fa914ecc0da 100644 --- a/src/modules/siputils/checks.h +++ b/src/modules/siputils/checks.h @@ -116,6 +116,13 @@ int is_request(struct sip_msg *msg); int w_is_reply(struct sip_msg *msg, char *foo, char *bar); int is_reply(struct sip_msg *msg); +/* + * Return true (1) if it is a SIP message, otherwise false (-1) + */ +int w_is_sip(struct sip_msg *msg, char *foo, char *bar); +int is_sip(struct sip_msg *msg); + + /* * Find if Request URI has a given parameter with matching value */ diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index d31671db79f..0912c6b132b 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -174,6 +174,7 @@ static cmd_export_t cmds[] = { fixup_free_set_uri, ANY_ROUTE}, {"is_request", (cmd_function)w_is_request, 0, 0, 0, ANY_ROUTE}, {"is_reply", (cmd_function)w_is_reply, 0, 0, 0, ANY_ROUTE}, + {"is_sip", (cmd_function)w_is_sip, 0, 0, 0, ANY_ROUTE}, {"is_gruu", (cmd_function)w_is_gruu, 0, 0, 0, ANY_ROUTE}, {"is_gruu", (cmd_function)w_is_gruu, 1, fixup_spve_null, 0, ANY_ROUTE}, {"is_supported", (cmd_function)w_is_supported, 1, fixup_option, 0, @@ -623,6 +624,11 @@ static sr_kemi_t sr_kemi_siputils_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("siputils"), str_init("is_sip"), + SR_KEMIP_INT, is_sip, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("siputils"), str_init("is_first_hop"), SR_KEMIP_INT, is_first_hop, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

RFC: remove structures and resources clean up on module destroy
by Daniel-Constantin Mierla 05 Jun '24

05 Jun '24

Hello, based on many reports coming over along all the past years, there are crashes that happen on module destroy callbacks, many could be fixed, but some cannot be predicted, depending on the moment when the kill (shut down) is triggered. Furthermore, there are cases when the clean makes no much sense, like attempting to close the DB connection, because the destroy callback is executed by Kamailio's main process only, which does not handle SIP traffic and usually does not have DB connection,. So actually, all the other connections from the SIP works are clean up automatically by the OS on process shut down. Also, the pkg and shm blocks are cleaned up as a whole after all, therefore trying to free chunks inside them that were used by various internal structures is kind of waste of time. The main purpose to do it in the past it to be able to discover memory leaks by having status reports written in syslog, but these reports can be triggered by RPC during runtime and it is even better to get them in such way. I think that the best is to use module destroy callbacks only to save data to backend (e.g., database) that has to be reloaded on restart, and leave the memory/resources clean up to the OS. In this way we also deal nicer with the inter-modules dependencies, the structures of a module will be always available, even after its mod-destroy callback execution, so if another module depending on them still wants to access, it should be no problem. At the last Kamailio Devel meeting we had a brief discussion that we may want to change mod-destroy to be done in two steps, first for storing meeded data to backed and then do the cleanup, but I think it is better without the 2nd step. Any comments or other suggestions? Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com

1 0

[kamailio/kamailio] Fix handling of pending reg contacts in P-CSCF (PR #3868)
by Supreeth Herle 05 Jun '24

05 Jun '24

#### 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) - [ ] 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/3868 -- Commit Summary -- * Revert "ims_registrar_pcscf: update registered state to pending registration if contact exists" * ims_registrar_pcscf: fix typo in comments * ims_ipsec_pcscf: update security params of newly created ipsec tunnel in contact -- File Changes -- M src/modules/ims_ipsec_pcscf/cmd.c (12) M src/modules/ims_registrar_pcscf/save.c (13) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3868.patch https://github.com/kamailio/kamailio/pull/3868.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3868 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3868(a)github.com>

1 1

PR 3828 Request For Comments
by tyler moore 04 Jun '24

04 Jun '24

Hey Team, I submitted a PR a while back that has not had much discussion: https://github.com/kamailio/kamailio/pull/3828 The intention was to allow loading in unsigned integer IDs from DB into PVs. Currently converting unsigned integers from DB to PVs will error by default unless the module specifically handles the ease use case. When the following parameter is enabled the srdb interface will allow the conversion to an integer PV value (possibly overflowing): |modparam("db_mysql", "unsigned_type", 1) | This PR allows the srdb APIs to convert the unsigned integer to an unsigned integer PV value. This can be quite useful in modules such as |auth_db| / |permissions| that can load an arbitrary column into a PV (|load_credentials|, |tag_col|/|peer_tag_avp|, etc..). Since most ID columns are auto incrementing unsigned integers this just makes sense for referring to customer data. Elevator pitch over.. What I need help with is reviewing the srdb changes, since I am unsure what side effects that would have on other modules. Comments are welcome here, on the PR, or find me on the matrix channel (@devopsec). Happy Coding.. Regards, Tyler Moore Full Stack Software Engineer dOpenSource

1 0

git:master:e9481214: dmq_usrloc: reformat exported structures
by Daniel-Constantin Mierla 04 Jun '24

04 Jun '24

Module: kamailio Branch: master Commit: e94812149c6f2867a5b23f1218a9af139590bf51 URL: https://github.com/kamailio/kamailio/commit/e94812149c6f2867a5b23f1218a9af1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-04T16:29:50+02:00 dmq_usrloc: reformat exported structures --- Modified: src/modules/dmq_usrloc/dmq_usrloc.c --- Diff: https://github.com/kamailio/kamailio/commit/e94812149c6f2867a5b23f1218a9af1… Patch: https://github.com/kamailio/kamailio/commit/e94812149c6f2867a5b23f1218a9af1… --- diff --git a/src/modules/dmq_usrloc/dmq_usrloc.c b/src/modules/dmq_usrloc/dmq_usrloc.c index d7715ff10e4..61b6286a392 100644 --- a/src/modules/dmq_usrloc/dmq_usrloc.c +++ b/src/modules/dmq_usrloc/dmq_usrloc.c @@ -48,29 +48,33 @@ usrloc_api_t dmq_ul; MODULE_VERSION -static param_export_t params[] = {{"enable", INT_PARAM, &dmq_usrloc_enable}, - {"sync", INT_PARAM, &_dmq_usrloc_sync}, - {"replicate_socket_info", INT_PARAM, - &_dmq_usrloc_replicate_socket_info}, - {"batch_msg_contacts", INT_PARAM, &_dmq_usrloc_batch_msg_contacts}, - {"batch_msg_size", INT_PARAM, &_dmq_usrloc_batch_msg_size}, - {"batch_size", INT_PARAM, &_dmq_usrloc_batch_size}, - {"batch_usleep", INT_PARAM, &_dmq_usrloc_batch_usleep}, - {"usrloc_domain", PARAM_STR, &_dmq_usrloc_domain}, - {"usrloc_delete", INT_PARAM, &_dmq_usrloc_delete}, {0, 0, 0}}; +/* clang-format off */ +static param_export_t params[] = { + {"enable", INT_PARAM, &dmq_usrloc_enable}, + {"sync", INT_PARAM, &_dmq_usrloc_sync}, + {"replicate_socket_info", INT_PARAM, &_dmq_usrloc_replicate_socket_info}, + {"batch_msg_contacts", INT_PARAM, &_dmq_usrloc_batch_msg_contacts}, + {"batch_msg_size", INT_PARAM, &_dmq_usrloc_batch_msg_size}, + {"batch_size", INT_PARAM, &_dmq_usrloc_batch_size}, + {"batch_usleep", INT_PARAM, &_dmq_usrloc_batch_usleep}, + {"usrloc_domain", PARAM_STR, &_dmq_usrloc_domain}, + {"usrloc_delete", INT_PARAM, &_dmq_usrloc_delete}, + {0, 0, 0} +}; struct module_exports exports = { - "dmq_usrloc", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - 0, /* exported functions */ - params, /* exported parameters */ - 0, /* RPC method exports */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - child_init, /* per-child init function */ - 0 /* module destroy function */ + "dmq_usrloc", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + 0, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + child_init, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format on */ static int mod_init(void)

1 0

[kamailio/kamailio] fixed handle_ruri_alias_mode(1) cannot proper handle multi alias (PR #3863)
by Lv Xiaobu 04 Jun '24

04 Jun '24

when receive BYE sip:xxx@xxxx;alias=ip1;alias=ip2 SIP/2.0, handle_ruri_alias_mode(1) doesn't work as documented You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3863 -- Commit Summary -- * fixed handle_ruri_alias_mode(1) cannot proper handle multi alias -- File Changes -- M src/modules/nathelper/nathelper.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3863.patch https://github.com/kamailio/kamailio/pull/3863.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3863 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3863(a)github.com>

3 7

git:master:3d187336: nathelper: remove magic constant
by Xenofon Karamanos 04 Jun '24

04 Jun '24

Module: kamailio Branch: master Commit: 3d187336f22e30800acefd28e4d0f98e0f677a49 URL: https://github.com/kamailio/kamailio/commit/3d187336f22e30800acefd28e4d0f98… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-06-04T13:38:17+03:00 nathelper: remove magic constant --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/3d187336f22e30800acefd28e4d0f98… Patch: https://github.com/kamailio/kamailio/commit/3d187336f22e30800acefd28e4d0f98… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 467c88a6a25..6e6d44ad7ed 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1153,7 +1153,7 @@ static int ki_handle_ruri_alias_mode(struct sip_msg *msg, int mode) } start = NULL; /* locate last alias parameter */ - while(rest_len > _ksr_contact_alias.len + 4) { + while(rest_len > _ksr_contact_alias.len) { if(strncmp(rest, _ksr_contact_alias.s, _ksr_contact_alias.len) == 0) { start = rest; if(mode == 0) {

1 0

git:master:8e0b2e4b: nathelper: fixed handle_ruri_alias_mode(1) cannot proper handle multi alias
by Xenofon Karamanos 04 Jun '24

04 Jun '24

Module: kamailio Branch: master Commit: 8e0b2e4b6450fa50bd573fa013dc888aaaccd2bf URL: https://github.com/kamailio/kamailio/commit/8e0b2e4b6450fa50bd573fa013dc888… Author: codenot <codenot(a)msn.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-06-04T13:38:17+03:00 nathelper: fixed handle_ruri_alias_mode(1) cannot proper handle multi alias --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/8e0b2e4b6450fa50bd573fa013dc888… Patch: https://github.com/kamailio/kamailio/commit/8e0b2e4b6450fa50bd573fa013dc888… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 41985a8b3f8..467c88a6a25 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1160,8 +1160,6 @@ static int ki_handle_ruri_alias_mode(struct sip_msg *msg, int mode) /* use first alias parameter */ break; } - rest = rest + _ksr_contact_alias.len; - rest_len = rest_len - _ksr_contact_alias.len; } sep = memchr(rest, 59 /* ; */, rest_len); if(sep == NULL) {

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev