- sr-dev - kamailio.org

git:master:001e07dd: textopsx: docs for hf_iterator_append()
by Daniel-Constantin Mierla 26 Jul '21

26 Jul '21

Module: kamailio Branch: master Commit: 001e07ddaff30153ee9bc9beb5cb2430007173e5 URL: https://github.com/kamailio/kamailio/commit/001e07ddaff30153ee9bc9beb5cb243… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-26T17:15:38+02:00 textopsx: docs for hf_iterator_append() --- Modified: src/modules/textopsx/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/001e07ddaff30153ee9bc9beb5cb243… Patch: https://github.com/kamailio/kamailio/commit/001e07ddaff30153ee9bc9beb5cb243… --- diff --git a/src/modules/textopsx/doc/functions.xml b/src/modules/textopsx/doc/functions.xml index c1c5fd5f64..b43a0d4bb8 100644 --- a/src/modules/textopsx/doc/functions.xml +++ b/src/modules/textopsx/doc/functions.xml @@ -589,6 +589,35 @@ hf_iterator_end("i1"); } hf_iterator_end("i1"); ... +</programlisting> + </example> + </section> + <section id="textopsx.f.hf_iterator_append"> + <title> + <function moreinfo="none">hf_iterator_append(iname, htext)</function> + </title> + <para> + Add headers after the one at the current iterator possition. + </para> + <para> + The parameters can be dynamic strings with variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>hf_iterator_append</function> usage</title> + <programlisting format="linespecific"> +... + hf_iterator_start("i1"); + while(hf_iterator_next("i1")) { + if($hfitname(i1)=="My-Header") { + hf_iterator_append("i1", "My-New-Header: abc\r\n"); + break; + } + } + hf_iterator_end("i1"); +... </programlisting> </example> </section>

1 0

git:master:3f3fb6ad: textopsx: added hf_iterator_append(iname, htext) function
by Daniel-Constantin Mierla 26 Jul '21

26 Jul '21

Module: kamailio Branch: master Commit: 3f3fb6ad94805407b316eb0ec4883631ac1df604 URL: https://github.com/kamailio/kamailio/commit/3f3fb6ad94805407b316eb0ec488363… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-26T17:02:01+02:00 textopsx: added hf_iterator_append(iname, htext) function --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/3f3fb6ad94805407b316eb0ec488363… Patch: https://github.com/kamailio/kamailio/commit/3f3fb6ad94805407b316eb0ec488363… --- diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index ec3e1afb75..297ff1098e 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -77,6 +77,7 @@ static int w_hf_iterator_start(sip_msg_t *msg, char *piname, char *p2); static int w_hf_iterator_next(sip_msg_t *msg, char *piname, char *p2); static int w_hf_iterator_end(sip_msg_t *msg, char *piname, char *p2); static int w_hf_iterator_rm(sip_msg_t *msg, char *piname, char *p2); +static int w_hf_iterator_append(sip_msg_t *msg, char *piname, char *phtext); static int bind_textopsx(textopsx_api_t *tob); @@ -139,6 +140,8 @@ static cmd_export_t cmds[] = { fixup_free_spve_null, ANY_ROUTE}, {"hf_iterator_rm", w_hf_iterator_rm, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, + {"hf_iterator_append", w_hf_iterator_append, 2, fixup_spve_spve, + fixup_free_spve_spve, ANY_ROUTE}, {"bind_textopsx", (cmd_function)bind_textopsx, 1, 0, 0, ANY_ROUTE}, @@ -2057,6 +2060,63 @@ static int w_hf_iterator_rm(sip_msg_t *msg, char *piname, char *p2) return ki_hf_iterator_rm(msg, &iname); } +/** + * + */ +static int ki_hf_iterator_append(sip_msg_t *msg, str *iname, str *htext) +{ + int k; + sr_lump_t *anchor; + str sval = STR_NULL; + + k = ki_hf_iterator_index(msg, iname); + if(k<0 || _hf_iterators[k].it==NULL) { + return -1; + } + anchor = anchor_lump(msg, _hf_iterators[k].it->name.s + + _hf_iterators[k].it->len - msg->buf, 0, 0); + if (anchor==0) { + LM_ERR("cannot append hdr after %.*s\n", _hf_iterators[k].it->name.len, + _hf_iterators[k].it->name.s); + return -1; + } + sval.s = (char*)pkg_malloc(htext->len + 1); + if(sval.s==NULL) { + LM_ERR("failed append hdr after %.*s\n", _hf_iterators[k].it->name.len, + _hf_iterators[k].it->name.s); + return -1; + } + memcpy(sval.s, htext->s, htext->len); + sval.len = htext->len; + sval.s[sval.len] = '\0'; + + if (insert_new_lump_before(anchor, sval.s, sval.len, 0) == 0) { + LM_ERR("cannot insert lump\n"); + pkg_free(sval.s); + return -1; + } + return 1; +} + +/** + * + */ +static int w_hf_iterator_append(sip_msg_t *msg, char *piname, char *phtext) +{ + str iname = STR_NULL; + str htext = STR_NULL; + if(fixup_get_svalue(msg, (gparam_t*)piname, &iname)<0) { + LM_ERR("failed to get iterator name\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_t*)phtext, &htext)<0) { + LM_ERR("failed to get header text\n"); + return -1; + } + + return ki_hf_iterator_append(msg, &iname, &htext); +} + /** * */

1 0

Info: Kamailio World Online - Sep 1-2, 2021 - Celebrating 20 Years Of Development
by Daniel-Constantin Mierla 26 Jul '21

26 Jul '21

Hello, given the current situation across the world, no physical Kamailio World Conference is planned in 2021. However, this year the project celebrates 20 years of development -- according to commit history, the first one was done on the 3rd of September, 2021: > ❯ git log --reverse > commit 512dcd9838f5aeb0bfccd02cfc156067b7f02b71 > Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> > Date: Mon Sep 3 21:27:11 2001 +0000 > Initial revision To mark this notable milestone, we are going to organize an online event during Sep 1-2, 2021, similar to the one from 2020 -- the website for the event is available at: * https://www.kamailioworld.com/k09-online/ Mark the date in your calendar, more details about the content of the event will be published in the near future! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

kamailio trouble
by 崔群 25 Jul '21

25 Jul '21

Dear sir: I have some problems。the kamailio version is 5.3.0. My linux version is centos 7. the kamailio log: ERROR: <core> [core/tcp_main.c:3508]: send_fd_queue_run(): send_fd failed on socket 63 , queue entry 1, retries 90, connection 0x7ff46e6b1b60, tcp socket 218, errno=11 (Resource temporarily unavailable) ERROR: {1 12529 MESSAGE 359bf0410a7e471c950623e3f7a3b17b} <core> [core/kemi.c:94]: sr_kemi_core_err(): 202->408 CRITICAL: <core> [core/tcp_main.c:4218]: send2child(): tcp child 6, socket 65: queue full, 291 requests queued (total handled 10665748) This problem does not happen every time。When the number of user registrations increases significantly, errors will appear。I tried to set the parameter tcp_children is adjusted to 8, it will not appear frequently, but when the number of user registrations increases to about 5000, errors will still appear. My kamailio.cfg global parameters are set as follows：tls_max_connections=65536,tcp_max_connections=65536,open_max_files=65536。 I hope you can reply to me，thanks.

2 1

git:master:6ec588a7: modules: readme files regenerated - ruxc ... [skip ci]
by Kamailio Dev 24 Jul '21

24 Jul '21

Module: kamailio Branch: master Commit: 6ec588a71e49c88ac0b62f3385cb6e7744fc13f9 URL: https://github.com/kamailio/kamailio/commit/6ec588a71e49c88ac0b62f3385cb6e7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-24T08:31:20+02:00 modules: readme files regenerated - ruxc ... [skip ci] --- Modified: src/modules/ruxc/README --- Diff: https://github.com/kamailio/kamailio/commit/6ec588a71e49c88ac0b62f3385cb6e7… Patch: https://github.com/kamailio/kamailio/commit/6ec588a71e49c88ac0b62f3385cb6e7… --- diff --git a/src/modules/ruxc/README b/src/modules/ruxc/README index 6fb238e3b7..e437234139 100644 --- a/src/modules/ruxc/README +++ b/src/modules/ruxc/README @@ -28,6 +28,7 @@ Daniel-Constantin Mierla 3.1. http_timeout (int) 3.2. http_tlsmode (int) + 3.3. http_reuse (int) 4. Functions @@ -40,9 +41,10 @@ Daniel-Constantin Mierla 1.1. Set http_timeout parameter 1.2. Set http_tlsmode parameter - 1.3. ruxc_http_get() usage - 1.4. ruxc_http_post() usage - 1.5. Libruxc Usage + 1.3. Set http_reuse parameter + 1.4. ruxc_http_get() usage + 1.5. ruxc_http_post() usage + 1.6. Libruxc Usage Chapter 1. Admin Guide @@ -58,6 +60,7 @@ Chapter 1. Admin Guide 3.1. http_timeout (int) 3.2. http_tlsmode (int) + 3.3. http_reuse (int) 4. Functions @@ -95,6 +98,7 @@ Chapter 1. Admin Guide 3.1. http_timeout (int) 3.2. http_tlsmode (int) + 3.3. http_reuse (int) 3.1. http_timeout (int) @@ -120,6 +124,20 @@ modparam("ruxc", "http_timeout", 2000) modparam("ruxc", "http_tlsmode", 1) ... +3.3. http_reuse (int) + + Set to 1 in order to reuse the connection for all requests (each + Kamailio process has its own connection). Useful to avoid TCP connect + (and TLS handshake) when all requests are performed against the same + HTTP/S server. + + Default value is 0 (new connection for each request). + + Example 1.3. Set http_reuse parameter +... +modparam("ruxc", "http_reuse", 1) +... + 4. Functions 4.1. ruxc_http_get(url, hdrs, respv) @@ -137,7 +155,7 @@ modparam("ruxc", "http_tlsmode", 1) This function can be used from ANY_ROUTE. - Example 1.3. ruxc_http_get() usage + Example 1.4. ruxc_http_get() usage ... ruxc_http_get("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s .escape.param})", @@ -160,7 +178,7 @@ switch ($rc) { This function can be used from ANY_ROUTE. - Example 1.4. ruxc_http_post() usage + Example 1.5. ruxc_http_post() usage ... ruxc_http_post("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{ s.escape.param})", @@ -183,7 +201,7 @@ switch ($rc) { installed and its environment configured, then run the following commands: - Example 1.5. Libruxc Usage + Example 1.6. Libruxc Usage ... git clone https://github.com/miconda/ruxc cd ruxc

1 0

git:master:600d0e8f: ruxc: added http_reuse modparam
by Daniel-Constantin Mierla 24 Jul '21

24 Jul '21

Module: kamailio Branch: master Commit: 600d0e8fb7f24e424873e4ad24beb077d2b45ee4 URL: https://github.com/kamailio/kamailio/commit/600d0e8fb7f24e424873e4ad24beb07… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-24T08:16:49+02:00 ruxc: added http_reuse modparam - enable connection reuse --- Modified: src/modules/ruxc/doc/ruxc_admin.xml Modified: src/modules/ruxc/ruxc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/600d0e8fb7f24e424873e4ad24beb07… Patch: https://github.com/kamailio/kamailio/commit/600d0e8fb7f24e424873e4ad24beb07… --- diff --git a/src/modules/ruxc/doc/ruxc_admin.xml b/src/modules/ruxc/doc/ruxc_admin.xml index e4b0384ea4..e07c05c9f1 100644 --- a/src/modules/ruxc/doc/ruxc_admin.xml +++ b/src/modules/ruxc/doc/ruxc_admin.xml @@ -95,6 +95,27 @@ modparam("ruxc", "http_timeout", 2000) ... modparam("ruxc", "http_tlsmode", 1) ... +</programlisting> + </example> + </section> + <section id="ruxc.p.http_reuse"> + <title><varname>http_reuse</varname> (int)</title> + <para> + Set to 1 in order to reuse the connection for all requests (each &kamailio; + process has its own connection). Useful to avoid TCP connect (and TLS + handshake) when all requests are performed against the same HTTP/S server. + </para> + <para> + <emphasis> + Default value is 0 (new connection for each request). + </emphasis> + </para> + <example> + <title>Set <varname>http_reuse</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("ruxc", "http_reuse", 1) +... </programlisting> </example> </section> diff --git a/src/modules/ruxc/ruxc_mod.c b/src/modules/ruxc/ruxc_mod.c index 2cd1cd27d0..02fa278859 100644 --- a/src/modules/ruxc/ruxc_mod.c +++ b/src/modules/ruxc/ruxc_mod.c @@ -40,6 +40,7 @@ MODULE_VERSION static int _ruxc_http_timeout = 5000; static int _ruxc_http_tlsmode = 0; +static int _ruxc_http_reuse = 0; static int mod_init(void); static int child_init(int); @@ -73,6 +74,7 @@ static cmd_export_t cmds[]={ static param_export_t params[]={ {"http_timeout", PARAM_INT, &_ruxc_http_timeout}, {"http_tlsmode", PARAM_INT, &_ruxc_http_tlsmode}, + {"http_reuse", PARAM_INT, &_ruxc_http_reuse}, {0, 0, 0} }; @@ -132,6 +134,7 @@ static int ki_ruxc_http_get_helper(sip_msg_t *_msg, str *url, str *hdrs, v_http_request.timeout_read = _ruxc_http_timeout; v_http_request.timeout_write = _ruxc_http_timeout; v_http_request.tlsmode = _ruxc_http_tlsmode; + v_http_request.reuse = _ruxc_http_reuse; v_http_request.url = url->s; v_http_request.url_len = url->len; @@ -229,6 +232,7 @@ static int ki_ruxc_http_post_helper(sip_msg_t *_msg, str *url, str *body, str *h v_http_request.timeout_read = _ruxc_http_timeout; v_http_request.timeout_write = _ruxc_http_timeout; v_http_request.tlsmode = _ruxc_http_tlsmode; + v_http_request.reuse = _ruxc_http_reuse; v_http_request.url = url->s; v_http_request.url_len = url->len;

1 0

git:master:2042432b: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 23 Jul '21

23 Jul '21

Module: kamailio Branch: master Commit: 2042432b598fcceb9de7cf8a659498e99aec9f05 URL: https://github.com/kamailio/kamailio/commit/2042432b598fcceb9de7cf8a659498e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-23T19:46:14+02:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/2042432b598fcceb9de7cf8a659498e… Patch: https://github.com/kamailio/kamailio/commit/2042432b598fcceb9de7cf8a659498e…

1 0

git:master:12470055: rtpengine: add un/silence_media() methods
by Richard Fuchs 23 Jul '21

23 Jul '21

Module: kamailio Branch: master Commit: 12470055fddc1dd93e2295fcfb5119cf5340d722 URL: https://github.com/kamailio/kamailio/commit/12470055fddc1dd93e2295fcfb5119c… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2021-07-23T13:34:33-04:00 rtpengine: add un/silence_media() methods --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml Modified: src/modules/rtpengine/rtpengine.c Modified: src/modules/rtpengine/rtpengine.h --- Diff: https://github.com/kamailio/kamailio/commit/12470055fddc1dd93e2295fcfb5119c… Patch: https://github.com/kamailio/kamailio/commit/12470055fddc1dd93e2295fcfb5119c…

1 0

git:5.4:447e25a0: pv_headers: fix removal of all values when using PV_IDX_ALL
by Victor Seva 23 Jul '21

23 Jul '21

Module: kamailio Branch: 5.4 Commit: 447e25a0d1bf7eadb045a79bff7bfa50b0dca71c URL: https://github.com/kamailio/kamailio/commit/447e25a0d1bf7eadb045a79bff7bfa5… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-07-23T17:12:14+02:00 pv_headers: fix removal of all values when using PV_IDX_ALL $(x_hdr(whatever)[*]) = "hello" was just removing the first value (cherry picked from commit 9ad96c08e0deb759297b2d402295691d8dd657d5) --- Modified: src/modules/pv_headers/pvh_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/447e25a0d1bf7eadb045a79bff7bfa5… Patch: https://github.com/kamailio/kamailio/commit/447e25a0d1bf7eadb045a79bff7bfa5… --- diff --git a/src/modules/pv_headers/pvh_xavp.c b/src/modules/pv_headers/pvh_xavp.c index 7cba757456..96fdc292b0 100644 --- a/src/modules/pv_headers/pvh_xavp.c +++ b/src/modules/pv_headers/pvh_xavp.c @@ -618,7 +618,7 @@ int pvh_set_header( if(val == NULL || (val->flags & PV_VAL_NULL)) { if(idxf == PV_IDX_ALL) { - cnt = xavi_rm_by_name(hname, 1, &xavi); + cnt = xavi_rm_by_name(hname, 1, &avi); LM_DBG("removed %d values of %.*s=>%.*s, set $null\n", cnt, xavi->name.len, xavi->name.s, hname->len, hname->s); if(pvh_set_xavi(msg, &xavi_name, hname, NULL, SR_XTYPE_NULL, 0, 0) @@ -649,7 +649,7 @@ int pvh_set_header( goto err; } else if(idxf == PV_IDX_ALL) { if(hname_cnt > 1) { - cnt = xavi_rm_by_name(hname, 1, &xavi); + cnt = xavi_rm_by_name(hname, 1, &avi); LM_DBG("removed %d values of %.*s=>%.*s\n", cnt, xavi->name.len, xavi->name.s, hname->len, hname->s); }

1 0

git:5.5:e18c24b8: pv_headers: fix removal of all values when using PV_IDX_ALL
by Victor Seva 23 Jul '21

23 Jul '21

Module: kamailio Branch: 5.5 Commit: e18c24b88403e61461feace3b13fa59f948f1082 URL: https://github.com/kamailio/kamailio/commit/e18c24b88403e61461feace3b13fa59… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-07-23T17:11:45+02:00 pv_headers: fix removal of all values when using PV_IDX_ALL $(x_hdr(whatever)[*]) = "hello" was just removing the first value (cherry picked from commit 9ad96c08e0deb759297b2d402295691d8dd657d5) --- Modified: src/modules/pv_headers/pvh_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/e18c24b88403e61461feace3b13fa59… Patch: https://github.com/kamailio/kamailio/commit/e18c24b88403e61461feace3b13fa59… --- diff --git a/src/modules/pv_headers/pvh_xavp.c b/src/modules/pv_headers/pvh_xavp.c index 7cba757456..96fdc292b0 100644 --- a/src/modules/pv_headers/pvh_xavp.c +++ b/src/modules/pv_headers/pvh_xavp.c @@ -618,7 +618,7 @@ int pvh_set_header( if(val == NULL || (val->flags & PV_VAL_NULL)) { if(idxf == PV_IDX_ALL) { - cnt = xavi_rm_by_name(hname, 1, &xavi); + cnt = xavi_rm_by_name(hname, 1, &avi); LM_DBG("removed %d values of %.*s=>%.*s, set $null\n", cnt, xavi->name.len, xavi->name.s, hname->len, hname->s); if(pvh_set_xavi(msg, &xavi_name, hname, NULL, SR_XTYPE_NULL, 0, 0) @@ -649,7 +649,7 @@ int pvh_set_header( goto err; } else if(idxf == PV_IDX_ALL) { if(hname_cnt > 1) { - cnt = xavi_rm_by_name(hname, 1, &xavi); + cnt = xavi_rm_by_name(hname, 1, &avi); LM_DBG("removed %d values of %.*s=>%.*s\n", cnt, xavi->name.len, xavi->name.s, hname->len, hname->s); }

1 0

git:master:9ad96c08: pv_headers: fix removal of all values when using PV_IDX_ALL
by Victor Seva 23 Jul '21

23 Jul '21

Module: kamailio Branch: master Commit: 9ad96c08e0deb759297b2d402295691d8dd657d5 URL: https://github.com/kamailio/kamailio/commit/9ad96c08e0deb759297b2d402295691… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-07-23T17:11:03+02:00 pv_headers: fix removal of all values when using PV_IDX_ALL $(x_hdr(whatever)[*]) = "hello" was just removing the first value --- Modified: src/modules/pv_headers/pvh_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/9ad96c08e0deb759297b2d402295691… Patch: https://github.com/kamailio/kamailio/commit/9ad96c08e0deb759297b2d402295691… --- diff --git a/src/modules/pv_headers/pvh_xavp.c b/src/modules/pv_headers/pvh_xavp.c index 7cba757456..96fdc292b0 100644 --- a/src/modules/pv_headers/pvh_xavp.c +++ b/src/modules/pv_headers/pvh_xavp.c @@ -618,7 +618,7 @@ int pvh_set_header( if(val == NULL || (val->flags & PV_VAL_NULL)) { if(idxf == PV_IDX_ALL) { - cnt = xavi_rm_by_name(hname, 1, &xavi); + cnt = xavi_rm_by_name(hname, 1, &avi); LM_DBG("removed %d values of %.*s=>%.*s, set $null\n", cnt, xavi->name.len, xavi->name.s, hname->len, hname->s); if(pvh_set_xavi(msg, &xavi_name, hname, NULL, SR_XTYPE_NULL, 0, 0) @@ -649,7 +649,7 @@ int pvh_set_header( goto err; } else if(idxf == PV_IDX_ALL) { if(hname_cnt > 1) { - cnt = xavi_rm_by_name(hname, 1, &xavi); + cnt = xavi_rm_by_name(hname, 1, &avi); LM_DBG("removed %d values of %.*s=>%.*s\n", cnt, xavi->name.len, xavi->name.s, hname->len, hname->s); }

1 0

git:master:b31efd55: modules: readme files regenerated - sworker ... [skip ci]
by Kamailio Dev 22 Jul '21

22 Jul '21

Module: kamailio Branch: master Commit: b31efd5526cf11eded7823c6e93370024f5d2863 URL: https://github.com/kamailio/kamailio/commit/b31efd5526cf11eded7823c6e933700… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-22T15:46:15+02:00 modules: readme files regenerated - sworker ... [skip ci] --- Modified: src/modules/sworker/README --- Diff: https://github.com/kamailio/kamailio/commit/b31efd5526cf11eded7823c6e933700… Patch: https://github.com/kamailio/kamailio/commit/b31efd5526cf11eded7823c6e933700… --- diff --git a/src/modules/sworker/README b/src/modules/sworker/README index 241b077ab6..c5d571a179 100644 --- a/src/modules/sworker/README +++ b/src/modules/sworker/README @@ -115,7 +115,7 @@ request_route { that, 'drop' must be used so processing of the message does not continue to request_route or reply_route in the same process, it is going to be done by the delegated group of workers. It returns -1 - (false) in case there was a proble delegating the processing. + (false) in case there was a problem delegating the processing. This function can be used from REQUEST_ROUTE|CORE_REPLY_ROUTE.

1 0

[kamailio/kamailio] rr: all "record_route_...()" functions consider custom user AVP (#2804)
by annema-Kontron 22 Jul '21

22 Jul '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, testet against local branch of 5.1.6 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Until this fix, only the function record_route() considered the value of the custom user AVP (if present). The functions record_route_preset() and record_route_advertised_address(), on the other hand, ignored the value of the custom user AVP, even if it was presnt. Now all three functions, record_route(), record_route_preset() and record_route_advertised_address(), consider the value of the custom user VP, if it is present. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2804 -- Commit Summary -- * rr: all "record_route_...()" functions consider custom user AVP -- File Changes -- M src/modules/rr/record.c (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2804.patch https://github.com/kamailio/kamailio/pull/2804.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/2804

2 3

git:master:fc62ceeb: sworker: docs - fixed small typo
by Daniel-Constantin Mierla 22 Jul '21

22 Jul '21

Module: kamailio Branch: master Commit: fc62ceeb6d625acda6952486031efa1fe2945768 URL: https://github.com/kamailio/kamailio/commit/fc62ceeb6d625acda6952486031efa1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-22T15:34:48+02:00 sworker: docs - fixed small typo --- Modified: src/modules/sworker/doc/sworker_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fc62ceeb6d625acda6952486031efa1… Patch: https://github.com/kamailio/kamailio/commit/fc62ceeb6d625acda6952486031efa1… --- diff --git a/src/modules/sworker/doc/sworker_admin.xml b/src/modules/sworker/doc/sworker_admin.xml index 9656ff1071..2110998f2f 100644 --- a/src/modules/sworker/doc/sworker_admin.xml +++ b/src/modules/sworker/doc/sworker_admin.xml @@ -109,7 +109,7 @@ request_route { 'drop' must be used so processing of the message does not continue to request_route or reply_route in the same process, it is going to be done by the delegated group of workers. It returns -1 (false) in case there - was a proble delegating the processing. + was a problem delegating the processing. </para> <para> This function can be used from REQUEST_ROUTE|CORE_REPLY_ROUTE.

1 0

git:master:f3a031a5: rr: all "record_route_...()" functions consider custom user AVP
by Daniel-Constantin Mierla 22 Jul '21

22 Jul '21

Module: kamailio Branch: master Commit: f3a031a53fb413369ddf96de74ac43cd6831db5a URL: https://github.com/kamailio/kamailio/commit/f3a031a53fb413369ddf96de74ac43c… Author: valentin <christoph.valentin(a)kontron.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-22T15:32:21+02:00 rr: all "record_route_...()" functions consider custom user AVP Until this fix, only the function record_route() considered the value of the custom user AVP (if present). The functions record_route_preset() and record_route_advertised_address(), on the other hand, ignored the value of the custom user AVP, even if it was presnt. Now all three functions, record_route(), record_route_preset() and record_route_advertised_address(), consider the value of the custom user VP, if it is present. --- Modified: src/modules/rr/record.c --- Diff: https://github.com/kamailio/kamailio/commit/f3a031a53fb413369ddf96de74ac43c… Patch: https://github.com/kamailio/kamailio/commit/f3a031a53fb413369ddf96de74ac43c… --- diff --git a/src/modules/rr/record.c b/src/modules/rr/record.c index 8624ee5e13..b6178cade3 100644 --- a/src/modules/rr/record.c +++ b/src/modules/rr/record.c @@ -527,9 +527,12 @@ int record_route_preset(struct sip_msg* _m, str* _data) } if (add_username) { - if (get_username(_m, &user) < 0) { - LM_ERR("failed to extract username\n"); - return -1; + /* check if there is a custom user set */ + if (get_custom_user(_m, &user) < 0) { + if (get_username(_m, &user) < 0) { + LM_ERR("failed to extract username\n"); + return -1; + } } } else if (use_ob == 1) { if (rr_obb.encode_flow_token(&user, &_m->rcv) != 0) { @@ -814,9 +817,12 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) user.s = 0; if (add_username) { - if (get_username(_m, &user) < 0) { - LM_ERR("failed to extract username\n"); - return -1; + /* check if there is a custom user set */ + if (get_custom_user(_m, &user) < 0) { + if (get_username(_m, &user) < 0) { + LM_ERR("failed to extract username\n"); + return -1; + } } } else if (use_ob == 1) { if (rr_obb.encode_flow_token(&user, &_m->rcv) != 0) {

1 0

git:master:a5821343: modules: readme files regenerated - ruxc ... [skip ci]
by Kamailio Dev 22 Jul '21

22 Jul '21

Module: kamailio Branch: master Commit: a5821343b044dfabff5fab57fc01e1d23f7d69de URL: https://github.com/kamailio/kamailio/commit/a5821343b044dfabff5fab57fc01e1d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-22T10:01:23+02:00 modules: readme files regenerated - ruxc ... [skip ci] --- Modified: src/modules/ruxc/README --- Diff: https://github.com/kamailio/kamailio/commit/a5821343b044dfabff5fab57fc01e1d… Patch: https://github.com/kamailio/kamailio/commit/a5821343b044dfabff5fab57fc01e1d… --- diff --git a/src/modules/ruxc/README b/src/modules/ruxc/README index e3c9dae852..6fb238e3b7 100644 --- a/src/modules/ruxc/README +++ b/src/modules/ruxc/README @@ -27,6 +27,7 @@ Daniel-Constantin Mierla 3. Parameters 3.1. http_timeout (int) + 3.2. http_tlsmode (int) 4. Functions @@ -38,9 +39,10 @@ Daniel-Constantin Mierla List of Examples 1.1. Set http_timeout parameter - 1.2. ruxc_http_get() usage - 1.3. ruxc_http_post() usage - 1.4. Libruxc Usage + 1.2. Set http_tlsmode parameter + 1.3. ruxc_http_get() usage + 1.4. ruxc_http_post() usage + 1.5. Libruxc Usage Chapter 1. Admin Guide @@ -55,6 +57,7 @@ Chapter 1. Admin Guide 3. Parameters 3.1. http_timeout (int) + 3.2. http_tlsmode (int) 4. Functions @@ -91,6 +94,7 @@ Chapter 1. Admin Guide 3. Parameters 3.1. http_timeout (int) + 3.2. http_tlsmode (int) 3.1. http_timeout (int) @@ -104,6 +108,18 @@ Chapter 1. Admin Guide modparam("ruxc", "http_timeout", 2000) ... +3.2. http_tlsmode (int) + + The mode to connect over TLS to HTTPS sites: 0 accept all certificates; + 1 - accept trusted certificates. + + Default value is 0 (accept all certificates). + + Example 1.2. Set http_tlsmode parameter +... +modparam("ruxc", "http_tlsmode", 1) +... + 4. Functions 4.1. ruxc_http_get(url, hdrs, respv) @@ -121,7 +137,7 @@ modparam("ruxc", "http_timeout", 2000) This function can be used from ANY_ROUTE. - Example 1.2. ruxc_http_get() usage + Example 1.3. ruxc_http_get() usage ... ruxc_http_get("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s .escape.param})", @@ -144,7 +160,7 @@ switch ($rc) { This function can be used from ANY_ROUTE. - Example 1.3. ruxc_http_post() usage + Example 1.4. ruxc_http_post() usage ... ruxc_http_post("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{ s.escape.param})", @@ -167,7 +183,7 @@ switch ($rc) { installed and its environment configured, then run the following commands: - Example 1.4. Libruxc Usage + Example 1.5. Libruxc Usage ... git clone https://github.com/miconda/ruxc cd ruxc

1 0

git:master:8f340839: ruxc: added http_tlsmode parameter
by Daniel-Constantin Mierla 22 Jul '21

22 Jul '21

Module: kamailio Branch: master Commit: 8f34083999a379db0c5c24b6e2739f9a413ea86b URL: https://github.com/kamailio/kamailio/commit/8f34083999a379db0c5c24b6e2739f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-22T09:22:42+02:00 ruxc: added http_tlsmode parameter - if set to 1, it connects only to trusted https websites - default 0 - accept all certificates --- Modified: src/modules/ruxc/ruxc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8f34083999a379db0c5c24b6e2739f9… Patch: https://github.com/kamailio/kamailio/commit/8f34083999a379db0c5c24b6e2739f9… --- diff --git a/src/modules/ruxc/ruxc_mod.c b/src/modules/ruxc/ruxc_mod.c index 2d100d373c..2cd1cd27d0 100644 --- a/src/modules/ruxc/ruxc_mod.c +++ b/src/modules/ruxc/ruxc_mod.c @@ -39,6 +39,7 @@ MODULE_VERSION static int _ruxc_http_timeout = 5000; +static int _ruxc_http_tlsmode = 0; static int mod_init(void); static int child_init(int); @@ -71,6 +72,7 @@ static cmd_export_t cmds[]={ static param_export_t params[]={ {"http_timeout", PARAM_INT, &_ruxc_http_timeout}, + {"http_tlsmode", PARAM_INT, &_ruxc_http_tlsmode}, {0, 0, 0} }; @@ -129,6 +131,7 @@ static int ki_ruxc_http_get_helper(sip_msg_t *_msg, str *url, str *hdrs, v_http_request.timeout_connect = _ruxc_http_timeout; v_http_request.timeout_read = _ruxc_http_timeout; v_http_request.timeout_write = _ruxc_http_timeout; + v_http_request.tlsmode = _ruxc_http_tlsmode; v_http_request.url = url->s; v_http_request.url_len = url->len; @@ -225,6 +228,7 @@ static int ki_ruxc_http_post_helper(sip_msg_t *_msg, str *url, str *body, str *h v_http_request.timeout_connect = _ruxc_http_timeout; v_http_request.timeout_read = _ruxc_http_timeout; v_http_request.timeout_write = _ruxc_http_timeout; + v_http_request.tlsmode = _ruxc_http_tlsmode; v_http_request.url = url->s; v_http_request.url_len = url->len;

1 0

git:master:03a74e45: ruxc: docs for http_tlsmode parameter
by Daniel-Constantin Mierla 22 Jul '21

22 Jul '21

Module: kamailio Branch: master Commit: 03a74e4519d5de90512ac5f196640eb6cf405bfc URL: https://github.com/kamailio/kamailio/commit/03a74e4519d5de90512ac5f196640eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-22T09:52:48+02:00 ruxc: docs for http_tlsmode parameter --- Modified: src/modules/ruxc/doc/ruxc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/03a74e4519d5de90512ac5f196640eb… Patch: https://github.com/kamailio/kamailio/commit/03a74e4519d5de90512ac5f196640eb… --- diff --git a/src/modules/ruxc/doc/ruxc_admin.xml b/src/modules/ruxc/doc/ruxc_admin.xml index 059b64854a..e4b0384ea4 100644 --- a/src/modules/ruxc/doc/ruxc_admin.xml +++ b/src/modules/ruxc/doc/ruxc_admin.xml @@ -75,6 +75,26 @@ ... modparam("ruxc", "http_timeout", 2000) ... +</programlisting> + </example> + </section> + <section id="ruxc.p.http_tlsmode"> + <title><varname>http_tlsmode</varname> (int)</title> + <para> + The mode to connect over TLS to HTTPS sites: 0 accept all certificates; + 1 - accept trusted certificates. + </para> + <para> + <emphasis> + Default value is 0 (accept all certificates). + </emphasis> + </para> + <example> + <title>Set <varname>http_tlsmode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("ruxc", "http_tlsmode", 1) +... </programlisting> </example> </section>

1 0

git:master:126f89e7: modules: readme files regenerated - ruxc ... [skip ci]
by Kamailio Dev 19 Jul '21

19 Jul '21

Module: kamailio Branch: master Commit: 126f89e72212cee96d0ef3e7b43c249ab9c4429c URL: https://github.com/kamailio/kamailio/commit/126f89e72212cee96d0ef3e7b43c249… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-19T17:31:13+02:00 modules: readme files regenerated - ruxc ... [skip ci] --- Modified: src/modules/ruxc/README --- Diff: https://github.com/kamailio/kamailio/commit/126f89e72212cee96d0ef3e7b43c249… Patch: https://github.com/kamailio/kamailio/commit/126f89e72212cee96d0ef3e7b43c249… --- diff --git a/src/modules/ruxc/README b/src/modules/ruxc/README index e950003124..e3c9dae852 100644 --- a/src/modules/ruxc/README +++ b/src/modules/ruxc/README @@ -11,7 +11,7 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright © 2021 http://www.asipto.com + Copyright Â© 2021 http://www.asipto.com __________________________________________________________________ Table of Contents @@ -109,7 +109,7 @@ modparam("ruxc", "http_timeout", 2000) 4.1. ruxc_http_get(url, hdrs, respv) 4.2. ruxc_http_post(url, body, hdrs, respv) -4.1. ruxc_http_get(url, hdrs, respv) +4.1. ruxc_http_get(url, hdrs, respv) Perform a HTTP GET request to "url", storing the response body in the "respv" variable. The "hdrs" can be empty string to skip setting them. @@ -123,15 +123,15 @@ modparam("ruxc", "http_timeout", 2000) Example 1.2. ruxc_http_get() usage ... -http_client_get("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu -{s.escape.param})", +ruxc_http_get("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s +.escape.param})", "", "X-Token: abc", "$var(result)"); switch ($rc) { ... } ... -4.2. ruxc_http_post(url, body, hdrs, respv) +4.2. ruxc_http_post(url, body, hdrs, respv) Perform a HTTP POST request to "url", storing the response body in the "respv" variable. The "body" and "hdrs" can be empty strings to skip

1 0

git:master:cbc38427: ruxc: docs - fixed typo in function name
by Daniel-Constantin Mierla 19 Jul '21

19 Jul '21

Module: kamailio Branch: master Commit: cbc3842771393c71fe81f8eae87c1a7dbfd38974 URL: https://github.com/kamailio/kamailio/commit/cbc3842771393c71fe81f8eae87c1a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-19T16:35:36+02:00 ruxc: docs - fixed typo in function name --- Modified: src/modules/ruxc/doc/ruxc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cbc3842771393c71fe81f8eae87c1a7… Patch: https://github.com/kamailio/kamailio/commit/cbc3842771393c71fe81f8eae87c1a7… --- diff --git a/src/modules/ruxc/doc/ruxc_admin.xml b/src/modules/ruxc/doc/ruxc_admin.xml index af6ac8a0de..059b64854a 100644 --- a/src/modules/ruxc/doc/ruxc_admin.xml +++ b/src/modules/ruxc/doc/ruxc_admin.xml @@ -104,7 +104,7 @@ modparam("ruxc", "http_timeout", 2000) <title><function>ruxc_http_get()</function> usage</title> <programlisting format="linespecific"> ... -http_client_get("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s.escap…", +ruxc_http_get("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s.escap…", "", "X-Token: abc", "$var(result)"); switch ($rc) { ...

1 0

Why sip_msg_apply_changes can't be executed from BRANCH_FAILURE_ROUTE?
by Ivan Ribakov 19 Jul '21

19 Jul '21

Hi all, I need to modify headers and body of the ingress INVITE in the BRANCH_FAILURE_ROUTE block to reflect failure to deliver message to the first destination and include some additional information. However checking the documentation of the “sip_msg_apply_changes” (https://github.com/kamailio/kamailio/blob/master/src/core/msg_translator.c#…) I can see that it can only be executed from request and reply routes. That seems overly restrictive. Can someone shine some light on why is that and whether it’s safe to patch this part of the code to allow function execution from BRANCH_FAILURE_ROUTE as well? Thanks in advance, Ivan

3 5

git:master:abba6969: ruxc: set response variable
by Daniel-Constantin Mierla 19 Jul '21

19 Jul '21

Module: kamailio Branch: master Commit: abba69691efad80d208aeb000bf0382f94dfec71 URL: https://github.com/kamailio/kamailio/commit/abba69691efad80d208aeb000bf0382… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-19T10:19:14+02:00 ruxc: set response variable --- Modified: src/modules/ruxc/ruxc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/abba69691efad80d208aeb000bf0382… Patch: https://github.com/kamailio/kamailio/commit/abba69691efad80d208aeb000bf0382… --- diff --git a/src/modules/ruxc/ruxc_mod.c b/src/modules/ruxc/ruxc_mod.c index 2f5e6ae86a..2d100d373c 100644 --- a/src/modules/ruxc/ruxc_mod.c +++ b/src/modules/ruxc/ruxc_mod.c @@ -122,6 +122,7 @@ static int ki_ruxc_http_get_helper(sip_msg_t *_msg, str *url, str *hdrs, { RuxcHTTPRequest v_http_request = {0}; RuxcHTTPResponse v_http_response = {0}; + pv_value_t val = {0}; int ret; v_http_request.timeout = _ruxc_http_timeout; @@ -147,6 +148,14 @@ static int ki_ruxc_http_get_helper(sip_msg_t *_msg, str *url, str *hdrs, LM_DBG("response code: %d - data len: %d - data: [%.*s]\n", v_http_response.rescode, v_http_response.resdata_len, v_http_response.resdata_len, v_http_response.resdata); + val.rs.s = v_http_response.resdata; + val.rs.len = v_http_response.resdata_len; + val.flags = PV_VAL_STR; + if(dst->setf) { + dst->setf(_msg, &dst->pvp, (int)EQ_T, &val); + } else { + LM_WARN("target pv is not writable\n"); + } } ret = v_http_response.rescode; } @@ -209,6 +218,7 @@ static int ki_ruxc_http_post_helper(sip_msg_t *_msg, str *url, str *body, str *h { RuxcHTTPRequest v_http_request = {0}; RuxcHTTPResponse v_http_response = {0}; + pv_value_t val = {0}; int ret; v_http_request.timeout = _ruxc_http_timeout; @@ -239,6 +249,14 @@ static int ki_ruxc_http_post_helper(sip_msg_t *_msg, str *url, str *body, str *h LM_DBG("response code: %d - data len: %d - data: [%.*s]\n", v_http_response.rescode, v_http_response.resdata_len, v_http_response.resdata_len, v_http_response.resdata); + val.rs.s = v_http_response.resdata; + val.rs.len = v_http_response.resdata_len; + val.flags = PV_VAL_STR; + if(dst->setf) { + dst->setf(_msg, &dst->pvp, (int)EQ_T, &val); + } else { + LM_WARN("target pv is not writable\n"); + } } ret = v_http_response.rescode; }

1 0

git:master:6be39f68: Makefile.groups: added group for ruxc module
by Daniel-Constantin Mierla 19 Jul '21

19 Jul '21

Module: kamailio Branch: master Commit: 6be39f6864a56a5ff56dab3be1bb5fd749df387e URL: https://github.com/kamailio/kamailio/commit/6be39f6864a56a5ff56dab3be1bb5fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-19T08:38:55+02:00 Makefile.groups: added group for ruxc module --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/6be39f6864a56a5ff56dab3be1bb5fd… Patch: https://github.com/kamailio/kamailio/commit/6be39f6864a56a5ff56dab3be1bb5fd… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 4eea749671..99a990ad83 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -226,6 +226,9 @@ mod_list_mqtt=mqtt # - modules depending on nats and ev library mod_list_nats=nats +# - modules depending on ruxc library +mod_list_ruxc=ruxc + # - modules depending on secsipid library mod_list_secsipid=secsipid secsipid_proc @@ -268,6 +271,7 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_kafka) \ $(mod_list_mqtt) \ $(mod_list_nats) \ + $(mod_list_ruxc) \ $(mod_list_secsipid) \ $(mod_list_jwt) \ $(mod_list_lwsc) \ @@ -504,6 +508,9 @@ module_group_kmqtt=$(mod_list_mqtt) # K nats modules module_group_knats=$(mod_list_nats) +# K ruxc modules +module_group_kruxc=$(mod_list_ruxc) + # K secsipid modules module_group_ksecsipid=$(mod_list_secsipid)

1 0

git:master:81de7878: ruxc: new module with utility functions from libruxc
by Daniel-Constantin Mierla 19 Jul '21

19 Jul '21

Module: kamailio Branch: master Commit: 81de7878ff4706ba331fa787cc63dea562e6a814 URL: https://github.com/kamailio/kamailio/commit/81de7878ff4706ba331fa787cc63dea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-19T08:32:48+02:00 ruxc: new module with utility functions from libruxc - first target is to provide http get/post functions that do not depend on libcurl+libssl --- Added: src/modules/ruxc/Makefile Added: src/modules/ruxc/README Added: src/modules/ruxc/doc/Makefile Added: src/modules/ruxc/doc/ruxc.xml Added: src/modules/ruxc/doc/ruxc_admin.xml Added: src/modules/ruxc/ruxc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/81de7878ff4706ba331fa787cc63dea… Patch: https://github.com/kamailio/kamailio/commit/81de7878ff4706ba331fa787cc63dea…

1 0

git:master:851a8c0f: kemix: added KSR.kx.ifdef() and KSR.kx.ifndef()
by Daniel-Constantin Mierla 14 Jul '21

14 Jul '21

Module: kamailio Branch: master Commit: 851a8c0f0c8f7cc7ab22cb905bdb3987e9fa461b URL: https://github.com/kamailio/kamailio/commit/851a8c0f0c8f7cc7ab22cb905bdb398… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-14T10:08:50+02:00 kemix: added KSR.kx.ifdef() and KSR.kx.ifndef() - return true/false if a specified id is defined or not --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/851a8c0f0c8f7cc7ab22cb905bdb398… Patch: https://github.com/kamailio/kamailio/commit/851a8c0f0c8f7cc7ab22cb905bdb398… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index 1633188089..2b6f6ec9c2 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -1138,6 +1138,36 @@ static int ki_kx_get_defn(sip_msg_t *msg, str *dname) return n; } +/** + * + */ +static int ki_kx_ifdef(sip_msg_t *msg, str *dname) +{ + str *val; + + val = pp_define_get(dname->len, dname->s); + + if (val!=NULL) { + return SR_KEMI_TRUE; + } + return SR_KEMI_FALSE; +} + +/** + * + */ +static int ki_kx_ifndef(sip_msg_t *msg, str *dname) +{ + str *val; + + val = pp_define_get(dname->len, dname->s); + + if (val==NULL) { + return SR_KEMI_TRUE; + } + return SR_KEMI_FALSE; +} + /** * */ @@ -1505,6 +1535,16 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("ifdef"), + SR_KEMIP_BOOL, ki_kx_ifdef, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("ifndef"), + SR_KEMIP_BOOL, ki_kx_ifndef, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("kx"), str_init("get_env"), SR_KEMIP_XVAL, ki_kx_get_env, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:ed518fd6: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 13 Jul '21

13 Jul '21

Module: kamailio Branch: master Commit: ed518fd6fa4652e2a06a09e6d54ce5b19d0b9493 URL: https://github.com/kamailio/kamailio/commit/ed518fd6fa4652e2a06a09e6d54ce5b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-13T15:16:15+02:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/ed518fd6fa4652e2a06a09e6d54ce5b… Patch: https://github.com/kamailio/kamailio/commit/ed518fd6fa4652e2a06a09e6d54ce5b… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index 24d02d1c5d..8a1abb2643 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -648,9 +648,11 @@ modparam("rtpengine", "rtpengine_tout_ms", 2000) 4.5. rtpengine_allow_op (integer) Enable this setting to allow finishing the current sessions while - denying new sessions for the manually deactivated nodes via kamctl - command i.e. "disabled(permanent)" nodes. Probably the manually - deactivated machine is still running(did not crash). + denying new sessions for deactivated nodes. + + Nodes can be manually deactivated via kamctl command i.e. + "disabled(permanent)" nodes. Probably the manually deactivated machine + is still running(did not crash). This is useful when deactivating a node for maintenance and reject new sessions but allow current ones to finish. @@ -664,6 +666,12 @@ modparam("rtpengine", "rtpengine_tout_ms", 2000) Default value is “0” to keep the current behaviour. + If value set to “1” it will send commands to all disabled nodes for the + existing call. + + If value set to “2” it will send commands only to manually disabled + nodes. (Not when timeout is disabled or node broken) + Example 1.5. Set rtpengine_allow_op parameter ... modparam("rtpengine", "rtpengine_allow_op", 1)

1 0

[kamailio/kamailio] rtpengine: rtpengine_allow_op return node logic (#2800)
by descartin 13 Jul '21

13 Jul '21

When using rtpengine_allow_op param, return node for ongoing calls only if rtpengine is manually disabled. When a rtpengine instance is disabled, rtpengine_allow_op will allow the indialog requests to be processed through that rtpengine. But it's not desirable to return the node when the rtpengine has unexpectedly crashed or has any undesired issues, because the rtp commands attempted cause congestion problem in the kamailio. So with this patch we only return the node if the rtpengine has been manually disabled and it's still supposed to be working.   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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:  - [x ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2800 -- Commit Summary -- * rtpengine: On rtpengine_allow_op, return node only if rtpengine is manually disabled -- File Changes -- M src/modules/rtpengine/rtpengine.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2800.patch https://github.com/kamailio/kamailio/pull/2800.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/2800

3 10

git:master:3f7a6240: rtpengine: small debug log fix after merge of #2800
by Henning Westerholt 13 Jul '21

13 Jul '21

Module: kamailio Branch: master Commit: 3f7a6240215a76e9584e34459a1fcfe78a794611 URL: https://github.com/kamailio/kamailio/commit/3f7a6240215a76e9584e34459a1fcfe… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-07-13T13:04:10Z rtpengine: small debug log fix after merge of #2800 --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/3f7a6240215a76e9584e34459a1fcfe… Patch: https://github.com/kamailio/kamailio/commit/3f7a6240215a76e9584e34459a1fcfe… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 28c058c2ee..86b5dc484c 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3345,9 +3345,10 @@ select_rtpp_node(str callid, str viabranch, int do_test, struct rtpp_node **quer node->rn_url.len, node->rn_url.s, callid.len, callid.len, callid.s); return node; } else { - LM_DBG("node=%.*s for calllen=%d callid=%.*s is disabled, either broke or timeout disabled! Return it\n", + LM_DBG("node=%.*s for calllen=%d callid=%.*s is disabled, either broke or timeout disabled!\n", node->rn_url.len, node->rn_url.s, callid.len, callid.len, callid.s); if (rtpengine_allow_op == 1) { + LM_DBG("Return it\n"); return node; } }

1 0

git:master:f653ea8c: rtpengine: add mode 2 for rtpengine_allow_op to return only manually disabled nodes
by Henning Westerholt 13 Jul '21

13 Jul '21

Module: kamailio Branch: master Commit: f653ea8c05e6916ff14e7da491bcd68f928b97af URL: https://github.com/kamailio/kamailio/commit/f653ea8c05e6916ff14e7da491bcd68… Author: david <you(a)example.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-07-13T15:01:15+02:00 rtpengine: add mode 2 for rtpengine_allow_op to return only manually disabled nodes --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/f653ea8c05e6916ff14e7da491bcd68… Patch: https://github.com/kamailio/kamailio/commit/f653ea8c05e6916ff14e7da491bcd68… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index ef7d5a4fd7..731e4c6d56 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -259,8 +259,9 @@ modparam("rtpengine", "rtpengine_tout_ms", 2000) <section id="rtpengine.p.rtpengine_allow_op"> <title><varname>rtpengine_allow_op</varname> (integer)</title> <para> - Enable this setting to allow finishing the current sessions while denying new sessions for the - <emphasis>manually deactivated nodes </emphasis> via kamctl command i.e. "disabled(permanent)" nodes. + Enable this setting to allow finishing the current sessions while denying new sessions for deactivated nodes. + </para> + <para>Nodes can be <emphasis>manually deactivated </emphasis> via kamctl command i.e. "disabled(permanent)" nodes. Probably the manually deactivated machine is still running(did not crash). </para> <para> @@ -279,6 +280,18 @@ modparam("rtpengine", "rtpengine_tout_ms", 2000) Default value is <quote>0</quote> to keep the current behaviour. </emphasis> </para> + <para> + <emphasis> + If value set to <quote>1</quote> it will send commands to all disabled nodes for the + existing call. + </emphasis> + </para> + <para> + <emphasis> + If value set to <quote>2</quote> it will send commands only to manually disabled + nodes. (Not when timeout is disabled or node broken) + </emphasis> + </para> <example> <title>Set <varname>rtpengine_allow_op</varname> parameter</title> <programlisting format="linespecific"> diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 1777ebc98f..28c058c2ee 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3347,8 +3347,10 @@ select_rtpp_node(str callid, str viabranch, int do_test, struct rtpp_node **quer } else { LM_DBG("node=%.*s for calllen=%d callid=%.*s is disabled, either broke or timeout disabled! Return it\n", node->rn_url.len, node->rn_url.s, callid.len, callid.len, callid.s); + if (rtpengine_allow_op == 1) { + return node; + } } - /*return node;*/ } return NULL;

1 0

git:master:97620f9e: rtpengine: On rtpengine_allow_op, return node only if rtpengine is manually disabled
by Henning Westerholt 13 Jul '21

13 Jul '21

Module: kamailio Branch: master Commit: 97620f9ed633e8e5e9d719cb023e60a890ebb3f8 URL: https://github.com/kamailio/kamailio/commit/97620f9ed633e8e5e9d719cb023e60a… Author: david <you(a)example.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-07-13T15:01:15+02:00 rtpengine: On rtpengine_allow_op, return node only if rtpengine is manually disabled --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/97620f9ed633e8e5e9d719cb023e60a… Patch: https://github.com/kamailio/kamailio/commit/97620f9ed633e8e5e9d719cb023e60a… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 6266520578..1777ebc98f 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3343,11 +3343,12 @@ select_rtpp_node(str callid, str viabranch, int do_test, struct rtpp_node **quer if (node->rn_recheck_ticks == RTPENGINE_MAX_RECHECK_TICKS) { LM_DBG("node=%.*s for calllen=%d callid=%.*s is disabled(permanent) (probably still UP)! Return it\n", node->rn_url.len, node->rn_url.s, callid.len, callid.len, callid.s); + return node; } else { LM_DBG("node=%.*s for calllen=%d callid=%.*s is disabled, either broke or timeout disabled! Return it\n", node->rn_url.len, node->rn_url.s, callid.len, callid.len, callid.s); } - return node; + /*return node;*/ } return NULL;

1 0

git:master:84e3191c: pv: added $via1(...) - return attributes of 2nd via
by Daniel-Constantin Mierla 13 Jul '21

13 Jul '21

Module: kamailio Branch: master Commit: 84e3191c165f00aaba61174dd627d7e67b57f8c7 URL: https://github.com/kamailio/kamailio/commit/84e3191c165f00aaba61174dd627d7e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-13T09:12:17+02:00 pv: added $via1(...) - return attributes of 2nd via --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/84e3191c165f00aaba61174dd627d7e… Patch: https://github.com/kamailio/kamailio/commit/84e3191c165f00aaba61174dd627d7e… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 41c53eaa3f..cc976c86c0 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -548,6 +548,8 @@ static pv_export_t mod_pvs[] = { pv_parse_ccp_attrs_name, 0, 0, 0}, {{"via0", (sizeof("via0")-1)}, PVT_OTHER, pv_get_via0, 0, pv_parse_via_name, 0, 0, 0}, + {{"via1", (sizeof("via1")-1)}, PVT_OTHER, pv_get_via1, 0, + pv_parse_via_name, 0, 0, 0}, {{"viaZ", (sizeof("viaZ")-1)}, PVT_OTHER, pv_get_viaZ, 0, pv_parse_via_name, 0, 0, 0}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 34998b9882..292c96758c 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -4595,6 +4595,19 @@ int pv_get_via0(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_via_attr(msg, msg->via1, param, res); } +/** + * + */ +int pv_get_via1(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + if (parse_headers(msg, HDR_EOH_F, 0)<0) { + LM_DBG("failed to parse sip headers\n"); + return pv_get_null(msg, param, res); + } + + return pv_get_via_attr(msg, msg->via2, param, res); +} + /** * */ diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 19222bc63e..14c79ce86c 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -413,6 +413,7 @@ int pv_set_ccp_attrs(struct sip_msg* msg, pv_param_t *param, int pv_parse_via_name(pv_spec_p sp, str *in); int pv_get_via0(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +int pv_get_via1(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); int pv_get_viaZ(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); #endif

1 0

[kamailio/kamailio] warning_builder(): buffer size exceeded (probably too long URI) (#2799)
by Andrew Webster 13 Jul '21

13 Jul '21

Jul 12 10:43:50 host-sbc /usr/local/sbin/kamailio[4587]: ALERT: <script>: ALERT: route failure INVITE from sip:anonymous@anonymous.invalid (IP:52.114.148.0:6529) : <null> Jul 12 10:43:50 host-sbc /usr/local/sbin/kamailio[4587]: NOTICE: <core> [core/msg_translator.c:314]: warning_builder(): buffer size exceeded (probably too long URI) Jul 12 10:43:50 host-sbc /usr/local/sbin/kamailio[4587]: WARNING: <core> [core/msg_translator.c:2483]: build_res_buf_from_sip_req(): warning skipped -- too big Any idea why I am gettign this during Microsoft Teams integration? Freshly complied. root@host-sbc:/etc/kamailio/git# kamailio -v version: kamailio 5.5.1 (x86_64/linux) 6751cc 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_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED 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: 6751cc compiled on 18:04:44 Jul 10 2021 with gcc 7.5.0 root@host-sbc:/etc/kamailio/git# -- 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/2799

2 4

git:5.5:304ac124: topos: fix missing xavu_field_contact_host evaluation for contact_mode 0
by Daniel-Constantin Mierla 12 Jul '21

12 Jul '21

Module: kamailio Branch: 5.5 Commit: 304ac124e6ad86b60071b6c5ecf861e03b7e492b URL: https://github.com/kamailio/kamailio/commit/304ac124e6ad86b60071b6c5ecf861e… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-12T15:36:10+02:00 topos: fix missing xavu_field_contact_host evaluation for contact_mode 0 - fix missing xavu_field_contact_host evaluation for contact_mode 0 - it works currently only for contact_mode 1 and 2, but not for default mode (cherry picked from commit 4c6abaf9066aebbd304391dd6730cad7ee592611) --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/304ac124e6ad86b60071b6c5ecf861e… Patch: https://github.com/kamailio/kamailio/commit/304ac124e6ad86b60071b6c5ecf861e… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 6e88b35af3..b94a960340 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -411,13 +411,23 @@ int tps_storage_fill_contact(sip_msg_t *msg, tps_data_t *td, str *uuid, int dir, *td->cp = '@'; td->cp++; - if (_tps_contact_host.len) { - /* using configured hostname in the contact header */ - memcpy(td->cp, _tps_contact_host.s, _tps_contact_host.len); - td->cp += _tps_contact_host.len; + /* contact_host xavu takes preference */ + if (_tps_xavu_cfg.len>0 && _tps_xavu_field_contact_host.len>0) { + vavu = xavu_get_child_with_sval(&_tps_xavu_cfg, + &_tps_xavu_field_contact_host); + } + if(vavu!=NULL && vavu->val.v.s.len>0) { + memcpy(td->cp, vavu->val.v.s.s, vavu->val.v.s.len); + td->cp += vavu->val.v.s.len; } else { - memcpy(td->cp, puri.host.s, puri.host.len); - td->cp += puri.host.len; + if (_tps_contact_host.len) { + /* using configured hostname in the contact header */ + memcpy(td->cp, _tps_contact_host.s, _tps_contact_host.len); + td->cp += _tps_contact_host.len; + } else { + memcpy(td->cp, puri.host.s, puri.host.len); + td->cp += puri.host.len; + } } if(puri.port.len>0) { *td->cp = ':';

1 0

git:5.5:1f9f6fff: core: set MAX_WARNING_LEN to 1024
by Daniel-Constantin Mierla 12 Jul '21

12 Jul '21

Module: kamailio Branch: 5.5 Commit: 1f9f6fff6e0ab21e460538ffd1e54b6c60f54f7e URL: https://github.com/kamailio/kamailio/commit/1f9f6fff6e0ab21e460538ffd1e54b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-12T15:36:24+02:00 core: set MAX_WARNING_LEN to 1024 - 256 can be too short - close GH #2799 (cherry picked from commit 0d06e164efa720d91d49995585e80c9082ce3b21) --- Modified: src/core/config.h --- Diff: https://github.com/kamailio/kamailio/commit/1f9f6fff6e0ab21e460538ffd1e54b6… Patch: https://github.com/kamailio/kamailio/commit/1f9f6fff6e0ab21e460538ffd1e54b6… --- diff --git a/src/core/config.h b/src/core/config.h index e012e98edf..b71a15e7a8 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -91,7 +91,7 @@ #define SERVER_HDR "Server: " SRVAPP_SIGNATURE #define SERVER_HDR_LEN (sizeof(SERVER_HDR)-1) -#define MAX_WARNING_LEN 256 +#define MAX_WARNING_LEN 1024 #define MY_BRANCH ";branch=" #define MY_BRANCH_LEN (sizeof(MY_BRANCH) - 1)

1 0

git:5.5:6bf1c6af: core: ppcfg - clone value for substdef
by Daniel-Constantin Mierla 12 Jul '21

12 Jul '21

Module: kamailio Branch: 5.5 Commit: 6bf1c6af774f6b26597e639e90ce7cb584b626a3 URL: https://github.com/kamailio/kamailio/commit/6bf1c6af774f6b26597e639e90ce7cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-12T15:34:30+02:00 core: ppcfg - clone value for substdef - GH #2788 (cherry picked from commit 56d41f6238f39d0046c97527abcb23b8dd7924be) --- Modified: src/core/ppcfg.c --- Diff: https://github.com/kamailio/kamailio/commit/6bf1c6af774f6b26597e639e90ce7cb… Patch: https://github.com/kamailio/kamailio/commit/6bf1c6af774f6b26597e639e90ce7cb… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index a5aa1d3e28..73c0a2ef3c 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -30,6 +30,7 @@ #include "ut.h" #include "re.h" #include "pvar.h" +#include "str_list.h" #include "dprint.h" #include "ppcfg.h" @@ -44,6 +45,7 @@ typedef struct _pp_subst_rule { static pp_subst_rule_t *pp_subst_rules_head = NULL; static pp_subst_rule_t *pp_subst_rules_tail = NULL; static int _pp_ifdef_level = 0; +static str_list_t *_ksr_substdef_strlist = NULL; int pp_subst_add(char *data) { @@ -94,6 +96,7 @@ int pp_substdef_add(char *data, int mode) str defvalue; str newval; sip_msg_t *fmsg; + str_list_t *sb; if(pp_subst_add(data)<0) { LM_ERR("subst rule cannot be added\n"); @@ -146,7 +149,12 @@ int pp_substdef_add(char *data, int mode) if(memchr(defvalue.s, '$', defvalue.len) != NULL) { fmsg = faked_msg_get_next(); if(pv_eval_str(fmsg, &newval, &defvalue)>=0) { - defvalue = newval; + sb = str_list_block_add(&_ksr_substdef_strlist, newval.s, newval.len); + if(sb==NULL) { + LM_ERR("failed to handle substdef: [%s]\n", data); + return -1; + } + defvalue = sb->s; } } if(pp_define_set(defvalue.len, defvalue.s,

1 0

git:5.5:65249c18: core: fix building quoted value for #!subsdefs
by Daniel-Constantin Mierla 12 Jul '21

12 Jul '21

Module: kamailio Branch: 5.5 Commit: 65249c184f5fd54b3ea16edbda518ac7ff442d86 URL: https://github.com/kamailio/kamailio/commit/65249c184f5fd54b3ea16edbda518ac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-12T15:34:42+02:00 core: fix building quoted value for #!subsdefs (cherry picked from commit 879f8c4e52ab7f7f489107f18e2c80795c788bdd) --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/ppcfg.c Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/65249c184f5fd54b3ea16edbda518ac… Patch: https://github.com/kamailio/kamailio/commit/65249c184f5fd54b3ea16edbda518ac… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index ff8096d9f2..a6115a7599 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -2049,11 +2049,12 @@ int pp_define_set(int len, char *text, int mode) pp_defines[ppos].value.len = len; pp_defines[ppos].value.s = text; - LM_DBG("### setting define ID [%.*s] value [%.*s]\n", + LM_DBG("### setting define ID [%.*s] value [%.*s] (mode: %d)\n", pp_defines[ppos].name.len, pp_defines[ppos].name.s, pp_defines[ppos].value.len, - pp_defines[ppos].value.s); + pp_defines[ppos].value.s, + mode); return 0; } diff --git a/src/core/cfg.y b/src/core/cfg.y index be0a664dce..5b205fd230 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -2213,9 +2213,9 @@ event_route_stm: preprocess_stm: SUBST STRING { if(pp_subst_add($2)<0) YYERROR; } | SUBST error { yyerror("invalid subst preprocess statement"); } - | SUBSTDEF STRING { if(pp_substdef_add($2, 0)<0) YYERROR; } + | SUBSTDEF STRING { if(pp_substdef_add($2, KSR_PPDEF_NORMAL)<0) YYERROR; } | SUBSTDEF error { yyerror("invalid substdef preprocess statement"); } - | SUBSTDEFS STRING { if(pp_substdef_add($2, 1)<0) YYERROR; } + | SUBSTDEFS STRING { if(pp_substdef_add($2, KSR_PPDEF_QUOTED)<0) YYERROR; } | SUBSTDEFS error { yyerror("invalid substdefs preprocess statement"); } ; diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index 73c0a2ef3c..67391557f8 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -30,6 +30,7 @@ #include "ut.h" #include "re.h" #include "pvar.h" +#include "pvapi.h" #include "str_list.h" #include "dprint.h" @@ -149,25 +150,40 @@ int pp_substdef_add(char *data, int mode) if(memchr(defvalue.s, '$', defvalue.len) != NULL) { fmsg = faked_msg_get_next(); if(pv_eval_str(fmsg, &newval, &defvalue)>=0) { - sb = str_list_block_add(&_ksr_substdef_strlist, newval.s, newval.len); - if(sb==NULL) { - LM_ERR("failed to handle substdef: [%s]\n", data); - return -1; + if(mode!=KSR_PPDEF_QUOTED) { + sb = str_list_block_add(&_ksr_substdef_strlist, newval.s, newval.len); + if(sb==NULL) { + LM_ERR("failed to handle substdef: [%s]\n", data); + return -1; + } + defvalue = sb->s; + } else { + defvalue = newval; } - defvalue = sb->s; } } - if(pp_define_set(defvalue.len, defvalue.s, - (mode==1)?KSR_PPDEF_QUOTED:KSR_PPDEF_NORMAL)<0) { + if(mode==KSR_PPDEF_QUOTED) { + if(pv_get_buffer_size() < defvalue.len + 4) { + LM_ERR("defined value is too large\n"); + return -1; + } + newval.s = pv_get_buffer(); + newval.s[0] = '"'; + memcpy(newval.s + 1, defvalue.s, defvalue.len); + newval.s[defvalue.len + 1] = '"'; + newval.s[defvalue.len + 2] = '\0'; + newval.len = defvalue.len + 2; + sb = str_list_block_add(&_ksr_substdef_strlist, newval.s, newval.len); + if(sb==NULL) { + LM_ERR("failed to handle substdef: [%s]\n", data); + return -1; + } + defvalue = sb->s; + } + if(pp_define_set(defvalue.len, defvalue.s, KSR_PPDEF_QUOTED)<0) { LM_ERR("cannot set define value\n"); goto error; } - if(mode==1) { - defvalue.s++; - defvalue.len -= 2; - *(defvalue.s-1) = c; - defvalue.s[defvalue.len] = c; - } LM_DBG("### added substdef: [%.*s]=[%.*s] (%d)\n", defname.len, defname.s, defvalue.len, defvalue.s, mode); diff --git a/src/main.c b/src/main.c index a391f57afb..7630fcfeff 100644 --- a/src/main.c +++ b/src/main.c @@ -2330,7 +2330,7 @@ int main(int argc, char** argv) fprintf(stderr, "bad substdef parameter\n"); goto error; } - if(pp_substdef_add(optarg, 0)<0) { + if(pp_substdef_add(optarg, KSR_PPDEF_NORMAL)<0) { LM_ERR("failed to add substdef expression: %s\n", optarg); goto error; } @@ -2340,7 +2340,7 @@ int main(int argc, char** argv) fprintf(stderr, "bad substdefs parameter\n"); goto error; } - if(pp_substdef_add(optarg, 1)<0) { + if(pp_substdef_add(optarg, KSR_PPDEF_QUOTED)<0) { LM_ERR("failed to add substdefs expression: %s\n", optarg); goto error; }

1 0

git:master:0d06e164: core: set MAX_WARNING_LEN to 1024
by Daniel-Constantin Mierla 12 Jul '21

12 Jul '21

Module: kamailio Branch: master Commit: 0d06e164efa720d91d49995585e80c9082ce3b21 URL: https://github.com/kamailio/kamailio/commit/0d06e164efa720d91d49995585e80c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-12T14:02:28+02:00 core: set MAX_WARNING_LEN to 1024 - 256 can be too short - close GH #2799 --- Modified: src/core/config.h --- Diff: https://github.com/kamailio/kamailio/commit/0d06e164efa720d91d49995585e80c9… Patch: https://github.com/kamailio/kamailio/commit/0d06e164efa720d91d49995585e80c9… --- diff --git a/src/core/config.h b/src/core/config.h index e012e98edf..b71a15e7a8 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -91,7 +91,7 @@ #define SERVER_HDR "Server: " SRVAPP_SIGNATURE #define SERVER_HDR_LEN (sizeof(SERVER_HDR)-1) -#define MAX_WARNING_LEN 256 +#define MAX_WARNING_LEN 1024 #define MY_BRANCH ";branch=" #define MY_BRANCH_LEN (sizeof(MY_BRANCH) - 1)

1 0

git:master:9ec9d9ce: modules: readme files regenerated - textopsx ... [skip ci]
by Kamailio Dev 12 Jul '21

12 Jul '21

Module: kamailio Branch: master Commit: 9ec9d9ceb0b69d46d5a4d90a86b1185951feb9d4 URL: https://github.com/kamailio/kamailio/commit/9ec9d9ceb0b69d46d5a4d90a86b1185… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-12T08:16:23+02:00 modules: readme files regenerated - textopsx ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/9ec9d9ceb0b69d46d5a4d90a86b1185… Patch: https://github.com/kamailio/kamailio/commit/9ec9d9ceb0b69d46d5a4d90a86b1185… --- diff --git a/src/modules/textopsx/README b/src/modules/textopsx/README index e290fc172f..a72249f1be 100644 --- a/src/modules/textopsx/README +++ b/src/modules/textopsx/README @@ -37,6 +37,7 @@ Daniel-Constantin Mierla 2.16. hf_iterator_start(iname) 2.17. hf_iterator_end(iname) 2.18. textopsx.f.hf_iterator_next(iname) + 2.19. hf_iterator_rm(iname) 3. Selects @@ -64,7 +65,8 @@ Daniel-Constantin Mierla 1.16. hf_iterator_start usage 1.17. hf_iterator_end usage 1.18. hf_iterator_next usage - 1.19. @hf_value select usage + 1.19. hf_iterator_rm usage + 1.20. @hf_value select usage Chapter 1. Admin Guide @@ -91,6 +93,7 @@ Chapter 1. Admin Guide 2.16. hf_iterator_start(iname) 2.17. hf_iterator_end(iname) 2.18. textopsx.f.hf_iterator_next(iname) + 2.19. hf_iterator_rm(iname) 3. Selects @@ -128,6 +131,7 @@ Chapter 1. Admin Guide 2.16. hf_iterator_start(iname) 2.17. hf_iterator_end(iname) 2.18. textopsx.f.hf_iterator_next(iname) + 2.19. hf_iterator_rm(iname) 2.1. msg_apply_changes() @@ -470,6 +474,25 @@ hf_iterator_end("i1"); hf_iterator_end("i1"); ... +2.19. hf_iterator_rm(iname) + + Remove the header at the current iterator position. + + The parameter can be dynamic string with variables. + + This function can be used from ANY_ROUTE. + + Example 1.19. hf_iterator_rm usage +... + hf_iterator_start("i1"); + while(hf_iterator_next("i1")) { + if($hfitname(i1)=="My-Header") { + hf_iterator_rm("i1"); + } + } + hf_iterator_end("i1"); +... + 3. Selects 3.1. @hf_value @@ -505,7 +528,7 @@ hf_iterator_end("i1"); * IDX - Value index, negative value counts from bottom * PARAM_NAME - name of parameter - Example 1.19. @hf_value select usage + Example 1.20. @hf_value select usage ... $a = @hf_value.my_header[1].my_param; xplog("L_ERR", "$sel((a)hf_value.via[-1]), $sel((a)hf_value.from.tag)\n");

1 0

git:master:4a4b8047: textopsx: docs for hf_iterator_rm()
by Daniel-Constantin Mierla 12 Jul '21

12 Jul '21

Module: kamailio Branch: master Commit: 4a4b8047b4b46b003bc0b12b737ca956658d18cb URL: https://github.com/kamailio/kamailio/commit/4a4b8047b4b46b003bc0b12b737ca95… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-12T08:06:07+02:00 textopsx: docs for hf_iterator_rm() --- Modified: src/modules/textopsx/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/4a4b8047b4b46b003bc0b12b737ca95… Patch: https://github.com/kamailio/kamailio/commit/4a4b8047b4b46b003bc0b12b737ca95… --- diff --git a/src/modules/textopsx/doc/functions.xml b/src/modules/textopsx/doc/functions.xml index f9c388016e..c1c5fd5f64 100644 --- a/src/modules/textopsx/doc/functions.xml +++ b/src/modules/textopsx/doc/functions.xml @@ -561,6 +561,34 @@ hf_iterator_end("i1"); } hf_iterator_end("i1"); ... +</programlisting> + </example> + </section> + <section id="textopsx.f.hf_iterator_rm"> + <title> + <function moreinfo="none">hf_iterator_rm(iname)</function> + </title> + <para> + Remove the header at the current iterator position. + </para> + <para> + The parameter can be dynamic string with variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>hf_iterator_rm</function> usage</title> + <programlisting format="linespecific"> +... + hf_iterator_start("i1"); + while(hf_iterator_next("i1")) { + if($hfitname(i1)=="My-Header") { + hf_iterator_rm("i1"); + } + } + hf_iterator_end("i1"); +... </programlisting> </example> </section>

1 0

git:master:adc3bc18: textopsx: added hf_iterator_rm()
by Daniel-Constantin Mierla 12 Jul '21

12 Jul '21

Module: kamailio Branch: master Commit: adc3bc18477108fc976182a2efe5d1e314bac795 URL: https://github.com/kamailio/kamailio/commit/adc3bc18477108fc976182a2efe5d1e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-12T08:02:07+02:00 textopsx: added hf_iterator_rm() - remove the header at the current iterator position --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/adc3bc18477108fc976182a2efe5d1e… Patch: https://github.com/kamailio/kamailio/commit/adc3bc18477108fc976182a2efe5d1e… --- diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index 362cbee0e1..ec3e1afb75 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -76,6 +76,7 @@ static int assign_hf_value2_fixup(void **param, int param_no); static int w_hf_iterator_start(sip_msg_t *msg, char *piname, char *p2); static int w_hf_iterator_next(sip_msg_t *msg, char *piname, char *p2); static int w_hf_iterator_end(sip_msg_t *msg, char *piname, char *p2); +static int w_hf_iterator_rm(sip_msg_t *msg, char *piname, char *p2); static int bind_textopsx(textopsx_api_t *tob); @@ -136,6 +137,8 @@ static cmd_export_t cmds[] = { fixup_free_spve_null, ANY_ROUTE}, {"hf_iterator_end", w_hf_iterator_end, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, + {"hf_iterator_rm", w_hf_iterator_rm, 1, fixup_spve_null, + fixup_free_spve_null, ANY_ROUTE}, {"bind_textopsx", (cmd_function)bind_textopsx, 1, 0, 0, ANY_ROUTE}, @@ -1993,6 +1996,67 @@ static int w_hf_iterator_end(sip_msg_t *msg, char *piname, char *p2) return ki_hf_iterator_end(msg, &iname); } +/** + * + */ +static int ki_hf_iterator_index(sip_msg_t *msg, str *iname) +{ + int i; + int k; + + k = -1; + for(i=0; i<HF_ITERATOR_SIZE; i++) { + if(_hf_iterators[i].name.len>0) { + if(_hf_iterators[i].name.len==iname->len + && strncmp(_hf_iterators[i].name.s, iname->s, iname->len)==0) { + k = i; + break; + } + } + } + if(k==-1) { + LM_ERR("iterator not available [%.*s]\n", iname->len, iname->s); + return -1; + } + + return k; +} + +/** + * + */ +static int ki_hf_iterator_rm(sip_msg_t *msg, str *iname) +{ + int k; + sr_lump_t *anchor; + + k = ki_hf_iterator_index(msg, iname); + if(k<0 || _hf_iterators[k].it==NULL) { + return -1; + } + anchor = del_lump(msg, _hf_iterators[k].it->name.s - msg->buf, + _hf_iterators[k].it->len, 0); + if (anchor==0) { + LM_ERR("cannot remove hdr %.*s\n", _hf_iterators[k].it->name.len, + _hf_iterators[k].it->name.s); + return -1; + } + return 1; +} + +/** + * + */ +static int w_hf_iterator_rm(sip_msg_t *msg, char *piname, char *p2) +{ + str iname = STR_NULL; + if(fixup_get_svalue(msg, (gparam_t*)piname, &iname)<0) { + LM_ERR("failed to get iterator name\n"); + return -1; + } + return ki_hf_iterator_rm(msg, &iname); +} + /** * */ @@ -2606,6 +2670,11 @@ static sr_kemi_t sr_kemi_textopsx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("textopsx"), str_init("hf_iterator_rm"), + SR_KEMIP_INT, ki_hf_iterator_rm, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

range transformation or var
by Brandon Armstead 11 Jul '21

11 Jul '21

Is there a way to generate a random number between min and max currently? i.e. $var(rand) = $rand(0, 5) // generates a random int between 0 and 5? This could be useful for in configuration weighting / load distribution without a dispatcher module. Thanks!

2 2

git:master:56e93559: textopsx: hf iterator functions exported to kemi
by Daniel-Constantin Mierla 10 Jul '21

10 Jul '21

Module: kamailio Branch: master Commit: 56e935595a60e2c7c5c92fa8438941ea68436c23 URL: https://github.com/kamailio/kamailio/commit/56e935595a60e2c7c5c92fa8438941e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-10T06:47:19+02:00 textopsx: hf iterator functions exported to kemi --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/56e935595a60e2c7c5c92fa8438941e… Patch: https://github.com/kamailio/kamailio/commit/56e935595a60e2c7c5c92fa8438941e… --- diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index d3295bf02c..362cbee0e1 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -2591,6 +2591,21 @@ static sr_kemi_t sr_kemi_textopsx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("textopsx"), str_init("hf_iterator_start"), + SR_KEMIP_INT, ki_hf_iterator_start, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("textopsx"), str_init("hf_iterator_end"), + SR_KEMIP_INT, ki_hf_iterator_end, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("textopsx"), str_init("hf_iterator_next"), + SR_KEMIP_INT, ki_hf_iterator_next, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

Kamailio websocket state FINWAIT1 after switchover
by Shahid Hussain 09 Jul '21

09 Jul '21

Hi !., Kamailio websocket state is going into FINWAIT1 without sending FIN message out when we do service kamailio restart. I have a Primary and Secondary node configured. When I perform switchover socket status is going into FINWAIT1 state without sending FIN to the client hence client status is showing established, This is happening 90+% of times but does work sometimes. AT Kamailio: [root@localhost ~]# netstat -tunelap | grep 41034 tcp 0 1 172.27.45.198:9040 172.27.6.98:41034 FIN_WAIT1 0 0 - [root@localhost ~]# AT Nginx (client): root@meet:~# netstat -tunelap | grep 9040 tcp 0 0 172.27.6.98:41034 172.27.45.198:9040 ESTABLISHED 33 763106 1322/nginx: worker root@meet:~# Thanks, Shahid

2 2

git:master:4c6abaf9: topos: fix missing xavu_field_contact_host evaluation for contact_mode 0
by Henning Westerholt 08 Jul '21

08 Jul '21

Module: kamailio Branch: master Commit: 4c6abaf9066aebbd304391dd6730cad7ee592611 URL: https://github.com/kamailio/kamailio/commit/4c6abaf9066aebbd304391dd6730cad… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-07-08T14:57:27Z topos: fix missing xavu_field_contact_host evaluation for contact_mode 0 - fix missing xavu_field_contact_host evaluation for contact_mode 0 - it works currently only for contact_mode 1 and 2, but not for default mode --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/4c6abaf9066aebbd304391dd6730cad… Patch: https://github.com/kamailio/kamailio/commit/4c6abaf9066aebbd304391dd6730cad… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 6e88b35af3..b94a960340 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -411,13 +411,23 @@ int tps_storage_fill_contact(sip_msg_t *msg, tps_data_t *td, str *uuid, int dir, *td->cp = '@'; td->cp++; - if (_tps_contact_host.len) { - /* using configured hostname in the contact header */ - memcpy(td->cp, _tps_contact_host.s, _tps_contact_host.len); - td->cp += _tps_contact_host.len; + /* contact_host xavu takes preference */ + if (_tps_xavu_cfg.len>0 && _tps_xavu_field_contact_host.len>0) { + vavu = xavu_get_child_with_sval(&_tps_xavu_cfg, + &_tps_xavu_field_contact_host); + } + if(vavu!=NULL && vavu->val.v.s.len>0) { + memcpy(td->cp, vavu->val.v.s.s, vavu->val.v.s.len); + td->cp += vavu->val.v.s.len; } else { - memcpy(td->cp, puri.host.s, puri.host.len); - td->cp += puri.host.len; + if (_tps_contact_host.len) { + /* using configured hostname in the contact header */ + memcpy(td->cp, _tps_contact_host.s, _tps_contact_host.len); + td->cp += _tps_contact_host.len; + } else { + memcpy(td->cp, puri.host.s, puri.host.len); + td->cp += puri.host.len; + } } if(puri.port.len>0) { *td->cp = ':';

1 0

git:5.5:557ac56a: core: str list - added function to insert a block string in list
by Daniel-Constantin Mierla 08 Jul '21

08 Jul '21

Module: kamailio Branch: 5.5 Commit: 557ac56a6ec6b4ca3d76a57ff8b21c64027791f2 URL: https://github.com/kamailio/kamailio/commit/557ac56a6ec6b4ca3d76a57ff8b21c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-29T14:42:12+02:00 core: str list - added function to insert a block string in list (cherry picked from commit b92b931c26c199b756fd08e9c80cc9305469fd2b) --- Modified: src/core/str_list.c Modified: src/core/str_list.h --- Diff: https://github.com/kamailio/kamailio/commit/557ac56a6ec6b4ca3d76a57ff8b21c6… Patch: https://github.com/kamailio/kamailio/commit/557ac56a6ec6b4ca3d76a57ff8b21c6… --- diff --git a/src/core/str_list.c b/src/core/str_list.c index f63b4c9151..207cee5bc3 100644 --- a/src/core/str_list.c +++ b/src/core/str_list.c @@ -13,13 +13,13 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /** - * @file + * @file * @brief Kamailio core :: Simple str type list and helper functions * @ingroup core * Module: @ref core @@ -32,7 +32,7 @@ /** * @brief Add a new allocated list element to an existing list - * + * * Add a new allocated list element to an existing list, the allocation is done * from the private memory pool * @param s input character @@ -43,18 +43,45 @@ */ struct str_list *append_str_list(char *s, int len, struct str_list **last, int *total) { - struct str_list *new; - new = pkg_malloc(sizeof(struct str_list)); - if (!new) { + struct str_list *nv; + nv = pkg_malloc(sizeof(struct str_list)); + if (!nv) { PKG_MEM_ERROR; return 0; } - new->s.s = s; - new->s.len = len; - new->next = 0; + nv->s.s = s; + nv->s.len = len; + nv->next = 0; - (*last)->next = new; - *last = new; + (*last)->next = nv; + *last = nv; *total += len; - return new; + return nv; +} + +/** + * @brief Add a new allocated list element with cloned block value to an existing list + * + * Add a new allocated list element with cloned value in block to an existing list, + * the allocation is done from the private memory pool + * @param head existing list + * @param s input character + * @param len length of input character + * @return extended list + */ +str_list_t *str_list_block_add(str_list_t **head, char *s, int len) +{ + str_list_t *nv; + nv = pkg_mallocxz(sizeof(str_list_t) + (len+1)*sizeof(char)); + if (!nv) { + PKG_MEM_ERROR; + return 0; + } + nv->s.s = (char*)nv + sizeof(str_list_t); + memcpy(nv->s.s, s, len); + nv->s.len = len; + nv->next = *head; + *head = nv; + + return nv; } diff --git a/src/core/str_list.h b/src/core/str_list.h index db3fa12887..1eac2578b0 100644 --- a/src/core/str_list.h +++ b/src/core/str_list.h @@ -51,4 +51,16 @@ typedef struct str_list { */ struct str_list *append_str_list(char *s, int len, struct str_list **last, int *total); +/** + * @brief Add a new allocated list element with cloned block value to an existing list + * + * Add a new allocated list element with cloned value in block to an existing list, + * the allocation is done from the private memory pool + * @param head existing list + * @param s input character + * @param len length of input character + * @return extended list + */ +str_list_t *str_list_block_add(str_list_t **head, char *s, int len); + #endif

2 3

git:master:3a0a9292: modules: readme files regenerated - textopsx ... [skip ci]
by Kamailio Dev 07 Jul '21

07 Jul '21

Module: kamailio Branch: master Commit: 3a0a9292ec40d25f5246573d4a2a51838819d930 URL: https://github.com/kamailio/kamailio/commit/3a0a9292ec40d25f5246573d4a2a518… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-07T12:46:15+02:00 modules: readme files regenerated - textopsx ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/3a0a9292ec40d25f5246573d4a2a518… Patch: https://github.com/kamailio/kamailio/commit/3a0a9292ec40d25f5246573d4a2a518… --- diff --git a/src/modules/textopsx/README b/src/modules/textopsx/README index dbb27653a0..e290fc172f 100644 --- a/src/modules/textopsx/README +++ b/src/modules/textopsx/README @@ -34,6 +34,9 @@ Daniel-Constantin Mierla 2.13. include_hf_value(hf, hvalue) 2.14. exclude_hf_value(hf, hvalue) 2.15. hf_value_exists(hf, hvalue) + 2.16. hf_iterator_start(iname) + 2.17. hf_iterator_end(iname) + 2.18. textopsx.f.hf_iterator_next(iname) 3. Selects @@ -58,7 +61,10 @@ Daniel-Constantin Mierla 1.13. include_hf_value usage 1.14. exclude_hf_value usage 1.15. hf_value_exists usage - 1.16. @hf_value select usage + 1.16. hf_iterator_start usage + 1.17. hf_iterator_end usage + 1.18. hf_iterator_next usage + 1.19. @hf_value select usage Chapter 1. Admin Guide @@ -82,6 +88,9 @@ Chapter 1. Admin Guide 2.13. include_hf_value(hf, hvalue) 2.14. exclude_hf_value(hf, hvalue) 2.15. hf_value_exists(hf, hvalue) + 2.16. hf_iterator_start(iname) + 2.17. hf_iterator_end(iname) + 2.18. textopsx.f.hf_iterator_next(iname) 3. Selects @@ -116,6 +125,9 @@ Chapter 1. Admin Guide 2.13. include_hf_value(hf, hvalue) 2.14. exclude_hf_value(hf, hvalue) 2.15. hf_value_exists(hf, hvalue) + 2.16. hf_iterator_start(iname) + 2.17. hf_iterator_end(iname) + 2.18. textopsx.f.hf_iterator_next(iname) 2.1. msg_apply_changes() @@ -406,6 +418,58 @@ if (@hf_value_exists.supported.path == "1") { } ... +2.16. hf_iterator_start(iname) + + Start an iterator for headers in the current SIP message. The parameter + iname is used to identify the iterator. There can be up to 4 iterators + at the same time, with different name. + + The parameter can be a dynamic string with variables. + + This function can be used from ANY_ROUTE. + + Example 1.16. hf_iterator_start usage +... +hf_iterator_start("i1"); +... + +2.17. hf_iterator_end(iname) + + Close the iterator identified by iname parameter. The iname value must + be the same used for sht_iterator_start(). + + The parameter can be dynamic string with variables. + + This function can be used from ANY_ROUTE. + + Example 1.17. hf_iterator_end usage +... +hf_iterator_end("i1"); +... + +2.18. textopsx.f.hf_iterator_next(iname) + + Move the iterator to the next header. It must be called also after + sht_iterator_start() to get the first header. + + The return code is false when there is no other header in the list. + + The item name and value are accessible via variables: $hfitname(iname) + and $hfitbody(iname). + + The parameter can be dynamic string with variables. + + This function can be used from ANY_ROUTE. + + Example 1.18. hf_iterator_next usage +... + hf_iterator_start("i1"); + while(hf_iterator_next("i1")) { + xlog("hdr[$hfitname(i1)] is: $hfitbody(i1)\n"); + } + hf_iterator_end("i1"); +... + 3. Selects 3.1. @hf_value @@ -441,7 +505,7 @@ if (@hf_value_exists.supported.path == "1") { * IDX - Value index, negative value counts from bottom * PARAM_NAME - name of parameter - Example 1.16. @hf_value select usage + Example 1.19. @hf_value select usage ... $a = @hf_value.my_header[1].my_param; xplog("L_ERR", "$sel((a)hf_value.via[-1]), $sel((a)hf_value.from.tag)\n");

1 0

git:master:89d5a275: textopsx: docs for hdr iterator functions
by Daniel-Constantin Mierla 07 Jul '21

07 Jul '21

Module: kamailio Branch: master Commit: 89d5a2754e962c0f0bec59591b327d356999efbc URL: https://github.com/kamailio/kamailio/commit/89d5a2754e962c0f0bec59591b327d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-07T12:39:06+02:00 textopsx: docs for hdr iterator functions --- Modified: src/modules/textopsx/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/89d5a2754e962c0f0bec59591b327d3… Patch: https://github.com/kamailio/kamailio/commit/89d5a2754e962c0f0bec59591b327d3… --- diff --git a/src/modules/textopsx/doc/functions.xml b/src/modules/textopsx/doc/functions.xml index 0980e4060b..f9c388016e 100644 --- a/src/modules/textopsx/doc/functions.xml +++ b/src/modules/textopsx/doc/functions.xml @@ -482,5 +482,87 @@ if (@hf_value_exists.supported.path == "1") { </programlisting> </example> </section> + <section id="textopsx.f.hf_iterator_start"> + <title> + <function moreinfo="none">hf_iterator_start(iname)</function> + </title> + <para> + Start an iterator for headers in the current SIP message. + The parameter iname is used to identify the iterator. There + can be up to 4 iterators at the same time, with different name. + </para> + <para> + The parameter can be a dynamic string with variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>hf_iterator_start</function> usage</title> + <programlisting format="linespecific"> +... +hf_iterator_start("i1"); +... +</programlisting> + </example> + </section> + <section id="textopsx.f.hf_iterator_end"> + <title> + <function moreinfo="none">hf_iterator_end(iname)</function> + </title> + <para> + Close the iterator identified by iname parameter. The iname value + must be the same used for sht_iterator_start(). + </para> + <para> + The parameter can be dynamic string with variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>hf_iterator_end</function> usage</title> + <programlisting format="linespecific"> +... +hf_iterator_end("i1"); +... +</programlisting> + </example> + </section> + <section id="textopsx.f.hf_iterator_next"> + <title> + <function moreinfo="none">textopsx.f.hf_iterator_next(iname)</function> + </title> + <para> + Move the iterator to the next header. It must + be called also after sht_iterator_start() to get the first + header. + </para> + <para> + The return code is false when there is no other header in the list. + </para> + <para> + The item name and value are accessible via variables: + $hfitname(iname) and $hfitbody(iname). + </para> + <para> + The parameter can be dynamic string with variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>hf_iterator_next</function> usage</title> + <programlisting format="linespecific"> +... + hf_iterator_start("i1"); + while(hf_iterator_next("i1")) { + xlog("hdr[$hfitname(i1)] is: $hfitbody(i1)\n"); + } + hf_iterator_end("i1"); +... +</programlisting> + </example> + </section> </section>

1 0

git:master:7f4d7725: textopsx: return false on iterator end of headers
by Daniel-Constantin Mierla 07 Jul '21

07 Jul '21

Module: kamailio Branch: master Commit: 7f4d7725a55379ef0e7ee5c5a2050d3b1d4565bc URL: https://github.com/kamailio/kamailio/commit/7f4d7725a55379ef0e7ee5c5a2050d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-07T12:39:06+02:00 textopsx: return false on iterator end of headers --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/7f4d7725a55379ef0e7ee5c5a2050d3… Patch: https://github.com/kamailio/kamailio/commit/7f4d7725a55379ef0e7ee5c5a2050d3… --- diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index ee220fbb82..d3295bf02c 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -93,7 +93,7 @@ static int pv_get_hf_iterator_hbody(sip_msg_t *msg, pv_param_t *param, static pv_export_t mod_pvs[] = { { {"hfitname", sizeof("hfitname")-1}, PVT_OTHER, pv_get_hf_iterator_hname, 0, pv_parse_hf_iterator_name, 0, 0, 0 }, - { {"hfitbody", sizeof("hfitname")-1}, PVT_OTHER, pv_get_hf_iterator_hbody, 0, + { {"hfitbody", sizeof("hfitbody")-1}, PVT_OTHER, pv_get_hf_iterator_hbody, 0, pv_parse_hf_iterator_name, 0, 0, 0 }, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } }; @@ -1924,6 +1924,10 @@ static int ki_hf_iterator_next(sip_msg_t *msg, str *iname) LM_ERR("iterator not available [%.*s]\n", iname->len, iname->s); return -1; } + if(_hf_iterators[k].eoh == 1) { + return -1; + } + if(_hf_iterators[k].it == NULL) { _hf_iterators[k].it = msg->headers; } else { @@ -1931,6 +1935,7 @@ static int ki_hf_iterator_next(sip_msg_t *msg, str *iname) } if(_hf_iterators[k].it == NULL) { _hf_iterators[k].eoh = 1; + return -1; } return 1; }

1 0

git:master:ba3ce508: textopsx: added functions and variables to iterate headers list
by Daniel-Constantin Mierla 07 Jul '21

07 Jul '21

Module: kamailio Branch: master Commit: ba3ce5081bc31019bec6de8aecffc1b5a601c308 URL: https://github.com/kamailio/kamailio/commit/ba3ce5081bc31019bec6de8aecffc1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-07T12:39:05+02:00 textopsx: added functions and variables to iterate headers list --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/ba3ce5081bc31019bec6de8aecffc1b… Patch: https://github.com/kamailio/kamailio/commit/ba3ce5081bc31019bec6de8aecffc1b…

1 0

Build kamailio 5.3.1 db_mysql module with percona.
by Andrey Deykunov 07 Jul '21

07 Jul '21

Hi, We have kamailio server v. 5.3.1 with db_mysql.so built with our old mysql library 5.1.41. Now I'm trying to build it with libperconaclient20. I've tried many variants of build configuration, but every time I got errors when kamailio stops or starts, such: *2021-07-06T06:01:20.943809-07:00 devhpbx005-1 /var/lib/ums/sbin/kamailio[25711]: ERROR: db_mysql [km_my_con.c:139]: db_mysql_new_connection(): driver error: Lost connection to MySQL server at 'reading authorization packet', system error: 112021-07-06T06:01:20.946591-07:00 devhpbx005-1 /var/lib/ums/sbin/kamailio[25711]: ERROR: <core> [db.c:319]: db_do_init2(): could not add connection to the pool2021-07-06T06:01:20.947224-07:00 devhpbx005-1 /var/lib/ums/sbin/kamailio[25711]: ERROR: auth_db [auth_db_mod.c:159]: child_init(): unable to connect to the database2021-07-06T06:01:20.947592-07:00 devhpbx005-1 /var/lib/ums/sbin/kamailio[25711]: ERROR: <core> [core/sr_module.c:806]: init_mod_child(): error while initializing module auth_db (/var/lib/ums/lib64/kamailio/modules/auth_db.so) (idx: 5 rank: 5 desc: [udpreceiver child=4 sock=64.78.52.86:5060 <http://64.78.52.86:5060>])* or *2021-07-06T06:18:43.159744-07:00 devhpbx005-1 /var/lib/ums/sbin/kamailio[30954]: CRITICAL: <core> [core/mem/q_malloc.c:150]: qm_debug_check_frag(): BUG: qm: prev. fragm. tail overwritten(0, 0)[0x7fd5c6c85bc8:0x7fd5c6c85c00]! Memory allocator was calledfrom core: db_res.c:114. Fragment marked by db_mysql: km_my_con.c:75. Exec from core/mem/q_malloc.c:391.* Is there some specific way to build kamailio with percona? Thanks, Andrey

2 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev