sr-dev November 2025

sr-dev@lists.kamailio.org

13 participants
235 discussions

git:master:5e1be642: db_unixodbc: Use DocBook tag &kamailioconfig;
by Henning Westerholt 05 Nov '25

05 Nov '25

Module: kamailio Branch: master Commit: 5e1be642929aa6135c2e935da4ea2ca0d849938b URL: https://github.com/kamailio/kamailio/commit/5e1be642929aa6135c2e935da4ea2ca… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-11-05T10:36:30+01:00 db_unixodbc: Use DocBook tag &kamailioconfig; --- Modified: src/modules/db_unixodbc/doc/db_unixodbc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5e1be642929aa6135c2e935da4ea2ca… Patch: https://github.com/kamailio/kamailio/commit/5e1be642929aa6135c2e935da4ea2ca… --- diff --git a/src/modules/db_unixodbc/doc/db_unixodbc_admin.xml b/src/modules/db_unixodbc/doc/db_unixodbc_admin.xml index 7b366ed4577..cc8e5b8e1fe 100644 --- a/src/modules/db_unixodbc/doc/db_unixodbc_admin.xml +++ b/src/modules/db_unixodbc/doc/db_unixodbc_admin.xml @@ -198,7 +198,7 @@ modparam("db_unixodbc", "quote_char", "`") <section> <title>Configuring and Running</title> <para> - In the &kamailio;.cfg file, add the line: + In the &kamailioconfig; file, add the line: </para> <programlisting format="linespecific"> ....

1 0

git:master:04a6c248: cdp: Use DocBook tag &kamailioconfig;
by Henning Westerholt 05 Nov '25

05 Nov '25

Module: kamailio Branch: master Commit: 04a6c24801ae4fb98f3275c4f48c04a57fddf9eb URL: https://github.com/kamailio/kamailio/commit/04a6c24801ae4fb98f3275c4f48c04a… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-11-05T10:36:30+01:00 cdp: Use DocBook tag &kamailioconfig; --- Modified: src/modules/cdp/doc/cdp_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/04a6c24801ae4fb98f3275c4f48c04a… Patch: https://github.com/kamailio/kamailio/commit/04a6c24801ae4fb98f3275c4f48c04a… --- diff --git a/src/modules/cdp/doc/cdp_admin.xml b/src/modules/cdp/doc/cdp_admin.xml index 4c80f4db7be..fe3e9dd2d8c 100644 --- a/src/modules/cdp/doc/cdp_admin.xml +++ b/src/modules/cdp/doc/cdp_admin.xml @@ -56,7 +56,7 @@ transaction.c.</para> <para>There are 2 configuration areas for CDP. Firstly it must be loaded - and configured in the Kamailio.cfg file (this is the normal task + and configured in the &kamailioconfig; file (this is the normal task associated with Kamailio modules). Then, an XML file is required to configure various Diameter parameters and all related peers and the associated routes.</para>

1 0

git:master:1732b872: doc/docbook: Add missing root slash as URL path component
by Henning Westerholt 05 Nov '25

05 Nov '25

Module: kamailio Branch: master Commit: 1732b872a71bb0ae1a75a326922f8e5067e03a20 URL: https://github.com/kamailio/kamailio/commit/1732b872a71bb0ae1a75a326922f8e5… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-11-05T10:36:30+01:00 doc/docbook: Add missing root slash as URL path component --- Modified: doc/docbook/entities.xml --- Diff: https://github.com/kamailio/kamailio/commit/1732b872a71bb0ae1a75a326922f8e5… Patch: https://github.com/kamailio/kamailio/commit/1732b872a71bb0ae1a75a326922f8e5… --- diff --git a/doc/docbook/entities.xml b/doc/docbook/entities.xml index 5734b4c317d..692c99ef220 100644 --- a/doc/docbook/entities.xml +++ b/doc/docbook/entities.xml @@ -1,7 +1,7 @@  <!ENTITY fhg "FhG FOKUS"> -<!ENTITY iptel "<ulink url='http://iptel.org'>iptel.org</ulink>"> +<!ENTITY iptel "<ulink url='http://iptel.org/'>iptel.org</ulink>">  @@ -52,7 +52,7 @@ <!ENTITY sercmd "kamcmd"> <!ENTITY ctlsocket "kamailio_ctl"> -<!ENTITY serhome "https://www.kamailio.org"> +<!ENTITY serhome "https://www.kamailio.org/"> <!ENTITY serbugs "https://github.com/kamailio/kamailio/issues"> <!ENTITY serusers "https://lists.kamailio.org/mailman3/postorius/lists/sr-users.lists.kamailio…"> <!ENTITY serdev "https://lists.kamailio.org/mailman3/postorius/lists/sr-dev.lists.kamailio.o…"> @@ -86,12 +86,12 @@ <!ENTITY nat "<acronym>NAT</acronym>"> <!ENTITY ip "<acronym>IP</acronym>"> <!ENTITY udp "<acronym>UDP</acronym>"> -<!ENTITY ietf "<ulink url='https://www.ietf.org'>IETF</ulink>"> +<!ENTITY ietf "<ulink url='https://www.ietf.org/'>IETF</ulink>"> <!ENTITY im "<acronym>IM</acronym>"> <!ENTITY smtp "<acronym>SMTP</acronym>"> <!ENTITY tls "<acronym>TLS</acronym>"> <!ENTITY xmpp "<acronym>XMPP</acronym>"> -<!ENTITY gnu "<ulink url='https://www.gnu.org'>GNU</ulink>"> +<!ENTITY gnu "<ulink url='https://www.gnu.org/'>GNU</ulink>"> <!ENTITY gpl "<ulink url='https://www.gnu.org/licenses/licenses.html#GPL'>GPL</ulink>"> <!ENTITY openssl "<ulink url='https://www.openssl.org'>OpenSSL</ulink>"> @@ -103,5 +103,6 @@ <!ENTITY rfc5626 "<ulink url='https://www.ietf.org/rfc/rfc5626.txt'>RFC5626</ulink>">  -<!ENTITY openssl "<ulink url='https://www.openssl.org'>OpenSSL</ulink>"> -<!ENTITY libcurl "<ulink url='https://curl.haxx.se'>libcurl</ulink>"> + +<!ENTITY openssl "<ulink url='https://www.openssl.org/'>OpenSSL</ulink>"> +<!ENTITY libcurl "<ulink url='https://curl.haxx.se/'>libcurl</ulink>">

1 0

git:master:22332f03: tls: Fix and add DocBook tags
by Henning Westerholt 05 Nov '25

05 Nov '25

Module: kamailio Branch: master Commit: 22332f03a66375e70787c6a42fa8fd1df43fbe3c URL: https://github.com/kamailio/kamailio/commit/22332f03a66375e70787c6a42fa8fd1… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-11-05T10:36:30+01:00 tls: Fix and add DocBook tags --- Modified: src/modules/tls/doc/certs_howto.xml Modified: src/modules/tls/doc/tls.xml --- Diff: https://github.com/kamailio/kamailio/commit/22332f03a66375e70787c6a42fa8fd1… Patch: https://github.com/kamailio/kamailio/commit/22332f03a66375e70787c6a42fa8fd1… --- diff --git a/src/modules/tls/doc/certs_howto.xml b/src/modules/tls/doc/certs_howto.xml index 01a87d09b01..c2195fc023c 100644 --- a/src/modules/tls/doc/certs_howto.xml +++ b/src/modules/tls/doc/certs_howto.xml @@ -109,15 +109,15 @@ Setting &kamailio; to use the TLS certificate intended machine (preferably in your &kamailio; configuration directory, this is the default place &kamailio; searches for). -3. Set up &kamailio;.cfg to use the certificate +3. Set up &kamailioconfig; to use the certificate if your &kamailio; certificate name is different from cert.pem or it is not - placed in &kamailio; cfg. directory, add to your kamailio.cfg: + placed in &kamailio; config directory, add to your &kamailioconfig;: modparam("tls", "certificate", "/path/cert_file_name") 4. Set up &kamailio; to use the private key if your private key is not contained in the same file as the certificate (or the certificate name is not the default cert.pem), add to your - &kamailio;.cfg: + &kamailioconfig;: modparam("tls", "private_key", "/path/private_key_file") 5. Set up &kamailio; to use the CA list (optional) @@ -141,9 +141,9 @@ Revoking a certificate and using a CRL 2. Generate/update the certificate revocation list: openssl ca -gencrl -out my_crl.pem -3. Copy my_crl.pem to your &kamailio; config. dir +3. Copy my_crl.pem to your &kamailio; config directory. -4. Set up &kamailio; to use the CRL: +4. Set up &kamailioconfig; to use the CRL: modparam("tls", "crl", "path/my_crl.pem") diff --git a/src/modules/tls/doc/tls.xml b/src/modules/tls/doc/tls.xml index 53397e2d50a..1522f433286 100644 --- a/src/modules/tls/doc/tls.xml +++ b/src/modules/tls/doc/tls.xml @@ -54,8 +54,7 @@ <title>Overview</title> <para> This module implements the TLS transport for &kamailio; - using the <ulink url="http://www.openssl.org">OpenSSL library</ulink> - (http://www.openssl.org). To enable the &kamailio; TLS support this + using the &openssl; library. To enable the &kamailio; TLS support this module must be loaded and <emphasis>enable_tls=yes</emphasis> core setting must be added to the Kamailio config file. </para> @@ -68,7 +67,7 @@ <section id="tls.quick_start"> <title>Quick Start</title> <para> - The default kamailio.cfg file has basic tls support included, it has to + The default &kamailioconfig; file has basic tls support included, it has to be enabled with "#!define WITH_TLS" directive. </para> <para> @@ -173,7 +172,7 @@ request_route { <para> Note 1: the tls module must be loaded before any other &kamailio; module that uses libssl (OpenSSL library). A safe option is to have the tls module - loaded first (be in the first "loadmodule" in &kamailio;.cfg). + loaded first (be in the first "loadmodule" in &kamailioconfig;). </para> <para> Note 2: for libssl v3.x, the core parameter "tls_threads_mode"

1 0

git:master:c2e970d1: tls_wolfssl: Use DocBook tag &kamailioconfig;
by Henning Westerholt 05 Nov '25

05 Nov '25

Module: kamailio Branch: master Commit: c2e970d11b9b8ef6a540c32dbb55832ec2f3d965 URL: https://github.com/kamailio/kamailio/commit/c2e970d11b9b8ef6a540c32dbb55832… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-11-05T10:36:30+01:00 tls_wolfssl: Use DocBook tag &kamailioconfig; --- Modified: src/modules/tls_wolfssl/doc/tls_wolfssl.xml --- Diff: https://github.com/kamailio/kamailio/commit/c2e970d11b9b8ef6a540c32dbb55832… Patch: https://github.com/kamailio/kamailio/commit/c2e970d11b9b8ef6a540c32dbb55832… --- diff --git a/src/modules/tls_wolfssl/doc/tls_wolfssl.xml b/src/modules/tls_wolfssl/doc/tls_wolfssl.xml index cf7770a7704..5eee19b6b04 100644 --- a/src/modules/tls_wolfssl/doc/tls_wolfssl.xml +++ b/src/modules/tls_wolfssl/doc/tls_wolfssl.xml @@ -56,7 +56,7 @@ <section id="tls_wolfssl.quick_start"> <title>Quick Start</title> <para> - The default kamailio.cfg file has basic tls support included, it has to + The default &kamailioconfig; file has basic TLS support included, it has to be enabled with "#!define WITH_TLS" directive. </para> <example>

1 0

git:6.0:b6dc1b18: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 03 Nov '25

03 Nov '25

Module: kamailio Branch: 6.0 Commit: b6dc1b185e48b49ddd3e9a2af5efed4b6174dc50 URL: https://github.com/kamailio/kamailio/commit/b6dc1b185e48b49ddd3e9a2af5efed4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-11-03T10:46:18+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/dispatcher/README Modified: src/modules/sworker/README --- Diff: https://github.com/kamailio/kamailio/commit/b6dc1b185e48b49ddd3e9a2af5efed4… Patch: https://github.com/kamailio/kamailio/commit/b6dc1b185e48b49ddd3e9a2af5efed4… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index d111d59b551..f9ee0f8d0e6 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -846,15 +846,14 @@ modparam("dispatcher", "ds_retain_latency_stats", 1) 3.28. ds_latency_estimator_alpha (int) - The value to be used to control the memory of the estimator EWMA - "exponential weighted moving average" or "the speed at which the older - samples are dampened" a good explanation can be found here : - http://www.itl.nist.gov/div898/handbook/pmc/section3/pmc324.htm Because - Kamailio doesn't support float parameter types, the value in the - parameter is divided by 1000 and stored as float. For example, if you - want to set the alpha to be 0.75, use value 750 here. + The parameter decides how important each latency ping observation is in + the calculation of the EWMA. The higher the value of alpha, the more + closely the EWMA tracks the original time series. Because Kamailio + doesn't support float parameter types, the value in the parameter is + divided by 1000 and stored as float. For example, if you want to set + the alpha to be 0.25, use value 250 here. - Default value is “900 => 0.9”. + Default value is “100 => 0.1”. Example 1.30. Set the “ds_latency_estimator_alpha” parameter ... @@ -1198,11 +1197,13 @@ modparam("dispatcher", "ds_interval_mode", 7200) lowered by 1 for every ms of estimated congestion, a 'rweight' value of 50 is recommended. See the example "configuring load balancing with congestion detection" below. - The congestion estimation is done using an EWMA (see - ds_latency_estimator_alpha). If all the gateways in a set are - above their congestion threshold(weight), the load - distribution is instead done using the ratio of estimated - congestion ms. + The congestion estimation is done using an Exponentially + Weighted Moving Average (EWMA). More information about the + algorithm can be found at + http://www.itl.nist.gov/div898/handbook/pmc/section3/pmc324.ht + m. If all the gateways in a set are above their congestion + threshold(weight), the load distribution is instead done using + the ratio of estimated congestion ms. See also the description of the 'rweight' attribute in the 'Special Attributes' section. + “12” - dispatch to all destinations in setid at once (parallel @@ -2302,7 +2303,7 @@ route[DISPATCH] { exit; } -# Try next destionations in failure route +# Try next destinations in failure route failure_route[RTF_DISPATCH] { if (t_is_canceled()) { exit; diff --git a/src/modules/sworker/README b/src/modules/sworker/README index 132f3165f39..d0c587d592a 100644 --- a/src/modules/sworker/README +++ b/src/modules/sworker/README @@ -30,7 +30,7 @@ Daniel-Constantin Mierla 4. Functions 4.1. sworker_active() - 4.2. swork_task(gname) + 4.2. sworker_task(gname) List of Examples @@ -55,7 +55,7 @@ Chapter 1. Admin Guide 4. Functions 4.1. sworker_active() - 4.2. swork_task(gname) + 4.2. sworker_task(gname) 1. Overview @@ -113,7 +113,7 @@ modparam("sworker", "xdata", "$var(xdata)") 4. Functions 4.1. sworker_active() - 4.2. swork_task(gname) + 4.2. sworker_task(gname) 4.1. sworker_active() @@ -132,7 +132,7 @@ request_route { } ... -4.2. swork_task(gname) +4.2. sworker_task(gname) Delegate the processing of SIP message to a group of async workers. The function is restricted to be used inside event_route[core:pre-routing].

1 0

git: new commits in branch 6.0
by Daniel-Constantin Mierla 03 Nov '25

03 Nov '25

- URL: https://github.com/kamailio/kamailio/commit/aded821760d2b0be1e4fadb97d79fa1… Author: Michael Furmur <furmur(a)pm.me> Date: 2025-11-03T10:23:18+01:00 dispatcher: fix ds_latency_estimator_alpha meaning swap 'latency' and 'latency_stats->estimate' in the EWMA formula to ensure ds_latency_estimator_alpha rates new values over the old average estimate (cherry picked from commit d789b6c1fec4cd1743a51c87b8f01af7ddee03d7) - URL: https://github.com/kamailio/kamailio/commit/aba4d8149836264224bc0b6f371db52… Author: Julien Chavanton <jchavanton(a)gmail.com> Date: 2025-11-03T10:23:41+01:00 dispatcher: update the default value and docs of ds_latency_estimator_alpha This is to match the recent adjustement made in "dispatcher: fix ds_latency_estimator_alpha meaning" (cherry picked from commit 02c0e0b1b0f84754c468e97ae7f2c09e7c13e8ee) - URL: https://github.com/kamailio/kamailio/commit/c748b55c0c8db016ce24a811534106a… Author: Henning Westerholt <hw(a)gilawa.com> Date: 2025-11-03T10:24:33+01:00 dispatcher: add link to algorithm definition to main section (cherry picked from commit 0933cb319aa2e114b35cfac8383dd88855125b83) - URL: https://github.com/kamailio/kamailio/commit/697572e40c783ed9537b17fd290c88a… Author: Henning Westerholt <hw(a)gilawa.com> Date: 2025-11-03T10:24:53+01:00 dispatcher: show link in README file as well (cherry picked from commit 616c4c77db531feaf0ce3ea13962b9bb41bf2160) - URL: https://github.com/kamailio/kamailio/commit/78e65311ffcdec1f6c7149ff80fa454… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2025-11-03T10:26:01+01:00 sworker: fix function name in documentation (cherry picked from commit bf8a605bbf843d184c1f4d94bb7e1bf6697ef0d2) - URL: https://github.com/kamailio/kamailio/commit/392f02f85127b93e5f21d50aac70283… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2025-11-03T10:26:19+01:00 core: socket_info - fix typo in log message (cherry picked from commit ef53fdeb33a6158801c52f522a1398abd3777324) - URL: https://github.com/kamailio/kamailio/commit/548649a236dc5177cf9d2941856bfe3… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2025-11-03T10:26:45+01:00 dispatcher: fix typo in documentation and code comments (cherry picked from commit 46ee44af4f1d9ae4fccc6178142ca602ef689943) - URL: https://github.com/kamailio/kamailio/commit/9b0e8116e37cde82f1017d964dd57fa… Author: Tim Anderson <tim(a)claritynetworks.com.au> Date: 2025-11-03T10:27:19+01:00 xhttp_rpc: add handling of null strings in `print_value` - reported by GH #4351 (cherry picked from commit b32894f85485ba5cc9b4f4fa9cb706144e70d0e7) - URL: https://github.com/kamailio/kamailio/commit/60dc2c93359b3e0baaa200b524e2b51… Author: dmsf100 <diogo.figueiredo(a)glia.com> Date: 2025-11-03T10:27:36+01:00 dialog: fix sflags database persistence for dlg_setflag/dlg_resetflag Dialog script flags (sflags) were not being saved to database when dlg_setflag() or dlg_resetflag() functions were called. The functions updated flags in memory but didn't trigger database updates. - Add DLG_FLAG_CHANGED_SFLAGS flag to track sflags changes - Trigger immediate DB updates in realtime mode - Support delayed and shutdown database modes - Fix database update parameters to target sflags column correctly (cherry picked from commit 9dcba806093ef48962379a64770c2b71b8b74232) - URL: https://github.com/kamailio/kamailio/commit/e359c100cbf0f18b2cb3eb049a54d43… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-11-03T10:29:01+01:00 dialog: try sending bye to callee no matter of the return code for caller - GH #4404 (cherry picked from commit 25fa214154ede1907b20b0bf3d6c8e2ed8055512) - URL: https://github.com/kamailio/kamailio/commit/d4d9b1b6be3baf6374def56d5e6bc18… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-11-03T10:29:33+01:00 core: parser - parse From header on initial headers parsing (cherry picked from commit 316ea8925edd0c401c121e9dc0f21dde3a2c6598) - URL: https://github.com/kamailio/kamailio/commit/316610383101db55742dc85dc5b6cda… Author: Lyubomir Yatanski <lyubomir.yatanski(a)flolive.net> Date: 2025-11-03T10:29:40+01:00 core parser: fix after 316ea8925edd0c401c121e9dc0f21dde3a2c6598 > Error: core/parser/msg_parser.c:423:9: error: call to undeclared function 'parse_from_header'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] > 423 | if(parse_from_header(msg) < 0) { > | ^ > core/parser/msg_parser.c:423:9: note: did you mean 'parse_to_header'? > core/parser/parse_to.h:48:5: note: 'parse_to_header' declared here > 48 | int parse_to_header(struct sip_msg *const msg); > | ^ > 1 error generated. (cherry picked from commit d8715c16fb79365a26fb75990565be4fea701ae6) - URL: https://github.com/kamailio/kamailio/commit/c2dae566a61bca1e828c13ae30330b0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-11-03T10:29:51+01:00 core: parse - parse from body on first iteration (cherry picked from commit 4fef850efb73aa063ae4f920e0f86f2bf085956c) - URL: https://github.com/kamailio/kamailio/commit/cf1c796c549616e84bfb9eb84e793ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-11-03T10:29:59+01:00 core: parser - rework parsing From body on getting headers - reuse code for parsing To-body header on getting headers (cherry picked from commit 7ddba9d07a938299cb50f6dde354d8f691c307cf) - URL: https://github.com/kamailio/kamailio/commit/461dc36494711ed3b8db39e4eef7ce8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-11-03T10:30:08+01:00 tm: clean up locally parsed headers in onsend route - GH #4399 (cherry picked from commit e9d143f7890cae3c629c82df2c281d528d1499d9) - URL: https://github.com/kamailio/kamailio/commit/296c5766c87d8d23cc0d86102951f42… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-11-03T10:30:35+01:00 sms: handle case of unsupported length - GH #4413 (cherry picked from commit 42b24debb47edfef9229ada6fc7fafe293f530a9) - URL: https://github.com/kamailio/kamailio/commit/2f0b14803e8c60f3f617b8c26f49104… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-11-03T10:31:09+01:00 auth: export wrappers to the functions to calcupate HA1 and response - the function pointers can change based on the hashing algorithm (cherry picked from commit 3c16b81a363b15116ef1f3a480f1184fd2eb3d14)

1 0

git:6.0:6949f697: ims_ipsec_pcscf: fix selection of encryption algorithm selection
by Victor Seva 03 Nov '25

03 Nov '25

Module: kamailio Branch: 6.0 Commit: 6949f6970786d737daa88b05b014725ba81147f5 URL: https://github.com/kamailio/kamailio/commit/6949f6970786d737daa88b05b014725… Author: herlesupreeth <herlesupreeth(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-11-03T10:09:16+01:00 ims_ipsec_pcscf: fix selection of encryption algorithm selection (cherry picked from commit 1bdafed8d4bb97f1f9a7654155decbf9625b0504) --- Modified: src/modules/ims_ipsec_pcscf/sec_agree.c --- Diff: https://github.com/kamailio/kamailio/commit/6949f6970786d737daa88b05b014725… Patch: https://github.com/kamailio/kamailio/commit/6949f6970786d737daa88b05b014725… --- diff --git a/src/modules/ims_ipsec_pcscf/sec_agree.c b/src/modules/ims_ipsec_pcscf/sec_agree.c index 8a785c33d98..4ad62a69d6a 100644 --- a/src/modules/ims_ipsec_pcscf/sec_agree.c +++ b/src/modules/ims_ipsec_pcscf/sec_agree.c @@ -115,6 +115,32 @@ static int process_sec_agree_param( return 0; } +/** + * @brief Check whether UE IPsec parameters have been selected/populated. + * + * Verifies that all required fields of the provided ipsec_t structure are + * present (non-zero for integer fields and non-zero length for length-bearing + * fields). This function is used to decide if the UE has provided IPsec + * parameters for use in the session. + * + * @param params Pointer to an ipsec_t structure to inspect. Must be non-NULL; + * passing NULL yields undefined behavior. + * + * @return 1 if all required parameters are present: + * 0 if any of the above checks fail. + */ +static int is_ue_ipsec_params_selected(ipsec_t *params) +{ + if(params->spi_uc == 0 || params->spi_us == 0 || params->port_uc == 0 + || params->port_us == 0 || params->prot.len == 0 + || params->mod.len == 0 || params->r_alg.len == 0 + || params->r_ealg.len == 0) { + return 0; + } + + return 1; +} + static security_t *parse_sec_agree(struct hdr_field *h) { int i = 0; @@ -195,13 +221,31 @@ static security_t *parse_sec_agree(struct hdr_field *h) i = 0; if(name.len && value.len) { - if(strncasecmp(name.s, "alg", name.len) == 0) { - if(preferred_alg_found && preferred_ealg_found) { + if(ipsec_preferred_alg.len && ipsec_preferred_ealg.len) { + if(preferred_alg_found && preferred_ealg_found + && is_ue_ipsec_params_selected( + params->data.ipsec)) { break; } preferred_alg_found = 0; preferred_ealg_found = 0; } + if(ipsec_preferred_alg.len && !ipsec_preferred_ealg.len) { + if(preferred_alg_found + && is_ue_ipsec_params_selected( + params->data.ipsec)) { + break; + } + preferred_alg_found = 0; + } + if(!ipsec_preferred_alg.len && ipsec_preferred_ealg.len) { + if(preferred_ealg_found + && is_ue_ipsec_params_selected( + params->data.ipsec)) { + break; + } + preferred_ealg_found = 0; + } char alg_found = 0; char ealg_found = 0;

1 0

git:6.0:1a2ab319: ims_usrloc_scscf: improve find_contact_from_impu()
by Victor Seva 03 Nov '25

03 Nov '25

Module: kamailio Branch: 6.0 Commit: 1a2ab319458637e219bd43a4b2db9c8a38fd0b34 URL: https://github.com/kamailio/kamailio/commit/1a2ab319458637e219bd43a4b2db9c8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-11-03T10:08:20+01:00 ims_usrloc_scscf: improve find_contact_from_impu() * remove ':5060' from comparation * don't compare twice if there's no alias_term > ims_dialog [dlg_cb.c:271]: run_dlg_callbacks(): dialog=0x7fa0f03b9da0, type=16 > ims_usrloc_scscf [contact_dlg_handlers.c:65]: find_contact_from_impu(): Looking for contact [sip:1d5c5384e21d0969@10.17.10.37:5060;transport=udp] for IMPU [sip:+3910010008912@ims.mnc001.mcc001.3gppnetwork.org] > ims_usrloc_scscf [contact_dlg_handlers.c:102]: find_contact_from_impu(): Comparing [10.17.10.37:5060;transport=udp] and [10.17.10.37;transport=udp] > ims_usrloc_scscf [contact_dlg_handlers.c:104]: find_contact_from_impu(): Comparing [10.17.10.37:5060;transport=udp] and [10.17.10.37;transport=udp] > ims_usrloc_scscf [contact_dlg_handlers.c:113]: find_contact_from_impu(): Skipping sip:1d5c5384e21d0969@10.17.10.37;transport=udp > ims_usrloc_scscf [contact_dlg_handlers.c:118]: find_contact_from_impu(): malformed contact, bailing search > ims_usrloc_scscf [contact_dlg_handlers.c:163]: contact_dlg_handler(): Unable to find caller contact from dialog.... continuing > ims_usrloc_scscf [contact_dlg_handlers.c:65]: find_contact_from_impu(): Looking for contact [sip:527478AC-68FF7C1E0004017B-BD55A700@10.17.10.37:5060] for IMPU [tel:+3910010008913] > ims_usrloc_scscf [contact_dlg_handlers.c:102]: find_contact_from_impu(): Comparing [10.17.10.37:5060] and [10.17.10.37;transport=udp] > ims_usrloc_scscf [contact_dlg_handlers.c:104]: find_contact_from_impu(): Comparing [10.17.10.37:5060] and [10.17.10.37;transport=udp] > ims_usrloc_scscf [contact_dlg_handlers.c:113]: find_contact_from_impu(): Skipping sip:1cecbffd628fa83f@10.17.10.37;transport=udp > ims_usrloc_scscf [contact_dlg_handlers.c:118]: find_contact_from_impu(): malformed contact, bailing search > ims_usrloc_scscf [contact_dlg_handlers.c:189]: contact_dlg_handler(): Unable to find callee contact from dialog.... continuing > ims_usrloc_scscf [contact_dlg_handlers.c:204]: contact_dlg_handler(): No Contacts found for both caller && callee ... bailing (cherry picked from commit 6ce335298da14211716209b8b8c12efedc86f53f) --- Modified: src/modules/ims_usrloc_scscf/contact_dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/1a2ab319458637e219bd43a4b2db9c8… Patch: https://github.com/kamailio/kamailio/commit/1a2ab319458637e219bd43a4b2db9c8… --- diff --git a/src/modules/ims_usrloc_scscf/contact_dlg_handlers.c b/src/modules/ims_usrloc_scscf/contact_dlg_handlers.c index c872fbef4dc..0e7dd87174a 100644 --- a/src/modules/ims_usrloc_scscf/contact_dlg_handlers.c +++ b/src/modules/ims_usrloc_scscf/contact_dlg_handlers.c @@ -44,6 +44,34 @@ void contact_dlg_create_handler( LM_DBG("Successfully registered contact dialog handler\n"); } + +/** removes the default port ':5060' from the string in order compare later + * returns: + * 0 => found + * 1 => not found + * < 0 => error + */ +static int filter_default_port(str *src, str *dst) +{ + str default_port = str_init(":5060"); + char *port; + + if((port = str_search(src, &default_port))) { + dst->len = port - src->s; + memcpy(dst->s, src->s, dst->len); + memcpy(dst->s + dst->len, port + 5, src->len - dst->len - 5); + dst->len = src->len - 5; + return 0; + } + if(dst->len < src->len) { + LM_BUG("dst len < src len\n"); + return -1; + } + dst->len = src->len; + memcpy(dst->s, src->s, src->len); + return 1; +} + /** * Search for a contact related to an IMPU based on an original contact string (uri) * @param impu impurecord we will search through @@ -58,24 +86,29 @@ static inline int find_contact_from_impu( char *s_term; char *c_term; char *alias_term; - + char sbuf[512], cbuf[512]; + str str_aor = {sbuf, 512}, str_c = {cbuf, 512}; if(!search_aor) return 1; - LM_DBG("Looking for contact [%.*s] for IMPU [%.*s]\n", search_aor->len, - search_aor->s, impu->public_identity.len, impu->public_identity.s); + if(filter_default_port(search_aor, &str_aor) < 0) { + return 1; + } + + LM_DBG("Looking for contact [%.*s] for IMPU [%.*s]\n", STR_FMT(&str_aor), + STR_FMT(&impu->public_identity)); /* Filter out sip: and anything before @ from search URI */ - s_term = strstr(search_aor->s, "@"); + s_term = strstr(str_aor.s, "@"); if(!s_term) { - s_term = strstr(search_aor->s, ":"); + s_term = strstr(str_aor.s, ":"); } s_term += 1; - if(s_term - search_aor->s >= search_aor->len) { + if(s_term - str_aor.s >= str_aor.len) { goto error; } - i_searchlen = search_aor->len - (s_term - search_aor->s); + i_searchlen = str_aor.len - (s_term - str_aor.s); /* Compare the entire contact including alias, if not until alias IP */ alias_term = strstr(s_term, "~"); @@ -90,28 +123,37 @@ static inline int find_contact_from_impu( while(impucontact) { if(impucontact->contact) { + // clean up previous contact + str_c.len = 512; + memset(str_c.s, 0, 512); - c_term = strstr(impucontact->contact->c.s, "@"); + if(filter_default_port(&impucontact->contact->c, &str_c) < 0) { + LM_DBG("Skipping %.*s\n", STR_FMT(&impucontact->contact->c)); + impucontact = impucontact->next; + continue; + } + c_term = strstr(str_c.s, "@"); if(!c_term) { - c_term = strstr(impucontact->contact->c.s, ":"); + c_term = strstr(str_c.s, ":"); } c_term += 1; - c_searchlen = impucontact->contact->c.len - - (c_term - impucontact->contact->c.s); - + c_searchlen = str_c.len - (c_term - str_c.s); LM_DBG("Comparing [%.*s] and [%.*s]\n", i_searchlen, s_term, c_searchlen, c_term); - LM_DBG("Comparing [%.*s] and [%.*s]\n", alias_searchlen, s_term, - c_searchlen, c_term); - if((strncmp(c_term, s_term, i_searchlen) == 0) - || (strncmp(c_term, s_term, alias_searchlen) == 0)) { + if(strncmp(c_term, s_term, i_searchlen) == 0) { *scontact = impucontact->contact; return 0; } + if(alias_term) { + LM_DBG("Comparing [%.*s] and [%.*s]\n", alias_searchlen, s_term, + c_searchlen, c_term); + if(strncmp(c_term, s_term, alias_searchlen) == 0) { + *scontact = impucontact->contact; + return 0; + } + } + LM_DBG("Skipping %.*s\n", STR_FMT(&impucontact->contact->c)); } - if(impucontact->contact) - LM_DBG("Skipping %.*s\n", impucontact->contact->c.len, - impucontact->contact->c.s); impucontact = impucontact->next; } error:

1 0

[kamailio/kamailio] Add boundary check for parser (Issue #4451)
by 7erry 03 Nov '25

03 Nov '25

7erryX created an issue (kamailio/kamailio#4451) ### Description In [Commit bf6bd11](https://github.com/kamailio/kamailio/commit/bf6bd11a9b969c02a106f9… `parse_content_length` in `src/core/parser/parse_content.c` was added a new boundary check to prevent Out-of-bound memory operation. While there is a similar function, `decode_mime_type` in `src/core/parser/parse_content.c`, containing a similar logic flaw. ```C while(p < end && (*p == ' ' || *p == '\t' || (*p == '\n' && (*(p + 1) == ' ' || *(p + 1) == '\t')))) p++; if(p == end) goto error; ``` ### Possible Solutions Would it make sense to add a similar boundary check in the same way as `bf6bd11` did by adding `p+1<end`? Thank you for spending time reading this issue and apologies if I missed anything. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4451 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4451(a)github.com>

2 2

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2025