sr-dev May 2021

sr-dev@lists.kamailio.org

12 participants
287 discussions

git:5.5:6a5a61bf: core: xavp - safety checks for name len

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 6a5a61bfab80116338f6a9c91ed7ec5f7b98923b URL: https://github.com/kamailio/kamailio/commit/6a5a61bfab80116338f6a9c91ed7ec5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-13T17:55:06+02:00 core: xavp - safety checks for name len (cherry picked from commit d22d812da1c3b2a2f65f142ef5ed5fa07e8ab072) --- Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/6a5a61bfab80116338f6a9c91ed7ec5… Patch: https://github.com/kamailio/kamailio/commit/6a5a61bfab80116338f6a9c91ed7ec5… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index b11b99929d..036a5ffbe1 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -106,7 +106,7 @@ static sr_xavp_t *xavp_new_value(str *name, sr_xval_t *val) int size; unsigned int id; - if(name==NULL || name->s==NULL || val==NULL) + if(name==NULL || name->s==NULL || name->len<=0 || val==NULL) return NULL; id = get_hash1_raw(name->s, name->len); @@ -427,7 +427,7 @@ static int xavp_rm_internal(str *name, sr_xavp_t **head, int idx) int n=0; int count=0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return 0; id = get_hash1_raw(name->s, name->len); @@ -498,7 +498,7 @@ int xavp_count(str *name, sr_xavp_t **start) unsigned int id; int n = 0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return -1; id = get_hash1_raw(name->s, name->len); @@ -865,7 +865,7 @@ sr_xavp_t *xavp_extract(str *name, sr_xavp_t **list) sr_xavp_t *prv = 0; unsigned int id; - if(name==NULL || name->s==NULL) { + if(name==NULL || name->s==NULL || name->len<=0) { if(list!=NULL) { avp = *list; if(avp!=NULL) { @@ -1157,7 +1157,7 @@ static sr_xavp_t *xavu_get_internal(str *name, sr_xavp_t **list, sr_xavp_t **prv sr_xavp_t *avu; unsigned int id; - if(name==NULL || name->s==NULL) { + if(name==NULL || name->s==NULL || name->len<=0) { return NULL; } @@ -1235,7 +1235,7 @@ int xavu_rm_by_name(str *name, sr_xavp_t **head) unsigned int id; - if(name==NULL || name->s==NULL) { + if(name==NULL || name->s==NULL || name->len<=0) { return -1; } @@ -1579,7 +1579,7 @@ static sr_xavp_t *xavi_new_value(str *name, sr_xval_t *val) int size; unsigned int id; - if(name==NULL || name->s==NULL || val==NULL) + if(name==NULL || name->s==NULL || name->len<=0 || val==NULL) return NULL; id = get_hash1_case_raw(name->s, name->len); @@ -1812,7 +1812,7 @@ static sr_xavp_t *xavi_get_internal(str *name, sr_xavp_t **list, int idx, sr_xav unsigned int id; int n = 0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return NULL; id = get_hash1_case_raw(name->s, name->len); @@ -1939,7 +1939,7 @@ static int xavi_rm_internal(str *name, sr_xavp_t **head, int idx) int n=0; int count=0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return 0; id = get_hash1_case_raw(name->s, name->len); @@ -2022,7 +2022,7 @@ int xavi_count(str *name, sr_xavp_t **start) unsigned int id; int n = 0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return -1; id = get_hash1_case_raw(name->s, name->len); @@ -2315,7 +2315,7 @@ sr_xavp_t *xavi_extract(str *name, sr_xavp_t **list) sr_xavp_t *prv = 0; unsigned int id; - if(name==NULL || name->s==NULL) { + if(name==NULL || name->s==NULL || name->len<=0) { if(list!=NULL) { avi = *list; if(avi!=NULL) {

3 years, 6 months

git:5.5:5bc7e1d6: presence: set correct type for local_log_facility modparam

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 5bc7e1d636b617839f697838e326347b19cb0fcc URL: https://github.com/kamailio/kamailio/commit/5bc7e1d636b617839f697838e326347… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-13T17:54:57+02:00 presence: set correct type for local_log_facility modparam (cherry picked from commit 5f4662a95a97d5224bf03745a9a354a41925706c) --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/5bc7e1d636b617839f697838e326347… Patch: https://github.com/kamailio/kamailio/commit/5bc7e1d636b617839f697838e326347… --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index 301113aa03..09751bbc15 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -232,7 +232,7 @@ static param_export_t params[]={ { "fetch_rows", INT_PARAM, &pres_fetch_rows}, { "db_table_lock_type", INT_PARAM, &pres_db_table_lock_type}, { "local_log_level", PARAM_INT, &pres_local_log_level}, - { "local_log_facility", PARAM_STR, &pres_log_facility_str}, + { "local_log_facility", PARAM_STRING, &pres_log_facility_str}, { "subs_remove_match", PARAM_INT, &pres_subs_remove_match}, { "xavp_cfg", PARAM_STR, &pres_xavp_cfg}, { "retrieve_order", PARAM_INT, &pres_retrieve_order},

3 years, 6 months

git:master:5e3f7e15: topos: init xavp and context modparams to str null

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5e3f7e1557d90a3e6f40eff41cc0b0bb317ab544 URL: https://github.com/kamailio/kamailio/commit/5e3f7e1557d90a3e6f40eff41cc0b0b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-13T17:53:18+02:00 topos: init xavp and context modparams to str null --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5e3f7e1557d90a3e6f40eff41cc0b0b… Patch: https://github.com/kamailio/kamailio/commit/5e3f7e1557d90a3e6f40eff41cc0b0b… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index ba58920a6c..498cc8defe 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -107,13 +107,13 @@ str _tps_contact_host = str_init(""); int _tps_contact_mode = 0; str _tps_cparam_name = str_init("tps"); -str _tps_xavu_cfg = str_init(""); -str _tps_xavu_field_acontact = str_init(""); -str _tps_xavu_field_bcontact = str_init(""); -str _tps_xavu_field_contact_host = str_init(""); +str _tps_xavu_cfg = STR_NULL; +str _tps_xavu_field_acontact = STR_NULL; +str _tps_xavu_field_bcontact = STR_NULL; +str _tps_xavu_field_contact_host = STR_NULL; -str _tps_context_param = str_init(""); -str _tps_context_value = str_init(""); +str _tps_context_param = STR_NULL; +str _tps_context_value = STR_NULL; sanity_api_t scb; @@ -247,7 +247,8 @@ static int mod_init(void) if(sruid_init(&_tps_sruid, '-', "tpsh", SRUID_INC)<0) return -1; - if (_tps_contact_mode == 2 && (_tps_xavu_field_acontact.len <= 0 + if (_tps_contact_mode == 2 && (_tps_xavu_cfg.len <= 0 + || _tps_xavu_field_acontact.len <= 0 || _tps_xavu_field_bcontact.len <= 0)) { LM_ERR("contact_mode parameter is 2," " but a_contact or b_contact xavu fields not defined\n");

3 years, 6 months

git:master:d22d812d: core: xavp - safety checks for name len

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d22d812da1c3b2a2f65f142ef5ed5fa07e8ab072 URL: https://github.com/kamailio/kamailio/commit/d22d812da1c3b2a2f65f142ef5ed5fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-13T17:41:40+02:00 core: xavp - safety checks for name len --- Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/d22d812da1c3b2a2f65f142ef5ed5fa… Patch: https://github.com/kamailio/kamailio/commit/d22d812da1c3b2a2f65f142ef5ed5fa… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index b11b99929d..036a5ffbe1 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -106,7 +106,7 @@ static sr_xavp_t *xavp_new_value(str *name, sr_xval_t *val) int size; unsigned int id; - if(name==NULL || name->s==NULL || val==NULL) + if(name==NULL || name->s==NULL || name->len<=0 || val==NULL) return NULL; id = get_hash1_raw(name->s, name->len); @@ -427,7 +427,7 @@ static int xavp_rm_internal(str *name, sr_xavp_t **head, int idx) int n=0; int count=0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return 0; id = get_hash1_raw(name->s, name->len); @@ -498,7 +498,7 @@ int xavp_count(str *name, sr_xavp_t **start) unsigned int id; int n = 0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return -1; id = get_hash1_raw(name->s, name->len); @@ -865,7 +865,7 @@ sr_xavp_t *xavp_extract(str *name, sr_xavp_t **list) sr_xavp_t *prv = 0; unsigned int id; - if(name==NULL || name->s==NULL) { + if(name==NULL || name->s==NULL || name->len<=0) { if(list!=NULL) { avp = *list; if(avp!=NULL) { @@ -1157,7 +1157,7 @@ static sr_xavp_t *xavu_get_internal(str *name, sr_xavp_t **list, sr_xavp_t **prv sr_xavp_t *avu; unsigned int id; - if(name==NULL || name->s==NULL) { + if(name==NULL || name->s==NULL || name->len<=0) { return NULL; } @@ -1235,7 +1235,7 @@ int xavu_rm_by_name(str *name, sr_xavp_t **head) unsigned int id; - if(name==NULL || name->s==NULL) { + if(name==NULL || name->s==NULL || name->len<=0) { return -1; } @@ -1579,7 +1579,7 @@ static sr_xavp_t *xavi_new_value(str *name, sr_xval_t *val) int size; unsigned int id; - if(name==NULL || name->s==NULL || val==NULL) + if(name==NULL || name->s==NULL || name->len<=0 || val==NULL) return NULL; id = get_hash1_case_raw(name->s, name->len); @@ -1812,7 +1812,7 @@ static sr_xavp_t *xavi_get_internal(str *name, sr_xavp_t **list, int idx, sr_xav unsigned int id; int n = 0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return NULL; id = get_hash1_case_raw(name->s, name->len); @@ -1939,7 +1939,7 @@ static int xavi_rm_internal(str *name, sr_xavp_t **head, int idx) int n=0; int count=0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return 0; id = get_hash1_case_raw(name->s, name->len); @@ -2022,7 +2022,7 @@ int xavi_count(str *name, sr_xavp_t **start) unsigned int id; int n = 0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return -1; id = get_hash1_case_raw(name->s, name->len); @@ -2315,7 +2315,7 @@ sr_xavp_t *xavi_extract(str *name, sr_xavp_t **list) sr_xavp_t *prv = 0; unsigned int id; - if(name==NULL || name->s==NULL) { + if(name==NULL || name->s==NULL || name->len<=0) { if(list!=NULL) { avi = *list; if(avi!=NULL) {

3 years, 6 months

git:master:46080a1f: pv: added $rpl(cntrr) - count record-route headers in reply

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 46080a1f2c8aca4e9b187d62f0c3e74e0e29f3ad URL: https://github.com/kamailio/kamailio/commit/46080a1f2c8aca4e9b187d62f0c3e74… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-13T10:49:19+02:00 pv: added $rpl(cntrr) - count record-route headers in reply --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/46080a1f2c8aca4e9b187d62f0c3e74… Patch: https://github.com/kamailio/kamailio/commit/46080a1f2c8aca4e9b187d62f0c3e74… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 472c63f205..0493c23c08 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -41,6 +41,7 @@ #include "../../core/parser/parse_hname2.h" #include "../../core/parser/parse_content.h" #include "../../core/parser/parse_refer_to.h" +#include "../../core/parser/parse_rr.h" #include "../../core/parser/parse_rpid.h" #include "../../core/parser/parse_diversion.h" #include "../../core/parser/parse_ppi_pai.h" @@ -3773,6 +3774,8 @@ int pv_parse_rpl_attrs_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 1; else if(strncmp(in->s, "dport", 5)==0) sp->pvp.pvn.u.isname.name.n = 2; + else if(strncmp(in->s, "cntrr", 5)==0) + sp->pvp.pvn.u.isname.name.n = 21; else goto error; break; case 6: @@ -3813,6 +3816,7 @@ int pv_get_rpl_attrs(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) str sproto = STR_NULL; unsigned int port = 0; hdr_field_t *hf = NULL; + unsigned int hcnt = 0; if(param==NULL) { return pv_get_null(msg, param, res); @@ -3877,18 +3881,37 @@ int pv_get_rpl_attrs(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) case 20: /* count of via */ if (parse_headers(msg, HDR_EOH_F, 0)<0) { LM_DBG("failed to parse sip headers\n"); - return pv_get_uintval(msg, param, res, 0); + return pv_get_null(msg, param, res); } - port = 0; + hcnt = 0; for(hf=msg->h_via1; hf!=NULL; hf=hf->next) { if(hf->type==HDR_VIA_T) { via_body_t *vb; for(vb=(via_body_t*)hf->parsed; vb!=NULL; vb=vb->next) { - port++; + hcnt++; } } } - return pv_get_uintval(msg, param, res, port); + return pv_get_uintval(msg, param, res, hcnt); + case 21: /* count of record-route */ + if (parse_headers(msg, HDR_EOH_F, 0)<0) { + LM_DBG("failed to parse sip headers\n"); + return pv_get_null(msg, param, res); + } + hcnt = 0; + for(hf=msg->h_via1; hf!=NULL; hf=hf->next) { + if(hf->type == HDR_RECORDROUTE_T) { + rr_t *rrb; + if(parse_rr(hf) == -1) { + LM_ERR("failed parsing rr header\n"); + return pv_get_null(msg, param, res); + } + for(rrb=(rr_t*)hf->parsed; rrb!=NULL; rrb=rrb->next) { + hcnt++; + } + } + } + return pv_get_uintval(msg, param, res, hcnt); default: return pv_get_null(msg, param, res);

