sr-dev

sr-dev@lists.kamailio.org

17 participants
45418 discussions

git:master:6938b17c: ndb_redis: docs for connect_timeout and command_timeout server attributes
by Daniel-Constantin Mierla 15 Jul '25

15 Jul '25

Module: kamailio Branch: master Commit: 6938b17cb6e8cc2951ed255bf29239a0df939c2f URL: https://github.com/kamailio/kamailio/commit/6938b17cb6e8cc2951ed255bf29239a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-15T11:54:27+02:00 ndb_redis: docs for connect_timeout and command_timeout server attributes --- Modified: src/modules/ndb_redis/doc/ndb_redis_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6938b17cb6e8cc2951ed255bf29239a… Patch: https://github.com/kamailio/kamailio/commit/6938b17cb6e8cc2951ed255bf29239a… --- diff --git a/src/modules/ndb_redis/doc/ndb_redis_admin.xml b/src/modules/ndb_redis/doc/ndb_redis_admin.xml index efcd95c9671..e2fddbc3e5c 100644 --- a/src/modules/ndb_redis/doc/ndb_redis_admin.xml +++ b/src/modules/ndb_redis/doc/ndb_redis_admin.xml @@ -101,6 +101,16 @@ tls - is to enable TLS connectivity. </para> </listitem> + <listitem> + <para> + connect_timeout - is to set connect timeout to REDIS server. + </para> + </listitem> + <listitem> + <para> + command_timeout - is to set command timeout to REDIS server. + </para> + </listitem> </itemizedlist> <para>

1 0

git:master:55ddd80d: nsb_redis: docs updated to turn server attributes in a list
by Daniel-Constantin Mierla 15 Jul '25

15 Jul '25

Module: kamailio Branch: master Commit: 55ddd80d15d1d915c85ec397b6ee100d24e6f077 URL: https://github.com/kamailio/kamailio/commit/55ddd80d15d1d915c85ec397b6ee100… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-15T11:54:27+02:00 nsb_redis: docs updated to turn server attributes in a list --- Modified: src/modules/ndb_redis/doc/ndb_redis_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/55ddd80d15d1d915c85ec397b6ee100… Patch: https://github.com/kamailio/kamailio/commit/55ddd80d15d1d915c85ec397b6ee100… --- diff --git a/src/modules/ndb_redis/doc/ndb_redis_admin.xml b/src/modules/ndb_redis/doc/ndb_redis_admin.xml index 85287118725..efcd95c9671 100644 --- a/src/modules/ndb_redis/doc/ndb_redis_admin.xml +++ b/src/modules/ndb_redis/doc/ndb_redis_admin.xml @@ -63,12 +63,49 @@ <title><varname>server</varname> (str)</title> <para> Specify the details to connect to REDIS server. It takes a list of attribute=value - separated by semicolon, the attributes can be name, unix, addr, port, db, pass and tls. Name - is a generic identifier to be used with module functions. unix is the path to the unix - domain socket provided by redis server. addr and port are the IP address and the port to - connect to REDIS server. pass is the server password. tls is to enable TLS connectivity. - unix and (addr, port) are mutually exclusive. If both appear in same server settings unix - domain socket is configured. db is the DB number to use (defaults to 0 if not specified). + separated by semicolon, the attributes can be: + </para> + <itemizedlist> + <listitem> + <para> + name - is a generic identifier to be used with module functions. + </para> + </listitem> + <listitem> + <para> + unix - is the path to the unix domain socket to connect to REDIS server. + </para> + </listitem> + <listitem> + <para> + addr - is the IP address to connect to REDIS server. + </para> + </listitem> + <listitem> + <para> + port - is the port to connect to REDIS server. + </para> + </listitem> + <listitem> + <para> + db - is the DB number to use (defaults to 0 if not specified). + </para> + </listitem> + <listitem> + <para> + pass - is the server password. + </para> + </listitem> + <listitem> + <para> + tls - is to enable TLS connectivity. + </para> + </listitem> + </itemizedlist> + + <para> + Thr unix and (addr, port) are mutually exclusive, if both appear in + same server settings unix domain socket is configured. </para> <para> You can set this parameter many times, in case you want to connect to @@ -76,8 +113,9 @@ server name when querying the REDIS instance. </para> <para> - If tls is enabled, the module will validate the REDIS server certificate against the - ca_path. There is currently no way to connect with a specified client certificate, the + If tls is enabled, the module will validate the REDIS server certificate + against the ca_path. There is currently no way to connect with + a specified client certificate, the <ulink url="https://redis.io/docs/management/security/encryption/#client-certificate-au…">corresponding configuration</ulink> to check client certificates in the REDIS server must therefore be turned off. </para> @@ -98,11 +136,12 @@ modparam("ndb_redis", "server", "name=srvY;addr=127.0.0.3;port=6379;db=5;pass=my modparam("ndb_redis", "server", "name=srvY;unix=/tmp/redis.sock;db=3") # sentinel (for a redis slave) -modparam("ndb_redis", "server", "name=srvZ;sentinel_group=group_name;sentinel_master=0;sentinel=1.2.3.4:26379;sentinel=1.2.3.5:26379") +modparam("ndb_redis", "server", "name=srvZ;sentinel_group=group_name;sentinel_master=0;" + "sentinel=1.2.3.4:26379;sentinel=1.2.3.5:26379") # sentinel (for a redis master) -modparam("ndb_redis", "server", "name=srvZ;sentinel_group=group_name;sentinel_master=1;sentinel=1.2.3.4:26379;sentinel=1.2.3.5:26379") - +modparam("ndb_redis", "server", "name=srvZ;sentinel_group=group_name;sentinel_master=1;" + "sentinel=1.2.3.4:26379;sentinel=1.2.3.5:26379") ... </programlisting> </example> @@ -567,4 +606,3 @@ free reply data: </section> </section> </chapter> -

1 0

git:master:201ba078: ndb_redis: per server attributes for connect and command timeouts
by Daniel-Constantin Mierla 15 Jul '25

15 Jul '25

Module: kamailio Branch: master Commit: 201ba078948183ce7b42fcedc8cf0989b4d84ae3 URL: https://github.com/kamailio/kamailio/commit/201ba078948183ce7b42fcedc8cf098… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-15T11:54:27+02:00 ndb_redis: per server attributes for connect and command timeouts --- Modified: src/modules/ndb_redis/redis_client.c Modified: src/modules/ndb_redis/redis_client.h --- Diff: https://github.com/kamailio/kamailio/commit/201ba078948183ce7b42fcedc8cf098… Patch: https://github.com/kamailio/kamailio/commit/201ba078948183ce7b42fcedc8cf098… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index 4898673bfbc..24cff78e751 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -92,14 +92,8 @@ int redisc_init(void) int i, row; redisc_server_t *rsrv = NULL; param_t *pit = NULL; - struct timeval tv_conn; - struct timeval tv_cmd; - - tv_conn.tv_sec = (int)redis_connect_timeout_param / 1000; - tv_conn.tv_usec = (int)(redis_connect_timeout_param % 1000) * 1000; - - tv_cmd.tv_sec = (int)redis_cmd_timeout_param / 1000; - tv_cmd.tv_usec = (int)(redis_cmd_timeout_param % 1000) * 1000; + struct timeval tv_conn = {0}; + struct timeval tv_cmd = {0}; if(_redisc_srv_list == NULL) { LM_ERR("no redis servers defined\n"); @@ -119,6 +113,21 @@ int redisc_init(void) memset(pass, 0, sizeof(pass)); memset(unix_sock_path, 0, sizeof(unix_sock_path)); + if(rsrv->connect_timeout > 0) { + tv_conn.tv_sec = (long)(rsrv->connect_timeout / 1000); + tv_conn.tv_usec = (int)(rsrv->connect_timeout % 1000) * 1000; + } else { + tv_conn.tv_sec = (long)(redis_connect_timeout_param / 1000); + tv_conn.tv_usec = (int)(redis_connect_timeout_param % 1000) * 1000; + } + if(rsrv->command_timeout > 0) { + tv_cmd.tv_sec = (long)(rsrv->command_timeout / 1000); + tv_cmd.tv_usec = (int)(rsrv->command_timeout % 1000) * 1000; + } else { + tv_cmd.tv_sec = (long)(redis_cmd_timeout_param / 1000); + tv_cmd.tv_usec = (int)(redis_cmd_timeout_param % 1000) * 1000; + } + for(pit = rsrv->attrs; pit; pit = pit->next) { if(pit->name.len == 4 && strncmp(pit->name.s, "unix", 4) == 0) { snprintf(unix_sock_path, sizeof(unix_sock_path) - 1, "%.*s", @@ -408,7 +417,12 @@ int redisc_add_server(char *spec) if(pit->name.len == 4 && strncmp(pit->name.s, "name", 4) == 0) { rsrv->sname = &pit->body; rsrv->hname = get_hash1_raw(rsrv->sname->s, rsrv->sname->len); - break; + } else if(pit->name.len == 15 + && strncmp(pit->name.s, "connect_timeout", 15) == 0) { + str2sint(&pit->body, &rsrv->connect_timeout); + } else if(pit->name.len == 15 + && strncmp(pit->name.s, "command_timeout", 15) == 0) { + str2sint(&pit->body, &rsrv->command_timeout); } } if(rsrv->sname == NULL) { @@ -470,11 +484,20 @@ int redisc_reconnect_server(redisc_server_t *rsrv) struct timeval tv_conn; struct timeval tv_cmd; - tv_conn.tv_sec = (int)redis_connect_timeout_param / 1000; - tv_conn.tv_usec = (int)(redis_connect_timeout_param % 1000) * 1000; - - tv_cmd.tv_sec = (int)redis_cmd_timeout_param / 1000; - tv_cmd.tv_usec = (int)(redis_cmd_timeout_param % 1000) * 1000; + if(rsrv->connect_timeout > 0) { + tv_conn.tv_sec = (long)(rsrv->connect_timeout / 1000); + tv_conn.tv_usec = (int)(rsrv->connect_timeout % 1000) * 1000; + } else { + tv_conn.tv_sec = (long)(redis_connect_timeout_param / 1000); + tv_conn.tv_usec = (int)(redis_connect_timeout_param % 1000) * 1000; + } + if(rsrv->command_timeout > 0) { + tv_cmd.tv_sec = (long)(rsrv->command_timeout / 1000); + tv_cmd.tv_usec = (int)(rsrv->command_timeout % 1000) * 1000; + } else { + tv_cmd.tv_sec = (long)(redis_cmd_timeout_param / 1000); + tv_cmd.tv_usec = (int)(redis_cmd_timeout_param % 1000) * 1000; + } memset(addr, 0, sizeof(addr)); port = 6379; diff --git a/src/modules/ndb_redis/redis_client.h b/src/modules/ndb_redis/redis_client.h index 0a5a3d82dfb..c97a5791d6f 100644 --- a/src/modules/ndb_redis/redis_client.h +++ b/src/modules/ndb_redis/redis_client.h @@ -81,6 +81,8 @@ typedef struct redisc_server { str *sname; unsigned int hname; + int connect_timeout; + int command_timeout; param_t *attrs; char *spec; redisContext *ctxRedis;

1 0

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

15 Jul '25

Module: kamailio Branch: master Commit: 5be6d54a609db330b72f02b09fff4f2a3cddaa12 URL: https://github.com/kamailio/kamailio/commit/5be6d54a609db330b72f02b09fff4f2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-07-15T10:31:09+02:00 modules: readme files regenerated - permissions ... [skip ci] --- Modified: src/modules/permissions/README --- Diff: https://github.com/kamailio/kamailio/commit/5be6d54a609db330b72f02b09fff4f2… Patch: https://github.com/kamailio/kamailio/commit/5be6d54a609db330b72f02b09fff4f2…

1 0

[kamailio/kamailio] permissions: Perform LPM to find the longest matching subnet (PR #4297)
by Xenofon Karamanos 15 Jul '25

15 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR allows the functions `allow_address_group` and `allow_source_address_group` to search for Longest Prefix Match (LPM) when searching for an IP is in a subnet instead of the first found. Since this is a stricter check, i don't think we require an extra param for it, but feel free to suggest otherwise if there are any use-cases that required the first matched. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4297 -- Commit Summary -- * permissions: Perform LPM to find the longest matching subnet -- File Changes -- M src/modules/permissions/hash.c (23) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4297.patch https://github.com/kamailio/kamailio/pull/4297.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4297 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4297(a)github.com>

3 14

[kamailio/kamailio] src/Makefile.defs: Avoid warning for gcc 15 (PR #4318)
by Дилян Палаузов 15 Jul '25

15 Jul '25

With gcc --version ``` $ gcc --version gcc (GCC) 15.1.1 20250521 (Red Hat 15.1.1-2) Copyright (C) 2025 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ``` this avoids a warning, that gcc is too old. Before: ``` $ rm src/config.mak $ make config make -C src/ config make[1]: Entering directory '/git/voip/kamailio/src' target architecture <x86_64>, host architecture <x86_64> Makefile.defs:1065: You are using an old and unsupported gcc version (15.0+), compile at your own risk! making config... rm -f modules.lst make --no-print-directory modules.lst saving modules list... make[1]: Leaving directory '/git/voip/kamailio/src' ``` after: ``` $ rm src/config.mak $ make config make -C src/ config make[1]: Entering directory '/git/voip/kamailio/src' target architecture <x86_64>, host architecture <x86_64> making config... rm -f modules.lst make --no-print-directory modules.lst saving modules list... make[1]: Leaving directory '/git/voip/kamailio/src' ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4318 -- Commit Summary -- * src/Makefile.defs: Avoid warning for gcc 15 -- File Changes -- M src/Makefile.defs (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4318.patch https://github.com/kamailio/kamailio/pull/4318.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4318 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4318(a)github.com>

2 11

git:master:f124b517: Makefile.defs: Avoid warning for gcc 15
by Daniel-Constantin Mierla 15 Jul '25

15 Jul '25

Module: kamailio Branch: master Commit: f124b5175c53d2e3720b949e46012720ea6b36ee URL: https://github.com/kamailio/kamailio/commit/f124b5175c53d2e3720b949e4601272… Author: ÐÐ¸Ð»ÑÐ½ ÐÐ°Ð»Ð°ÑÐ·Ð¾Ð² <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-15T10:16:51+02:00 Makefile.defs: Avoid warning for gcc 15 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/f124b5175c53d2e3720b949e4601272… Patch: https://github.com/kamailio/kamailio/commit/f124b5175c53d2e3720b949e4601272… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 6ff7eeddb51..b8ddc6dd7ac 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -287,28 +287,28 @@ ifneq (,$(findstring gcc, $(CC_LONGVER))) CC_SHORTVER:=$(shell echo "$(CC_VER)" | cut -d" " -f 2| \ sed -e 's/[^0-9]*-$.*$/\1/'| \ sed -e 's/2\.9.*/2.9x/' \ - -e 's/3\.[0-3]\..*/3.0/' \ - -e 's/3\.[0-3]/3.0/' \ - -e 's/3\.[4-9]\..*/3.4/' \ - -e 's/3\.[4-9]/3.4/' \ - -e 's/4\.[0-1]\..*/4.x/' \ - -e 's/4\.[0-1]/4.x/' \ - -e 's/4\.[2-4]\..*/4.2+/' \ - -e 's/4\.[2-4]$$/4.2+/' \ - -e 's/4\.[5-9]\..*/4.5+/' \ - -e 's/4\.[5-9]$$/4.5+/' \ - -e 's/5\.[0-9]\..*/5.0+/' \ - -e 's/5\.[0-9]$$/5.0+/' \ - -e 's/6\.[0-9]\..*/6.0+/' \ - -e 's/6\.[0-9]$$/6.0+/' \ - -e 's/7\.[0-9]\..*/7.0+/' \ - -e 's/7\.[0-9]$$/7.0+/' \ - -e 's/8\.[0-9]\..*/8.0+/' \ - -e 's/8\.[0-9]$$/8.0+/' \ - -e 's/9\.[0-9]\..*/9.0+/' \ - -e 's/9\.[0-9]$$/9.0+/' \ - -e 's/1[0-4]\.[0-9]\..*/9.0+/' \ - -e 's/1[0-4]\.[0-9]$$/9.0+/') + -e 's/^3\.[0-3]\..*/3.0/' \ + -e 's/^3\.[0-3]/3.0/' \ + -e 's/^3\.[4-9]\..*/3.4/' \ + -e 's/^3\.[4-9]/3.4/' \ + -e 's/^4\.[0-1]\..*/4.x/' \ + -e 's/^4\.[0-1]/4.x/' \ + -e 's/^4\.[2-4]\..*/4.2+/' \ + -e 's/^4\.[2-4]$$/4.2+/' \ + -e 's/^4\.[5-9]\..*/4.5+/' \ + -e 's/^4\.[5-9]$$/4.5+/' \ + -e 's/^5\.[0-9]\..*/5.0+/' \ + -e 's/^5\.[0-9]$$/5.0+/' \ + -e 's/^6\.[0-9]\..*/6.0+/' \ + -e 's/^6\.[0-9]$$/6.0+/' \ + -e 's/^7\.[0-9]\..*/7.0+/' \ + -e 's/^7\.[0-9]$$/7.0+/' \ + -e 's/^8\.[0-9]\..*/8.0+/' \ + -e 's/^8\.[0-9]$$/8.0+/' \ + -e 's/^9\.[0-9]\..*/9.0+/' \ + -e 's/^9\.[0-9]$$/9.0+/' \ + -e 's/^1[0-5]\.[0-9]\..*/9.0+/' \ + -e 's/^1[0-5]\.[0-9]$$/9.0+/') ifeq (,$(strip $(filter-out 3.0 3.4 4.x 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+ 9.0+,$(CC_SHORTVER)))) # dependencies can be generated on-the-fly while compiling *.c CC_MKDEP_OPTS=-MMD -MP

1 0

git:master:68da5e0b: permissions: docs for subnet_match_mode param
by Daniel-Constantin Mierla 15 Jul '25

15 Jul '25

Module: kamailio Branch: master Commit: 68da5e0b1a8507efc03730e5c76d10079d5bc24d URL: https://github.com/kamailio/kamailio/commit/68da5e0b1a8507efc03730e5c76d100… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-15T10:16:18+02:00 permissions: docs for subnet_match_mode param - updated notes about subnet matching --- Modified: src/modules/permissions/doc/permissions_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/68da5e0b1a8507efc03730e5c76d100… Patch: https://github.com/kamailio/kamailio/commit/68da5e0b1a8507efc03730e5c76d100… --- diff --git a/src/modules/permissions/doc/permissions_admin.xml b/src/modules/permissions/doc/permissions_admin.xml index f893a3e4eb7..1e5e022902e 100644 --- a/src/modules/permissions/doc/permissions_admin.xml +++ b/src/modules/permissions/doc/permissions_admin.xml @@ -224,14 +224,16 @@ <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. + its related functions can do First Prefix Match (FPM) or the + Longest Prefix Match (LPM) methods to find the subnet matching record, + which can set the tag variable. The matching method is controled by + the parameter subnet_match_mode. </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: + Th LPM 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). + The FPM/LPM behavior is now consistent across the following functions: </para> <itemizedlist> <listitem><para><function>allow_address()</function></para></listitem> @@ -842,6 +844,28 @@ modparam("permissions", "peer_tag_mode", 1) ... modparam("permissions", "max_subnets", 1024) ... +</programlisting> + </example> + </section> + <section id ="permissions.p.subnet_match_mode"> + <title><varname>subnet_match_mode</varname> (int)</title> + <para> + Control how subnet addresses are matched: 0 - return on the first + prefix match; 1 - return on the longest prefix match. It impacts + functions like allow_source_address(), allow_address(), + allow_source_address_group() or allow_address_group(). + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>subnet_match_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("permissions", "subnet_match_mode", 1) +... </programlisting> </example> </section>

1 0

git:master:6568a5be: permissions: added subnet_match_mode param
by Daniel-Constantin Mierla 15 Jul '25

15 Jul '25

Module: kamailio Branch: master Commit: 6568a5be5b912326e8bea85a5c37a28d36863a24 URL: https://github.com/kamailio/kamailio/commit/6568a5be5b912326e8bea85a5c37a28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-15T10:16:18+02:00 permissions: added subnet_match_mode param - control how subnet match is done: 0 - return on first prefix match; 1 - return on longest prefix match - default: 0 - backward compatible behaviour --- Modified: src/modules/permissions/hash.c Modified: src/modules/permissions/permissions.c --- Diff: https://github.com/kamailio/kamailio/commit/6568a5be5b912326e8bea85a5c37a28… Patch: https://github.com/kamailio/kamailio/commit/6568a5be5b912326e8bea85a5c37a28… --- diff --git a/src/modules/permissions/hash.c b/src/modules/permissions/hash.c index aeb8dce2d23..1ef625913e4 100644 --- a/src/modules/permissions/hash.c +++ b/src/modules/permissions/hash.c @@ -47,6 +47,7 @@ extern int perm_peer_tag_mode; extern int _perm_max_subnets; +extern int _perm_subnet_match_mode; #define PERM_MAX_SUBNETS _perm_max_subnets @@ -719,6 +720,10 @@ int match_subnet_table(struct subnet *table, unsigned int grp, ip_addr_t *addr, best_mask = table[i].mask; best_idx = i; } + if(_perm_subnet_match_mode == 0) { + /* use the first match */ + break; + } } i++; } @@ -762,6 +767,10 @@ int find_group_in_subnet_table( best_mask = table[i].mask; best_idx = i; } + if(_perm_subnet_match_mode == 0) { + /* use the first match */ + break; + } } i++; } diff --git a/src/modules/permissions/permissions.c b/src/modules/permissions/permissions.c index 788bf48b135..fcf17fc7534 100644 --- a/src/modules/permissions/permissions.c +++ b/src/modules/permissions/permissions.c @@ -97,6 +97,7 @@ time_t *perm_rpc_reload_time = NULL; int _perm_max_subnets = 512; int _perm_load_backends = 0xFFFF; +int _perm_subnet_match_mode = 0; /* * Convert the name of the files into table index @@ -198,6 +199,7 @@ static param_export_t params[] = { {"mask_col", PARAM_STR, &perm_mask_col}, {"port_col", PARAM_STR, &perm_port_col}, {"max_subnets", PARAM_INT, &_perm_max_subnets}, + {"subnet_match_mode", PARAM_INT, &_perm_subnet_match_mode}, {"load_backends", PARAM_INT, &_perm_load_backends}, {"reload_delta", PARAM_INT, &perm_reload_delta}, {"trusted_cleanup_interval", PARAM_INT, &perm_trusted_table_interval},

1 0

git:5.8:3aefb94d: cdp: cdp_rpc_list_peers() release lock on errors
by Victor Seva 15 Jul '25

15 Jul '25

Module: kamailio Branch: 5.8 Commit: 3aefb94d09225646fd30e106b41694d9e92bc0f6 URL: https://github.com/kamailio/kamailio/commit/3aefb94d09225646fd30e106b41694d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-07-15T09:14:36+02:00 cdp: cdp_rpc_list_peers() release lock on errors (cherry picked from commit 7f078931d3d684822e90485024672632be29741c) (cherry picked from commit 9c6fbd3b139d9e48b7cc2323f3b902773f181c83) --- Modified: src/modules/cdp/cdp_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/3aefb94d09225646fd30e106b41694d… Patch: https://github.com/kamailio/kamailio/commit/3aefb94d09225646fd30e106b41694d… --- diff --git a/src/modules/cdp/cdp_rpc.c b/src/modules/cdp/cdp_rpc.c index 576b1ba8fcc..b54ba60c12f 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, "ssd", "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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev