sr-dev July 2021

sr-dev@lists.kamailio.org

13 participants
226 discussions

git:5.4:447e25a0: pv_headers: fix removal of all values when using PV_IDX_ALL

by Victor Seva

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); }

2 years, 10 months

git:5.5:e18c24b8: pv_headers: fix removal of all values when using PV_IDX_ALL

by Victor Seva

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); }

2 years, 10 months

git:master:9ad96c08: pv_headers: fix removal of all values when using PV_IDX_ALL

by Victor Seva

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); }

2 years, 10 months

git:master:b31efd55: modules: readme files regenerated - sworker ... [skip ci]

by Kamailio Dev

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.

2 years, 10 months

[kamailio/kamailio] rr: all "record_route_...()" functions consider custom user AVP (#2804)

by annema-Kontron

#### 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 years, 10 months

git:master:fc62ceeb: sworker: docs - fixed small typo

by Daniel-Constantin Mierla

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.

2 years, 10 months

git:master:f3a031a5: rr: all "record_route_...()" functions consider custom user AVP

by Daniel-Constantin Mierla

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) {

2 years, 10 months

git:master:a5821343: modules: readme files regenerated - ruxc ... [skip ci]

by Kamailio Dev

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

2 years, 10 months

git:master:03a74e45: ruxc: docs for http_tlsmode parameter

by Daniel-Constantin Mierla

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>

2 years, 10 months

git:master:8f340839: ruxc: added http_tlsmode parameter

by Daniel-Constantin Mierla

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;

2 years, 10 months

← Newer
1
...
14
15
16
17
18
19
20
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2021