3 years, 6 months

git:master:5f4662a9: presence: set correct type for local_log_facility modparam

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5f4662a95a97d5224bf03745a9a354a41925706c URL: https://github.com/kamailio/kamailio/commit/5f4662a95a97d5224bf03745a9a354a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-12T18:14:29+02:00 presence: set correct type for local_log_facility modparam --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/5f4662a95a97d5224bf03745a9a354a… Patch: https://github.com/kamailio/kamailio/commit/5f4662a95a97d5224bf03745a9a354a… --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index 301113aa03..09751bbc15 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -232,7 +232,7 @@ static param_export_t params[]={ { "fetch_rows", INT_PARAM, &pres_fetch_rows}, { "db_table_lock_type", INT_PARAM, &pres_db_table_lock_type}, { "local_log_level", PARAM_INT, &pres_local_log_level}, - { "local_log_facility", PARAM_STR, &pres_log_facility_str}, + { "local_log_facility", PARAM_STRING, &pres_log_facility_str}, { "subs_remove_match", PARAM_INT, &pres_subs_remove_match}, { "xavp_cfg", PARAM_STR, &pres_xavp_cfg}, { "retrieve_order", PARAM_INT, &pres_retrieve_order},

3 years, 6 months

git:5.5:9fe76d00: secsipid: docs - set GO111MODULE=off in installation example

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 9fe76d00f32aa3adfb0bfb2c7cbe325681089037 URL: https://github.com/kamailio/kamailio/commit/9fe76d00f32aa3adfb0bfb2c7cbe325… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-12T16:07:52+02:00 secsipid: docs - set GO111MODULE=off in installation example (cherry picked from commit ecc8a34dae44883b125ae7a3da59d4a332e0b48c) --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9fe76d00f32aa3adfb0bfb2c7cbe325… Patch: https://github.com/kamailio/kamailio/commit/9fe76d00f32aa3adfb0bfb2c7cbe325… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index d9d622af17..1e22e371fb 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -318,7 +318,7 @@ request_route { <section id="secsipid.s.installation"> <title>Installation</title> <para> - The module needs "secsipdi_proc.so" module thatdepends on "libsecsipid", + The module needs "secsipdi_proc.so" module that depends on "libsecsipid", which is a component of "sipsecidx" project from https://github.com/asipto/secsipidx/. The library is implemented in Go language, with generated C API and library. Until the @@ -334,6 +334,7 @@ request_route { <title>Libsecsipid Usage</title> <programlisting format="linespecific"> ... +export GO111MODULE=off go get https://github.com/asipto/secsipidx cd $GOPATH/src/github.com/asipto/secsipidx/csecsipid/ make liba @@ -351,6 +352,10 @@ make install ... </programlisting> </example> + <para> + For more details about compilation and installation of libsecsipid, see: + <ulink url="https://github.com/asipto/secsipidx">https://github.com/asipto/secsipidx</ulink>. + </para> </section> </chapter>

3 years, 6 months

git:5.5:c1fad6fd: tcpops: use fixup_igp_all() instead of fixup_igp_null()

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: c1fad6fd1c05e86f974c3771ba246ee2e05abf45 URL: https://github.com/kamailio/kamailio/commit/c1fad6fd1c05e86f974c3771ba246ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-12T16:07:26+02:00 tcpops: use fixup_igp_all() instead of fixup_igp_null() - needed for functions with many parameters (cherry picked from commit 02240711239149e2f5c4890a70ab158d10fa8187) --- Modified: src/modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c1fad6fd1c05e86f974c3771ba246ee… Patch: https://github.com/kamailio/kamailio/commit/c1fad6fd1c05e86f974c3771ba246ee… --- diff --git a/src/modules/tcpops/tcpops_mod.c b/src/modules/tcpops/tcpops_mod.c index b2d2fbe7dd..23036fd771 100644 --- a/src/modules/tcpops/tcpops_mod.c +++ b/src/modules/tcpops/tcpops_mod.c @@ -78,27 +78,27 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[]={ {"tcp_keepalive_enable", (cmd_function)w_tcp_keepalive_enable4, 4, - fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_keepalive_enable", (cmd_function)w_tcp_keepalive_enable3, 3, - fixup_igp_null, fixup_free_igp_null, REQUEST_ROUTE|ONREPLY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_keepalive_disable", (cmd_function)w_tcp_keepalive_disable1, 1, - fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_keepalive_disable", (cmd_function)w_tcp_keepalive_disable0, 0, 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_set_connection_lifetime", (cmd_function)w_tcpops_set_connection_lifetime2, 2, - fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_set_connection_lifetime", (cmd_function)w_tcpops_set_connection_lifetime1, 1, - fixup_igp_null, fixup_free_igp_null, REQUEST_ROUTE|ONREPLY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_enable_closed_event", (cmd_function)w_tcpops_enable_closed_event1, 1, - fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_enable_closed_event", (cmd_function)w_tcpops_enable_closed_event0, 0, 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_conid_state", (cmd_function)w_tcp_conid_state, 1, - fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_get_conid", (cmd_function)w_tcp_get_conid, 2, fixup_spve_pvar, fixup_free_spve_pvar, ANY_ROUTE}, {"tcp_conid_alive", (cmd_function)w_tcp_conid_alive, 1, - fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_set_otcpid", (cmd_function)w_tcp_set_otcpid, 1, fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_set_otcpid_flag", (cmd_function)w_tcp_set_otcpid_flag, 1,

3 years, 6 months

git:5.5:b57ab055: usrloc: unnecessary periodic db queries cancelled

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: b57ab05589b1982df456b39bf8f26359e73a63cc URL: https://github.com/kamailio/kamailio/commit/b57ab05589b1982df456b39bf8f2635… Author: korayvt <koray.vatansever(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-12T16:07:14+02:00 usrloc: unnecessary periodic db queries cancelled (cherry picked from commit 42bc79b3b617632b6f83e1352b5cb8266706d7c0) --- Modified: src/modules/usrloc/dlist.c Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/b57ab05589b1982df456b39bf8f2635… Patch: https://github.com/kamailio/kamailio/commit/b57ab05589b1982df456b39bf8f2635… --- diff --git a/src/modules/usrloc/dlist.c b/src/modules/usrloc/dlist.c index 44ce3c6376..252bb8bde0 100644 --- a/src/modules/usrloc/dlist.c +++ b/src/modules/usrloc/dlist.c @@ -960,7 +960,9 @@ int synchronize_all_udomains(int istart, int istep) res |= db_timer_udomain(ptr->d); } } - ul_ka_db_records((unsigned int)istart); + if (ul_ka_mode != ULKA_NONE) { + ul_ka_db_records((unsigned int)istart); + } } else { for( ptr=_ksr_ul_root ; ptr ; ptr=ptr->next) { mem_timer_udomain(ptr->d, istart, istep); diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index 9d96b2d7a6..204ddfd29f 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -1094,8 +1094,10 @@ int db_timer_udomain(udomain_t* _d) db_val_t vals[3]; int key_num = 2; - /* call contact expired call back for a domain before deleting database rows */ - udomain_contact_expired_cb(ul_dbh, _d); + /* If contact-expired callback exists, run it for a domain before deleting database rows */ + if (exists_ulcb_type(UL_CONTACT_EXPIRE)) { + udomain_contact_expired_cb(ul_dbh, _d); + } keys[0] = &ul_expires_col; ops[0] = "<";

3 years, 6 months

git:5.5:6d71c939: dialog: ignore 408 on keepalive with cseq 0

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 6d71c9399027f2ed41cd6eae576d862440bd4fd4 URL: https://github.com/kamailio/kamailio/commit/6d71c9399027f2ed41cd6eae576d862… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-12T16:07:05+02:00 dialog: ignore 408 on keepalive with cseq 0 - some UAs do not reply at all (cherry picked from commit 7aa8056a5e3a9804133cb9ff79640d8116be63da) --- Modified: src/modules/dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/6d71c9399027f2ed41cd6eae576d862… Patch: https://github.com/kamailio/kamailio/commit/6d71c9399027f2ed41cd6eae576d862… --- diff --git a/src/modules/dialog/dlg_req_within.c b/src/modules/dialog/dlg_req_within.c index d48d139965..809834527f 100644 --- a/src/modules/dialog/dlg_req_within.c +++ b/src/modules/dialog/dlg_req_within.c @@ -271,6 +271,12 @@ void dlg_ka_cb_all(struct cell* t, int type, struct tmcb_params* ps, int dir) LM_DBG("skip updating non-confirmed dialogs\n"); goto done; } + if(ps->code==408 && (dlg->cseq[dir].len==0 + || (dlg->cseq[dir].len==1 && dlg->cseq[dir].s[0]=='\0'))) { + LM_DBG("ignore 408 for %s cseq 0\n", + ((dir==DLG_CALLER_LEG)?"caller":"callee")); + goto done; + } tend = 0; if(dir==DLG_CALLER_LEG) { dlg->ka_src_counter++;

3 years, 6 months

← Newer
1
...
16
17
18
19
20
21
22
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2021