- sr-dev - kamailio.org

git:master:ca886ffa: modules: readme files regenerated - siputils ... [skip ci]
by Kamailio Dev 11 May '21

11 May '21

Module: kamailio Branch: master Commit: ca886ffa64db8cc209dcc7098ffb69902464da72 URL: https://github.com/kamailio/kamailio/commit/ca886ffa64db8cc209dcc7098ffb699… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-05-11T17:31:12+02:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/ca886ffa64db8cc209dcc7098ffb699… Patch: https://github.com/kamailio/kamailio/commit/ca886ffa64db8cc209dcc7098ffb699… --- diff --git a/src/modules/siputils/README b/src/modules/siputils/README index a1aeae393c..453179d5a1 100644 --- a/src/modules/siputils/README +++ b/src/modules/siputils/README @@ -449,8 +449,9 @@ modparam("auth", "rpid_avp", "$avp(myrpid)") Inserting the call-id in the internal list, which is checked when further replies arrive. Any 183 reply that is received during the - timeout value will be converted to a 180 message. Please note that you - need to set a positive timeout value in order to use this function. + timeout value will be converted to a 180 message with removed SDP body. + Please note that you need to set a positive ring_timeout value in order + to use this function. The function returns TRUE on success, and FALSE during processing failures.

1 0

git:master:212840c3: siptuils: small doc extension for ring filter functionality
by Henning Westerholt 11 May '21

11 May '21

Module: kamailio Branch: master Commit: 212840c367e4b2945bb105e1fd087543f7fdf316 URL: https://github.com/kamailio/kamailio/commit/212840c367e4b2945bb105e1fd08754… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-05-11T15:24:01Z siptuils: small doc extension for ring filter functionality --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/212840c367e4b2945bb105e1fd08754… Patch: https://github.com/kamailio/kamailio/commit/212840c367e4b2945bb105e1fd08754… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index 5764c152d4..8e7140385d 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -281,8 +281,9 @@ modparam("auth", "rpid_avp", "$avp(myrpid)") <para> Inserting the call-id in the internal list, which is checked when further replies arrive. Any 183 reply that is received during the - timeout value will be converted to a 180 message. Please note that you - need to set a positive timeout value in order to use this function. + timeout value will be converted to a 180 message with removed SDP body. + Please note that you need to set a positive ring_timeout value in order + to use this function. </para> <para> The function returns TRUE on success, and FALSE during processing failures.

1 0

git:master:9c2fea2d: modules: readme files regenerated - siputils ... [skip ci]
by Kamailio Dev 11 May '21

11 May '21

Module: kamailio Branch: master Commit: 9c2fea2df70e3fe609324a9d868efe9998bcda10 URL: https://github.com/kamailio/kamailio/commit/9c2fea2df70e3fe609324a9d868efe9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-05-11T15:46:16+02:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/9c2fea2df70e3fe609324a9d868efe9… Patch: https://github.com/kamailio/kamailio/commit/9c2fea2df70e3fe609324a9d868efe9… --- diff --git a/src/modules/siputils/README b/src/modules/siputils/README index 87d3ecf9e4..a1aeae393c 100644 --- a/src/modules/siputils/README +++ b/src/modules/siputils/README @@ -96,7 +96,7 @@ Gabriel Vasile 4.30. is_reply() 4.31. is_gruu([uri]) 4.32. is_supported(option) - 4.33. is_first_hop() + 4.33. is_first_hop([mode]) 4.34. sip_p_charging_vector(flags) 4.35. contact_param_encode(pname, saddr) 4.36. contact_param_decode(pname) @@ -217,7 +217,7 @@ Chapter 1. Admin Guide 4.30. is_reply() 4.31. is_gruu([uri]) 4.32. is_supported(option) - 4.33. is_first_hop() + 4.33. is_first_hop([mode]) 4.34. sip_p_charging_vector(flags) 4.35. contact_param_encode(pname, saddr) 4.36. contact_param_decode(pname) @@ -438,7 +438,7 @@ modparam("auth", "rpid_avp", "$avp(myrpid)") 4.30. is_reply() 4.31. is_gruu([uri]) 4.32. is_supported(option) - 4.33. is_first_hop() + 4.33. is_first_hop([mode]) 4.34. sip_p_charging_vector(flags) 4.35. contact_param_encode(pname, saddr) 4.36. contact_param_decode(pname) @@ -994,24 +994,37 @@ if(is_gruu()) { ... } if (is_supported("outbound")) { ... } ... -4.33. is_first_hop() +4.33. is_first_hop([mode]) The function returns true if the proxy is first hop after the original - sender. For incoming SIP requests, it means there is only one Via - header. For incoming SIP replies, it means that top Record-Route URI is - 'myself' and source address is not matching it (to avoid detecting in - case of local loops). The detection is done only when Record-Route has - an IP address in its URI (for a domain, it returns -1/false). + sender based on a best effort estimation by checking Via and + Record-Route headers. + + For incoming SIP requests, it means there is only one Via header. + + For incoming SIP replies, if mode==0, it means that top Record-Route + URI is 'myself' and source address is not matching local IP (to avoid + detecting in case of local loops). Therefore for mode==0 the detection + is done only when Record-Route has an IP address in its URI (for a + domain, it returns -1/false). If mode==1, then the check of local IP is + no longer done, only if top Record-Route is myself, returning true also + if there is a domain, assuming that is expected no looping can happen + based on config rules. Note that it does not detect spirals, which can have the condition for replies true also in the case of additional SIP reply reception. + Parameter mode is optional and can be an integer or a varaible holding + an integer. If not provided, the behaviour is like mode==0. + This function can be used from ANY_ROUTE. Example 1.42. is_first_hop() usage ... if(is_first_hop()) { ... } ... +if(is_first_hop_mode("1")) { ... } +... 4.34. sip_p_charging_vector(flags)

1 0

git:master:425ba921: siputils: docs - updates to is_first_hop() for mode parameter
by Daniel-Constantin Mierla 11 May '21

11 May '21

