- sr-dev - kamailio.org

git:master:c09961d5: acc_json: add cdr_skip parameter
by Lucian Balaceanu 16 Jul '25

16 Jul '25

Module: kamailio Branch: master Commit: c09961d5b3144b1fb5809a29280c5baa776ee6ea URL: https://github.com/kamailio/kamailio/commit/c09961d5b3144b1fb5809a29280c5ba… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2025-07-16T10:44:04+03:00 acc_json: add cdr_skip parameter --- Modified: src/modules/acc_json/acc_json_mod.c Modified: src/modules/acc_json/doc/acc_json_admin.xml --- Diff: https://github.com/… [View More]kamailio/kamailio/commit/c09961d5b3144b1fb5809a29280c5ba… Patch: https://github.com/kamailio/kamailio/commit/c09961d5b3144b1fb5809a29280c5ba… --- diff --git a/src/modules/acc_json/acc_json_mod.c b/src/modules/acc_json/acc_json_mod.c index 3008012ecdd..a24ff607c79 100644 --- a/src/modules/acc_json/acc_json_mod.c +++ b/src/modules/acc_json/acc_json_mod.c @@ -99,6 +99,7 @@ str cdr_q_name = {0, 0}; static char *cdr_log_facility_str = 0; static char *cdr_json_pre_encoded_prefix_str = 0; str cdr_json_pre_encoded_prefix = {0, 0}; +str acc_json_cdr_skip = {NULL, 0}; static cmd_export_t cmds[] = {{0, 0, 0, 0, 0, 0}}; @@ -118,6 +119,7 @@ static param_export_t params[] = {{"acc_flag", PARAM_INT, &acc_flag}, {"cdr_pre_encoded_prefix", PARAM_STRING, &cdr_json_pre_encoded_prefix_str}, {"cdr_enable", PARAM_INT, &cdr_enable}, + {"cdr_skip", PARAM_STR, &acc_json_cdr_skip}, {"cdr_expired_dlg_enable", PARAM_INT, &cdr_expired_dlg_enable}, {"cdr_log_level", PARAM_INT, &cdr_log_level}, {"cdr_log_facility", PARAM_STRING, &cdr_log_facility_str}, @@ -452,7 +454,19 @@ int cdr_json_write(struct dlg_cell *dlg, struct sip_msg *req, cdr_info_t *inf) int extra_cnt = 0; int core_cnt = 0; - json_t *object = json_object(); + json_t *object = NULL; + + /* Skip cdr if cdr_skip dlg_var exists */ + if(acc_json_cdr_skip.len > 0) { + str nocdr_val = {0}; + dlgb.get_dlg_varval(dlg, &acc_json_cdr_skip, &nocdr_val); + if(nocdr_val.s) { + LM_DBG("cdr_skip dlg_var set, skip cdr!"); + return 0; + } + } + + object = json_object(); /* get default values */ core_cnt = accb.get_core_cdr_attrs(dlg, inf->varr, inf->iarr, inf->tarr); diff --git a/src/modules/acc_json/doc/acc_json_admin.xml b/src/modules/acc_json/doc/acc_json_admin.xml index 08bb113d06c..8d3ae12bf8f 100644 --- a/src/modules/acc_json/doc/acc_json_admin.xml +++ b/src/modules/acc_json/doc/acc_json_admin.xml @@ -348,6 +348,24 @@ modparam("acc_json", "cdr_enable", 1) </example> </section> + <section id="acc_json.p.cdr_skip"> + <title><varname>cdr_skip</varname> (string)</title> + <para> + Skip cdr generation for dialogs with this dlg_var set. + </para> + <para> + Default value is NULL. + </para> + <example> + <title>cdr_skip example</title> + <programlisting format="linespecific"> +... +modparam("acc_json", "cdr_skip", "nocdr") +... +</programlisting> + </example> + </section> + <section id="acc.p.cdr_extra"> <title><varname>cdr_extra</varname> (str)</title> <para> [View Less]

1 0

git:master:dfd5358f: dispatcher: docs for event_callback_mode parameter
by Daniel-Constantin Mierla 16 Jul '25

16 Jul '25

Module: kamailio Branch: master Commit: dfd5358fd4a685d5c368753e826bff63c4e38988 URL: https://github.com/kamailio/kamailio/commit/dfd5358fd4a685d5c368753e826bff6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-16T09:31:34+02:00 dispatcher: docs for event_callback_mode parameter --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]dfd5358fd4a685d5c368753e826bff6… Patch: https://github.com/kamailio/kamailio/commit/dfd5358fd4a685d5c368753e826bff6… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 1f897f8335b..9429afba67f 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1073,6 +1073,40 @@ end </example> </section> + <section id="dispatcher.p.event_callback_mode"> + <title><varname>event_callback_mode</varname> (int)</title> + <para> + Controls when the event_route or the KEMI event callback function + are executed. If set to 0, they are executed when the destination + state changes based on OPTIONS keepalives or the use of config + functions to set the state (e.g., ds_mark_dst(...)). If set to 1, + they are executed only on state change due to OPTIONS keepalives. + </para> + <para> + Note that event routes are not executed on RPC commands setting + the destination state. + </para> + <para> + <emphasis> + Default value is '0'. + </emphasis> + </para> + <example> + <title>Set <varname>event_callback_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("dispatcher", "event_callback_mode", 1) +... +-- event callback function implemented in Lua +function ksr_dispatcher_event(evname) + KSR.info("===== dispatcher module triggered event: " .. evname .. "\n"); + return 1; +end +... +</programlisting> + </example> + </section> + <section id="dispatcher.p.ds_attrs_none"> <title><varname>ds_attrs_none</varname> (int)</title> <para> @@ -2634,39 +2668,45 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt) <section id="dispatcher.ex.event_routes"> <title>Event routes</title> <section> - <title> - <function moreinfo="none">dispatcher:dst-down</function> - </title> - <para> + <title> + <function moreinfo="none">dispatcher:dst-down</function> + </title> + <para> When defined, the module calls event_route[dispatcher:ds-down] when a destination goes down (becomes probing). A typical use case is to update NMC equipment as to the status of a destination. - </para> + </para> + <para> + Its execution is controlled by event_callback_mode parameter. + </para> <programlisting format="linespecific"> ... event_route[dispatcher:dst-down] { xlog("L_ERR", "Destination down: $rm $ru ($du)\n"); } ... - </programlisting> +</programlisting> </section> <section> - <title> - <function moreinfo="none">dispatcher:dst-up</function> - </title> - <para> + <title> + <function moreinfo="none">dispatcher:dst-up</function> + </title> + <para> When defined, the module calls event_route[dispatcher:ds-up] when a destination that was previously down (probing) comes up. A typical use case is to update NMC equipment as to the status of a destination. - </para> + </para> + <para> + Its execution is controlled by event_callback_mode parameter. + </para> <programlisting format="linespecific"> ... event_route[dispatcher:dst-up] { xlog("L_ERR", "Destination up: $rm $ru\n"); } ... - </programlisting> +</programlisting> </section> </section> [View Less]

1 0

git:master:77805bc1: dispatcher: added parameter event_callback_mode
by Daniel-Constantin Mierla 16 Jul '25

16 Jul '25

Module: kamailio Branch: master Commit: 77805bc1f028f4cca956d4f05dd9dc3c0d534d0f URL: https://github.com/kamailio/kamailio/commit/77805bc1f028f4cca956d4f05dd9dc3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-16T09:31:34+02:00 dispatcher: added parameter event_callback_mode - control when event route and KEMI callback functions are executed --- Modified: src/modules/dispatcher/dispatch.c Modified: … [View More]

1 0

git:master:48d3fdb3: ims_isc: remove function names from log messages
by Victor Seva 15 Jul '25

15 Jul '25

Module: kamailio Branch: master Commit: 48d3fdb3cfa3e5eec777853e1a4d32d844e94e8f URL: https://github.com/kamailio/kamailio/commit/48d3fdb3cfa3e5eec777853e1a4d32d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-07-15T18:17:41+02:00 ims_isc: remove function names from log messages * use generic PKG_MEM_ERROR messages on pkg_malloc errors --- Modified: src/modules/ims_isc/third_party_reg.c --- … [View More]Diff: https://github.com/kamailio/kamailio/commit/48d3fdb3cfa3e5eec777853e1a4d32d… Patch: https://github.com/kamailio/kamailio/commit/48d3fdb3cfa3e5eec777853e1a4d32d… --- diff --git a/src/modules/ims_isc/third_party_reg.c b/src/modules/ims_isc/third_party_reg.c index b1b6de69076..71f26314c65 100644 --- a/src/modules/ims_isc/third_party_reg.c +++ b/src/modules/ims_isc/third_party_reg.c @@ -168,7 +168,7 @@ int build_p_associated_uri(ims_subscription *s) if(!p_associated_uri.buf) { p_associated_uri.data_len = 0; p_associated_uri.buf_len = 0; - LM_ERR("no pkg memory left\n"); + PKG_MEM_ERROR; return -1; } else { p_associated_uri.buf_len = p_associated_uri.data_len; @@ -384,8 +384,7 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) str b = {0, 0}; uac_req_t req; - LM_DBG("r_send_third_party_reg: REGISTER to <%.*s>\n", r->req_uri.len, - r->req_uri.s); + LM_DBG("REGISTER to <%.*s>\n", r->req_uri.len, r->req_uri.s); h.len = event_hdr.len + max_fwds_hdr.len; h.len += expires_s.len + 12 + expires_e.len; @@ -432,7 +431,7 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) h.s = pkg_malloc(h.len); if(!h.s) { - LM_ERR("r_send_third_party_reg: Error allocating %d bytes\n", h.len); + PKG_MEM_ERROR; h.len = 0; return 0; } @@ -490,8 +489,7 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) b.len = body_s.len + r->body.content.len + body_e.len; b.s = pkg_malloc(b.len); if(!b.s) { - LM_ERR("r_send_third_party_reg: Error allocating %d bytes\n", - b.len); + PKG_MEM_ERROR; b.len = 0; goto error; } @@ -508,8 +506,7 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) b.len = r->body.content.len; b.s = pkg_malloc(b.len); if(!b.s) { - LM_ERR("r_send_third_party_reg: Error allocating %d bytes\n", - b.len); + PKG_MEM_ERROR; b.len = 0; goto error; } @@ -524,8 +521,7 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) b.len = r->body.content.len; b.s = pkg_malloc(b.len); if(!b.s) { - LM_ERR("r_send_third_party_reg: Error allocating %d bytes\n", - b.len); + PKG_MEM_ERROR; b.len = 0; goto error; } @@ -541,7 +537,7 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) TMCB_RESPONSE_IN | TMCB_ON_FAILURE | TMCB_LOCAL_COMPLETED, r_third_party_reg_response, &(r->req_uri)); if(isc_tmb.t_request(&req, &(r->req_uri), &(r->to), &(r->from), 0) < 0) { - LM_ERR("r_send_third_party_reg: Error sending in transaction\n"); + LM_ERR("Error sending in transaction\n"); goto error; } if(h.s) @@ -568,9 +564,9 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) void r_third_party_reg_response( struct cell *t, int type, struct tmcb_params *ps) { - LM_DBG("r_third_party_reg_response: code %d\n", ps->code); + LM_DBG("code %d\n", ps->code); if(!ps->rpl) { - LM_ERR("r_third_party_reg_response: No reply\n"); + LM_ERR("No reply\n"); return; } @@ -581,6 +577,6 @@ void r_third_party_reg_response( return; } else if(ps->code == 404) { } else { - LM_DBG("r_third_party_reg_response: code %d\n", ps->code); + LM_DBG("code %d\n", ps->code); } } [View Less]

1 0

git:master:db7c46d9: ims_isc: fix wrong log level messages
by Victor Seva 15 Jul '25

15 Jul '25

Module: kamailio Branch: master Commit: db7c46d97cf2d3f47024dbf9583aad575dd14b35 URL: https://github.com/kamailio/kamailio/commit/db7c46d97cf2d3f47024dbf9583aad5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-07-15T18:03:07+02:00 ims_isc: fix wrong log level messages this are clearly debug log messages, not errors --- Modified: src/modules/ims_isc/third_party_reg.c --- Diff: https://github.… [View More]

1 0

[kamailio/kamailio] stuck of processing messages on UDP localhost:5060 socket (Issue #4325)
by Simon Darienko 15 Jul '25

15 Jul '25

sem32 created an issue (kamailio/kamailio#4325) ### Description The issue: in 15 second after start of kamailio, it stops to read the UDP socket localhost:5060 ### Troubleshooting <img width="683" height="406" alt="Image" src="https://github.com/user-attachments/assets/b93ed7d3-8944-477b-867b-ca7fcae8…" /> #### Reproduction Preconditions: - More than one worker for UDP localhost:5060 - Kamailio receives SIP OPTION from the Asterisk by UDP localhost - In the Kamailio's script we have … [View More]

1 0

[kamailio/kamailio] github: [skip ci]: bump awalsh128/cache-apt-pkgs-action from 1.5.0 to 1.5.1 (PR #4324)
by dependabot[bot] 15 Jul '25

15 Jul '25

Bumps [awalsh128/cache-apt-pkgs-action](https://github.com/awalsh128/cache-apt-pkg… from 1.5.0 to 1.5.1. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/awalsh128/cache-apt-pkgs-action/releases&quot… releases</a>.</em></p> <blockquote> <h2>v1.5.1</h2> <h2>What'… [View More]

2 1

git:master:10196c29: github: [skip ci]: bump awalsh128/cache-apt-pkgs-action
by Victor Seva 15 Jul '25

15 Jul '25

Module: kamailio Branch: master Commit: 10196c29ce54a0cf28bcdb0264ec45f43925097c URL: https://github.com/kamailio/kamailio/commit/10196c29ce54a0cf28bcdb0264ec45f… Author: dependabot[bot] <49699333+dependabot[bot](a)users.noreply.github.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-07-15T16:33:18+02:00 github: [skip ci]: bump awalsh128/cache-apt-pkgs-action Bumps [awalsh128/cache-apt-pkgs-action](https://github.com/awalsh128/cache-apt-pkg… from 1.5.… [View More]

1 0

git:master:031827e9: modules: readme files regenerated - ndb_redis ... [skip ci]
by Kamailio Dev 15 Jul '25

15 Jul '25

Module: kamailio Branch: master Commit: 031827e9f62254052df89ca632a21306d3175a63 URL: https://github.com/kamailio/kamailio/commit/031827e9f62254052df89ca632a2130… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-07-15T12:31:09+02:00 modules: readme files regenerated - ndb_redis ... [skip ci] --- Modified: src/modules/ndb_redis/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:eb19b681: ndb_redis: docs - break long lines in example to fit better in text format
by Daniel-Constantin Mierla 15 Jul '25

15 Jul '25

Module: kamailio Branch: master Commit: eb19b6816e4242553320da0df62e72e3b107f765 URL: https://github.com/kamailio/kamailio/commit/eb19b6816e4242553320da0df62e72e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-15T12:29:50+02:00 ndb_redis: docs - break long lines in example to fit better in text format --- Modified: src/modules/ndb_redis/doc/ndb_redis_admin.xml --- Diff: https://github.com/kamailio/… [View More]

1 0

git:master:33ba71c2: modules: readme files regenerated - ndb_redis ... [skip ci]
by Kamailio Dev 15 Jul '25

15 Jul '25

Module: kamailio Branch: master Commit: 33ba71c209cd612ce59ea547d42c4da11304e5a5 URL: https://github.com/kamailio/kamailio/commit/33ba71c209cd612ce59ea547d42c4da… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-07-15T12:01:10+02:00 modules: readme files regenerated - ndb_redis ... [skip ci] --- Modified: src/modules/ndb_redis/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]33ba71c209cd612ce59ea547d42c4da… Patch: https://github.com/kamailio/kamailio/commit/33ba71c209cd612ce59ea547d42c4da… --- diff --git a/src/modules/ndb_redis/README b/src/modules/ndb_redis/README index 3f180a1168e..b189f67d5a5 100644 --- a/src/modules/ndb_redis/README +++ b/src/modules/ndb_redis/README @@ -154,15 +154,20 @@ Chapter 1. Admin Guide 3.1. server (str) 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). + attribute=value separated by semicolon, the attributes can be: + * name - is a generic identifier to be used with module functions. + * unix - is the path to the unix domain socket to connect to REDIS + server. + * addr - is the IP address to connect to REDIS server. + * port - is the port to connect to REDIS server. + * db - is the DB number to use (defaults to 0 if not specified). + * pass - is the server password. + * tls - is to enable TLS connectivity. + * connect_timeout - is to set connect timeout to REDIS server. + * command_timeout - is to set command timeout to REDIS server. + + Thr unix and (addr, port) are mutually exclusive, if both appear in + same server settings unix domain socket is configured. You can set this parameter many times, in case you want to connect to many REDIS servers, just give different attributes and use the specific @@ -189,12 +194,13 @@ 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_ma -ster=0;sentinel=1.2.3.4:26379;sentinel=1.2.3.5:26379") +ster=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_ma -ster=1;sentinel=1.2.3.4:26379;sentinel=1.2.3.5:26379") - +ster=1;" + "sentinel=1.2.3.4:26379;sentinel=1.2.3.5:26379") ... 3.2. init_without_redis (integer) [View Less]

1 0

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/… [View More]

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/… [View More]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> - [View Less]

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: … [View More] 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; [View Less]

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/… [View More]

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> [View Less]

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 <… [View More]

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: … [View More]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 [View Less]

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://… [View More]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> [View Less]

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 … [View More]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}, [View Less]

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 … [View More]

1 0

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: … [View More]

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/… [View More]

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/… [View More]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 [View Less]

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 -… [View More]-- 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> [View Less]

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev