- sr-dev - kamailio.org

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

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

05 May '21

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

1 0

[kamailio/kamailio] uac: Add reg_hash_size parameter (#2725)
by Alex Hermann 05 May '21

05 May '21

Allow configuring the hash table size. The default(4) is hardly usable on anything but a test system.   #### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2725 -- Commit Summary -- * uac: Add reg_hash_size parameter -- File Changes -- M src/modules/uac/doc/uac_admin.xml (20) M src/modules/uac/uac.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2725.patch https://github.com/kamailio/kamailio/pull/2725.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/2725

2 2

git:master:880a14a6: uac: Add reg_hash_size parameter
by Daniel-Constantin Mierla 05 May '21

05 May '21

Module: kamailio Branch: master Commit: 880a14a6f45af27001ec348e9b44134915bcbeb7 URL: https://github.com/kamailio/kamailio/commit/880a14a6f45af27001ec348e9b44134… Author: Alex Hermann <alex(a)hexla.nl> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-05T20:45:23+02:00 uac: Add reg_hash_size parameter Allow configuring the hash table size. The default(4) is hardly usable on anything but a test system. --- Modified: src/modules/uac/doc/uac_admin.xml Modified: src/modules/uac/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/880a14a6f45af27001ec348e9b44134… Patch: https://github.com/kamailio/kamailio/commit/880a14a6f45af27001ec348e9b44134… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index c8271974a3..352d038ea2 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -459,6 +459,26 @@ modparam("uac", "reg_random_delay", 300) </example> </section> + <section id="uac.p.reg_hash_size"> + <title><varname>reg_hash_size</varname> (int)</title> + <para> + The number of entries of the hash table used by uac_reg to store the + registration records is 2^hash_size. For hash_size=4, the number of + slots of the hash table is 16. + </para> + <para> + <emphasis>Default value is <quote>4</quote> (16 slots).</emphasis> + </para> + <example> + <title>Set <varname>reg_hash_size</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("uac", "reg_hash_size", 10) +... + </programlisting> + </example> + </section> + <section id="uac.p.reg_db_table"> <title><varname>reg_db_table</varname> (string)</title> <para> diff --git a/src/modules/uac/uac.c b/src/modules/uac/uac.c index 486fed2894..5f0a3ad635 100644 --- a/src/modules/uac/uac.c +++ b/src/modules/uac/uac.c @@ -181,6 +181,7 @@ 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 }, {"default_socket", PARAM_STR, &uac_default_socket}, {"event_callback", PARAM_STR, &uac_event_callback}, {0, 0, 0}

1 0

git:5.4:0572c819: tm: lw parser - fix matching To header in lw_get_hf_name()
by Daniel-Constantin Mierla 05 May '21

05 May '21

Module: kamailio Branch: 5.4 Commit: 0572c8192d26702fc0ac21ae76cbf81fbad91126 URL: https://github.com/kamailio/kamailio/commit/0572c8192d26702fc0ac21ae76cbf81… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-05T18:57:57+02:00 tm: lw parser - fix matching To header in lw_get_hf_name() (cherry picked from commit 4ab6e05df56afb7802a2cd125e89b9282a1c6c85) (cherry picked from commit 33db4ffc558b7a9d4c291c929b9e73b3cf8b16f0) --- Modified: src/modules/tm/lw_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/0572c8192d26702fc0ac21ae76cbf81… Patch: https://github.com/kamailio/kamailio/commit/0572c8192d26702fc0ac21ae76cbf81… --- diff --git a/src/modules/tm/lw_parser.c b/src/modules/tm/lw_parser.c index d13ec58311..6f48304f53 100644 --- a/src/modules/tm/lw_parser.c +++ b/src/modules/tm/lw_parser.c @@ -188,9 +188,11 @@ char *lw_get_hf_name(char *begin, char *end, enum _hdr_types_t *type) case 't': /* To */ if(LOWER_BYTE(*(p + 1)) == 'o') { - p += 2; - *type = HDR_TO_T; - break; + if((*(p + 2) == ' ') || (*(p + 2) == ':')) { + p += 2; + *type = HDR_TO_T; + break; + } } if((*(p + 1) == ' ') || (*(p + 1) == ':')) { p++;

1 0

git:5.5:33db4ffc: tm: lw parser - fix matching To header in lw_get_hf_name()
by Daniel-Constantin Mierla 05 May '21

05 May '21

Module: kamailio Branch: 5.5 Commit: 33db4ffc558b7a9d4c291c929b9e73b3cf8b16f0 URL: https://github.com/kamailio/kamailio/commit/33db4ffc558b7a9d4c291c929b9e73b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-05T18:57:11+02:00 tm: lw parser - fix matching To header in lw_get_hf_name() (cherry picked from commit 4ab6e05df56afb7802a2cd125e89b9282a1c6c85) --- Modified: src/modules/tm/lw_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/33db4ffc558b7a9d4c291c929b9e73b… Patch: https://github.com/kamailio/kamailio/commit/33db4ffc558b7a9d4c291c929b9e73b… --- diff --git a/src/modules/tm/lw_parser.c b/src/modules/tm/lw_parser.c index d13ec58311..6f48304f53 100644 --- a/src/modules/tm/lw_parser.c +++ b/src/modules/tm/lw_parser.c @@ -188,9 +188,11 @@ char *lw_get_hf_name(char *begin, char *end, enum _hdr_types_t *type) case 't': /* To */ if(LOWER_BYTE(*(p + 1)) == 'o') { - p += 2; - *type = HDR_TO_T; - break; + if((*(p + 2) == ' ') || (*(p + 2) == ':')) { + p += 2; + *type = HDR_TO_T; + break; + } } if((*(p + 1) == ' ') || (*(p + 1) == ':')) { p++;

1 0

git:master:4ab6e05d: tm: lw parser - fix matching To header in lw_get_hf_name()
by Daniel-Constantin Mierla 05 May '21

05 May '21

Module: kamailio Branch: master Commit: 4ab6e05df56afb7802a2cd125e89b9282a1c6c85 URL: https://github.com/kamailio/kamailio/commit/4ab6e05df56afb7802a2cd125e89b92… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-05T18:56:39+02:00 tm: lw parser - fix matching To header in lw_get_hf_name() --- Modified: src/modules/tm/lw_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/4ab6e05df56afb7802a2cd125e89b92… Patch: https://github.com/kamailio/kamailio/commit/4ab6e05df56afb7802a2cd125e89b92… --- diff --git a/src/modules/tm/lw_parser.c b/src/modules/tm/lw_parser.c index d13ec58311..6f48304f53 100644 --- a/src/modules/tm/lw_parser.c +++ b/src/modules/tm/lw_parser.c @@ -188,9 +188,11 @@ char *lw_get_hf_name(char *begin, char *end, enum _hdr_types_t *type) case 't': /* To */ if(LOWER_BYTE(*(p + 1)) == 'o') { - p += 2; - *type = HDR_TO_T; - break; + if((*(p + 2) == ' ') || (*(p + 2) == ':')) { + p += 2; + *type = HDR_TO_T; + break; + } } if((*(p + 1) == ' ') || (*(p + 1) == ':')) { p++;

1 0

git:master:79167239: 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: master Commit: 791672393aeba320fd1608746fb61e9a96e19d06 URL: https://github.com/kamailio/kamailio/commit/791672393aeba320fd1608746fb61e9… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-05-05T18:40:05+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) --- Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/791672393aeba320fd1608746fb61e9… Patch: https://github.com/kamailio/kamailio/commit/791672393aeba320fd1608746fb61e9…

1 0

Kamailio v5.5.0 Released - new major version is out
by Daniel-Constantin Mierla 05 May '21

05 May '21

Kamailio v5.5.0 is out – it comes with 6 new modules and a considerable set of improvements touching again more than 80 existing modules. You can read detailed release notes at: * https://www.kamailio.org/w/kamailio-v5-5-0-release-notes/ Many thanks to all developers and community members that made possible this release. v5.5.0 brings more flexibility and optimizations across many components, enhancements to distributed message queue (dmq module), load balancer, http client, STIR/SHAKEN support, IMS/VoLTE, rtpengine and tls as well as to make available more functions to KEMI interface ... just to list only a few here. Enjoy Kamailio v5.5.0! Thank you for flying Kamailio! Stay safe and healthy! Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online May 17-20, 2021 (Europe Timezone) - June 7-10, 2021 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

callid reparsing in replies when topoh is loaded
by David Escartín 05 May '21

05 May '21

Hello We have seen that in cases when callee sends a callid starting by "!!:", which is also the default callid_prefix value, we do see that when reading the $ci in the onreply routes it's changed for example like this from Call-ID !!:Y5HfD54-DIKfL56nz5TIYIioYVznLb1ID5TUYf1oz8zBYCl0LCllD9loDbD* to Call-ID \xA6\xF3\xF1\xFE\xFD:\xFEUq\xCA\xFD\xAB:\xF2\xA5\xA6Wۤ\x83\xABʫe\xFE\xF2\x87\xA7\e[;ã\xA5\xAC\xC1ɬ\xF3\xFD|\xDB\xFE\xAF in that call we are actually not doing topology hiding, so we are dropping the message on the topoh:msg-outgoing event route This seems to cause to send that weird callid in the messages. I guess that change should not be done. Could you please take a look? thanks and best regards david escartin sonoc -- <http://www.sonoc.io/> David Escartín NOC engineer *www.sonoc.io* <http://www.sonoc.io/> [image: LinkedIn] <https://www.linkedin.com/company/sonoc> [image: Twitter] <https://twitter.com/sonoc_> [image: Facebook] <https://www.facebook.com/SONOCio/> This e-mail is for the exclusive use of its recipients and may contain business secrets or other confidential or privileged information. Any unauthorised use, copying, publication or distribution of this e-mail is strictly prohibited. If you are not the intended recipient, please inform us immediately by replying to this e-mail and delete it, including any attachments or copies on your system. In accordance with the GDPR (EU) 2016/679 and the LOPDGDD 3/2018, we inform you that this e-mail address and/or any other personal data you have provided us with will be treated by SONOC with absolute confidentiality and with the only purpose of providing you with the requested services, due to your condition as a client, supplier or because you have requested information from us at any time. These data will only be kept for as long as required to comply with legal obligations. You can exercise your rights at any time by sending an e-mail to: *dataprotection(a)sonoc.io* <dataprotection(a)sonoc.io>*.* <dataprotection(a)sonoc.io>

1 1

git:5.5:d4c1a11a: ChangeLog: content updated for v5.5.0
by Daniel-Constantin Mierla 05 May '21

05 May '21

Module: kamailio Branch: 5.5 Commit: d4c1a11aefb0192c1cb829959ef3a70b84cd7cbd URL: https://github.com/kamailio/kamailio/commit/d4c1a11aefb0192c1cb829959ef3a70… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-05T10:59:03+02:00 ChangeLog: content updated for v5.5.0 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/d4c1a11aefb0192c1cb829959ef3a70… Patch: https://github.com/kamailio/kamailio/commit/d4c1a11aefb0192c1cb829959ef3a70…

1 0

git:5.5:8fda0163: pkg/kamailio/deb: version set 5.5.0
by Victor Seva 05 May '21

05 May '21

Module: kamailio Branch: 5.5 Commit: 8fda0163b93d4f94b0398c529a90db300a1187f8 URL: https://github.com/kamailio/kamailio/commit/8fda0163b93d4f94b0398c529a90db3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-05-05T10:33:42+02:00 pkg/kamailio/deb: version set 5.5.0 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/8fda0163b93d4f94b0398c529a90db3… Patch: https://github.com/kamailio/kamailio/commit/8fda0163b93d4f94b0398c529a90db3…

1 0

git:5.5:03339e97: Makefile.defs: version set to 5.5.0
by Daniel-Constantin Mierla 05 May '21

05 May '21

Module: kamailio Branch: 5.5 Commit: 03339e971ed3c9a9d79812d346805db6eeb2c98a URL: https://github.com/kamailio/kamailio/commit/03339e971ed3c9a9d79812d346805db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-05T10:29:41+02:00 Makefile.defs: version set to 5.5.0 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/03339e971ed3c9a9d79812d346805db… Patch: https://github.com/kamailio/kamailio/commit/03339e971ed3c9a9d79812d346805db… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 86476f4d97..6b24118a9c 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 5 SUBLEVEL = 0 -EXTRAVERSION = -rc1 +EXTRAVERSION = # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:5.5:cbdf8d8c: pkg: version set to 5.5.0 for rpm and alpine specs
by Daniel-Constantin Mierla 05 May '21

05 May '21

Module: kamailio Branch: 5.5 Commit: cbdf8d8c4c142dba78fd767986f54620a306e077 URL: https://github.com/kamailio/kamailio/commit/cbdf8d8c4c142dba78fd767986f5462… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-05T10:23:47+02:00 pkg: version set to 5.5.0 for rpm and alpine specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/cbdf8d8c4c142dba78fd767986f5462… Patch: https://github.com/kamailio/kamailio/commit/cbdf8d8c4c142dba78fd767986f5462… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index f23ad03308..e5f39653d1 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.1.0 +pkgver=5.5.0 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 4f5a833a57..3928c1c596 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.4.0 +%define ver 5.5.0 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

git:5.5:b2d6fefe: ndb_cassandra: update include paths as expected by thrift lib package
by Daniel-Constantin Mierla 05 May '21

05 May '21

Module: kamailio Branch: 5.5 Commit: b2d6fefef14d20fc9291bfff5f959860895a7bff URL: https://github.com/kamailio/kamailio/commit/b2d6fefef14d20fc9291bfff5f95986… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-05T10:13:34+02:00 ndb_cassandra: update include paths as expected by thrift lib package (cherry picked from commit 3511e0a975395a14f48fe5b6d60435315f7638dc) --- Modified: src/modules/ndb_cassandra/Cassandra.h Modified: src/modules/ndb_cassandra/cassandra_types.h Modified: src/modules/ndb_cassandra/thrift_wrapper.cpp --- Diff: https://github.com/kamailio/kamailio/commit/b2d6fefef14d20fc9291bfff5f95986… Patch: https://github.com/kamailio/kamailio/commit/b2d6fefef14d20fc9291bfff5f95986… --- diff --git a/src/modules/ndb_cassandra/Cassandra.h b/src/modules/ndb_cassandra/Cassandra.h index 6e453d742e..210d7a9234 100644 --- a/src/modules/ndb_cassandra/Cassandra.h +++ b/src/modules/ndb_cassandra/Cassandra.h @@ -6,7 +6,7 @@ #ifndef Cassandra_H #define Cassandra_H -#include <TProcessor.h> +#include <thrift/TProcessor.h> #include "cassandra_types.h" namespace org { namespace apache { namespace cassandra { diff --git a/src/modules/ndb_cassandra/cassandra_types.h b/src/modules/ndb_cassandra/cassandra_types.h index 9150a5c0dd..1aaa871a4b 100644 --- a/src/modules/ndb_cassandra/cassandra_types.h +++ b/src/modules/ndb_cassandra/cassandra_types.h @@ -6,10 +6,10 @@ #ifndef cassandra_TYPES_H #define cassandra_TYPES_H -#include <Thrift.h> -#include <TApplicationException.h> -#include <protocol/TProtocol.h> -#include <transport/TTransport.h> +#include <thrift/Thrift.h> +#include <thrift/TApplicationException.h> +#include <thrift/protocol/TProtocol.h> +#include <thrift/transport/TTransport.h> diff --git a/src/modules/ndb_cassandra/thrift_wrapper.cpp b/src/modules/ndb_cassandra/thrift_wrapper.cpp index 6f40241a59..0c6c4e4aa3 100644 --- a/src/modules/ndb_cassandra/thrift_wrapper.cpp +++ b/src/modules/ndb_cassandra/thrift_wrapper.cpp @@ -1,11 +1,11 @@ -#include "Thrift.h" -#include "transport/TSocket.h" -#include "transport/TTransport.h" -#include "transport/TBufferTransports.h" -#include "protocol/TProtocol.h" -#include "protocol/TBinaryProtocol.h" -#include "Cassandra.h" +#include <thrift/Thrift.h> +#include <thrift/transport/TSocket.h> +#include <thrift/transport/TTransport.h> +#include <thrift/transport/TBufferTransports.h> +#include <thrift/protocol/TProtocol.h> +#include <thrift/protocol/TBinaryProtocol.h> +#include "Cassandra.h" #include "thrift_wrapper.h" using namespace std;

1 0

git:5.5:ff2ff19a: siptrace: debug messages on net data callbacks
by Daniel-Constantin Mierla 05 May '21

05 May '21

Module: kamailio Branch: 5.5 Commit: ff2ff19af7087e188d3b7c100f80db2c8c534ca9 URL: https://github.com/kamailio/kamailio/commit/ff2ff19af7087e188d3b7c100f80db2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-05T10:13:06+02:00 siptrace: debug messages on net data callbacks (cherry picked from commit 95f3b4dea5d3f0d57ba79c8e8cd34d2ab30c7193) --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/ff2ff19af7087e188d3b7c100f80db2… Patch: https://github.com/kamailio/kamailio/commit/ff2ff19af7087e188d3b7c100f80db2… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 4648340d73..012644bfa0 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2141,9 +2141,12 @@ int siptrace_net_data_recv(sr_event_param_t *evp) if(siptrace_exec_evcb_msg(&sto) == DROP_R_F) { /* drop() used in event_route - all done */ + LM_DBG("skipping processing message due to drop\n"); return 0; } + LM_DBG("processing message mode %d\n", _siptrace_mode); + if(_siptrace_mode & SIPTRACE_MODE_HEP) { trace_send_hep_duplicate(&sto.body, &sto.fromip, &sto.toip, NULL, NULL); } @@ -2269,9 +2272,12 @@ int siptrace_net_data_sent(sr_event_param_t *evp) if(siptrace_exec_evcb_msg(&sto) == DROP_R_F) { /* drop() used in event_route - all done */ + LM_DBG("skipping processing message due to drop\n"); return 0; } + LM_DBG("processing message mode %d\n", _siptrace_mode); + if(_siptrace_mode & SIPTRACE_MODE_HEP) { trace_send_hep_duplicate(&sto.body, &sto.fromip, &sto.toip, NULL, NULL); }

1 0

git:5.5:06921b71: ndb_cassandra: Makefile - use pkg-config if available
by Daniel-Constantin Mierla 05 May '21

05 May '21

Module: kamailio Branch: 5.5 Commit: 06921b71ee42a8c88229595a619d3390d0090b75 URL: https://github.com/kamailio/kamailio/commit/06921b71ee42a8c88229595a619d339… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-05T10:13:23+02:00 ndb_cassandra: Makefile - use pkg-config if available (cherry picked from commit 4b9fe7b72f8d9b53dbae24eb7bd269d527642f71) --- Modified: src/modules/ndb_cassandra/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/06921b71ee42a8c88229595a619d339… Patch: https://github.com/kamailio/kamailio/commit/06921b71ee42a8c88229595a619d339… --- diff --git a/src/modules/ndb_cassandra/Makefile b/src/modules/ndb_cassandra/Makefile index 6046eaf186..97e08542c4 100644 --- a/src/modules/ndb_cassandra/Makefile +++ b/src/modules/ndb_cassandra/Makefile @@ -9,11 +9,25 @@ LD=g++ auto_gen= NAME=ndb_cassandra.so -THRIFT_DIR = /usr/local/include/thrift -LIB_DIR = /usr/local/lib - -DEFS += -I${THRIFT_DIR} -LIBS += -L${LIB_DIR} thrift_wrapper.o cassandra_constants.o cassandra_types.o Cassandra.o -lthrift +ifeq ($(CROSS_COMPILE),) + BUILDER = $(shell which pkg-config) +ifneq ($(BUILDER),) + PKGLIBTHRIFT = $(shell $(BUILDER) --exists thrift > /dev/null 2>&1 ; echo $$? ) +ifneq ($(PKGLIBTHRIFT),0) + BUILDER = +endif +endif +endif + +ifneq ($(BUILDER),) + THRIFT_INC = $(shell $(BUILDER) --cflags thrift) + DEFS += $(THRIFT_INC) + LIBS += $(shell $(BUILDER) --libs thrift) +else + THRIFT_INC = -I/usr/local/include + DEFS += $(THRIFT_INC) + LIBS += -L/usr/local/lib thrift_wrapper.o cassandra_constants.o cassandra_types.o Cassandra.o -lthrift +endif CXXFLAGS=$(CFLAGS:-Wno-deprecated option=) CXXFLAGS+=-Wno-write-strings -Wno-deprecated -Wno-unused-function -Wno-sign-compare -Wno-strict-aliasing @@ -22,18 +36,18 @@ include ../../Makefile.modules cassandra_constants.o: cassandra_constants.cpp cassandra_constants.h @echo "Compiling $<" - $(CXX) $(CXXFLAGS) -I/usr/local/include/thrift -c $< -o $@ + $(CXX) $(CXXFLAGS) $(THRIFT_INC) -c $< -o $@ cassandra_types.o: cassandra_types.cpp cassandra_types.h @echo "Compiling $<" - $(CXX) $(CXXFLAGS) -I/usr/local/include/thrift -c $< -o $@ + $(CXX) $(CXXFLAGS) $(THRIFT_INC) -c $< -o $@ Cassandra.o: Cassandra.cpp Cassandra.h @echo "Compiling $<" - $(CXX) $(CXXFLAGS) -I/usr/local/include/thrift -c $< -o $@ + $(CXX) $(CXXFLAGS) $(THRIFT_INC) -c $< -o $@ thrift_wrapper.o: thrift_wrapper.cpp thrift_wrapper.h @echo "Compiling $<" $(CXX) $(CXXFLAGS) $(CFLAGS) $(C_DEFS) $(DEFS) -c $< -o $@ -ndb_cassandra.so: thrift_wrapper.o cassandra_constants.o cassandra_types.o Cassandra.o +ndb_cassandra.so: thrift_wrapper.o cassandra_constants.o cassandra_types.o Cassandra.o

1 0

git:5.5:2d259465: tcpops: use fixup function from core, remove internal wrapper
by Daniel-Constantin Mierla 05 May '21

05 May '21

Module: kamailio Branch: 5.5 Commit: 2d259465de5224dae4afe533d6ed7b104c59762e URL: https://github.com/kamailio/kamailio/commit/2d259465de5224dae4afe533d6ed7b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-05T10:12:55+02:00 tcpops: use fixup function from core, remove internal wrapper - set also fixup free function in cmd exports (cherry picked from commit 12fca1c369b6698cace66de171dcb166be8ae831) --- Modified: src/modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2d259465de5224dae4afe533d6ed7b1… Patch: https://github.com/kamailio/kamailio/commit/2d259465de5224dae4afe533d6ed7b1… --- diff --git a/src/modules/tcpops/tcpops_mod.c b/src/modules/tcpops/tcpops_mod.c index 82d9889355..b2d2fbe7dd 100644 --- a/src/modules/tcpops/tcpops_mod.c +++ b/src/modules/tcpops/tcpops_mod.c @@ -61,7 +61,6 @@ static int w_tcpops_enable_closed_event0(sip_msg_t* msg, char* p1, char* p2); static int w_tcp_conid_state(sip_msg_t* msg, char* con, char *p2); static int w_tcp_conid_alive(sip_msg_t* msg, char* con, char *p2); static int w_tcp_get_conid(sip_msg_t* msg, char *paddr, char *pvn); -static int fixup_numpv(void** param, int param_no); static int w_tcp_set_otcpid(sip_msg_t* msg, char* conid, char *p2); static int w_tcp_set_otcpid_flag(sip_msg_t* msg, char* mode, char *p2); @@ -79,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_numpv, 0, ANY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {"tcp_keepalive_enable", (cmd_function)w_tcp_keepalive_enable3, 3, - fixup_numpv, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_keepalive_disable", (cmd_function)w_tcp_keepalive_disable1, 1, - fixup_numpv, 0, ANY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, 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_numpv, 0, ANY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {"tcp_set_connection_lifetime", (cmd_function)w_tcpops_set_connection_lifetime1, 1, - fixup_numpv, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_enable_closed_event", (cmd_function)w_tcpops_enable_closed_event1, 1, - fixup_numpv, 0, ANY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, 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_numpv, 0, ANY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, 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_numpv, 0, ANY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, 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, @@ -522,14 +521,6 @@ static int w_tcpops_enable_closed_event0(sip_msg_t* msg, char* p1, char* p2) return ki_tcpops_enable_closed_event(msg); } -/** - * - */ -static int fixup_numpv(void** param, int param_no) -{ - return fixup_igp_null(param, 1); -} - /** * */

1 0

git:master:4b9fe7b7: ndb_cassandra: Makefile - use pkg-config if available
by Daniel-Constantin Mierla 05 May '21

05 May '21

Module: kamailio Branch: master Commit: 4b9fe7b72f8d9b53dbae24eb7bd269d527642f71 URL: https://github.com/kamailio/kamailio/commit/4b9fe7b72f8d9b53dbae24eb7bd269d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-05T09:12:25+02:00 ndb_cassandra: Makefile - use pkg-config if available --- Modified: src/modules/ndb_cassandra/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/4b9fe7b72f8d9b53dbae24eb7bd269d… Patch: https://github.com/kamailio/kamailio/commit/4b9fe7b72f8d9b53dbae24eb7bd269d… --- diff --git a/src/modules/ndb_cassandra/Makefile b/src/modules/ndb_cassandra/Makefile index 6046eaf186..97e08542c4 100644 --- a/src/modules/ndb_cassandra/Makefile +++ b/src/modules/ndb_cassandra/Makefile @@ -9,11 +9,25 @@ LD=g++ auto_gen= NAME=ndb_cassandra.so -THRIFT_DIR = /usr/local/include/thrift -LIB_DIR = /usr/local/lib - -DEFS += -I${THRIFT_DIR} -LIBS += -L${LIB_DIR} thrift_wrapper.o cassandra_constants.o cassandra_types.o Cassandra.o -lthrift +ifeq ($(CROSS_COMPILE),) + BUILDER = $(shell which pkg-config) +ifneq ($(BUILDER),) + PKGLIBTHRIFT = $(shell $(BUILDER) --exists thrift > /dev/null 2>&1 ; echo $$? ) +ifneq ($(PKGLIBTHRIFT),0) + BUILDER = +endif +endif +endif + +ifneq ($(BUILDER),) + THRIFT_INC = $(shell $(BUILDER) --cflags thrift) + DEFS += $(THRIFT_INC) + LIBS += $(shell $(BUILDER) --libs thrift) +else + THRIFT_INC = -I/usr/local/include + DEFS += $(THRIFT_INC) + LIBS += -L/usr/local/lib thrift_wrapper.o cassandra_constants.o cassandra_types.o Cassandra.o -lthrift +endif CXXFLAGS=$(CFLAGS:-Wno-deprecated option=) CXXFLAGS+=-Wno-write-strings -Wno-deprecated -Wno-unused-function -Wno-sign-compare -Wno-strict-aliasing @@ -22,18 +36,18 @@ include ../../Makefile.modules cassandra_constants.o: cassandra_constants.cpp cassandra_constants.h @echo "Compiling $<" - $(CXX) $(CXXFLAGS) -I/usr/local/include/thrift -c $< -o $@ + $(CXX) $(CXXFLAGS) $(THRIFT_INC) -c $< -o $@ cassandra_types.o: cassandra_types.cpp cassandra_types.h @echo "Compiling $<" - $(CXX) $(CXXFLAGS) -I/usr/local/include/thrift -c $< -o $@ + $(CXX) $(CXXFLAGS) $(THRIFT_INC) -c $< -o $@ Cassandra.o: Cassandra.cpp Cassandra.h @echo "Compiling $<" - $(CXX) $(CXXFLAGS) -I/usr/local/include/thrift -c $< -o $@ + $(CXX) $(CXXFLAGS) $(THRIFT_INC) -c $< -o $@ thrift_wrapper.o: thrift_wrapper.cpp thrift_wrapper.h @echo "Compiling $<" $(CXX) $(CXXFLAGS) $(CFLAGS) $(C_DEFS) $(DEFS) -c $< -o $@ -ndb_cassandra.so: thrift_wrapper.o cassandra_constants.o cassandra_types.o Cassandra.o +ndb_cassandra.so: thrift_wrapper.o cassandra_constants.o cassandra_types.o Cassandra.o

1 0

git:master:3511e0a9: ndb_cassandra: update include paths as expected by thrift lib package
by Daniel-Constantin Mierla 05 May '21

05 May '21

Module: kamailio Branch: master Commit: 3511e0a975395a14f48fe5b6d60435315f7638dc URL: https://github.com/kamailio/kamailio/commit/3511e0a975395a14f48fe5b6d604353… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-05T09:23:15+02:00 ndb_cassandra: update include paths as expected by thrift lib package --- Modified: src/modules/ndb_cassandra/Cassandra.h Modified: src/modules/ndb_cassandra/cassandra_types.h Modified: src/modules/ndb_cassandra/thrift_wrapper.cpp --- Diff: https://github.com/kamailio/kamailio/commit/3511e0a975395a14f48fe5b6d604353… Patch: https://github.com/kamailio/kamailio/commit/3511e0a975395a14f48fe5b6d604353… --- diff --git a/src/modules/ndb_cassandra/Cassandra.h b/src/modules/ndb_cassandra/Cassandra.h index 6e453d742e..210d7a9234 100644 --- a/src/modules/ndb_cassandra/Cassandra.h +++ b/src/modules/ndb_cassandra/Cassandra.h @@ -6,7 +6,7 @@ #ifndef Cassandra_H #define Cassandra_H -#include <TProcessor.h> +#include <thrift/TProcessor.h> #include "cassandra_types.h" namespace org { namespace apache { namespace cassandra { diff --git a/src/modules/ndb_cassandra/cassandra_types.h b/src/modules/ndb_cassandra/cassandra_types.h index 9150a5c0dd..1aaa871a4b 100644 --- a/src/modules/ndb_cassandra/cassandra_types.h +++ b/src/modules/ndb_cassandra/cassandra_types.h @@ -6,10 +6,10 @@ #ifndef cassandra_TYPES_H #define cassandra_TYPES_H -#include <Thrift.h> -#include <TApplicationException.h> -#include <protocol/TProtocol.h> -#include <transport/TTransport.h> +#include <thrift/Thrift.h> +#include <thrift/TApplicationException.h> +#include <thrift/protocol/TProtocol.h> +#include <thrift/transport/TTransport.h> diff --git a/src/modules/ndb_cassandra/thrift_wrapper.cpp b/src/modules/ndb_cassandra/thrift_wrapper.cpp index 6f40241a59..0c6c4e4aa3 100644 --- a/src/modules/ndb_cassandra/thrift_wrapper.cpp +++ b/src/modules/ndb_cassandra/thrift_wrapper.cpp @@ -1,11 +1,11 @@ -#include "Thrift.h" -#include "transport/TSocket.h" -#include "transport/TTransport.h" -#include "transport/TBufferTransports.h" -#include "protocol/TProtocol.h" -#include "protocol/TBinaryProtocol.h" -#include "Cassandra.h" +#include <thrift/Thrift.h> +#include <thrift/transport/TSocket.h> +#include <thrift/transport/TTransport.h> +#include <thrift/transport/TBufferTransports.h> +#include <thrift/protocol/TProtocol.h> +#include <thrift/protocol/TBinaryProtocol.h> +#include "Cassandra.h" #include "thrift_wrapper.h" using namespace std;

1 0

The plan for releasing Kamailio v5.5.0
by Daniel-Constantin Mierla 05 May '21

05 May '21

Hello, after almost 4 weeks since development was frozen, it is time to plan releasing the next major stable version, respectively 5.5.0, therefore I propose to do it on Wednesday, May 5, 2021. The branch 5.5 was already created about one week ago, several doc resources were published (core/variables/transformations/rpcs/stats cookbooks, alphabetic indexes, ...). If anyone is testing an upgrade from branch 5.4 to 5.5 and encounters changes that should be done in Kamailio config, add notes about at: * https://www.kamailio.org/wiki/install/upgrade/5.4.x-to-5.5.0 Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online May 17-20, 2021 (Europe Timezone) - June 7-10, 2021 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 1

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

04 May '21

Module: kamailio Branch: master Commit: fe6923cd8e995c400fc1838304c95142cc00273e URL: https://github.com/kamailio/kamailio/commit/fe6923cd8e995c400fc1838304c9514… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-05-04T23:24:53+02:00 lost: change in the method for parsing the From header in lost_get_from_header() related to #2723 --- Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/fe6923cd8e995c400fc1838304c9514… Patch: https://github.com/kamailio/kamailio/commit/fe6923cd8e995c400fc1838304c9514… --- 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

git:master:95f3b4de: siptrace: debug messages on net data callbacks
by Daniel-Constantin Mierla 04 May '21

04 May '21

Module: kamailio Branch: master Commit: 95f3b4dea5d3f0d57ba79c8e8cd34d2ab30c7193 URL: https://github.com/kamailio/kamailio/commit/95f3b4dea5d3f0d57ba79c8e8cd34d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-04T14:09:27+02:00 siptrace: debug messages on net data callbacks --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/95f3b4dea5d3f0d57ba79c8e8cd34d2… Patch: https://github.com/kamailio/kamailio/commit/95f3b4dea5d3f0d57ba79c8e8cd34d2… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 4648340d73..012644bfa0 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2141,9 +2141,12 @@ int siptrace_net_data_recv(sr_event_param_t *evp) if(siptrace_exec_evcb_msg(&sto) == DROP_R_F) { /* drop() used in event_route - all done */ + LM_DBG("skipping processing message due to drop\n"); return 0; } + LM_DBG("processing message mode %d\n", _siptrace_mode); + if(_siptrace_mode & SIPTRACE_MODE_HEP) { trace_send_hep_duplicate(&sto.body, &sto.fromip, &sto.toip, NULL, NULL); } @@ -2269,9 +2272,12 @@ int siptrace_net_data_sent(sr_event_param_t *evp) if(siptrace_exec_evcb_msg(&sto) == DROP_R_F) { /* drop() used in event_route - all done */ + LM_DBG("skipping processing message due to drop\n"); return 0; } + LM_DBG("processing message mode %d\n", _siptrace_mode); + if(_siptrace_mode & SIPTRACE_MODE_HEP) { trace_send_hep_duplicate(&sto.body, &sto.fromip, &sto.toip, NULL, NULL); }

1 0

git:master:12fca1c3: tcpops: use fixup function from core, remove internal wrapper
by Daniel-Constantin Mierla 04 May '21

04 May '21

Module: kamailio Branch: master Commit: 12fca1c369b6698cace66de171dcb166be8ae831 URL: https://github.com/kamailio/kamailio/commit/12fca1c369b6698cace66de171dcb16… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-04T14:09:27+02:00 tcpops: use fixup function from core, remove internal wrapper - set also fixup free function in cmd exports --- Modified: src/modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/12fca1c369b6698cace66de171dcb16… Patch: https://github.com/kamailio/kamailio/commit/12fca1c369b6698cace66de171dcb16… --- diff --git a/src/modules/tcpops/tcpops_mod.c b/src/modules/tcpops/tcpops_mod.c index 82d9889355..b2d2fbe7dd 100644 --- a/src/modules/tcpops/tcpops_mod.c +++ b/src/modules/tcpops/tcpops_mod.c @@ -61,7 +61,6 @@ static int w_tcpops_enable_closed_event0(sip_msg_t* msg, char* p1, char* p2); static int w_tcp_conid_state(sip_msg_t* msg, char* con, char *p2); static int w_tcp_conid_alive(sip_msg_t* msg, char* con, char *p2); static int w_tcp_get_conid(sip_msg_t* msg, char *paddr, char *pvn); -static int fixup_numpv(void** param, int param_no); static int w_tcp_set_otcpid(sip_msg_t* msg, char* conid, char *p2); static int w_tcp_set_otcpid_flag(sip_msg_t* msg, char* mode, char *p2); @@ -79,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_numpv, 0, ANY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {"tcp_keepalive_enable", (cmd_function)w_tcp_keepalive_enable3, 3, - fixup_numpv, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_keepalive_disable", (cmd_function)w_tcp_keepalive_disable1, 1, - fixup_numpv, 0, ANY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, 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_numpv, 0, ANY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {"tcp_set_connection_lifetime", (cmd_function)w_tcpops_set_connection_lifetime1, 1, - fixup_numpv, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_enable_closed_event", (cmd_function)w_tcpops_enable_closed_event1, 1, - fixup_numpv, 0, ANY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, 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_numpv, 0, ANY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, 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_numpv, 0, ANY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, 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, @@ -522,14 +521,6 @@ static int w_tcpops_enable_closed_event0(sip_msg_t* msg, char* p1, char* p2) return ki_tcpops_enable_closed_event(msg); } -/** - * - */ -static int fixup_numpv(void** param, int param_no) -{ - return fixup_igp_null(param, 1); -} - /** * */

1 0

git:5.3:febeef97: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 03 May '21

03 May '21

Module: kamailio Branch: 5.3 Commit: febeef975013eacc53e6b11766b7058f408282fc URL: https://github.com/kamailio/kamailio/commit/febeef975013eacc53e6b11766b7058… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-05-04T01:01:32+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/febeef975013eacc53e6b11766b7058… Patch: https://github.com/kamailio/kamailio/commit/febeef975013eacc53e6b11766b7058… --- diff --git a/src/modules/siputils/README b/src/modules/siputils/README index 74344a83c1..fcb315391b 100644 --- a/src/modules/siputils/README +++ b/src/modules/siputils/README @@ -705,7 +705,7 @@ if (is_alphanumex("$rU", "+.-_")) { This function will encode uri-s inside Contact header in the following manner sip:username:password@ip:port;transport=protocol goes - sip:encoding_prefix*username*ip*port*protocol@hostpart. + sip:encoding_prefix*username*password*ip*port*protocol@hostpart. * is the default separator and can be changed by setting the contact_flds_separator module parameter. @@ -731,9 +731,9 @@ if (src_ip == 10.0.0.0/8) encode_contact("natted_client","1.2.3.4"); 4.18. decode_contact() This function will decode the request URI. If the RURI is in the format - sip:encoding_prefix*username*ip*port*protocol@hostpart it will be - decoded to sip:username:password@ip:port;transport=protocol It uses the - default set parameter for contact encoding separator. + sip:encoding_prefix*username*password*ip*port*protocol@hostpart it will + be decoded to sip:username:password@ip:port;transport=protocol. It uses + the default set parameter for contact encoding separator. The function returns negative on error, 1 on success.

1 0

git:5.4:e0c60cf1: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 03 May '21

03 May '21

Module: kamailio Branch: 5.4 Commit: e0c60cf12d465323bcf06899683b2b59dba7295c URL: https://github.com/kamailio/kamailio/commit/e0c60cf12d465323bcf06899683b2b5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-05-04T01:01:22+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/e0c60cf12d465323bcf06899683b2b5… Patch: https://github.com/kamailio/kamailio/commit/e0c60cf12d465323bcf06899683b2b5… --- diff --git a/src/modules/siputils/README b/src/modules/siputils/README index 6a1ae76b9f..87d3ecf9e4 100644 --- a/src/modules/siputils/README +++ b/src/modules/siputils/README @@ -761,7 +761,7 @@ if (is_alphanumex("$rU", "+.-_")) { This function will encode uri-s inside Contact header in the following manner sip:username:password@ip:port;transport=protocol goes - sip:encoding_prefix*username*ip*port*protocol@hostpart. + sip:encoding_prefix*username*password*ip*port*protocol@hostpart. * is the default separator and can be changed by setting the contact_flds_separator module parameter. @@ -787,9 +787,9 @@ if (src_ip == 10.0.0.0/8) encode_contact("natted_client","1.2.3.4"); 4.20. decode_contact() This function will decode the request URI. If the RURI is in the format - sip:encoding_prefix*username*ip*port*protocol@hostpart it will be - decoded to sip:username:password@ip:port;transport=protocol It uses the - default set parameter for contact encoding separator. + sip:encoding_prefix*username*password*ip*port*protocol@hostpart it will + be decoded to sip:username:password@ip:port;transport=protocol. It uses + the default set parameter for contact encoding separator. The function returns negative on error, 1 on success.

1 0

git:5.3:09b510ad: siputils: update docs for encode/decode_contact functions
by Ovidiu Sas 03 May '21

03 May '21

Module: kamailio Branch: 5.3 Commit: 09b510adbef121f94739d1fcf46bd92baf80ea77 URL: https://github.com/kamailio/kamailio/commit/09b510adbef121f94739d1fcf46bd92… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-05-03T18:47:43-04:00 siputils: update docs for encode/decode_contact functions (cherry picked from commit bf73b0d72177828e3c35f0fe318f7ef654c89b6b) --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/09b510adbef121f94739d1fcf46bd92… Patch: https://github.com/kamailio/kamailio/commit/09b510adbef121f94739d1fcf46bd92… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index d7ef042486..139c99903a 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -740,7 +740,7 @@ if (is_alphanumex("$rU", "+.-_")) { This function will encode uri-s inside Contact header in the following manner sip:username:password@ip:port;transport=protocol goes - sip:encoding_prefix*username*ip*port*protocol@hostpart. + sip:encoding_prefix*username*password*ip*port*protocol@hostpart. </para> <para> * is the default separator and can be changed by setting the contact_flds_separator @@ -784,9 +784,9 @@ if (src_ip == 10.0.0.0/8) encode_contact("natted_client","1.2.3.4"); </title> <para> This function will decode the request URI. If the RURI is in the format - sip:encoding_prefix*username*ip*port*protocol@hostpart it will be decoded to - sip:username:password@ip:port;transport=protocol It uses the default - set parameter for contact encoding separator. + sip:encoding_prefix*username*password*ip*port*protocol@hostpart it will + be decoded to sip:username:password@ip:port;transport=protocol. It uses + the default set parameter for contact encoding separator. </para> <para> The function returns negative on error, 1 on success.

1 0

git:5.4:ea1239e5: siputils: update docs for encode/decode_contact functions
by Ovidiu Sas 03 May '21

03 May '21

Module: kamailio Branch: 5.4 Commit: ea1239e57190da34b3043de3c8266a004554146e URL: https://github.com/kamailio/kamailio/commit/ea1239e57190da34b3043de3c8266a0… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-05-03T18:44:48-04:00 siputils: update docs for encode/decode_contact functions (cherry picked from commit bf73b0d72177828e3c35f0fe318f7ef654c89b6b) --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ea1239e57190da34b3043de3c8266a0… Patch: https://github.com/kamailio/kamailio/commit/ea1239e57190da34b3043de3c8266a0… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index 880105792a..4667e42f63 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -796,7 +796,7 @@ if (is_alphanumex("$rU", "+.-_")) { This function will encode uri-s inside Contact header in the following manner sip:username:password@ip:port;transport=protocol goes - sip:encoding_prefix*username*ip*port*protocol@hostpart. + sip:encoding_prefix*username*password*ip*port*protocol@hostpart. </para> <para> * is the default separator and can be changed by setting the contact_flds_separator @@ -840,9 +840,9 @@ if (src_ip == 10.0.0.0/8) encode_contact("natted_client","1.2.3.4"); </title> <para> This function will decode the request URI. If the RURI is in the format - sip:encoding_prefix*username*ip*port*protocol@hostpart it will be decoded to - sip:username:password@ip:port;transport=protocol It uses the default - set parameter for contact encoding separator. + sip:encoding_prefix*username*password*ip*port*protocol@hostpart it will + be decoded to sip:username:password@ip:port;transport=protocol. It uses + the default set parameter for contact encoding separator. </para> <para> The function returns negative on error, 1 on success.

1 0

git:5.5:2b9dc471: siputils: update docs for encode/decode_contact functions
by Ovidiu Sas 03 May '21

03 May '21

Module: kamailio Branch: 5.5 Commit: 2b9dc4713d85b1367631871205547aaf25a822a1 URL: https://github.com/kamailio/kamailio/commit/2b9dc4713d85b1367631871205547aa… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-05-03T18:44:00-04:00 siputils: update docs for encode/decode_contact functions (cherry picked from commit bf73b0d72177828e3c35f0fe318f7ef654c89b6b) --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2b9dc4713d85b1367631871205547aa… Patch: https://github.com/kamailio/kamailio/commit/2b9dc4713d85b1367631871205547aa… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index 880105792a..4667e42f63 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -796,7 +796,7 @@ if (is_alphanumex("$rU", "+.-_")) { This function will encode uri-s inside Contact header in the following manner sip:username:password@ip:port;transport=protocol goes - sip:encoding_prefix*username*ip*port*protocol@hostpart. + sip:encoding_prefix*username*password*ip*port*protocol@hostpart. </para> <para> * is the default separator and can be changed by setting the contact_flds_separator @@ -840,9 +840,9 @@ if (src_ip == 10.0.0.0/8) encode_contact("natted_client","1.2.3.4"); </title> <para> This function will decode the request URI. If the RURI is in the format - sip:encoding_prefix*username*ip*port*protocol@hostpart it will be decoded to - sip:username:password@ip:port;transport=protocol It uses the default - set parameter for contact encoding separator. + sip:encoding_prefix*username*password*ip*port*protocol@hostpart it will + be decoded to sip:username:password@ip:port;transport=protocol. It uses + the default set parameter for contact encoding separator. </para> <para> The function returns negative on error, 1 on success.

1 0

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

03 May '21

Module: kamailio Branch: master Commit: ff4eea76a523851772da574437f99a9348578db4 URL: https://github.com/kamailio/kamailio/commit/ff4eea76a523851772da574437f99a9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-05-04T00:31:09+02:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/ff4eea76a523851772da574437f99a9… Patch: https://github.com/kamailio/kamailio/commit/ff4eea76a523851772da574437f99a9… --- diff --git a/src/modules/siputils/README b/src/modules/siputils/README index 6a1ae76b9f..87d3ecf9e4 100644 --- a/src/modules/siputils/README +++ b/src/modules/siputils/README @@ -761,7 +761,7 @@ if (is_alphanumex("$rU", "+.-_")) { This function will encode uri-s inside Contact header in the following manner sip:username:password@ip:port;transport=protocol goes - sip:encoding_prefix*username*ip*port*protocol@hostpart. + sip:encoding_prefix*username*password*ip*port*protocol@hostpart. * is the default separator and can be changed by setting the contact_flds_separator module parameter. @@ -787,9 +787,9 @@ if (src_ip == 10.0.0.0/8) encode_contact("natted_client","1.2.3.4"); 4.20. decode_contact() This function will decode the request URI. If the RURI is in the format - sip:encoding_prefix*username*ip*port*protocol@hostpart it will be - decoded to sip:username:password@ip:port;transport=protocol It uses the - default set parameter for contact encoding separator. + sip:encoding_prefix*username*password*ip*port*protocol@hostpart it will + be decoded to sip:username:password@ip:port;transport=protocol. It uses + the default set parameter for contact encoding separator. The function returns negative on error, 1 on success.

1 0

git:master:bf73b0d7: siputils: update docs for encode/decode_contact functions
by Ovidiu Sas 03 May '21

03 May '21

Module: kamailio Branch: master Commit: bf73b0d72177828e3c35f0fe318f7ef654c89b6b URL: https://github.com/kamailio/kamailio/commit/bf73b0d72177828e3c35f0fe318f7ef… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-05-03T18:20:05-04:00 siputils: update docs for encode/decode_contact functions --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/bf73b0d72177828e3c35f0fe318f7ef… Patch: https://github.com/kamailio/kamailio/commit/bf73b0d72177828e3c35f0fe318f7ef… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index 880105792a..4667e42f63 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -796,7 +796,7 @@ if (is_alphanumex("$rU", "+.-_")) { This function will encode uri-s inside Contact header in the following manner sip:username:password@ip:port;transport=protocol goes - sip:encoding_prefix*username*ip*port*protocol@hostpart. + sip:encoding_prefix*username*password*ip*port*protocol@hostpart. </para> <para> * is the default separator and can be changed by setting the contact_flds_separator @@ -840,9 +840,9 @@ if (src_ip == 10.0.0.0/8) encode_contact("natted_client","1.2.3.4"); </title> <para> This function will decode the request URI. If the RURI is in the format - sip:encoding_prefix*username*ip*port*protocol@hostpart it will be decoded to - sip:username:password@ip:port;transport=protocol It uses the default - set parameter for contact encoding separator. + sip:encoding_prefix*username*password*ip*port*protocol@hostpart it will + be decoded to sip:username:password@ip:port;transport=protocol. It uses + the default set parameter for contact encoding separator. </para> <para> The function returns negative on error, 1 on success.

1 0

[kamailio/kamailio] lost: resolve geolocation url using POST (#2641)
by sergey-safarov 03 May '21

03 May '21

### Description According [RFC5985](https://tools.ietf.org/html/rfc5985) > The POST method is the only method REQUIRED for HELD. If a LIS chooses to support GET or HEAD, it SHOULD consider the kind of application doing the GET. So not all LIS servers support the GET method and only the POST method always present. Also [rfc6753#section-3.2](https://tools.ietf.org/html/rfc6753#section-3.2) > An HTTP GET request to a HELD URI produces a HELD response as if the following HELD request had been sent using HTTP POST: <locationRequest xmlns="urn:ietf:params:xml:ns:geopriv:held"> <locationType exact="false"> geodetic civic </locationType> </locationRequest> ### Expected behavior Dereference Geolocation URLs using POST method with content according [rfc6753#section-3.2](https://tools.ietf.org/html/rfc6753#section-3.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/2641

3 9

git:5.5:27520fa3: pkg/kamailio/deb: version set 5.5.0~rc0
by Victor Seva 03 May '21

03 May '21

Module: kamailio Branch: 5.5 Commit: 27520fa3293d45d9e407bc42f39d1d31e94c69d6 URL: https://github.com/kamailio/kamailio/commit/27520fa3293d45d9e407bc42f39d1d3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-05-03T16:46:12+02:00 pkg/kamailio/deb: version set 5.5.0~rc0 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/27520fa3293d45d9e407bc42f39d1d3… Patch: https://github.com/kamailio/kamailio/commit/27520fa3293d45d9e407bc42f39d1d3…

2 2

git:5.5:29edc511: pkg/kamailio/deb: version set 5.5.0~rc1
by Victor Seva 03 May '21

03 May '21

Module: kamailio Branch: 5.5 Commit: 29edc5113c5e398e427026f88bea2877cdb94fab URL: https://github.com/kamailio/kamailio/commit/29edc5113c5e398e427026f88bea287… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-05-03T17:44:23+02:00 pkg/kamailio/deb: version set 5.5.0~rc1 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/29edc5113c5e398e427026f88bea287… Patch: https://github.com/kamailio/kamailio/commit/29edc5113c5e398e427026f88bea287…

1 0

[kamailio/kamailio] kamailio Crash on qm_debug_check_frag() (#2607)
by aatif218 03 May '21

03 May '21

**Description** facing crashes the server, raised by qm_debug_check_frag(). **Troubleshooting** The error message: Jan 23 12:27:26 fep-1 /usr/local/fep-kamailio/sbin/kamailio[2893]: ERROR: <core> [core/tcp_main.c:4451]: handle_tcpconn_ev(): io_watch_del(3) failed: for 0x7fdbdc31f360, fd 31166 Jan 23 12:27:26 fep-1 /usr/local/fep-kamailio/sbin/kamailio[2893]: ERROR: <core> [core/tcp_main.c:4451]: handle_tcpconn_ev(): io_watch_del(3) failed: for 0x7fdbcbf232a8, fd 31326 Jan 23 12:27:26 fep-1 /usr/local/fep-kamailio/sbin/kamailio[2893]: ERROR: <core> [core/tcp_main.c:4451]: handle_tcpconn_ev(): io_watch_del(3) failed: for 0x7fdbd990b9e8, fd 31327 Jan 23 12:27:26 fep-1 /usr/local/fep-kamailio/sbin/kamailio[2893]: ERROR: <core> [core/tcp_main.c:4451]: handle_tcpconn_ev(): io_watch_del(3) failed: for 0x7fdbd89cd1d8, fd 31360 Jan 23 12:27:26 fep-1 /usr/local/fep-kamailio/sbin/kamailio[2893]: ERROR: <core> [core/tcp_main.c:4451]: handle_tcpconn_ev(): io_watch_del(3) failed: for 0x7fdbcf0bab28, fd 31434 Jan 23 12:27:26 fep-1 /usr/local/fep-kamailio/sbin/kamailio[2893]: ERROR: <core> [core/tcp_main.c:4451]: handle_tcpconn_ev(): io_watch_del(3) failed: for 0x7fdbc6e031b0, fd 31471 Jan 23 12:27:26 fep-1 /usr/local/fep-kamailio/sbin/kamailio[2893]: ERROR: <core> [core/tcp_main.c:4451]: handle_tcpconn_ev(): io_watch_del(3) failed: for 0x7fdbdb7fd598, fd 31472 Jan 23 12:27:26 fep-1 /usr/local/fep-kamailio/sbin/kamailio[2893]: ERROR: <core> [core/tcp_main.c:4451]: handle_tcpconn_ev(): io_watch_del(3) failed: for 0x7fdbdeb334c8, fd 31494 Jan 23 12:27:26 fep-1 /usr/local/fep-kamailio/sbin/kamailio[2893]: ERROR: <core> [core/tcp_main.c:4451]: handle_tcpconn_ev(): io_watch_del(3) failed: for 0x7fdbddee6de8, fd 31524 Jan 23 12:27:26 fep-1 /usr/local/fep-kamailio/sbin/kamailio[2893]: ERROR: <core> [core/tcp_main.c:4451]: handle_tcpconn_ev(): io_watch_del(3) failed: for 0x7fdbdb91ef70, fd 31576 Jan 23 12:27:26 fep-1 /usr/local/fep-kamailio/sbin/kamailio[2893]: ERROR: <core> [core/tcp_main.c:4451]: handle_tcpconn_ev(): io_watch_del(3) failed: for 0x7fdbc76a1da8, fd 31690 Jan 23 12:27:31 fep-1 /usr/local/fep-kamailio/sbin/kamailio[2893]: CRITICAL: <core> [core/io_wait.h:596]: io_watch_del(): invalid fd 31327, not in [0, 2054) Jan 23 12:27:31 fep-1 /usr/local/fep-kamailio/sbin/kamailio[2893]: CRITICAL: <core> [core/io_wait.h:596]: io_watch_del(): invalid fd 31360, not in [0, 2054) Jan 23 12:27:31 fep-1 /usr/local/fep-kamailio/sbin/kamailio[2893]: CRITICAL: <core> [core/io_wait.h:596]: io_watch_del(): invalid fd 31434, not in [0, 2054) Jan 23 12:28:09 fep-1 /usr/local/fep-kamailio/sbin/kamailio[2809]: ALERT: <core> [main.c:777]: handle_sigs(): child process 2858 exited by a signal 6 Jan 23 12:28:09 fep-1 /usr/local/fep-kamailio/sbin/kamailio[2809]: ALERT: <core> [main.c:780]: handle_sigs(): core was generated Jan 23 12:28:09 fep-1 /usr/local/fep-kamailio/sbin/kamailio[2809]: CRITICAL: <core> [core/mem/q_malloc.c:138]: qm_debug_check_frag(): BUG: qm: fragm. 0x7fdbd7e8a0e8 (address 0x7fdbd7e8a120) end overwritten (5fd4cd2e, abcdefed)! Memory allocator was called from core: core/usr_avp.c:626. Fragment marked by core: core/usr_avp.c:175. Exec from core/mem/q_malloc.c:511. The output from GDB: GNU gdb (GDB) Red Hat Enterprise Linux 7.6.1-110.el7 Copyright (C) 2013 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-redhat-linux-gnu". For bug reporting instructions, please see: <http://www.gnu.org/software/gdb/bugs/>... Reading symbols from /usr/local/fep-kamailio/sbin/kamailio...done. [New LWP 2809] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib64/libthread_db.so.1". Core was generated by `/usr/local/fep-kamailio/sbin/kamailio -f /usr/local/fep-kamailio/etc/kamailio/k'. Program terminated with signal 6, Aborted. #0 0x00007fde7acbf277 in raise () from /lib64/libc.so.6 Missing separate debuginfos, use: debuginfo-install cyrus-sasl-lib-2.1.26-21.el7.x86_64 glibc-2.17-222.el7.x86_64 keyutils-libs-1.5.8-3.el7.x86_64 krb5-libs-1.15.1-19.el7.x86_64 libcom_err-1.42.9-12.el7_5.x86_64 libcurl-7.29.0-54.el7.x86_64 libgcc-4.8.5-36.el7_6.1.x86_64 libidn-1.28-4.el7.x86_64 libselinux-2.5-12.el7.x86_64 libssh2-1.4.3-10.el7_2.1.x86_64 libstdc++-4.8.5-36.el7_6.1.x86_64 libunistring-0.9.3-9.el7.x86_64 nspr-4.21.0-1.el7.x86_64 nss-3.44.0-4.el7.x86_64 nss-softokn-freebl-3.44.0-5.el7.x86_64 nss-util-3.44.0-3.el7.x86_64 openldap-2.4.44-5.el7.x86_64 openssl-libs-1.0.2k-12.el7.x86_64 pcre-8.32-17.el7.x86_64 zlib-1.2.7-17.el7.x86_64 (gdb) bt #0 0x00007fde7acbf277 in raise () from /lib64/libc.so.6 #1 0x00007fde7acc0968 in abort () from /lib64/libc.so.6 #2 0x00000000006d7c95 in qm_debug_check_frag (qm=0x7fdbc25ae000, f=0x7fdbd7e8a0e8, file=0x817155 "core: core/usr_avp.c", line=626, efile=0x83f7c5 "core/mem/q_malloc.c", eline=511) at core/mem/q_malloc.c:140 #3 0x00000000006db99e in qm_free (qmp=0x7fdbc25ae000, p=0x7fdbd7e8a120, file=0x817155 "core: core/usr_avp.c", func=0x8189a0 <__FUNCTION__.8526> "destroy_avp_list_unsafe", line=626, mname=0x817150 "core") at core/mem/q_malloc.c:511 #4 0x00000000005e7ede in destroy_avp_list_unsafe (list=0x7fdbd7e8a950) at core/usr_avp.c:626 #5 0x00007fde38d4bd8f in free_cell_helper (dead_cell=0x7fdbd7e8a750, silent=1, fname=0x7fde38e4267f "h_table.c", fline=466) at h_table.c:255 #6 0x00007fde38d4c9e1 in free_hash_table () at h_table.c:466 #7 0x00007fde38df9cd0 in tm_shutdown () at t_funcs.c:88 #8 0x0000000000581960 in destroy_modules () at core/sr_module.c:746 #9 0x000000000041cda7 in cleanup (show_status=1) at main.c:563 #10 0x000000000041e682 in shutdown_children (sig=15, show_status=1) at main.c:706 #11 0x0000000000421715 in handle_sigs () at main.c:806 #12 0x000000000042b9a7 in main_loop () at main.c:1817 #13 0x0000000000433b96 in main (argc=9, argv=0x7ffea05cd2c8) at main.c:2856 (gdb) bt full #0 0x00007fde7acbf277 in raise () from /lib64/libc.so.6 No symbol table info available. #1 0x00007fde7acc0968 in abort () from /lib64/libc.so.6 No symbol table info available. #2 0x00000000006d7c95 in qm_debug_check_frag (qm=0x7fdbc25ae000, f=0x7fdbd7e8a0e8, file=0x817155 "core: core/usr_avp.c", line=626, efile=0x83f7c5 "core/mem/q_malloc.c", eline=511) at core/mem/q_malloc.c:140 p = 0x7ffea05cc3b0 __FUNCTION__ = "qm_debug_check_frag" #3 0x00000000006db99e in qm_free (qmp=0x7fdbc25ae000, p=0x7fdbd7e8a120, file=0x817155 "core: core/usr_avp.c", func=0x8189a0 <__FUNCTION__.8526> "destroy_avp_list_unsafe", line=626, mname=0x817150 "core") at core/mem/q_malloc.c:511 qm = 0x7fdbc25ae000 f = 0x7fdbd7e8a0e8 size = 408 next = 0x7fdbd7e8a5c8 prev = 0x7fdbd7e8a1d8 __FUNCTION__ = "qm_free" #4 0x00000000005e7ede in destroy_avp_list_unsafe (list=0x7fdbd7e8a950) at core/usr_avp.c:626 avp = 0x7fdbd7e8a080 foo = 0x7fdbd7e8a120 __FUNCTION__ = "destroy_avp_list_unsafe" #5 0x00007fde38d4bd8f in free_cell_helper (dead_cell=0x7fdbd7e8a750, silent=1, fname=0x7fde38e4267f "h_table.c", fline=466) at h_table.c:255 b = 0x0 i = 1 rpl = 0x0 tt = 0x0 foo = 0x7fde34a5df80 <__FUNCTION__.7259> cbs = 0x0 cbs_tmp = 0x7fde388fe570 __FUNCTION__ = "free_cell_helper" #6 0x00007fde38d4c9e1 in free_hash_table () at h_table.c:466 p_cell = 0x7fdbd7e8a750 tmp_cell = 0x7fdbc27e3060 i = 40845 __FUNCTION__ = "free_hash_table" #7 0x00007fde38df9cd0 in tm_shutdown () at t_funcs.c:88 __FUNCTION__ = "tm_shutdown" #8 0x0000000000581960 in destroy_modules () at core/sr_module.c:746 t = 0x7fde3c51e4c0 foo = 0x7fde3c51e020 __FUNCTION__ = "destroy_modules" #9 0x000000000041cda7 in cleanup (show_status=1) at main.c:563 memlog = 0 __FUNCTION__ = "cleanup" #10 0x000000000041e682 in shutdown_children (sig=15, show_status=1) at main.c:706 __FUNCTION__ = "shutdown_children" #11 0x0000000000421715 in handle_sigs () at main.c:806 chld = 0 chld_status = 134 any_chld_stopped = 1 memlog = -1027733624 __FUNCTION__ = "handle_sigs" #12 0x000000000042b9a7 in main_loop () at main.c:1817 i = 10 pid = 2893 si = 0x0 si_desc = "udp receiver child=9 sock=10.50.7.18:5060\000:0:0:1]:5060\000:5060)\000\000\000\004\000\000\000\000\000\000\000\000\340Z\302\333\177\000\000\000\000\000\000\000\000\000\000 \006\276\302\333\177\000\000`\315\\\240\376\177\000\000\220\006\276\302\333\177\000\000r\fb3\336\177\000\000P\246\222<\336\177\000" nrprocs = 10 woneinit = 1 __FUNCTION__ = "main_loop" #13 0x0000000000433b96 in main (argc=9, argv=0x7ffea05cd2c8) at main.c:2856 **Additional Information** Kamailio Version - output of Kamailio -v version: kamailio 5.4.2 (x86_64/linux) f8885c flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: f8885c compiled on 04:30:53 Dec 16 2020 with gcc 4.8.5 **Operating System:** NAME="CentOS Linux" VERSION="7 (Core)" ID="centos" **Note:** It looks similar to the following issue https://github.com/kamailio/kamailio/issues/2503 -- 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/2607

2 5

[kamailio/kamailio] [Feature] RFC 8898 support (#2669)
by Grzegorz Kapkowski 03 May '21

03 May '21

### Description Hi, is there anyone working on adding support for [RFC 8898](https://tools.ietf.org/html/rfc8898) and do you know of any clients that already implement it or are working towards supporting it? How could I go about starting such effort? ### RFC 8898 Third-Party Token-Based Authentication and Authorization for Session Initiation Protocol (SIP) Abstract This document defines the "Bearer" authentication scheme for the Session Initiation Protocol (SIP) and a mechanism by which user authentication and SIP registration authorization is delegated to a third party, using the OAuth 2.0 framework and OpenID Connect Core 1.0. This document updates RFC 3261 to provide guidance on how a SIP User Agent Client (UAC) responds to a SIP 401/407 response that contains multiple WWW-Authenticate/Proxy-Authenticate header fields. ... -- 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/2669

3 5

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev