sr-dev

sr-dev@lists.kamailio.org

16 participants
45408 discussions

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] dialog.dlg_flag: unclear in the documentation/implementation if it is deprecated or removed (Issue #4321)
by Дилян Палаузов 14 Jul '25

14 Jul '25

dilyanpalauzov created an issue (kamailio/kamailio#4321) With Kamailio 5.8 this worked: ``` FLT_DIALOG=10 modparam("dialog", "dlg_flag", FLT_DIALOG) ``` In version 6.0 it produces an error: ``` 0(1) ERROR: <core> [core/modparam.c:187]: set_mod_param_regex(): parameter <dlg_flag> of type <2:int> not found in module <dialog> 0(1) CRITICAL: <core> [core/cfg.y:4049]: yyerror_at(): parse error in config file /conf/kamailio.cfg, line 169, column 34: Can't set module parameter ``` and e60a06469503c566d40437e69cf3374 has removed dialog.dlg_flag option. But https://www.kamailio.org/docs/modules/devel/modules/dialog.html#dialog.p.fl… states for dlg_flag: > 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()”. This is not so correct. If it is deprecated, then Kamailio will still work with it. If it is not needed any more to set this parameter, then it means that the parameter can nevertheless be set. But it cannot be set. * Documentation should state that the parameter is removed, instead of classifying it as deprecated, and there is no need to set it anymore. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4321 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4321(a)github.com>

3 3

[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

git:master:982a1a67: tls: Fix typo
by Daniel-Constantin Mierla 14 Jul '25

14 Jul '25

Module: kamailio Branch: master Commit: 982a1a676a84142a511e4f095f8d19161f3c34ee URL: https://github.com/kamailio/kamailio/commit/982a1a676a84142a511e4f095f8d191… 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: Fix typo --- Modified: src/modules/tls/tls_server.h --- Diff: https://github.com/kamailio/kamailio/commit/982a1a676a84142a511e4f095f8d191… Patch: https://github.com/kamailio/kamailio/commit/982a1a676a84142a511e4f095f8d191… --- diff --git a/src/modules/tls/tls_server.h b/src/modules/tls/tls_server.h index 5cb454f4cb2..a7b8fe0d1f5 100644 --- a/src/modules/tls/tls_server.h +++ b/src/modules/tls/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

git:master:a426a2e1: pv: Fix typo
by Daniel-Constantin Mierla 14 Jul '25

14 Jul '25

Module: kamailio Branch: master Commit: a426a2e113c4b41af36ee4240cc10460a6cb537a URL: https://github.com/kamailio/kamailio/commit/a426a2e113c4b41af36ee4240cc1046… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-14T12:58:23+02:00 pv: Fix typo --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/a426a2e113c4b41af36ee4240cc1046… Patch: https://github.com/kamailio/kamailio/commit/a426a2e113c4b41af36ee4240cc1046… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index e1cf00e3443..6ed27e7712b 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -178,7 +178,7 @@ static pv_export_t mod_pvs[] = { PVT_OTHER, pv_get_diversion, 0, 0, 0, pv_init_iname, 1}, {{"dir", (sizeof("dir") - 1)}, /* */ PVT_OTHER, pv_get_diversion, 0, 0, 0, pv_init_iname, 2}, - {{"dip", (sizeof("dis") - 1)}, /* */ + {{"dip", (sizeof("dip") - 1)}, /* */ PVT_OTHER, pv_get_diversion, 0, 0, 0, pv_init_iname, 3}, {{"dic", (sizeof("dic") - 1)}, /* */ PVT_OTHER, pv_get_diversion, 0, 0, 0, pv_init_iname, 4},

1 0

git:master:6b929330: core: Fix typos
by Daniel-Constantin Mierla 14 Jul '25

14 Jul '25

Module: kamailio Branch: master Commit: 6b92933080230f9546c9559aba9ecdfad7759a15 URL: https://github.com/kamailio/kamailio/commit/6b92933080230f9546c9559aba9ecdf… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-14T12:58:23+02:00 core: Fix typos --- Modified: src/core/tcp_conn.h Modified: src/core/timer.h Modified: src/core/timer_ticks.h --- Diff: https://github.com/kamailio/kamailio/commit/6b92933080230f9546c9559aba9ecdf… Patch: https://github.com/kamailio/kamailio/commit/6b92933080230f9546c9559aba9ecdf… --- diff --git a/src/core/tcp_conn.h b/src/core/tcp_conn.h index 1fc3c001f15..8b8c71df8ff 100644 --- a/src/core/tcp_conn.h +++ b/src/core/tcp_conn.h @@ -40,7 +40,7 @@ #define TCP_CHILD_TIMEOUT \ 5 /* after 5 seconds, the child "returns" - * the connection to the tcp maing process */ + * the connection to the tcp main process */ #define TCP_MAIN_SELECT_TIMEOUT 5 /* how often "tcp main" checks for timeout*/ #define TCP_CHILD_SELECT_TIMEOUT 2 /* the same as above but for children */ diff --git a/src/core/timer.h b/src/core/timer.h index b3920163731..73a9d4c48cc 100644 --- a/src/core/timer.h +++ b/src/core/timer.h @@ -53,7 +53,7 @@ #ifdef USE_SLOW_TIMER #include <sys/types.h> -typedef unsigned int slow_idx_t; /* type fot the slow index */ +typedef unsigned int slow_idx_t; /* type for the slow index */ extern pid_t slow_timer_pid; #endif diff --git a/src/core/timer_ticks.h b/src/core/timer_ticks.h index 292b73e71a9..c5e93aee92e 100644 --- a/src/core/timer_ticks.h +++ b/src/core/timer_ticks.h @@ -43,7 +43,7 @@ #define S_TO_TICKS(s) ((s)*TIMER_TICKS_HZ) -/** @brief how many s pe per t ticks, integer value */ +/** @brief how many seconds per ticks, integer value */ #define TICKS_TO_S(t) ((t) / TIMER_TICKS_HZ) /** @brief how many ms per t ticks, integer value */

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