sr-dev

sr-dev@lists.kamailio.org

17 participants
45418 discussions

git:6.0:9c6fbd3b: cdp: cdp_rpc_list_peers() release lock on errors
by Victor Seva 15 Jul '25

15 Jul '25

Module: kamailio Branch: 6.0 Commit: 9c6fbd3b139d9e48b7cc2323f3b902773f181c83 URL: https://github.com/kamailio/kamailio/commit/9c6fbd3b139d9e48b7cc2323f3b9027… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-07-15T09:13:43+02:00 cdp: cdp_rpc_list_peers() release lock on errors (cherry picked from commit 7f078931d3d684822e90485024672632be29741c) --- Modified: src/modules/cdp/cdp_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/9c6fbd3b139d9e48b7cc2323f3b9027… Patch: https://github.com/kamailio/kamailio/commit/9c6fbd3b139d9e48b7cc2323f3b9027… --- diff --git a/src/modules/cdp/cdp_rpc.c b/src/modules/cdp/cdp_rpc.c index 8df60230c51..55ce61a6363 100644 --- a/src/modules/cdp/cdp_rpc.c +++ b/src/modules/cdp/cdp_rpc.c @@ -99,6 +99,7 @@ static void cdp_rpc_list_peers(rpc_t *rpc, void *ctx) rpc->fault( ctx, 500, "Internal error creating peers container struct"); lock_release(i->lock); + lock_release(peer_list_lock); return; } if(rpc->struct_add(peerdetail_container, "ssL", "State", @@ -109,6 +110,7 @@ static void cdp_rpc_list_peers(rpc_t *rpc, void *ctx) rpc->fault(ctx, 500, "Internal error creating peer detail container struct"); lock_release(i->lock); + lock_release(peer_list_lock); return; } if(rpc->struct_add(peerdetail_container, "{", "Applications", @@ -118,6 +120,7 @@ static void cdp_rpc_list_peers(rpc_t *rpc, void *ctx) "Internal error creating peer application container " "struct"); lock_release(i->lock); + lock_release(peer_list_lock); return; } @@ -130,6 +133,7 @@ static void cdp_rpc_list_peers(rpc_t *rpc, void *ctx) rpc->fault(ctx, 500, "Internal error creating appid/vendorid information"); lock_release(i->lock); + lock_release(peer_list_lock); return; } }

1 0

git:master:7f078931: cdp: cdp_rpc_list_peers() release lock on errors
by Victor Seva 15 Jul '25

15 Jul '25

Module: kamailio Branch: master Commit: 7f078931d3d684822e90485024672632be29741c URL: https://github.com/kamailio/kamailio/commit/7f078931d3d684822e9048502467263… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-07-15T08:53:38+02:00 cdp: cdp_rpc_list_peers() release lock on errors --- Modified: src/modules/cdp/cdp_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/7f078931d3d684822e9048502467263… Patch: https://github.com/kamailio/kamailio/commit/7f078931d3d684822e9048502467263… --- diff --git a/src/modules/cdp/cdp_rpc.c b/src/modules/cdp/cdp_rpc.c index 8df60230c51..55ce61a6363 100644 --- a/src/modules/cdp/cdp_rpc.c +++ b/src/modules/cdp/cdp_rpc.c @@ -99,6 +99,7 @@ static void cdp_rpc_list_peers(rpc_t *rpc, void *ctx) rpc->fault( ctx, 500, "Internal error creating peers container struct"); lock_release(i->lock); + lock_release(peer_list_lock); return; } if(rpc->struct_add(peerdetail_container, "ssL", "State", @@ -109,6 +110,7 @@ static void cdp_rpc_list_peers(rpc_t *rpc, void *ctx) rpc->fault(ctx, 500, "Internal error creating peer detail container struct"); lock_release(i->lock); + lock_release(peer_list_lock); return; } if(rpc->struct_add(peerdetail_container, "{", "Applications", @@ -118,6 +120,7 @@ static void cdp_rpc_list_peers(rpc_t *rpc, void *ctx) "Internal error creating peer application container " "struct"); lock_release(i->lock); + lock_release(peer_list_lock); return; } @@ -130,6 +133,7 @@ static void cdp_rpc_list_peers(rpc_t *rpc, void *ctx) rpc->fault(ctx, 500, "Internal error creating appid/vendorid information"); lock_release(i->lock); + lock_release(peer_list_lock); return; } }

1 0

git:master:c57dfd98: modules: readme files regenerated - permissions ... [skip ci]
by Kamailio Dev 14 Jul '25

14 Jul '25

Module: kamailio Branch: master Commit: c57dfd9869b32b1901fd4b76b7f5a50239f9bce0 URL: https://github.com/kamailio/kamailio/commit/c57dfd9869b32b1901fd4b76b7f5a50… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-07-14T15:46:10+02:00 modules: readme files regenerated - permissions ... [skip ci] --- Modified: src/modules/permissions/README --- Diff: https://github.com/kamailio/kamailio/commit/c57dfd9869b32b1901fd4b76b7f5a50… Patch: https://github.com/kamailio/kamailio/commit/c57dfd9869b32b1901fd4b76b7f5a50… --- diff --git a/src/modules/permissions/README b/src/modules/permissions/README index 39d6435b153..144e36f9471 100644 --- a/src/modules/permissions/README +++ b/src/modules/permissions/README @@ -348,6 +348,21 @@ Chapter 1. Admin Guide module parameter) is added as value to peer_tag AVP if peer_tag_avp module parameter has been defined. +Note + + Starting with Kamailio version 6.1.x, the allow_address() function and + its related functions use the Longest Prefix Match (LPM) method to find + matching entries. + + This means the _group variants will now return the most specific + (longest) subnet match, instead of the first match (which was + previously the entry with the lowest group ID). This LPM behavior is + now consistent across the following functions: + * allow_address() + * allow_source_address() + * allow_source_address_group() + * allow_address_group() + 1.5. Trusted Requests The module can be used to determine if an incoming request can be @@ -1013,6 +1028,10 @@ if (allow_uri("basename", "$avp(i:705)") { // Check URI stored in $avp(i:705) any port. The “group_id” argument can be an integer string or a pseudo variable. +Note + + See Address permissions for more details. + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. Example 1.35. allow_address() usage @@ -1035,6 +1054,10 @@ if (!allow_address("2", "$avp(dst_adr)", "$avp(dst_port)") { Equal to “allow_address(group_id, "$si", "$sp")”. If 'group_id' is missing, the function is equal to allow_address("1", "$si", "$sp"). +Note + + See Address permissions for more details. + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. Example 1.36. allow_source_address(group_id) usage @@ -1052,6 +1075,11 @@ if (!allow_source_address("1")) { table in any group. If yes, returns that group. If not returns -1. Port value 0 in cached address and group table matches any port. +Note + + See Address permissions for more details on how searching is + implemented. + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. Example 1.37. allow_source_address_group() usage @@ -1070,6 +1098,11 @@ if ($var(group) != -1) { in cached address and group table matches any port. The parameters can be pseudo-variables. +Note + + See Address permissions for more details on how searching is + implemented. + This function can be used from ANY_ROUTE. Example 1.38. allow_source_address_group() usage

1 0

git:master:9e0402e9: permissions: doc: Add note related to LPM search
by Henning Westerholt 14 Jul '25

14 Jul '25

Module: kamailio Branch: master Commit: 9e0402e9b1d9d789211bfb3c13fc11ab6d5fa320 URL: https://github.com/kamailio/kamailio/commit/9e0402e9b1d9d789211bfb3c13fc11a… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-07-14T15:42:47+02:00 permissions: doc: Add note related to LPM search - allow_address() and 3 more related function now perform LPM search - allow_source_address() - allow_source_address_group() - allow_address_group --- Modified: src/modules/permissions/doc/permissions_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9e0402e9b1d9d789211bfb3c13fc11a… Patch: https://github.com/kamailio/kamailio/commit/9e0402e9b1d9d789211bfb3c13fc11a… --- diff --git a/src/modules/permissions/doc/permissions_admin.xml b/src/modules/permissions/doc/permissions_admin.xml index 494a7ecc0fb..f893a3e4eb7 100644 --- a/src/modules/permissions/doc/permissions_admin.xml +++ b/src/modules/permissions/doc/permissions_admin.xml @@ -221,6 +221,25 @@ (see tag_col module parameter) is added as value to peer_tag AVP if peer_tag_avp module parameter has been defined. </para> + <note> + <para> + Starting with Kamailio version 6.1.x, the <function>allow_address()</function> + function and its related functions use the Longest Prefix Match (LPM) method to + find matching entries. + </para> + <para> + This means the <function>_group</function> variants will now return the most specific + (longest) subnet match, instead of the first match (which was previously the entry with + the lowest group ID). + This LPM behavior is now consistent across the following functions: + </para> + <itemizedlist> + <listitem><para><function>allow_address()</function></para></listitem> + <listitem><para><function>allow_source_address()</function></para></listitem> + <listitem><para><function>allow_source_address_group()</function></para></listitem> + <listitem><para><function>allow_address_group()</function></para></listitem> + </itemizedlist> + </note> </section> <section id="sec-trusted-requests"> <title>Trusted Requests</title> @@ -1259,6 +1278,9 @@ if (allow_uri("basename", "$avp(i:705)") { // Check URI stored in $avp(i:705) matches any port. The <quote>group_id</quote> argument can be an integer string or a pseudo variable. </para> + <note> + See <link linkend="sec-address-permissions"> Address permissions </link> for more details. + </note> <para> This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. </para> @@ -1289,6 +1311,9 @@ if (!allow_address("2", "$avp(dst_adr)", "$avp(dst_port)") { Equal to <quote>allow_address(group_id, "$si", "$sp")</quote>. If 'group_id' is missing, the function is equal to allow_address("1", "$si", "$sp"). </para> + <note> + See <link linkend="sec-address-permissions"> Address permissions </link> for more details. + </note> <para> This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. </para> @@ -1315,6 +1340,10 @@ if (!allow_source_address("1")) { If not returns -1. Port value 0 in cached address and group table matches any port. </para> + <note> + See <link linkend="sec-address-permissions"> Address permissions </link> + for more details on how searching is implemented. + </note> <para> This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. </para> @@ -1341,6 +1370,10 @@ if ($var(group) != -1) { If not returns -1. Port value 0 in cached address and group table matches any port. The parameters can be pseudo-variables. </para> + <note> + See <link linkend="sec-address-permissions"> Address permissions </link> + for more details on how searching is implemented. + </note> <para> This function can be used from ANY_ROUTE. </para>

1 0

git:master:47a9423e: permissions: Perform LPM to find the longest matching subnet
by Henning Westerholt 14 Jul '25

14 Jul '25

Module: kamailio Branch: master Commit: 47a9423e2a5174a679905d6da6ef4fa0048e4fb1 URL: https://github.com/kamailio/kamailio/commit/47a9423e2a5174a679905d6da6ef4fa… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-07-14T15:42:47+02:00 permissions: Perform LPM to find the longest matching subnet --- Modified: src/modules/permissions/hash.c --- Diff: https://github.com/kamailio/kamailio/commit/47a9423e2a5174a679905d6da6ef4fa… Patch: https://github.com/kamailio/kamailio/commit/47a9423e2a5174a679905d6da6ef4fa… --- diff --git a/src/modules/permissions/hash.c b/src/modules/permissions/hash.c index 753cf9051fa..aeb8dce2d23 100644 --- a/src/modules/permissions/hash.c +++ b/src/modules/permissions/hash.c @@ -699,6 +699,8 @@ int match_subnet_table(struct subnet *table, unsigned int grp, ip_addr_t *addr, { unsigned int count, i; avp_value_t val; + int best_idx = -1; + unsigned int best_mask = 0; count = table[PERM_MAX_SUBNETS].grp; @@ -713,18 +715,25 @@ int match_subnet_table(struct subnet *table, unsigned int grp, ip_addr_t *addr, if(((table[i].port == port) || (table[i].port == 0)) && (ip_addr_match_net(addr, &table[i].subnet, table[i].mask) == 0)) { - if(tag_avp.n && table[i].tag.s) { - val.s = table[i].tag; - if(add_avp(tag_avp_type | AVP_VAL_STR, tag_avp, val) != 0) { - LM_ERR("setting of tag_avp failed\n"); - return -1; - } + if(table[i].mask > best_mask) { + best_mask = table[i].mask; + best_idx = i; } - return 1; } i++; } + if(best_idx >= 0) { + if(tag_avp.n && table[best_idx].tag.s) { + val.s = table[best_idx].tag; + if(add_avp(tag_avp_type | AVP_VAL_STR, tag_avp, val) != 0) { + LM_ERR("setting of tag_avp failed\n"); + return -1; + } + } + return 1; + } + return -1; } @@ -739,6 +748,8 @@ int find_group_in_subnet_table( { unsigned int count, i; avp_value_t val; + int best_idx = -1; + unsigned int best_mask = 0; count = table[PERM_MAX_SUBNETS].grp; @@ -747,18 +758,25 @@ int find_group_in_subnet_table( if(((table[i].port == port) || (table[i].port == 0)) && (ip_addr_match_net(addr, &table[i].subnet, table[i].mask) == 0)) { - if(tag_avp.n && table[i].tag.s) { - val.s = table[i].tag; - if(add_avp(tag_avp_type | AVP_VAL_STR, tag_avp, val) != 0) { - LM_ERR("setting of tag_avp failed\n"); - return -1; - } + if(table[i].mask > best_mask) { + best_mask = table[i].mask; + best_idx = i; } - return table[i].grp; } i++; } + if(best_idx >= 0) { + if(tag_avp.n && table[best_idx].tag.s) { + val.s = table[best_idx].tag; + if(add_avp(tag_avp_type | AVP_VAL_STR, tag_avp, val) != 0) { + LM_ERR("setting of tag_avp failed\n"); + return -1; + } + } + return table[best_idx].grp; + } + return -1; }

1 0

git:master:6e4041d7: .github: scripts/check-commit.sh - added prefix tests for files in the repo
by Daniel-Constantin Mierla 14 Jul '25

14 Jul '25

Module: kamailio Branch: master Commit: 6e4041d7115af1efe399c44589192280e413504a URL: https://github.com/kamailio/kamailio/commit/6e4041d7115af1efe399c4458919228… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-14T14:43:43+02:00 .github: scripts/check-commit.sh - added prefix tests for files in the repo --- Modified: .github/scripts/check-commit.sh --- Diff: https://github.com/kamailio/kamailio/commit/6e4041d7115af1efe399c4458919228… Patch: https://github.com/kamailio/kamailio/commit/6e4041d7115af1efe399c4458919228… --- diff --git a/.github/scripts/check-commit.sh b/.github/scripts/check-commit.sh index 87aa17be598..099e070f15c 100755 --- a/.github/scripts/check-commit.sh +++ b/.github/scripts/check-commit.sh @@ -47,6 +47,18 @@ check_subject() { return fi + # file (e.g., ChangeLog, etc/kamailio.cfg) + if [ -f "${prefix}" ] ; then + echo "[${commit}] prefix is a file in the repo, OK[${prefix}]" + return + fi + + # shortcut to src/ file (e.g., src/Makefile.defs) + if [ -f "src/${prefix}" ] ; then + echo "[${commit}] prefix is a file in the src repo, OK[${prefix}]" + return + fi + # github configs if [[ "${prefix}" =~ ^github$ ]] ; then echo "[${commit}] prefix is github config, OK[${prefix}]"

1 0

[kamailio/kamailio] UAC module - dynamic Contact value (Issue #4316)
by kurtyks 14 Jul '25

14 Jul '25

kurtyks created an issue (kamailio/kamailio#4316)  ### Description  ### Expected behavior #### Actual observed behavior #### Debugging Data ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` Rn. UAC module allows only global setting of Contact header, while sending REGISTER to UAS. It is done by setting param reg_contact_addr (string). This is edge case, but sometimes for diffrent itsp’s i need to pass diffrent contact value, while for example one is on public internet, other is behind vpn. It d be nice just to extend uacreg table + contact_addr, contact_port, contact_user or just by adding contact field with URI to be sent in register. ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4316 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4316(a)github.com>

3 3

git:master:b8379410: modules: readme files regenerated - dialog ... [skip ci]
by Kamailio Dev 14 Jul '25

14 Jul '25

Module: kamailio Branch: master Commit: b83794109113cbbd335625796f55d2b5aaa3968f URL: https://github.com/kamailio/kamailio/commit/b83794109113cbbd335625796f55d2b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-07-14T13:01:10+02:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/b83794109113cbbd335625796f55d2b… Patch: https://github.com/kamailio/kamailio/commit/b83794109113cbbd335625796f55d2b… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index be626d40c7c..dab489750b1 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -669,7 +669,7 @@ modparam("dialog", "rr_param", "xyz") 6.4. dlg_flag (integer) - Note: This flag has beed deprecated and not used anyymore. it is not + Note: This flag has beed deprecated and not used anymore. It is not needed to set this parameter and its corresponding flag for initial request in case the “dlg_manage()” function is used. In other words, use “dlg_manage()”.

1 0

[kamailio/kamailio] Fix typos (PR #4322)
by Bastian Triller 14 Jul '25

14 Jul '25

#### 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/4322 -- Commit Summary -- * htable: Fix typo * core: Fix typos * pv: Fix typo -- File Changes -- M src/core/parser/parse_fline.c (2) M src/core/tcp_conn.h (2) M src/core/timer.h (2) M src/core/timer_ticks.h (2) M src/modules/pv/pv.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4322.patch https://github.com/kamailio/kamailio/pull/4322.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4322 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4322(a)github.com>

2 3

git:master:157f0ea6: tls_wolfssl: Fix typo
by Daniel-Constantin Mierla 14 Jul '25

14 Jul '25

Module: kamailio Branch: master Commit: 157f0ea6eb570226bcbf52c6ebb706f2e81b3c8e URL: https://github.com/kamailio/kamailio/commit/157f0ea6eb570226bcbf52c6ebb706f… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-14T12:58:23+02:00 tls_wolfssl: Fix typo --- Modified: src/modules/tls_wolfssl/tls_server.h --- Diff: https://github.com/kamailio/kamailio/commit/157f0ea6eb570226bcbf52c6ebb706f… Patch: https://github.com/kamailio/kamailio/commit/157f0ea6eb570226bcbf52c6ebb706f… --- diff --git a/src/modules/tls_wolfssl/tls_server.h b/src/modules/tls_wolfssl/tls_server.h index 6c2ca4a2237..7eb8164a063 100644 --- a/src/modules/tls_wolfssl/tls_server.h +++ b/src/modules/tls_wolfssl/tls_server.h @@ -52,7 +52,7 @@ typedef struct tls_rd_buf /* tls conn flags */ #define F_TLS_CON_WR_WANTS_RD 1 /* write wants read */ #define F_TLS_CON_HANDSHAKED 2 /* connection is handshaked */ -#define F_TLS_CON_RENEGOTIATION 4 /* renegotiation by clinet */ +#define F_TLS_CON_RENEGOTIATION 4 /* renegotiation by client */ typedef struct tls_extra_data {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev