sr-dev March 2024

sr-dev@lists.kamailio.org

14 participants
242 discussions

git:master:5392dbf8: pkg/kamailio/obs: Allow builders to disable wolfssl module [skip ci]

by Victor Seva

Module: kamailio Branch: master Commit: 5392dbf8070abf36734d9c857924df91186bc2dd URL: https://github.com/kamailio/kamailio/commit/5392dbf8070abf36734d9c857924df9… Author: Oded Arbel <oded(a)geek.co.il> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-03-14T11:01:53+01:00 pkg/kamailio/obs: Allow builders to disable wolfssl module [skip ci] Building the WolfSSL module should be optional, even if it is on by default, builders should be able to choose to not need to install 4th party repositories. fixes #3781 --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/5392dbf8070abf36734d9c857924df9… Patch: https://github.com/kamailio/kamailio/commit/5392dbf8070abf36734d9c857924df9… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 59f7360f9e2..8bbe77b63dd 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -29,6 +29,7 @@ %bcond_without sctp %bcond_without websocket %bcond_without xmlrpc +%bcond_without wolfssl %endif %if 0%{?rhel} == 7 @@ -65,6 +66,7 @@ %bcond_without sctp %bcond_without websocket %bcond_without xmlrpc +%bcond_without wolfssl %endif %if 0%{?rhel} == 8 @@ -111,6 +113,7 @@ %bcond_without sctp %bcond_without websocket %bcond_without xmlrpc +%bcond_without wolfssl %endif %if 0%{?rhel} == 9 @@ -157,6 +160,7 @@ %bcond_without sctp %bcond_without websocket %bcond_without xmlrpc +%bcond_without wolfssl %endif %if 0%{?suse_version} @@ -186,6 +190,7 @@ %bcond_without sctp %bcond_without websocket %bcond_without xmlrpc +%bcond_without wolfssl %endif # build with openssl 1.1.1 on RHEL 7 based dists @@ -1037,6 +1042,7 @@ BuildRequires: openssl-devel TLS transport for Kamailio. +%if %{with wolfssl} %package tls_wolfssl Summary: TLS transport for Kamailio based on wolfSSL Group: %{PKGGROUP} @@ -1044,6 +1050,7 @@ BuildRequires: pkgconfig(wolfssl) %description tls_wolfssl TLS transport for Kamailio based on wolfSSL +%endif %package tcpops @@ -1291,7 +1298,11 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ %if "%{?_unitdir}" != "" ksystemd \ %endif - ktls ktls_wolfssl kunixodbc kutils \ + ktls \ +%if %{with wolfssl} + ktls_wolfssl \ +%endif + kunixodbc kutils \ %if %{with websocket} kwebsocket \ %endif @@ -1400,7 +1411,11 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %if "%{?_unitdir}" != "" ksystemd \ %endif - ktls ktls_wolfssl kunixodbc kutils \ + ktls \ +%if %{with wolfssl} + ktls_wolfssl \ +%endif + kunixodbc kutils \ %if %{with websocket} kwebsocket \ %endif @@ -2337,10 +2352,12 @@ fi %{_libdir}/kamailio/modules/tls.so +%if %{with wolfssl} %files tls_wolfssl %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.tls_wolfssl %{_libdir}/kamailio/modules/tls_wolfssl.so +%endif %files tcpops

8 months, 2 weeks

git:5.8:45ee72fc: topos: properly handle cases of no user in contact for mode 1

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.8 Commit: 45ee72fcf0ae8aeb135196ef8729fe0cea14048e URL: https://github.com/kamailio/kamailio/commit/45ee72fcf0ae8aeb135196ef8729fe0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-14T09:59:37+01:00 topos: properly handle cases of no user in contact for mode 1 - contact mode 1 accepted cases with no-user in contact uri but not in r-uri, however, requests within dialog can have one's contact in r-uri and then processing failed (cherry picked from commit 24e410f9a20d004f55bcc79cd10fb35cb26e4570) --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/45ee72fcf0ae8aeb135196ef8729fe0… Patch: https://github.com/kamailio/kamailio/commit/45ee72fcf0ae8aeb135196ef8729fe0… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index bb153bb780a..946092c04f9 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -223,6 +223,7 @@ int tps_storage_fill_contact( int i; int contact_len; int cparam_len; + int cuser_len = 0; sr_xavp_t *vavu = NULL; if(dir == TPS_DIR_DOWNSTREAM) { @@ -317,21 +318,27 @@ int tps_storage_fill_contact( LM_ERR("failed to parse the contact uri\n"); return -1; } - memcpy(td->cp, curi.user.s, curi.user.len); - td->cp += curi.user.len; + if(curi.user.len > 0) { + memcpy(td->cp, curi.user.s, curi.user.len); + td->cp += curi.user.len; + cuser_len = curi.user.len; + } else { + LM_DBG("no contact user - skipping it\n"); + } } else { /* extract the ruri */ if(parse_sip_msg_uri(msg) < 0) { LM_ERR("failed to parse r-uri\n"); return -1; } - if(msg->parsed_uri.user.len == 0) { - LM_ERR("no r-uri user\n"); - return -1; + if(msg->parsed_uri.user.len > 0) { + memcpy(td->cp, msg->parsed_uri.user.s, + msg->parsed_uri.user.len); + td->cp += msg->parsed_uri.user.len; + cuser_len = msg->parsed_uri.user.len; + } else { + LM_DBG("no r-uri user - skipping it\n"); } - memcpy(td->cp, msg->parsed_uri.user.s, - msg->parsed_uri.user.len); - td->cp += msg->parsed_uri.user.len; } } else if(ctmode == TPS_CONTACT_MODE_XAVPUSER) { if(dir == TPS_DIR_DOWNSTREAM) { @@ -344,6 +351,7 @@ int tps_storage_fill_contact( } memcpy(td->cp, vavu->val.v.s.s, vavu->val.v.s.len); td->cp += vavu->val.v.s.len; + cuser_len = vavu->val.v.s.len; } else { /* extract the b contact */ vavu = xavu_get_child_with_sval( @@ -354,11 +362,11 @@ int tps_storage_fill_contact( } memcpy(td->cp, vavu->val.v.s.s, vavu->val.v.s.len); td->cp += vavu->val.v.s.len; + cuser_len = vavu->val.v.s.len; } } - if(!((ctmode == TPS_CONTACT_MODE_RURIUSER) - && (dir == TPS_DIR_DOWNSTREAM) && (curi.user.len <= 0))) { + if(cuser_len > 0) { *td->cp = '@'; td->cp++; }

8 months, 2 weeks

git:5.8:772b4645: topos: small rearangement by removing else after return in the true block

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.8 Commit: 772b464552cff0b9ebb769e57fae718c0357ba11 URL: https://github.com/kamailio/kamailio/commit/772b464552cff0b9ebb769e57fae718… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-14T09:59:37+01:00 topos: small rearangement by removing else after return in the true block - reduce level of indentation - a few wraps in curly braces for clearer view of the if block (cherry picked from commit b6fccea258e56b7d3195659245713a6d44acb013) --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/772b464552cff0b9ebb769e57fae718… Patch: https://github.com/kamailio/kamailio/commit/772b464552cff0b9ebb769e57fae718… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index fc0c2835a33..bb153bb780a 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -241,8 +241,9 @@ int tps_storage_fill_contact( } contact_len = sv.len; - if(_tps_contact_host.len) + if(_tps_contact_host.len) { contact_len = sv.len - puri.host.len + _tps_contact_host.len; + } if(ctmode == TPS_CONTACT_MODE_RURIUSER || ctmode == TPS_CONTACT_MODE_XAVPUSER) { @@ -283,8 +284,9 @@ int tps_storage_fill_contact( for(i = 0; i < sv.len; i++) { *td->cp = sv.s[i]; td->cp++; - if(sv.s[i] == ':') + if(sv.s[i] == ':') { break; + } } if(ctmode == TPS_CONTACT_MODE_RURIUSER || ctmode == TPS_CONTACT_MODE_XAVPUSER) { @@ -296,27 +298,24 @@ int tps_storage_fill_contact( || msg->contact == NULL) { LM_WARN("bad sip message or missing Contact hdr\n"); return -1; - } else { - if(parse_contact(msg->contact) < 0 - || ((contact_body_t *)msg->contact->parsed) - ->contacts - == NULL - || ((contact_body_t *)msg->contact->parsed) - ->contacts->next - != NULL) { - LM_ERR("bad Contact header\n"); - return -1; - } else { - if(parse_uri(((contact_body_t *)msg->contact->parsed) - ->contacts->uri.s, - ((contact_body_t *)msg->contact->parsed) - ->contacts->uri.len, - &curi) - < 0) { - LM_ERR("failed to parse the contact uri\n"); - return -1; - } - } + } + if(parse_contact(msg->contact) < 0 + || ((contact_body_t *)msg->contact->parsed)->contacts + == NULL + || ((contact_body_t *)msg->contact->parsed) + ->contacts->next + != NULL) { + LM_ERR("bad Contact header\n"); + return -1; + } + if(parse_uri(((contact_body_t *)msg->contact->parsed) + ->contacts->uri.s, + ((contact_body_t *)msg->contact->parsed) + ->contacts->uri.len, + &curi) + < 0) { + LM_ERR("failed to parse the contact uri\n"); + return -1; } memcpy(td->cp, curi.user.s, curi.user.len); td->cp += curi.user.len;

8 months, 2 weeks

git:master:c0286d5c: utils/kamctl: version updated for devel version to 5.9.0

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c0286d5c322759110dbadfca67edacb7cd9a0a7a URL: https://github.com/kamailio/kamailio/commit/c0286d5c322759110dbadfca67edacb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-13T20:48:20+01:00 utils/kamctl: version updated for devel version to 5.9.0 --- Modified: utils/kamctl/kamctl Modified: utils/kamctl/kamdbctl --- Diff: https://github.com/kamailio/kamailio/commit/c0286d5c322759110dbadfca67edacb… Patch: https://github.com/kamailio/kamailio/commit/c0286d5c322759110dbadfca67edacb… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 6bdcfa20bc2..f9a7d92f47f 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -5,7 +5,7 @@ #=================================================================== ### version for this script -VERSION='5.8.0' +VERSION='5.9.0' PATH=$PATH:/usr/local/sbin/ diff --git a/utils/kamctl/kamdbctl b/utils/kamctl/kamdbctl index 37180f7c425..d5713f1f7d9 100755 --- a/utils/kamctl/kamdbctl +++ b/utils/kamctl/kamdbctl @@ -5,7 +5,7 @@ #=================================================================== ### version for this script -VERSION='5.6.0' +VERSION='5.9.0' PATH=$PATH:/usr/local/sbin/

8 months, 2 weeks

git:master:e55d9f50: modules: readme files regenerated - dispatcher ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: e55d9f50be4adfc14ff9de45c77c23bd0f5e1981 URL: https://github.com/kamailio/kamailio/commit/e55d9f50be4adfc14ff9de45c77c23b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-03-13T10:16:29+01:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/e55d9f50be4adfc14ff9de45c77c23b… Patch: https://github.com/kamailio/kamailio/commit/e55d9f50be4adfc14ff9de45c77c23b… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 17885b6f77c..209d77f4c87 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1491,10 +1491,14 @@ if(ds_list_exists("10")) { set, then port is ignored. If bit two is set, then protocol is ignored. If bit three is set, then state must be active. If bit four is set, then socket/sockname be matched. If bit five is set, - then try to find the most complete "address/protocol/port/local - socket" combination for all dispatcher targets. The parameter can - be an integer or a variable holding an integer value. It must be - provided if the uri parameter is provided. + then try to find the most closest target from all dispatcher + targets with the mandatory ip and combination of local socket, + protocol, port, the weighted search result is combined from bit + flags of matched components: ip - 1, port - 2, protocol - 4, local + socket - 8, the target with the maximum value of flags combination + will be selected. The parameter can be an integer or a variable + holding an integer value. It must be provided if the uri parameter + is provided. * uri (optional) - if parameter is empty or missing, the matching is done against source IP, port and protocol. Otherwise the value has to be a valid SIP URI, used to match against addresses in the

8 months, 2 weeks

[kamailio/kamailio] dispatcher: refine documentation (PR #3783)

by Dennis

- more clear documentation for the new ds_is_from_list flags   #### 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 - [ ] 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/3783 -- Commit Summary -- * dispatcher: refine documentation -- File Changes -- M src/modules/dispatcher/doc/dispatcher_admin.xml (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3783.patch https://github.com/kamailio/kamailio/pull/3783.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3783 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3783(a)github.com>

8 months, 2 weeks

git:master:761e963c: dispatcher: refine documentation

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 761e963c0f7d9bf1b66c1ef18a409756b919ae2c URL: https://github.com/kamailio/kamailio/commit/761e963c0f7d9bf1b66c1ef18a40975… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-13T10:08:05+01:00 dispatcher: refine documentation - more clear documentation for the new ds_is_from_list flags --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/761e963c0f7d9bf1b66c1ef18a40975… Patch: https://github.com/kamailio/kamailio/commit/761e963c0f7d9bf1b66c1ef18a40975… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 4708ca06c92..83ef06285a0 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1805,9 +1805,12 @@ if(ds_list_exists("10")) { If bit two is set, then protocol is ignored. If bit three is set, then state must be active. If bit four is set, then socket/sockname be matched. - If bit five is set, then try to find the most complete - "address/protocol/port/local socket" combination for all dispatcher targets. The parameter - can be an integer or a variable holding an integer value. + If bit five is set, then try to find the most closest target from all + dispatcher targets with the mandatory ip and combination of local socket, protocol, port, + the weighted search result is combined from bit flags of matched components: + ip - 1, port - 2, protocol - 4, local socket - 8, + the target with the maximum value of flags combination will be selected. + The parameter can be an integer or a variable holding an integer value. It must be provided if the uri parameter is provided. </para> </listitem>

8 months, 2 weeks

git:master:0054b875: Avoid 'qm_strnstr' defined but not used warning

by Juha Heinanen

Module: kamailio Branch: master Commit: 0054b875045b4badfedd3e8424bf4772d6a9bc6b URL: https://github.com/kamailio/kamailio/commit/0054b875045b4badfedd3e8424bf477… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2024-03-12T22:18:20+02:00 Avoid 'qm_strnstr' defined but not used warning --- Modified: src/core/mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/0054b875045b4badfedd3e8424bf477… Patch: https://github.com/kamailio/kamailio/commit/0054b875045b4badfedd3e8424bf477… --- diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index aa68debdf30..5850c07a018 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -993,6 +993,7 @@ void qm_status(void *qmp) } +#ifdef DBG_QM_MALLOC static void *qm_strnstr(const void *b1, int l1, const void *b2, int l2) { char *sp = (char *)b1; @@ -1012,6 +1013,7 @@ static void *qm_strnstr(const void *b1, int l1, const void *b2, int l2) return NULL; } +#endif void qm_status_filter(void *qmp, str *fmatch, FILE *fp) {

8 months, 2 weeks

git:5.8:2122afae: Avoid 'qm_strnstr' defined but not used warning

by Juha Heinanen

Module: kamailio Branch: 5.8 Commit: 2122afae2a6604c0bc44a43ab37ee274a15a700a URL: https://github.com/kamailio/kamailio/commit/2122afae2a6604c0bc44a43ab37ee27… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2024-03-12T22:16:23+02:00 Avoid 'qm_strnstr' defined but not used warning --- Modified: src/core/mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/2122afae2a6604c0bc44a43ab37ee27… Patch: https://github.com/kamailio/kamailio/commit/2122afae2a6604c0bc44a43ab37ee27… --- diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index aa68debdf30..5850c07a018 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -993,6 +993,7 @@ void qm_status(void *qmp) } +#ifdef DBG_QM_MALLOC static void *qm_strnstr(const void *b1, int l1, const void *b2, int l2) { char *sp = (char *)b1; @@ -1012,6 +1013,7 @@ static void *qm_strnstr(const void *b1, int l1, const void *b2, int l2) return NULL; } +#endif void qm_status_filter(void *qmp, str *fmatch, FILE *fp) {

8 months, 2 weeks

git:5.8:1928af8f: core: set null-terminated char for modparam (backport from master)

by Juha Heinanen

Module: kamailio Branch: 5.8 Commit: 1928af8f90ebf02f610c0904bc3d24a00aaedb81 URL: https://github.com/kamailio/kamailio/commit/1928af8f90ebf02f610c0904bc3d24a… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2024-03-12T07:54:50+02:00 core: set null-terminated char for modparam (backport from master) --- Modified: src/core/modparam.c --- Diff: https://github.com/kamailio/kamailio/commit/1928af8f90ebf02f610c0904bc3d24a… Patch: https://github.com/kamailio/kamailio/commit/1928af8f90ebf02f610c0904bc3d24a… --- diff --git a/src/core/modparam.c b/src/core/modparam.c index 46ea0169e53..b48d9e82442 100644 --- a/src/core/modparam.c +++ b/src/core/modparam.c @@ -152,6 +152,7 @@ int set_mod_param_regex(char *regex, char *name, modparam_t type, void *val) return -1; } strncpy(*((char **)ptr), (char *)val2, len_param); + (*((char **)ptr))[len_param] = '\0'; break; case PARAM_STR:

8 months, 2 weeks

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2024