Module: kamailio Branch: master Commit: 425ba921288c8d5a6ae3076287d0cf39c735a8fd URL: https://github.com/kamailio/kamailio/commit/425ba921288c8d5a6ae3076287d0cf3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-11T15:38:14+02:00 siputils: docs - updates to is_first_hop() for mode parameter --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/425ba921288c8d5a6ae3076287d0cf3… Patch: https://github.com/kamailio/kamailio/commit/425ba921288c8d5a6ae3076287d0cf3… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index 4667e42f63..5764c152d4 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -1169,22 +1169,35 @@ if (is_supported("outbound")) { ... } </section> <section id="siputils.f.is_first_hop"> <title> - <function moreinfo="none">is_first_hop()</function> + <function moreinfo="none">is_first_hop([mode])</function> </title> <para> The function returns true if the proxy is first hop after the - original sender. For incoming SIP requests, it means there is only - one Via header. For incoming SIP replies, it means that top - Record-Route URI is 'myself' and source address is not matching it - (to avoid detecting in case of local loops). The detection is done - only when Record-Route has an IP address in its URI (for a domain, - it returns -1/false). + original sender based on a best effort estimation by checking Via + and Record-Route headers. + </para> + <para> + For incoming SIP requests, it means there is only one Via header. + </para> + <para> + For incoming SIP replies, if mode==0, it means that top Record-Route + URI is 'myself' and source address is not matching local IP (to avoid + detecting in case of local loops). Therefore for mode==0 the detection + is done only when Record-Route has an IP address in its URI (for a domain, + it returns -1/false). If mode==1, then the check of local IP is no + longer done, only if top Record-Route is myself, returning true also if + there is a domain, assuming that is expected no looping can happen + based on config rules. </para> <para> Note that it does not detect spirals, which can have the condition for replies true also in the case of additional SIP reply reception. </para> <para> + Parameter mode is optional and can be an integer or a varaible holding + an integer. If not provided, the behaviour is like mode==0. + </para> + <para> This function can be used from ANY_ROUTE. </para> <example> @@ -1193,6 +1206,8 @@ if (is_supported("outbound")) { ... } ... if(is_first_hop()) { ... } ... +if(is_first_hop_mode("1")) { ... } +... </programlisting> </example> </section>

1 0

git:master:6045c62f: siputils: added optional mode parameter to is_first_hop()
by Daniel-Constantin Mierla 11 May '21

11 May '21

Module: kamailio Branch: master Commit: 6045c62f4ebaf861cf725ea7c1e560b22f7a5379 URL: https://github.com/kamailio/kamailio/commit/6045c62f4ebaf861cf725ea7c1e560b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-11T15:16:36+02:00 siputils: added optional mode parameter to is_first_hop() - if set to 1, skip checking for loops - exported to kemi as is_first_hop_mode(int mode) --- Modified: src/modules/siputils/sipops.c Modified: src/modules/siputils/sipops.h Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/6045c62f4ebaf861cf725ea7c1e560b… Patch: https://github.com/kamailio/kamailio/commit/6045c62f4ebaf861cf725ea7c1e560b… --- diff --git a/src/modules/siputils/sipops.c b/src/modules/siputils/sipops.c index 95b1baa5d0..fb1040c6ba 100644 --- a/src/modules/siputils/sipops.c +++ b/src/modules/siputils/sipops.c @@ -140,12 +140,12 @@ int w_is_supported(sip_msg_t *msg, char *_option, char *p2) } -int is_first_hop(sip_msg_t *msg) +int is_first_hop_mode(sip_msg_t *msg, int mode) { int ret; rr_t* r = NULL; sip_uri_t puri; - struct ip_addr *ip; + struct ip_addr *ip = NULL; if(msg==NULL) return -1; @@ -180,10 +180,12 @@ int is_first_hop(sip_msg_t *msg) LM_DBG("failed to parse uri in first record-route header\n"); return -1; } - if (((ip = str2ip(&(puri.host))) == NULL) - && ((ip = str2ip6(&(puri.host))) == NULL)) { - LM_DBG("uri host is not an ip address\n"); - return -1; + if(mode==0) { + if (((ip = str2ip(&(puri.host))) == NULL) + && ((ip = str2ip6(&(puri.host))) == NULL)) { + LM_DBG("uri host is not an ip address\n"); + return -1; + } } ret = check_self(&puri.host, (puri.port.s)?puri.port_no:0, (puri.transport_val.s)?puri.proto:0); @@ -191,13 +193,15 @@ int is_first_hop(sip_msg_t *msg) LM_DBG("top record route uri is not myself\n"); return -1; } - if (ip_addr_cmp(ip, &(msg->rcv.src_ip)) - && ((msg->rcv.src_port == puri.port_no) - || ((puri.port.len == 0) && (msg->rcv.src_port == 5060))) - && (puri.proto==msg->rcv.proto - || (puri.proto==0 && msg->rcv.proto==PROTO_UDP)) ) { - LM_DBG("source address matches top record route uri - loop\n"); - return -1; + if(mode==0) { + if (ip_addr_cmp(ip, &(msg->rcv.src_ip)) + && ((msg->rcv.src_port == puri.port_no) + || ((puri.port.len == 0) && (msg->rcv.src_port == 5060))) + && (puri.proto==msg->rcv.proto + || (puri.proto==0 && msg->rcv.proto==PROTO_UDP)) ) { + LM_DBG("source address matches top record route uri - loop\n"); + return -1; + } } /* todo - check spirals */ return 1; @@ -206,6 +210,23 @@ int is_first_hop(sip_msg_t *msg) } } +int w_is_first_hop_mode(sip_msg_t *msg, char *p1mode, char *p2) +{ + int mode = 0; + + if(fixup_get_ivalue(msg, (gparam_t*)p1mode, &mode)<0) { + LM_ERR("failed to get mode parameter\n"); + return -1; + } + + return is_first_hop_mode(msg, mode); +} + +int is_first_hop(sip_msg_t *msg) +{ + return is_first_hop_mode(msg, 0); +} + int w_is_first_hop(sip_msg_t *msg, char *p1, char *p2) { return is_first_hop(msg); diff --git a/src/modules/siputils/sipops.h b/src/modules/siputils/sipops.h index 27ac0c035e..97d885c71c 100644 --- a/src/modules/siputils/sipops.h +++ b/src/modules/siputils/sipops.h @@ -40,5 +40,7 @@ int w_is_gruu(sip_msg_t *msg, char *uri1, char *p2); int w_is_supported(sip_msg_t *msg, char *_option, char *p2); int w_is_first_hop(sip_msg_t *msg, char *p1, char *p2); int is_first_hop(sip_msg_t *msg); +int w_is_first_hop_mode(sip_msg_t *msg, char *p1mode, char *p2); +int is_first_hop_mode(sip_msg_t *msg, int mode); #endif diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index 33a3c40a61..57ae9fb262 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -185,6 +185,8 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE}, {"is_first_hop", (cmd_function)w_is_first_hop, 0, 0, 0, ANY_ROUTE}, + {"is_first_hop", (cmd_function)w_is_first_hop, 1, fixup_igp_null, + fixup_free_igp_null, ANY_ROUTE}, {"is_tel_number", (cmd_function)is_tel_number, 1, fixup_spve_null, 0, ANY_ROUTE}, {"is_numeric", (cmd_function)is_numeric, 1, fixup_spve_null, @@ -571,6 +573,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_first_hop_mode"), + SR_KEMIP_INT, is_first_hop_mode, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("siputils"), str_init("is_uri"), SR_KEMIP_INT, ki_is_uri, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:cc2a9518: modules: readme files regenerated - uac ... [skip ci]
by Kamailio Dev 10 May '21

10 May '21

Module: kamailio Branch: master Commit: cc2a9518207e36b7b18aef5c8714f0c21da3dd95 URL: https://github.com/kamailio/kamailio/commit/cc2a9518207e36b7b18aef5c8714f0c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-05-10T09:46:22+02:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/cc2a9518207e36b7b18aef5c8714f0c… Patch: https://github.com/kamailio/kamailio/commit/cc2a9518207e36b7b18aef5c8714f0c…

1 0

git:master:cd2abf6e: uac: exposed reg_use_domain via modparam
by Daniel-Constantin Mierla 10 May '21

10 May '21

Module: kamailio Branch: master Commit: cd2abf6e278539b31ebfd355acf841faf6121e25 URL: https://github.com/kamailio/kamailio/commit/cd2abf6e278539b31ebfd355acf841f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-10T09:34:47+02:00 uac: exposed reg_use_domain via modparam - control if the lookup over username uses also domain --- Modified: src/modules/uac/uac.c Modified: src/modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/cd2abf6e278539b31ebfd355acf841f… Patch: https://github.com/kamailio/kamailio/commit/cd2abf6e278539b31ebfd355acf841f… --- diff --git a/src/modules/uac/uac.c b/src/modules/uac/uac.c index 46503bf592..50873ef557 100644 --- a/src/modules/uac/uac.c +++ b/src/modules/uac/uac.c @@ -114,6 +114,7 @@ static int child_init(int rank); extern int reg_timer_interval; extern int _uac_reg_gc_interval; +extern int _uac_reg_use_domain; static pv_export_t mod_pvs[] = { { {"uac_req", sizeof("uac_req")-1}, PVT_OTHER, pv_get_uac_req, pv_set_uac_req, @@ -184,7 +185,8 @@ static param_export_t params[] = { {"reg_random_delay", INT_PARAM, &reg_random_delay }, {"reg_active", INT_PARAM, &reg_active_param }, {"reg_gc_interval", INT_PARAM, &_uac_reg_gc_interval }, - {"reg_hash_size", INT_PARAM, &reg_htable_size }, + {"reg_hash_size", INT_PARAM, &reg_htable_size }, + {"reg_use_domain", PARAM_INT, &_uac_reg_use_domain }, {"default_socket", PARAM_STR, &uac_default_socket}, {"event_callback", PARAM_STR, &uac_event_callback}, {0, 0, 0} diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index c36ee8ac82..1ea1b62135 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -116,7 +116,7 @@ static reg_ht_t *_reg_htable = NULL; static reg_ht_t *_reg_htable_gc = NULL; static gen_lock_t *_reg_htable_gc_lock = NULL; -int reg_use_domain = 0; +int _uac_reg_use_domain = 0; int reg_timer_interval = 90; int reg_retry_interval = 0; int reg_htable_size = 4; @@ -1630,7 +1630,7 @@ int uac_reg_lookup(struct sip_msg *msg, str *src, pv_spec_t *dst, int mode) LM_ERR("failed to parse uri\n"); return -2; } - reg = reg_ht_get_byuser(&puri.user, (reg_use_domain)?&puri.host:NULL); + reg = reg_ht_get_byuser(&puri.user, (_uac_reg_use_domain)?&puri.host:NULL); if(reg==NULL) { LM_DBG("no user: %.*s\n", src->len, src->s); @@ -1673,7 +1673,7 @@ int uac_reg_status(struct sip_msg *msg, str *src, int mode) LM_ERR("failed to parse uri\n"); return -1; } - reg = reg_ht_get_byuser(&puri.user, (reg_use_domain)?&puri.host:NULL); + reg = reg_ht_get_byuser(&puri.user, (_uac_reg_use_domain)?&puri.host:NULL); if(reg==NULL) { LM_DBG("no user: %.*s\n", src->len, src->s); @@ -1717,7 +1717,7 @@ int uac_reg_request_to(struct sip_msg *msg, str *src, unsigned int mode) reg = reg_ht_get_byuuid(src); break; case 1: - if(reg_use_domain) + if(_uac_reg_use_domain) { if (parse_uri(src->s, src->len, &puri)!=0) {

1 0

git:master:ec600414: uac: docs for reg_use_domain parameter
by Daniel-Constantin Mierla 10 May '21

10 May '21

Module: kamailio Branch: master Commit: ec600414a3ba01e641beda6c11201b7185c879db URL: https://github.com/kamailio/kamailio/commit/ec600414a3ba01e641beda6c11201b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-10T09:39:16+02:00 uac: docs for reg_use_domain parameter --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ec600414a3ba01e641beda6c11201b7… Patch: https://github.com/kamailio/kamailio/commit/ec600414a3ba01e641beda6c11201b7… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 52362af1e3..b6184a6daa 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -582,6 +582,24 @@ modparam("uac", "reg_active", 0) <programlisting format="linespecific"> ... modparam("uac", "reg_gc_interval", 60) +... + </programlisting> + </example> + </section> + <section id="uac.p.reg_use_domain"> + <title><varname>reg_use_domain</varname> (int)</title> + <para> + If set to 1, domain part of URIs is used by functions doing + lookup on user name. + </para> + <para> + <emphasis>Default value is <quote>0</quote>.</emphasis> + </para> + <example> + <title>Set <varname>reg_use_domain</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("uac", "reg_use_domain", 1) ... </programlisting> </example> @@ -647,8 +665,6 @@ end </programlisting> </example> </section> - - </section> <section>

1 0

git:master:ea3ca819: uac: renamed parameter for kemi uac_reg_lookup_uri()
by Daniel-Constantin Mierla 10 May '21

10 May '21

Module: kamailio Branch: master Commit: ea3ca819bc07fed6b40bd6cc8f6f147dac66d9ca URL: https://github.com/kamailio/kamailio/commit/ea3ca819bc07fed6b40bd6cc8f6f147… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-10T09:28:31+02:00 uac: renamed parameter for kemi uac_reg_lookup_uri() - be suggestive of its purpose in the index docs --- Modified: src/modules/uac/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/ea3ca819bc07fed6b40bd6cc8f6f147… Patch: https://github.com/kamailio/kamailio/commit/ea3ca819bc07fed6b40bd6cc8f6f147… --- diff --git a/src/modules/uac/uac.c b/src/modules/uac/uac.c index c7e181dc7c..46503bf592 100644 --- a/src/modules/uac/uac.c +++ b/src/modules/uac/uac.c @@ -684,7 +684,7 @@ static int w_uac_reg_lookup_uri(struct sip_msg* msg, char* src, char* dst) return uac_reg_lookup(msg, &sval, dpv, 1); } -static int ki_uac_reg_lookup_uri(sip_msg_t* msg, str* userid, str* sdst) +static int ki_uac_reg_lookup_uri(sip_msg_t* msg, str* suri, str* sdst) { pv_spec_t *dpv = NULL; dpv = pv_cache_get(sdst); @@ -692,7 +692,7 @@ static int ki_uac_reg_lookup_uri(sip_msg_t* msg, str* userid, str* sdst) LM_ERR("cannot get pv spec for [%.*s]\n", sdst->len, sdst->s); return -1; } - return uac_reg_lookup(msg, userid, dpv, 1); + return uac_reg_lookup(msg, suri, dpv, 1); } static int w_uac_reg_status(struct sip_msg* msg, char* src, char* p2)

1 0

[kamailio/kamailio] tspops: failed tcp_keepalive_enable (#2730)
by sergey-safarov 09 May '21

09 May '21

### Description Cannot use `tcp_keepalive_enable` function on master branch. #### Reproduction Create config file like ``` listen=udp:127.0.0.1:5060 loadmodule "pv.so" loadmodule "tcpops.so" #modparam("http_client", "httpcon", "http://example.com=>http://example.com"); request_route { tcp_keepalive_enable("22", "60", "5", "2"); } ``` and then start Kamailio #### Log Messages ``` [root@sbc-a0 config]# kamailio -ddd -DD -E -f /tmp/test.cfg 0(30164) INFO: <core> [main.c:2139]: main(): private (per process) memory: 8388608 bytes 0(30164) DEBUG: <core> [core/mem/q_malloc.c:199]: qm_malloc_init(): QM_OPTIMIZE=16384, /ROUNDTO=2048 0(30164) DEBUG: <core> [core/mem/q_malloc.c:201]: qm_malloc_init(): QM_HASH_SIZE=2099, qm_block size=235152 0(30164) DEBUG: <core> [core/mem/q_malloc.c:203]: qm_malloc_init(): qm_malloc_init(0xffff8d5c0010, 8388608), start=0xffff8d5c0010 0(30164) DEBUG: <core> [core/mem/q_malloc.c:212]: qm_malloc_init(): size= 8388608, init_overhead=235256 0(30164) DEBUG: <core> [core/cfg.lex:1964]: pp_define(): defining id: KAMAILIO_5 0(30164) DEBUG: <core> [core/cfg.lex:1964]: pp_define(): defining id: KAMAILIO_5_6 0(30164) DEBUG: <core> [core/cfg.lex:1964]: pp_define(): defining id: KAMAILIO_5_6_0 0(30164) DEBUG: <core> [core/route.c:129]: route_add(): mapping routing block (0xa70d60)[0] to 0 0(30164) DEBUG: <core> [core/route.c:129]: route_add(): mapping routing block (0xa70da0)[0] to 0 0(30164) DEBUG: <core> [core/route.c:129]: route_add(): mapping routing block (0xa70d00)[0] to 0 0(30164) DEBUG: <core> [core/route.c:129]: route_add(): mapping routing block (0xa70d40)[0] to 0 0(30164) DEBUG: <core> [core/route.c:129]: route_add(): mapping routing block (0xa70d20)[0] to 0 0(30164) DEBUG: <core> [core/route.c:129]: route_add(): mapping routing block (0xa70d80)[0] to 0 0(30164) DEBUG: <core> [core/pvapi.c:2146]: pv_init_buffer(): PV print buffer initialized to [40][8192] 0(30164) DEBUG: <core> [main.c:2460]: main(): read 4025707099 from /dev/urandom 0(30164) DEBUG: <core> [main.c:2466]: main(): seeding PRNG with 1351243300 0(30164) DEBUG: <core> [core/rand/cryptorand.c:36]: cryptorand_seed(): seeding cryptorand generator with 1351243300 0(30164) DEBUG: <core> [core/rand/fortuna/random.c:154]: system_reseed(): cryptographic PRNG reseed done with 32 bytes 0(30164) DEBUG: <core> [core/rand/fortuna/random.c:175]: sr_add_entropy(): additional 4 bytes entropy added to cryptographic PRNG 0(30164) DEBUG: <core> [main.c:2471]: main(): test random numbers 1639832327 574986100 3505011376 2068663732 0(30164) DEBUG: <core> [core/cfg.y:1860]: yyparse(): loading module pv.so 0(30164) DEBUG: <core> [core/sr_module.c:510]: ksr_locate_module(): found module to load </usr/lib64/kamailio/modules/pv.so> 0(30164) DEBUG: <core> [core/sr_module.c:560]: load_module(): trying to load </usr/lib64/kamailio/modules/pv.so> 0(30164) DEBUG: <core> [core/kemi.c:3062]: sr_kemi_modules_add(): adding core module 0(30164) DEBUG: <core> [core/kemi.c:3066]: sr_kemi_modules_add(): adding pv module 0(30164) DEBUG: <core> [core/kemi.c:3070]: sr_kemi_modules_add(): adding hdr module 0(30164) DEBUG: <core> [core/kemi.c:3084]: sr_kemi_modules_add(): adding module: pvx 0(30164) DEBUG: <core> [core/sr_module.c:288]: register_module(): register PV from: pv 0(30164) DEBUG: <core> [core/cfg.lex:1964]: pp_define(): defining id: MOD_pv 0(30164) DEBUG: <core> [core/cfg.y:1860]: yyparse(): loading module tcpops.so 0(30164) DEBUG: <core> [core/sr_module.c:510]: ksr_locate_module(): found module to load </usr/lib64/kamailio/modules/tcpops.so> 0(30164) DEBUG: <core> [core/sr_module.c:560]: load_module(): trying to load </usr/lib64/kamailio/modules/tcpops.so> 0(30164) DEBUG: <core> [core/kemi.c:3084]: sr_kemi_modules_add(): adding module: tcpops 0(30164) DEBUG: <core> [core/sr_module.c:288]: register_module(): register PV from: tcpops 0(30164) DEBUG: <core> [core/cfg.lex:1964]: pp_define(): defining id: MOD_tcpops 0(30164) DEBUG: <core> [core/route_struct.c:128]: mk_action(): ACTION type24, i/count 0/2: type 9(9)/ data (nil) 0(30164) DEBUG: <core> [core/route_struct.c:128]: mk_action(): ACTION type24, i/count 1/2: type 3(3)/ data (nil) 0(30164) DEBUG: <core> [core/sr_module.c:710]: find_mod_export_record(): found export of <tcp_keepalive_enable> in module tcpops [/usr/lib64/kamailio/modules/tcpops.so] 0(30164) DEBUG: <core> [core/mem/shm.c:100]: shm_core_pools_init(): preparing to initialize shm core pools 0(30164) DEBUG: <core> [core/mem/q_malloc.c:199]: qm_malloc_init(): QM_OPTIMIZE=16384, /ROUNDTO=2048 0(30164) DEBUG: <core> [core/mem/q_malloc.c:201]: qm_malloc_init(): QM_HASH_SIZE=2099, qm_block size=235152 0(30164) DEBUG: <core> [core/mem/q_malloc.c:203]: qm_malloc_init(): qm_malloc_init(0xffff89470000, 67108864), start=0xffff89470000 0(30164) DEBUG: <core> [core/mem/q_malloc.c:212]: qm_malloc_init(): size= 67108864, init_overhead=235256 0(30164) DEBUG: <core> [core/ppcfg.c:233]: pp_ifdef_level_check(): same number of pairing preprocessor directives #!IF[N]DEF - #!ENDIF 0(30164) DEBUG: <core> [core/route.c:129]: route_add(): mapping routing block (0xa70d80)[core:receive-parse-error] to 1 0(30164) INFO: <core> [core/sctp_core.c:74]: sctp_core_check_support(): SCTP API not enabled - if you want to use it, load sctp module 0(30164) DEBUG: <core> [core/name_alias.h:62]: grep_aliases(): matching (1:localhost.localdomain:5060) vs. (1:localhost:5060) 0(30164) DEBUG: <core> [core/name_alias.h:62]: grep_aliases(): matching (1:localhost4:5060) vs. (1:localhost.localdomain:5060) 0(30164) DEBUG: <core> [core/name_alias.h:62]: grep_aliases(): matching (1:localhost4:5060) vs. (1:localhost:5060) 0(30164) DEBUG: <core> [core/name_alias.h:62]: grep_aliases(): matching (1:localhost4.localdomain4:5060) vs. (1:localhost4:5060) 0(30164) DEBUG: <core> [core/name_alias.h:62]: grep_aliases(): matching (1:localhost4.localdomain4:5060) vs. (1:localhost.localdomain:5060) 0(30164) DEBUG: <core> [core/name_alias.h:62]: grep_aliases(): matching (1:localhost4.localdomain4:5060) vs. (1:localhost:5060) Listening on udp: 127.0.0.1:5060 Aliases: udp: localhost4.localdomain4:5060 udp: localhost4:5060 udp: localhost.localdomain:5060 udp: localhost:5060 0(30164) DEBUG: <core> [core/mem/pkg.c:108]: pkg_print_manager(): pkg - using memory manager: q_malloc 0(30164) DEBUG: <core> [core/mem/shm.c:300]: shm_print_manager(): shm - using memory manager: q_malloc 0(30164) DEBUG: <core> [core/cfg/cfg.c:173]: cfg_declare(): new config group has been registered: 'core' (num=57, size=228) 0(30164) DEBUG: <core> [core/cfg/cfg.c:173]: cfg_declare(): new config group has been registered: 'tcp' (num=27, size=108) 0(30164) DEBUG: <core> [core/timer.c:239]: init_timer(): starting with *ticks=1894875476 0(30164) DEBUG: <core> [core/timer.c:280]: init_timer(): timer_list between 0xffff894a9fd8 and 0xffff894edfd8 0(30164) DEBUG: <core> [core/pt.c:139]: register_procs(): registering new processes: 0 (old) + 1 (new) = 1 (total) 0(30164) INFO: <core> [core/tcp_main.c:4983]: init_tcp(): using epoll_lt as the io watch method (auto detected) 0(30164) DEBUG: <core> [core/daemonize.c:207]: enable_dumpable(): trying enable core dumping... 0(30164) DEBUG: <core> [core/daemonize.c:224]: enable_dumpable(): core dumping is enabled now (1)... 0(30164) DEBUG: <core> [core/daemonize.c:583]: set_core_dump(): core dump limits set to 18446744073709551615 0(30164) DEBUG: <core> [core/async_task.c:137]: async_task_init(): start initializing asynk task framework 0(30164) DEBUG: <core> [core/sr_module.c:931]: init_mod(): pv 0(30164) DEBUG: <core> [core/sr_module.c:931]: init_mod(): tcpops 0(30164) DEBUG: tcpops [tcpops_mod.c:137]: mod_init(): TCP keepalive module loaded. 0(30164) DEBUG: <core> [core/route.c:129]: route_add(): mapping routing block (0xa70d80)[tcp:closed] to 2 0(30164) DEBUG: <core> [core/route.c:129]: route_add(): mapping routing block (0xa70d80)[tcp:timeout] to 3 0(30164) DEBUG: <core> [core/route.c:129]: route_add(): mapping routing block (0xa70d80)[tcp:reset] to 4 0(30164) DEBUG: <core> [core/pt.c:100]: init_pt(): registering new processes: 1 (old) + 12 (new) = 13 (total) 0(30164) INFO: <core> [main.c:3030]: main(): processes (at least): 13 - shm size: 67108864 - pkg size: 8388608 0(30164) DEBUG: <core> [core/route.c:885]: fix_actions(): fixing tcp_keepalive_enable() 0(30164) ERROR: <core> [core/route.c:1166]: fix_actions(): fixing failed (code=-1) at cfg:/tmp/test.cfg:9 error -1 while trying to fix configuration 0(30164) DEBUG: <core> [core/sr_module.c:823]: destroy_modules(): starting modules destroy phase 0(30164) DEBUG: tcpops [tcpops_mod.c:171]: mod_destroy(): TCP keepalive module unloaded. 0(30164) INFO: <core> [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized 0(30164) DEBUG: <core> [core/mem/shm.c:288]: shm_destroy_manager(): destroying memory manager: q_malloc 0(30164) DEBUG: <core> [core/mem/q_malloc.c:1186]: qm_shm_lock_destroy(): destroying the shared memory lock 0(30164) DEBUG: <core> [core/mem/pkg.c:97]: pkg_destroy_manager(): destroying memory manager: q_malloc ``` ### Additional Information current master on CentOS8 -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2730

2 4

git:master:02240711: tcpops: use fixup_igp_all() instead of fixup_igp_null()
by Daniel-Constantin Mierla 08 May '21

08 May '21

Module: kamailio Branch: master Commit: 02240711239149e2f5c4890a70ab158d10fa8187 URL: https://github.com/kamailio/kamailio/commit/02240711239149e2f5c4890a70ab158… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-08T23:30:22+02:00 tcpops: use fixup_igp_all() instead of fixup_igp_null() - needed for functions with many parameters --- Modified: src/modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/02240711239149e2f5c4890a70ab158… Patch: https://github.com/kamailio/kamailio/commit/02240711239149e2f5c4890a70ab158… --- 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,

1 0

[kamailio/kamailio] lost: dynamic HELD url resolving (#2574)
by sergey-safarov 07 May '21

07 May '21

### Description According to design logic HELD request need to send a carrier LIS server. Now lost module sends this request to the preconfigured server via `http_client/httpcon` param. I prefer to use dynamic LIS server discovery according to [rfc7216#section-4](https://tools.ietf.org/html/rfc7216#section-4) and [rfc5986#section-4](https://tools.ietf.org/html/rfc5986#section-4). So dynamic LIS discovery works as: 1. Kamailio send reverse `.in-addr.arpa.` or `.ip6.arpa.` DNS request and caller host DNS name; 2. Kamailio send `LIS:HELD` NAPTR request for a resolved caller hostname and LIS server. 3. Kamailio send HELD request for resolved LIS address. So do get working dynamic LIS discovery required to implement two DNS requests. If any DNS request will fail, then `lost_held_query` function returns an error code. To define required dynamic LIS discovery I suggest use an empty string ("") or NULL value ($null) as the first ("con") function param. This feature request for discussion with lost module author (Wolfgang Kampichler @wkampich) and other interest devs. The ticket may be closed at any time. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2574

3 5

git:master:22f0d9e1: modules: readme files regenerated - uac ... [skip ci]
by Kamailio Dev 07 May '21

07 May '21

Module: kamailio Branch: master Commit: 22f0d9e11002f9eb8c33a765a6ae14739a01ec7f URL: https://github.com/kamailio/kamailio/commit/22f0d9e11002f9eb8c33a765a6ae147… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-05-07T08:16:20+02:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/22f0d9e11002f9eb8c33a765a6ae147… Patch: https://github.com/kamailio/kamailio/commit/22f0d9e11002f9eb8c33a765a6ae147…

1 0

[kamailio/kamailio] username based lookup in uac_reg_lookup (#2714)
by Surendra Tiwari 07 May '21

07 May '21

### Description Currently uac_reg_lookup don't have provision to pass the mode parameter but its implement in core fuction: https://github.com/kamailio/kamailio/blob/951c9ac9adaccc1c35e152593cb3c2e7f… This should be imported to kemi as well as cfg function.  ### Expected behavior lookup in uacreg should be supported using username based also, currently uuid based support is only there. #### Actual observed behavior #### Debugging Data ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` 5.4.5 ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2714

2 2

git:master:7cee6518: uac: added uac_reg_lookup_uri() - do lookup for user in the uri
by Daniel-Constantin Mierla 07 May '21

07 May '21

Module: kamailio Branch: master Commit: 7cee6518421ed16b715d32a8b2ff6d222eac038b URL: https://github.com/kamailio/kamailio/commit/7cee6518421ed16b715d32a8b2ff6d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-07T08:00:34+02:00 uac: added uac_reg_lookup_uri() - do lookup for user in the uri --- Modified: src/modules/uac/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/7cee6518421ed16b715d32a8b2ff6d2… Patch: https://github.com/kamailio/kamailio/commit/7cee6518421ed16b715d32a8b2ff6d2… --- diff --git a/src/modules/uac/uac.c b/src/modules/uac/uac.c index 5f0a3ad635..c7e181dc7c 100644 --- a/src/modules/uac/uac.c +++ b/src/modules/uac/uac.c @@ -102,6 +102,7 @@ static int w_restore_to(struct sip_msg* msg, char* p1, char* p2); static int w_uac_auth(struct sip_msg* msg, char* str, char* str2); static int w_uac_auth_mode(struct sip_msg* msg, char* pmode, char* str2); static int w_uac_reg_lookup(struct sip_msg* msg, char* src, char* dst); +static int w_uac_reg_lookup_uri(struct sip_msg* msg, char* src, char* dst); static int w_uac_reg_status(struct sip_msg* msg, char* src, char* dst); static int w_uac_reg_request_to(struct sip_msg* msg, char* src, char* mode_s); static int w_uac_reg_enable(struct sip_msg* msg, char* pfilter, char* pval); @@ -142,6 +143,8 @@ static cmd_export_t cmds[]={ {"uac_req_send", (cmd_function)w_uac_req_send, 0, 0, 0, ANY_ROUTE}, {"uac_reg_lookup", (cmd_function)w_uac_reg_lookup, 2, fixup_spve_pvar, fixup_free_spve_pvar, ANY_ROUTE }, + {"uac_reg_lookup_uri", (cmd_function)w_uac_reg_lookup_uri, 2, fixup_spve_pvar, + fixup_free_spve_pvar, ANY_ROUTE }, {"uac_reg_status", (cmd_function)w_uac_reg_status, 1, fixup_spve_null, 0, ANY_ROUTE }, {"uac_reg_request_to", (cmd_function)w_uac_reg_request_to, 2, @@ -666,6 +669,32 @@ static int ki_uac_reg_lookup(sip_msg_t* msg, str* userid, str* sdst) return uac_reg_lookup(msg, userid, dpv, 0); } +static int w_uac_reg_lookup_uri(struct sip_msg* msg, char* src, char* dst) +{ + pv_spec_t *dpv; + str sval; + + if(fixup_get_svalue(msg, (gparam_t*)src, &sval)<0) { + LM_ERR("cannot get the uuid parameter\n"); + return -1; + } + + dpv = (pv_spec_t*)dst; + + return uac_reg_lookup(msg, &sval, dpv, 1); +} + +static int ki_uac_reg_lookup_uri(sip_msg_t* msg, str* userid, str* sdst) +{ + pv_spec_t *dpv = NULL; + dpv = pv_cache_get(sdst); + if(dpv==NULL) { + LM_ERR("cannot get pv spec for [%.*s]\n", sdst->len, sdst->s); + return -1; + } + return uac_reg_lookup(msg, userid, dpv, 1); +} + static int w_uac_reg_status(struct sip_msg* msg, char* src, char* p2) { str sval; @@ -827,6 +856,11 @@ static sr_kemi_t sr_kemi_uac_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("uac"), str_init("uac_reg_lookup_uri"), + SR_KEMIP_INT, ki_uac_reg_lookup_uri, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("uac"), str_init("uac_reg_status"), SR_KEMIP_INT, ki_uac_reg_status, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:624da2b7: uac: docs for uac_reg_lookup_uri()
by Daniel-Constantin Mierla 07 May '21

07 May '21

Module: kamailio Branch: master Commit: 624da2b7deb2539064be70a7566783fd36a15886 URL: https://github.com/kamailio/kamailio/commit/624da2b7deb2539064be70a7566783f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-07T08:09:11+02:00 uac: docs for uac_reg_lookup_uri() --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/624da2b7deb2539064be70a7566783f… Patch: https://github.com/kamailio/kamailio/commit/624da2b7deb2539064be70a7566783f… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 352d038ea2..52362af1e3 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -1005,6 +1005,31 @@ if(uac_reg_lookup("$rU", "$ru")) { lookup("location"); } +... + </programlisting> + </example> + </section> + <section id="uac.f.uac_reg_lookup_uri"> + <title> + <function moreinfo="none">uac_reg_lookup_uri(uri, dst)</function> + </title> + <para> + This function sets the PV dst to SIP URI that correspond to the URI user + in uac registrations table. The uri can contain pseudo-variables and + dst must be the name of a pseudo-variable. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>uac_reg_lookup_uri</function> usage</title> + <programlisting format="linespecific"> +... + +if(uac_reg_lookup("$var(uri)", "$ru")) +{ + lookup("location"); +} ... </programlisting> </example>

1 0

git:master:7aa8056a: dialog: ignore 408 on keepalive with cseq 0
by Daniel-Constantin Mierla 06 May '21

06 May '21

Module: kamailio Branch: master Commit: 7aa8056a5e3a9804133cb9ff79640d8116be63da URL: https://github.com/kamailio/kamailio/commit/7aa8056a5e3a9804133cb9ff79640d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-06T12:27:05+02:00 dialog: ignore 408 on keepalive with cseq 0 - some UAs do not reply at all --- Modified: src/modules/dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/7aa8056a5e3a9804133cb9ff79640d8… Patch: https://github.com/kamailio/kamailio/commit/7aa8056a5e3a9804133cb9ff79640d8… --- 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++;

1 0

[kamailio/kamailio] lwsc: failed build on Fedora 33 (#2727)
by sergey-safarov 06 May '21

06 May '21

``` LD (gcc) [M app_lua_sr.so] app_lua_sr.so CC (gcc) [M lwsc.so] lwsc_mod.o lwsc_mod.c: In function 'lwsc_get_endpoint': lwsc_mod.c:533:13: error: 'struct lws_context_creation_info' has no member named 'ws_ping_pong_interval' 533 | ep->crtinfo.ws_ping_pong_interval = 5; /*secs*/ | ^ make[2]: *** [../../Makefile.rules:100: lwsc_mod.o] Error 1 make[1]: *** [Makefile:511: modules] Error 1 make[1]: Leaving directory '/root/rpmbuild/BUILD/kamailio-5.5.0/src' make: *** [Makefile:34: every-module] Error 2 ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2727

2 6

git:5.5:4a4835e1: lwsc: set ws_ping_pong_interval only for libwebsockets 3.x
by Daniel-Constantin Mierla 06 May '21

06 May '21

Module: kamailio Branch: 5.5 Commit: 4a4835e122bb3a53d2a1794640e1dec66736a897 URL: https://github.com/kamailio/kamailio/commit/4a4835e122bb3a53d2a1794640e1dec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-06T11:39:33+02:00 lwsc: set ws_ping_pong_interval only for libwebsockets 3.x (cherry picked from commit 048ed4210d52fb817ae6b03756d95e9b25899330) --- Modified: src/modules/lwsc/lwsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4a4835e122bb3a53d2a1794640e1dec… Patch: https://github.com/kamailio/kamailio/commit/4a4835e122bb3a53d2a1794640e1dec… --- diff --git a/src/modules/lwsc/lwsc_mod.c b/src/modules/lwsc/lwsc_mod.c index 17eb0ca30a..a6985acb6d 100644 --- a/src/modules/lwsc/lwsc_mod.c +++ b/src/modules/lwsc/lwsc_mod.c @@ -529,7 +529,7 @@ static lwsc_endpoint_t* lwsc_get_endpoint(str *wsurl, str *wsproto) ep->crtinfo.protocols = ep->protocols; ep->crtinfo.gid = -1; ep->crtinfo.uid = -1; -#if LWS_LIBRARY_VERSION_MAJOR >= 3 +#if LWS_LIBRARY_VERSION_MAJOR == 3 ep->crtinfo.ws_ping_pong_interval = 5; /*secs*/ #endif /* 1 internal and 1 (+ 1 http2 nwsi) */

1 0

git:master:048ed421: lwsc: set ws_ping_pong_interval only for libwebsockets 3.x
by Daniel-Constantin Mierla 06 May '21

06 May '21

Module: kamailio Branch: master Commit: 048ed4210d52fb817ae6b03756d95e9b25899330 URL: https://github.com/kamailio/kamailio/commit/048ed4210d52fb817ae6b03756d95e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-06T11:37:58+02:00 lwsc: set ws_ping_pong_interval only for libwebsockets 3.x --- Modified: src/modules/lwsc/lwsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/048ed4210d52fb817ae6b03756d95e9… Patch: https://github.com/kamailio/kamailio/commit/048ed4210d52fb817ae6b03756d95e9… --- diff --git a/src/modules/lwsc/lwsc_mod.c b/src/modules/lwsc/lwsc_mod.c index 17eb0ca30a..a6985acb6d 100644 --- a/src/modules/lwsc/lwsc_mod.c +++ b/src/modules/lwsc/lwsc_mod.c @@ -529,7 +529,7 @@ static lwsc_endpoint_t* lwsc_get_endpoint(str *wsurl, str *wsproto) ep->crtinfo.protocols = ep->protocols; ep->crtinfo.gid = -1; ep->crtinfo.uid = -1; -#if LWS_LIBRARY_VERSION_MAJOR >= 3 +#if LWS_LIBRARY_VERSION_MAJOR == 3 ep->crtinfo.ws_ping_pong_interval = 5; /*secs*/ #endif /* 1 internal and 1 (+ 1 http2 nwsi) */

1 0

git:5.5:4f930b76: lost: use of parser functions parse_pai_header() and parse_from_header() related to #2723
by Wolfgang Kampichler 05 May '21

05 May '21

Module: kamailio Branch: 5.5 Commit: 4f930b7618e874a651083c5e4de55d9ed0027bf3 URL: https://github.com/kamailio/kamailio/commit/4f930b7618e874a651083c5e4de55d9… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-05-05T21:53:43+02:00 lost: use of parser functions parse_pai_header() and parse_from_header() related to #2723 - lost_get_pai_header(): parsing method update lost_get_from_header(): parsing method update - memset(): fixed number of bytes to be filled (unrelated) (cherry picked from commit 791672393aeba320fd1608746fb61e9a96e19d06) --- Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/4f930b7618e874a651083c5e4de55d9… Patch: https://github.com/kamailio/kamailio/commit/4f930b7618e874a651083c5e4de55d9…

1 0

git:5.5:e96c3517: lost: change in the method for parsing the From header in lost_get_from_header() related to #2723
by Wolfgang Kampichler 05 May '21

05 May '21

Module: kamailio Branch: 5.5 Commit: e96c35170ebb2b01fb25c4e9f422119696924086 URL: https://github.com/kamailio/kamailio/commit/e96c35170ebb2b01fb25c4e9f422119… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-05-05T21:53:12+02:00 lost: change in the method for parsing the From header in lost_get_from_header() related to #2723 (cherry picked from commit fe6923cd8e995c400fc1838304c95142cc00273e) --- Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/e96c35170ebb2b01fb25c4e9f422119… Patch: https://github.com/kamailio/kamailio/commit/e96c35170ebb2b01fb25c4e9f422119… --- diff --git a/src/modules/lost/utilities.c b/src/modules/lost/utilities.c index bcb045f451..beb1d2e932 100644 --- a/src/modules/lost/utilities.c +++ b/src/modules/lost/utilities.c @@ -442,9 +442,10 @@ p_lost_geolist_t lost_get_geolocation_header(struct sip_msg *msg, int *items) str hdr = STR_NULL; p_lost_geolist_t list = NULL; + *items = 0; + if(parse_headers(msg, HDR_EOH_F, 0) == -1) { LM_ERR("failed to parse SIP headers\n"); - *items = 0; return list; } @@ -481,8 +482,8 @@ char *lost_get_pai_header(struct sip_msg *msg, int *lgth) *lgth = 0; - if(parse_headers(msg, HDR_PAI_F, 0) == -1) { - LM_ERR("could not parse P-A-I header\n"); + if(parse_headers(msg, HDR_EOH_F, 0) == -1) { + LM_ERR("failed to parse SIP headers\n"); return res; } @@ -640,34 +641,53 @@ int lost_get_nameinfo(char *ip, str *name, int flag) */ char *lost_get_from_header(struct sip_msg *msg, int *lgth) { - to_body_t *f_body; + struct hdr_field *hf; + to_body_t *from_body; char *res = NULL; *lgth = 0; - if(parse_headers(msg, HDR_FROM_F, 0) == -1) { - LM_ERR("failed to parse From header\n"); + if(parse_headers(msg, HDR_EOH_F, 0) == -1) { + LM_ERR("failed to parse SIP headers\n"); return res; } - if(msg->from == NULL || get_from(msg) == NULL) { - LM_ERR("From header not found\n"); - return res; - } - f_body = get_from(msg); + for(hf = msg->headers; hf; hf = hf->next) { + if(hf->type == HDR_FROM_T) { - LM_DBG("From body: [%.*s]\n", f_body->body.len, f_body->body.s); + LM_DBG("From body: [%.*s]\n", hf->body.len, hf->body.s); - res = (char *)pkg_malloc((f_body->uri.len + 1) * sizeof(char)); - if(res == NULL) { - PKG_MEM_ERROR; - return res; - } else { - memset(res, 0, f_body->uri.len + 1); - memcpy(res, f_body->uri.s, f_body->uri.len + 1); - res[f_body->uri.len] = '\0'; + /* first, get some memory */ + from_body = pkg_malloc(sizeof(to_body_t)); + if(from_body == NULL) { + PKG_MEM_ERROR; + return res; + } + /* parse From body */ + memset(from_body, 0, sizeof(to_body_t)); + parse_to(hf->body.s, hf->body.s + hf->body.len + 1, from_body); + if(from_body->error == PARSE_ERROR) { + LM_ERR("bad From header\n"); + pkg_free(from_body); + return res; + } + if(from_body->error == PARSE_OK) { + res = (char *)pkg_malloc( + (from_body->uri.len + 1) * sizeof(char)); + if(res == NULL) { + PKG_MEM_ERROR; + pkg_free(from_body); + return res; + } else { + memset(res, 0, from_body->uri.len + 1); + memcpy(res, from_body->uri.s, from_body->uri.len + 1); + res[from_body->uri.len] = '\0'; + pkg_free(from_body); - *lgth = strlen(res); + *lgth = strlen(res); + } + } + } } return res;

1 0

[kamailio/kamailio] Default config and options for Kamailio 5.5.0 (#2719)
by Daniel-Constantin Mierla 05 May '21

05 May '21

With several days before releasing v5.5.0, let's see if there is any tuning that should be done to default kamailio.cfg. Note that the proposals and discussions must focus around current config, if any loaded module should have different values for parameters, if the routing blocks should be adjusted to cope better with common use cases. This is not for asking refactoring or adding major changes/features. In such cases, the option is to make PR to add to `misc/examples/` (new files or to existing files). >From the discussions done for 5.4.0, the next were considered for the future, however I haven't seen much activity on the community forums related to them during past months, so I am not sure they worth at this moment, but let list them for a starting point: * keepalive to be done with usrloc module to get round trip timer, etc * dlgs module loaded to see the basic stats about active calls -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2719

2 3

[kamailio/kamailio] usrloc: cancel unnecessary db queries (#2726)
by korayvt 05 May '21

05 May '21

#### 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  It looks like the db query is made before checking the configuration parameters for the following features: - internal keep-alive mechanism - contact-expired callback execution For example, although keepalive mode is turned off, the location table is periodically queried. This is also true when there is no usrloc:contact-expired route. In this commit, checks are added before these two db queries. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2726 -- Commit Summary -- * Merge pull request #1 from kamailio/master * Merge pull request #2 from kamailio/master * Merge pull request #3 from kamailio/master * usrloc: unnecessary periodic db queries cancelled -- File Changes -- M src/modules/usrloc/dlist.c (4) M src/modules/usrloc/udomain.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2726.patch https://github.com/kamailio/kamailio/pull/2726.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/2726

2 2

git:master:42bc79b3: usrloc: unnecessary periodic db queries cancelled
by Daniel-Constantin Mierla 05 May '21

05 May '21

Module: kamailio Branch: master Commit: 42bc79b3b617632b6f83e1352b5cb8266706d7c0 URL: https://github.com/kamailio/kamailio/commit/42bc79b3b617632b6f83e1352b5cb82… Author: korayvt <koray.vatansever(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-05T20:53:48+02:00 usrloc: unnecessary periodic db queries cancelled --- Modified: src/modules/usrloc/dlist.c Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/42bc79b3b617632b6f83e1352b5cb82… Patch: https://github.com/kamailio/kamailio/commit/42bc79b3b617632b6f83e1352b5cb82… --- 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] = "<";

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev