- sr-dev - kamailio.org

git:master:0666d34f: dispacther: docs - remark about RFC7339 for overload control values
by Daniel-Constantin Mierla 13 Jun '24

13 Jun '24

Module: kamailio Branch: master Commit: 0666d34f8816479724b4bdf4621147ccba156c66 URL: https://github.com/kamailio/kamailio/commit/0666d34f8816479724b4bdf4621147c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-13T13:24:04+02:00 dispacther: docs - remark about RFC7339 for overload control values --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0666d34f8816479724b4bdf4621147c… Patch: https://github.com/kamailio/kamailio/commit/0666d34f8816479724b4bdf4621147c… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 70a30ed7f7e..e50ea26f518 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -2019,8 +2019,8 @@ onreply_route { <function moreinfo="none">ds_oc_set_attrs(setid, uri, rval, tval, sval)</function> </title> <para> - Sets the overload control rate and time internval limit - for the destination (setid, uri). + Sets the overload control rate, time internval limit and sequence number + for the destination record (setid, uri) following RFC7339 specifications. </para> <para>Description of parameters:</para> <itemizedlist> @@ -2055,7 +2055,7 @@ onreply_route { <title><function>ds_oc_set_attrs()</function> usage</title> <programlisting format="linespecific"> ... - ds_oc_set_attrs("1", "sip:127.0.0.1:5080", "30", "1000", "1"); + ds_oc_set_attrs("1", "sip:127.0.0.1:5080", "30", "180000", "1"); ... </programlisting> </example>

1 0

git:master:b3875476: dispatcher: use milliseconds for time validity interval
by Daniel-Constantin Mierla 13 Jun '24

13 Jun '24

Module: kamailio Branch: master Commit: b3875476e02bf2590e857f73367efa4cedfbd328 URL: https://github.com/kamailio/kamailio/commit/b3875476e02bf2590e857f73367efa4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-13T13:09:08+02:00 dispatcher: use milliseconds for time validity interval --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/b3875476e02bf2590e857f73367efa4… Patch: https://github.com/kamailio/kamailio/commit/b3875476e02bf2590e857f73367efa4… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 678352bf62d..ecd0f3a0c9d 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -473,8 +473,8 @@ int ds_oc_set_attrs( timerclear(&tdiff); /* interval set to itval or to default 500 milliseconds */ - tdiff.tv_sec = ((itval > 0) ? itval : 500000) / 1000000; - tdiff.tv_usec = ((itval > 0) ? itval : 500000) % 1000000; + tdiff.tv_sec = (((itval > 0) ? itval : 500) * 1000) / 1000000; + tdiff.tv_usec = (((itval > 0) ? itval : 500) * 1000) % 1000000; for(i = 0; i < idx->nr; i++) { if(idx->dlist[i].uri.len == duri->len

1 0

git:master:736408b3: dispatcher: keep internal oc rate as the received value
by Daniel-Constantin Mierla 13 Jun '24

13 Jun '24

Module: kamailio Branch: master Commit: 736408b3e6e05cffd3978689b10549dc236ccb0d URL: https://github.com/kamailio/kamailio/commit/736408b3e6e05cffd3978689b10549d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-13T12:52:39+02:00 dispatcher: keep internal oc rate as the received value --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/736408b3e6e05cffd3978689b10549d… Patch: https://github.com/kamailio/kamailio/commit/736408b3e6e05cffd3978689b10549d… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index bab1a5deb31..678352bf62d 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -405,7 +405,7 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) str2int(&pit->body, &dest->attrs.ocmax); } else if(pit->name.len == 6 && strncasecmp(pit->name.s, "ocrate", 6) == 0) { - str2int(&pit->body, &dest->attrs.ocmin); + str2int(&pit->body, &dest->attrs.ocrate); } } if(dest->attrs.ocmax < 0 || dest->attrs.ocmax > 100) { @@ -435,12 +435,12 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) void ds_oc_prepare(ds_dest_t *dp) { int i; - for(i = 0; i < 100 - dp->attrs.ocrate; i++) { - dp->ocdist[i] = 1; - } - for(i = 100 - dp->attrs.ocrate; i < 100; i++) { + for(i = 0; i < dp->attrs.ocrate; i++) { dp->ocdist[i] = 0; } + for(i = dp->attrs.ocrate; i < 100; i++) { + dp->ocdist[i] = 1; + } shuffle_uint100array(dp->ocdist); } @@ -473,7 +473,8 @@ int ds_oc_set_attrs( timerclear(&tdiff); /* interval set to itval or to default 500 milliseconds */ - tdiff.tv_usec = (itval > 0) ? itval : 500000; + tdiff.tv_sec = ((itval > 0) ? itval : 500000) / 1000000; + tdiff.tv_usec = ((itval > 0) ? itval : 500000) % 1000000; for(i = 0; i < idx->nr; i++) { if(idx->dlist[i].uri.len == duri->len @@ -482,7 +483,7 @@ int ds_oc_set_attrs( LM_DBG("skipping entry %d due to seq condition\n", i); continue; } - idx->dlist[i].attrs.ocrate = 100 - irval; + idx->dlist[i].attrs.ocrate = irval; if(idx->dlist[i].attrs.ocrate < idx->dlist[i].attrs.ocmin) { idx->dlist[i].attrs.ocrate = idx->dlist[i].attrs.ocmin; } @@ -504,6 +505,7 @@ int ds_oc_set_attrs( */ static inline int ds_oc_skip(ds_set_t *dsg, int alg, int n) { + int ret; struct timeval tnow; if(alg != DS_ALG_OVERLOAD) { @@ -514,16 +516,19 @@ static inline int ds_oc_skip(ds_set_t *dsg, int alg, int n) if(timercmp(&dsg->dlist[n].octime, &tnow, <)) { /* over the time interval validity - use it */ + LM_DBG("time validity not matching\n"); return 0; } if(dsg->dlist[n].ocdist[dsg->dlist[n].ocidx] == 1) { /* use it */ - return 0; + ret = 0; + } else { + /* skip it */ + ret = 1; } dsg->dlist[n].ocidx = (dsg->dlist[n].ocidx + 1) % 100; - /* skip it */ - return 1; + return ret; } /**

1 0

git:master:c3ce318e: dispatcher: print oc details in the record group not in attrs
by Daniel-Constantin Mierla 13 Jun '24

13 Jun '24

Module: kamailio Branch: master Commit: c3ce318e01bf0eae70daa109e680a75f3ea71546 URL: https://github.com/kamailio/kamailio/commit/c3ce318e01bf0eae70daa109e680a75… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-13T11:51:46+02:00 dispatcher: print oc details in the record group not in attrs --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/c3ce318e01bf0eae70daa109e680a75… Patch: https://github.com/kamailio/kamailio/commit/c3ce318e01bf0eae70daa109e680a75… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 1e6beef600d..3fd941c21c4 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1869,12 +1869,16 @@ int ds_rpc_print_set( ipbuf[0] = '\0'; ip_addr2sbufz( &node->dlist[j].ip_address, ipbuf, IP_ADDR_MAX_STRZ_SIZE); - if(rpc->struct_add(vh, "Ssddjj", "HOST", &node->dlist[j].host, + if(rpc->struct_add(vh, "Ssddjjujj", "HOST", &node->dlist[j].host, "IPADDR", ipbuf, "PORT", (int)node->dlist[j].port, "PROTOID", (int)node->dlist[j].proto, "DNSTIME_SEC", (unsigned long)node->dlist[j].dnstime.tv_sec, "DNSTIME_USEC", - (unsigned long)node->dlist[j].dnstime.tv_usec) + (unsigned long)node->dlist[j].dnstime.tv_usec, "OCRATE", + node->dlist[j].attrs.ocrate, "OCTIME_SEC", + (unsigned long)node->dlist[j].octime.tv_sec, + "OCTIME_USEC", + (unsigned long)node->dlist[j].octime.tv_usec) < 0) { rpc->fault(ctx, 500, "Internal error creating dest struct"); return -1; @@ -1886,7 +1890,7 @@ int ds_rpc_print_set( rpc->fault(ctx, 500, "Internal error creating dest struct"); return -1; } - if(rpc->struct_add(wh, "SSdddSSSujj", "BODY", + if(rpc->struct_add(wh, "SSdddSSS", "BODY", &(node->dlist[j].attrs.body), "DUID", (node->dlist[j].attrs.duid.s) ? &(node->dlist[j].attrs.duid) @@ -1904,11 +1908,7 @@ int ds_rpc_print_set( "OBPROXY", (node->dlist[j].attrs.obproxy.s) ? &(node->dlist[j].attrs.obproxy) - : &data, - "OCRATE", node->dlist[j].attrs.ocrate, "OCTIME_SEC", - (unsigned long)node->dlist[j].octime.tv_sec, - "OCTIME_USEC", - (unsigned long)node->dlist[j].octime.tv_usec) + : &data) < 0) { rpc->fault(ctx, 500, "Internal error creating attrs struct"); return -1;

1 0

git:5.7:f8fa74e7: core: tcp - change log levels for failing to set source for tcp connections
by Daniel-Constantin Mierla 13 Jun '24

13 Jun '24

Module: kamailio Branch: 5.7 Commit: f8fa74e7b2901ecae8bbb851250d8b28452b18da URL: https://github.com/kamailio/kamailio/commit/f8fa74e7b2901ecae8bbb851250d8b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-13T10:53:36+02:00 core: tcp - change log levels for failing to set source for tcp connections - it is not possible always and it can fill the logs (cherry picked from commit 15403a543d83e337ee578ad37dc1d84316e4cf16) (cherry picked from commit 8a027b99cf8dc4f7e889aa7644f1f7699c7cb08e) --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/f8fa74e7b2901ecae8bbb851250d8b2… Patch: https://github.com/kamailio/kamailio/commit/f8fa74e7b2901ecae8bbb851250d8b2… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 955eb4b6e19..593f1a3be57 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1284,7 +1284,7 @@ inline static int find_listening_sock_info( if(setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void *)&optval, sizeof(optval)) == -1) { - LM_ERR("setsockopt SO_REUSEADDR %s\n", strerror(errno)); + LM_NOTICE("setsockopt SO_REUSEADDR [%s]\n", strerror(errno)); /* continue, not critical */ } #endif @@ -1293,19 +1293,19 @@ inline static int find_listening_sock_info( if(setsockopt(s, SOL_SOCKET, SO_REUSEPORT, (void *)&optval, sizeof(optval)) == -1) { - LM_ERR("setsockopt SO_REUSEPORT %s\n", strerror(errno)); + LM_NOTICE("setsockopt SO_REUSEPORT [%s]\n", strerror(errno)); /* continue, not critical */ } #endif if(unlikely(bind(s, &si->su.s, sockaddru_len(si->su)) != 0)) { - LM_WARN("binding to source address %s failed: %s [%d]\n", + LM_DBG("binding to source address %s failed: [%s] [%d]\n", su2a(&si->su, sizeof(si->su)), strerror(errno), errno); return -1; } } } else { if(unlikely(bind(s, &(*from)->s, sockaddru_len(**from)) != 0)) { - LM_WARN("binding to source address %s failed: %s [%d]\n", + LM_DBG("binding to source address %s failed: [%s] [%d]\n", su2a(&si->su, sizeof(si->su)), strerror(errno), errno); return -1; }

1 0

git:5.8:8a027b99: core: tcp - change log levels for failing to set source for tcp connections
by Daniel-Constantin Mierla 13 Jun '24

13 Jun '24

Module: kamailio Branch: 5.8 Commit: 8a027b99cf8dc4f7e889aa7644f1f7699c7cb08e URL: https://github.com/kamailio/kamailio/commit/8a027b99cf8dc4f7e889aa7644f1f76… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-13T10:53:09+02:00 core: tcp - change log levels for failing to set source for tcp connections - it is not possible always and it can fill the logs (cherry picked from commit 15403a543d83e337ee578ad37dc1d84316e4cf16) --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/8a027b99cf8dc4f7e889aa7644f1f76… Patch: https://github.com/kamailio/kamailio/commit/8a027b99cf8dc4f7e889aa7644f1f76… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 2456459cfa2..d5a46030cf4 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1288,7 +1288,7 @@ inline static int find_listening_sock_info( if(setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void *)&optval, sizeof(optval)) == -1) { - LM_ERR("setsockopt SO_REUSEADDR %s\n", strerror(errno)); + LM_NOTICE("setsockopt SO_REUSEADDR [%s]\n", strerror(errno)); /* continue, not critical */ } #endif @@ -1297,19 +1297,19 @@ inline static int find_listening_sock_info( if(setsockopt(s, SOL_SOCKET, SO_REUSEPORT, (void *)&optval, sizeof(optval)) == -1) { - LM_ERR("setsockopt SO_REUSEPORT %s\n", strerror(errno)); + LM_NOTICE("setsockopt SO_REUSEPORT [%s]\n", strerror(errno)); /* continue, not critical */ } #endif if(unlikely(bind(s, &si->su.s, sockaddru_len(si->su)) != 0)) { - LM_WARN("binding to source address %s failed: %s [%d]\n", + LM_DBG("binding to source address %s failed: [%s] [%d]\n", su2a(&si->su, sizeof(si->su)), strerror(errno), errno); return -1; } } } else { if(unlikely(bind(s, &(*from)->s, sockaddru_len(**from)) != 0)) { - LM_WARN("binding to source address %s failed: %s [%d]\n", + LM_DBG("binding to source address %s failed: [%s] [%d]\n", su2a(&si->su, sizeof(si->su)), strerror(errno), errno); return -1; }

1 0

git:master:15403a54: core: tcp - change log levels for failing to set source for tcp connections
by Daniel-Constantin Mierla 12 Jun '24

12 Jun '24

Module: kamailio Branch: master Commit: 15403a543d83e337ee578ad37dc1d84316e4cf16 URL: https://github.com/kamailio/kamailio/commit/15403a543d83e337ee578ad37dc1d84… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-12T16:21:34+02:00 core: tcp - change log levels for failing to set source for tcp connections - it is not possible always and it can fill the logs --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/15403a543d83e337ee578ad37dc1d84… Patch: https://github.com/kamailio/kamailio/commit/15403a543d83e337ee578ad37dc1d84… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 2456459cfa2..d5a46030cf4 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1288,7 +1288,7 @@ inline static int find_listening_sock_info( if(setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void *)&optval, sizeof(optval)) == -1) { - LM_ERR("setsockopt SO_REUSEADDR %s\n", strerror(errno)); + LM_NOTICE("setsockopt SO_REUSEADDR [%s]\n", strerror(errno)); /* continue, not critical */ } #endif @@ -1297,19 +1297,19 @@ inline static int find_listening_sock_info( if(setsockopt(s, SOL_SOCKET, SO_REUSEPORT, (void *)&optval, sizeof(optval)) == -1) { - LM_ERR("setsockopt SO_REUSEPORT %s\n", strerror(errno)); + LM_NOTICE("setsockopt SO_REUSEPORT [%s]\n", strerror(errno)); /* continue, not critical */ } #endif if(unlikely(bind(s, &si->su.s, sockaddru_len(si->su)) != 0)) { - LM_WARN("binding to source address %s failed: %s [%d]\n", + LM_DBG("binding to source address %s failed: [%s] [%d]\n", su2a(&si->su, sizeof(si->su)), strerror(errno), errno); return -1; } } } else { if(unlikely(bind(s, &(*from)->s, sockaddru_len(**from)) != 0)) { - LM_WARN("binding to source address %s failed: %s [%d]\n", + LM_DBG("binding to source address %s failed: [%s] [%d]\n", su2a(&si->su, sizeof(si->su)), strerror(errno), errno); return -1; }

1 0

git:master:40d65759: dispatcher: internally keep the selecting instead of skipping rate
by Daniel-Constantin Mierla 12 Jun '24

12 Jun '24

Module: kamailio Branch: master Commit: 40d657592d1be9975deae6052132c458d6485fd9 URL: https://github.com/kamailio/kamailio/commit/40d657592d1be9975deae6052132c45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-12T13:35:05+02:00 dispatcher: internally keep the selecting instead of skipping rate --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/40d657592d1be9975deae6052132c45… Patch: https://github.com/kamailio/kamailio/commit/40d657592d1be9975deae6052132c45… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 84166540a37..bab1a5deb31 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -412,7 +412,7 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) dest->attrs.ocmax = 100; } if(dest->attrs.ocmin < 0 || dest->attrs.ocmin > 100) { - dest->attrs.ocmin = 10; + dest->attrs.ocmin = 0; } if(dest->attrs.ocrate <= 0 || dest->attrs.ocrate > 100) { dest->attrs.ocrate = 0; @@ -482,7 +482,7 @@ int ds_oc_set_attrs( LM_DBG("skipping entry %d due to seq condition\n", i); continue; } - idx->dlist[i].attrs.ocrate = irval; + idx->dlist[i].attrs.ocrate = 100 - irval; if(idx->dlist[i].attrs.ocrate < idx->dlist[i].attrs.ocmin) { idx->dlist[i].attrs.ocrate = idx->dlist[i].attrs.ocmin; }

1 0

Kamailio v5.8.2 Released
by Daniel-Constantin Mierla 12 Jun '24

12 Jun '24

Hello, Kamailio SIP Server v5.8.2 stable release is out. This is a maintenance release of the latest stable branch, 5.8, that includes fixes since the release of v5.8.1. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.8.x. Deployments running previous v5.8.x versions are strongly recommended to be upgraded to v5.8.2. For more details about version 5.8.2 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2024/06/kamailio-v5-8-2-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com

1 0

git:5.8:3fa5f48c: ChangeLog: content updated for v5.8.2
by Daniel-Constantin Mierla 12 Jun '24

12 Jun '24

Module: kamailio Branch: 5.8 Commit: 3fa5f48cd3627f1fe80acf56da1a187f3a01ddb0 URL: https://github.com/kamailio/kamailio/commit/3fa5f48cd3627f1fe80acf56da1a187… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-12T10:43:13+02:00 ChangeLog: content updated for v5.8.2 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/3fa5f48cd3627f1fe80acf56da1a187… Patch: https://github.com/kamailio/kamailio/commit/3fa5f48cd3627f1fe80acf56da1a187…

1 0

git:5.8:5a090532: Makefile.defs: version set to 5.8.2
by Daniel-Constantin Mierla 12 Jun '24

12 Jun '24

Module: kamailio Branch: 5.8 Commit: 5a090532b2e702ae758b384b54550fed5ddddfdb URL: https://github.com/kamailio/kamailio/commit/5a090532b2e702ae758b384b54550fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-12T10:02:55+02:00 Makefile.defs: version set to 5.8.2 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/5a090532b2e702ae758b384b54550fe… Patch: https://github.com/kamailio/kamailio/commit/5a090532b2e702ae758b384b54550fe… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 0f960b4478e..07fa021aa59 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 8 -SUBLEVEL = 1 +SUBLEVEL = 2 EXTRAVERSION = # memory manager switcher

1 0

git:master:24afb14c: carrierroute: use proper define for db_url
by Henning Westerholt 12 Jun '24

12 Jun '24

Module: kamailio Branch: master Commit: 24afb14cfaba28c4e5a7dfe9f352b02a551eed5c URL: https://github.com/kamailio/kamailio/commit/24afb14cfaba28c4e5a7dfe9f352b02… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-06-12T07:59:20Z carrierroute: use proper define for db_url --- Modified: src/modules/carrierroute/doc/carrierroute_db.xml --- Diff: https://github.com/kamailio/kamailio/commit/24afb14cfaba28c4e5a7dfe9f352b02… Patch: https://github.com/kamailio/kamailio/commit/24afb14cfaba28c4e5a7dfe9f352b02… --- diff --git a/src/modules/carrierroute/doc/carrierroute_db.xml b/src/modules/carrierroute/doc/carrierroute_db.xml index 87017a3d259..0e9d7b3fded 100644 --- a/src/modules/carrierroute/doc/carrierroute_db.xml +++ b/src/modules/carrierroute/doc/carrierroute_db.xml @@ -29,7 +29,7 @@ ALL CHANGES DONE HERE WILL BE LOST IF THE FILE IS REGENERATED <title>Set <varname>db_url</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("carrierroute", "db_url", "dbdriver://username:password@dbhost/dbname") +modparam("carrierroute", "db_url", "&exampledb;") ... </programlisting> </example>

1 0

git:5.8:2ce09cbd: pkg: deb specs updated for v5.8.2
by Daniel-Constantin Mierla 12 Jun '24

12 Jun '24

Module: kamailio Branch: 5.8 Commit: 2ce09cbd669753266bba8659073320af6f53664b URL: https://github.com/kamailio/kamailio/commit/2ce09cbd669753266bba8659073320a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-12T09:40:58+02:00 pkg: deb specs updated for v5.8.2 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jammy/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/2ce09cbd669753266bba8659073320a… Patch: https://github.com/kamailio/kamailio/commit/2ce09cbd669753266bba8659073320a…

1 0

git:5.8:f3daac30: pkg/kamailio: version set 5.8.2 for rpms and alpine
by Daniel-Constantin Mierla 12 Jun '24

12 Jun '24

Module: kamailio Branch: 5.8 Commit: f3daac3024c6a623fa9021d92f77daf2cf866c8d URL: https://github.com/kamailio/kamailio/commit/f3daac3024c6a623fa9021d92f77daf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-12T08:57:25+02:00 pkg/kamailio: version set 5.8.2 for rpms and alpine --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/f3daac3024c6a623fa9021d92f77daf… Patch: https://github.com/kamailio/kamailio/commit/f3daac3024c6a623fa9021d92f77daf… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 4b56df12b49..f68763c8c3a 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.8.1 +pkgver=5.8.2 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index ee339c02d99..53831a5d27b 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.8.1 +%define ver 5.8.2 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

Releasing v5.8.2
by Daniel-Constantin Mierla 12 Jun '24

12 Jun '24

Hello, I am considering to release Kamailio v5.8.2 (out of branch 5.8) on Wednesday, June 12, 2024. If anyone is aware of issues not yet on the bug tracker, report them there asap in order to have a better chance to be fixed. Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com

2 2

[kamailio/kamailio] ims_icscf: add missing documents for database params (PR #3873)
by H. Yavari 11 Jun '24

11 Jun '24

- Adding missing ims_icscf database parameters documents. - Change the default value for ims_icscf db_url to Kamailio db_url. - ims_usrloc_pcscf: fix the db_url type from into to string in document.   #### Pre-Submission Checklist    - [ :white_check_mark:] Commit message has the format required by CONTRIBUTING guide - [ :white_check_mark:] Commits are split per component (core, individual modules, libs, utils, ...) - [ :white_check_mark:] Each component has a single commit (if not, squash them into one commit) - [ :white_check_mark:] 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 - [ :white_check_mark: ] 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 - [ :white_check_mark:] 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/3873 -- Commit Summary -- * ims_icscf: add missing documents for database params -- File Changes -- M src/modules/ims_icscf/doc/ims_icscf_admin.xml (100) M src/modules/ims_icscf/ims_icscf_mod.c (3) M src/modules/ims_usrloc_pcscf/doc/ims_usrloc_pcscf_admin.xml (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3873.patch https://github.com/kamailio/kamailio/pull/3873.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3873 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3873(a)github.com>

2 4

git:master:e047f35a: dispatcher: debug messages for setting oc attributes
by Daniel-Constantin Mierla 11 Jun '24

11 Jun '24

Module: kamailio Branch: master Commit: e047f35ad5e1d7b4984a9cce72ffb782fdae3bda URL: https://github.com/kamailio/kamailio/commit/e047f35ad5e1d7b4984a9cce72ffb78… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-11T14:19:02+02:00 dispatcher: debug messages for setting oc attributes --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/e047f35ad5e1d7b4984a9cce72ffb78… Patch: https://github.com/kamailio/kamailio/commit/e047f35ad5e1d7b4984a9cce72ffb78… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 49e560a710b..84166540a37 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -466,8 +466,8 @@ int ds_oc_set_attrs( LM_ERR("destination set [%d] not found\n", setid); return -1; } - LM_DBG("update oc rate for %.*s in group %d to %d\n", duri->len, duri->s, - setid, irval); + LM_DBG("updating oc attrs for %d %.*s to rate %d validity %d seq %d\n", + setid, duri->len, duri->s, irval, itval, isval); gettimeofday(&tnow, NULL); timerclear(&tdiff); @@ -479,6 +479,7 @@ int ds_oc_set_attrs( if(idx->dlist[i].uri.len == duri->len && strncasecmp(idx->dlist[i].uri.s, duri->s, duri->len) == 0) { if(idx->dlist[i].ocseq >= isval) { + LM_DBG("skipping entry %d due to seq condition\n", i); continue; } idx->dlist[i].attrs.ocrate = irval; @@ -492,6 +493,7 @@ int ds_oc_set_attrs( timeradd(&tnow, &tdiff, &idx->dlist[i].octime); idx->dlist[i].ocseq = isval; ret = 1; + LM_DBG("updated entry %d\n", i); } } return ret;

1 0

git:master:842bb793: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 11 Jun '24

11 Jun '24

Module: kamailio Branch: master Commit: 842bb7936ea92a9785711b7e61392615bb541826 URL: https://github.com/kamailio/kamailio/commit/842bb7936ea92a9785711b7e6139261… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-06-11T13:46:10+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/842bb7936ea92a9785711b7e6139261… Patch: https://github.com/kamailio/kamailio/commit/842bb7936ea92a9785711b7e6139261… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 1e99229575a..fbac75c662d 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -122,7 +122,7 @@ Federico Cabiddu 4.14. ds_load_unset() 4.15. ds_reload() 4.16. ds_dsg_fetch(setid) - 4.17. ds_oc_set_attrs(setid, uri, rval, tval) + 4.17. ds_oc_set_attrs(setid, uri, rval, tval, sval) 5. RPC Commands @@ -291,7 +291,7 @@ Chapter 1. Admin Guide 4.14. ds_load_unset() 4.15. ds_reload() 4.16. ds_dsg_fetch(setid) - 4.17. ds_oc_set_attrs(setid, uri, rval, tval) + 4.17. ds_oc_set_attrs(setid, uri, rval, tval, sval) 5. RPC Commands @@ -1118,7 +1118,7 @@ modparam("dispatcher", "ds_interval_mode", 7200) 4.14. ds_load_unset() 4.15. ds_reload() 4.16. ds_dsg_fetch(setid) - 4.17. ds_oc_set_attrs(setid, uri, rval, tval) + 4.17. ds_oc_set_attrs(setid, uri, rval, tval, sval) 4.1. ds_select_dst(set, alg[, limit]) @@ -1636,7 +1636,7 @@ onreply_route { xinfo("set id: 1 - all: $dsg(count); active: $dsg(active)\n"); ... -4.17. ds_oc_set_attrs(setid, uri, rval, tval) +4.17. ds_oc_set_attrs(setid, uri, rval, tval, sval) Sets the overload control rate and time internval limit for the destination (setid, uri). @@ -1650,12 +1650,15 @@ onreply_route { * tval - time interval limit to apply the overload control rate (in milliseconds). If the value is 0 or negative, then the default value 500 is used. + * sval - the sequence number for overload control. + + The parameters can include variables. This function can be used from ANY_ROUTE. Example 1.60. ds_oc_set_attrs() usage ... - ds_oc_set_attrs("1", "sip:127.0.0.1:5080", "30", "1000"); + ds_oc_set_attrs("1", "sip:127.0.0.1:5080", "30", "1000", "1"); ... 5. RPC Commands

1 0

git:master:e92be0e1: docs: new parameter for ds_oc_set_attrs()
by Daniel-Constantin Mierla 11 Jun '24

11 Jun '24

Module: kamailio Branch: master Commit: e92be0e131193b4b0a294e71fb2cfb4f52f5ef6f URL: https://github.com/kamailio/kamailio/commit/e92be0e131193b4b0a294e71fb2cfb4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-11T13:35:44+02:00 docs: new parameter for ds_oc_set_attrs() --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e92be0e131193b4b0a294e71fb2cfb4… Patch: https://github.com/kamailio/kamailio/commit/e92be0e131193b4b0a294e71fb2cfb4… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 62e212f8744..70a30ed7f7e 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -2016,7 +2016,7 @@ onreply_route { </section> <section id="dispatcher.f.ds_oc_set_attrs"> <title> - <function moreinfo="none">ds_oc_set_attrs(setid, uri, rval, tval)</function> + <function moreinfo="none">ds_oc_set_attrs(setid, uri, rval, tval, sval)</function> </title> <para> Sets the overload control rate and time internval limit @@ -2041,9 +2041,13 @@ onreply_route { <para><emphasis>tval</emphasis> - time interval limit to apply the overload control rate (in milliseconds). If the value is 0 or negative, then the default value 500 is used.</para> - </listitem> + </listitem> + <listitem> + <para><emphasis>sval</emphasis> - the sequence number for overload + control.</para> + </listitem> </itemizedlist> - + <para>The parameters can include variables.</para> <para> This function can be used from ANY_ROUTE. </para> @@ -2051,7 +2055,7 @@ onreply_route { <title><function>ds_oc_set_attrs()</function> usage</title> <programlisting format="linespecific"> ... - ds_oc_set_attrs("1", "sip:127.0.0.1:5080", "30", "1000"); + ds_oc_set_attrs("1", "sip:127.0.0.1:5080", "30", "1000", "1"); ... </programlisting> </example>

1 0

git:master:803e8442: dispatcher: track oc-seq values
by Daniel-Constantin Mierla 11 Jun '24

11 Jun '24

Module: kamailio Branch: master Commit: 803e8442a2278adc19eebfbb2ff0aba31c180539 URL: https://github.com/kamailio/kamailio/commit/803e8442a2278adc19eebfbb2ff0aba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-11T13:09:10+02:00 dispatcher: track oc-seq values --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/803e8442a2278adc19eebfbb2ff0aba… Patch: https://github.com/kamailio/kamailio/commit/803e8442a2278adc19eebfbb2ff0aba…

1 0

git:master:b3eefcd3: core: additional fixup functions for int-str-int-int-int parameters
by Daniel-Constantin Mierla 11 Jun '24

11 Jun '24

Module: kamailio Branch: master Commit: b3eefcd34fa16a13f233afcf285f3abbe4401394 URL: https://github.com/kamailio/kamailio/commit/b3eefcd34fa16a13f233afcf285f3ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-11T12:59:37+02:00 core: additional fixup functions for int-str-int-int-int parameters --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/b3eefcd34fa16a13f233afcf285f3ab… Patch: https://github.com/kamailio/kamailio/commit/b3eefcd34fa16a13f233afcf285f3ab… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index fa7e2c4b47a..18785662936 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -1095,3 +1095,39 @@ int fixup_free_isii(void **param, int param_no) return E_UNSPEC; } } + +/** + * + */ +int fixup_isiii(void **param, int param_no) +{ + switch(param_no) { + case 1: + case 3: + case 4: + case 5: + return fixup_igp_null(param, 1); + case 2: + return fixup_spve_null(param, 1); + default: + return E_UNSPEC; + } +} + +/** + * + */ +int fixup_free_isiii(void **param, int param_no) +{ + switch(param_no) { + case 1: + case 3: + case 4: + case 5: + return fixup_free_igp_null(param, 1); + case 2: + return fixup_free_spve_null(param, 1); + default: + return E_UNSPEC; + } +} diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index 76c57bc9bf6..092f65b93bc 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -190,4 +190,7 @@ int fixup_free_isi(void **param, int param_no); int fixup_isii(void **param, int param_no); int fixup_free_isii(void **param, int param_no); +int fixup_isiii(void **param, int param_no); +int fixup_free_isiii(void **param, int param_no); + #endif

1 0

git:master:9eb117ab: dispatcher: print oc rate and time in rpc list full
by Daniel-Constantin Mierla 11 Jun '24

11 Jun '24

Module: kamailio Branch: master Commit: 9eb117abe34abbaa1ff228df3d81506b46933e53 URL: https://github.com/kamailio/kamailio/commit/9eb117abe34abbaa1ff228df3d81506… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-11T10:57:31+02:00 dispatcher: print oc rate and time in rpc list full --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/9eb117abe34abbaa1ff228df3d81506… Patch: https://github.com/kamailio/kamailio/commit/9eb117abe34abbaa1ff228df3d81506… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index c7ea8380543..4726992a559 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1881,7 +1881,7 @@ int ds_rpc_print_set( rpc->fault(ctx, 500, "Internal error creating dest struct"); return -1; } - if(rpc->struct_add(wh, "SSdddSSS", "BODY", + if(rpc->struct_add(wh, "SSdddSSSujj", "BODY", &(node->dlist[j].attrs.body), "DUID", (node->dlist[j].attrs.duid.s) ? &(node->dlist[j].attrs.duid) @@ -1899,7 +1899,11 @@ int ds_rpc_print_set( "OBPROXY", (node->dlist[j].attrs.obproxy.s) ? &(node->dlist[j].attrs.obproxy) - : &data) + : &data, + "OCRATE", node->dlist[j].attrs.ocrate, "OCTIME_SEC", + (unsigned long)node->dlist[j].octime.tv_sec, + "OCTIME_USEC", + (unsigned long)node->dlist[j].octime.tv_usec) < 0) { rpc->fault(ctx, 500, "Internal error creating attrs struct"); return -1;

1 0

[kamailio/kamailio] pike: fix documentation for reqs_density_per_unit (PR #3806)
by tsearle 11 Jun '24

11 Jun '24

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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 - [ ] 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/3806 -- Commit Summary -- * pike: fix documentation for reqs_density_per_unit -- File Changes -- M src/modules/pike/doc/pike_admin.xml (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3806.patch https://github.com/kamailio/kamailio/pull/3806.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3806 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3806(a)github.com>

5 7

git:master:dd30f8b9: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 10 Jun '24

10 Jun '24

Module: kamailio Branch: master Commit: dd30f8b905a80f85891df72a1f865c9ad1508c9a URL: https://github.com/kamailio/kamailio/commit/dd30f8b905a80f85891df72a1f865c9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-06-10T13:16:10+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/dd30f8b905a80f85891df72a1f865c9… Patch: https://github.com/kamailio/kamailio/commit/dd30f8b905a80f85891df72a1f865c9… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index c095bc201be..1e99229575a 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -122,7 +122,7 @@ Federico Cabiddu 4.14. ds_load_unset() 4.15. ds_reload() 4.16. ds_dsg_fetch(setid) - 4.17. ds_oc_set_rate(setid, uri, val) + 4.17. ds_oc_set_attrs(setid, uri, rval, tval) 5. RPC Commands @@ -212,7 +212,7 @@ Federico Cabiddu 1.57. ds_load_unset usage 1.58. ds_reload usage 1.59. ds_dsg_fetch() usage - 1.60. ds_oc_set_rate() usage + 1.60. ds_oc_set_attrs() usage 1.61. dispatcher list file 1.62. Kamailio config script - sample dispatcher usage @@ -291,7 +291,7 @@ Chapter 1. Admin Guide 4.14. ds_load_unset() 4.15. ds_reload() 4.16. ds_dsg_fetch(setid) - 4.17. ds_oc_set_rate(setid, uri, val) + 4.17. ds_oc_set_attrs(setid, uri, rval, tval) 5. RPC Commands @@ -1118,7 +1118,7 @@ modparam("dispatcher", "ds_interval_mode", 7200) 4.14. ds_load_unset() 4.15. ds_reload() 4.16. ds_dsg_fetch(setid) - 4.17. ds_oc_set_rate(setid, uri, val) + 4.17. ds_oc_set_attrs(setid, uri, rval, tval) 4.1. ds_select_dst(set, alg[, limit]) @@ -1636,22 +1636,26 @@ onreply_route { xinfo("set id: 1 - all: $dsg(count); active: $dsg(active)\n"); ... -4.17. ds_oc_set_rate(setid, uri, val) +4.17. ds_oc_set_attrs(setid, uri, rval, tval) - Sets the overload control rate for the destination (setid, uri). + Sets the overload control rate and time internval limit for the + destination (setid, uri). Description of parameters: * setid - the set (group) id. The parameter can be an integer or a variable holding an integer value. * uri - the URI of the destination. - * val - the value of the overload control rate (from 1 to 100) - how + * rval - the value of the overload control rate (from 1 to 100) - how many times to skip using this destination in 100 selections. + * tval - time interval limit to apply the overload control rate (in + milliseconds). If the value is 0 or negative, then the default + value 500 is used. This function can be used from ANY_ROUTE. - Example 1.60. ds_oc_set_rate() usage + Example 1.60. ds_oc_set_attrs() usage ... - ds_oc_set_rate("1", "sip:127.0.0.1:5080", "30"); + ds_oc_set_attrs("1", "sip:127.0.0.1:5080", "30", "1000"); ... 5. RPC Commands

1 0

git:master:851a839b: dispatcher: compare time interval validity for oveload control
by Daniel-Constantin Mierla 10 Jun '24

10 Jun '24

Module: kamailio Branch: master Commit: 851a839b50296669523947e1a0d73f1b602f0819 URL: https://github.com/kamailio/kamailio/commit/851a839b50296669523947e1a0d73f1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-10T13:09:26+02:00 dispatcher: compare time interval validity for oveload control --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/851a839b50296669523947e1a0d73f1… Patch: https://github.com/kamailio/kamailio/commit/851a839b50296669523947e1a0d73f1… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index c7722acb32e..6e13987a4da 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -498,18 +498,26 @@ int ds_oc_set_attrs(sip_msg_t *msg, int setid, str *duri, int irval, int itval) */ static inline int ds_oc_skip(ds_set_t *dsg, int alg, int n) { - int ret = 0; + struct timeval tnow; if(alg != DS_ALG_OVERLOAD) { return 0; } + gettimeofday(&tnow, NULL); + + if(timercmp(&dsg->dlist[n].octime, &tnow, <)) { + /* over the time interval validity - use it */ + return 0; + } if(dsg->dlist[n].ocdist[dsg->dlist[n].ocidx] == 1) { - ret = 0; + /* use it */ + return 0; } dsg->dlist[n].ocidx = (dsg->dlist[n].ocidx + 1) % 100; - return ret; + /* skip it */ + return 1; } /**

1 0

git:master:244fc84a: dispatcher: docs for ds_oc_set_attrs(...)
by Daniel-Constantin Mierla 10 Jun '24

10 Jun '24

Module: kamailio Branch: master Commit: 244fc84a971d3381e731dab558c19d96e0922f5f URL: https://github.com/kamailio/kamailio/commit/244fc84a971d3381e731dab558c19d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-10T12:49:42+02:00 dispatcher: docs for ds_oc_set_attrs(...) --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/244fc84a971d3381e731dab558c19d9… Patch: https://github.com/kamailio/kamailio/commit/244fc84a971d3381e731dab558c19d9… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index e0e8d1beed8..62e212f8744 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -2014,12 +2014,13 @@ onreply_route { </programlisting> </example> </section> - <section id="dispatcher.f.ds_oc_set_rate"> + <section id="dispatcher.f.ds_oc_set_attrs"> <title> - <function moreinfo="none">ds_oc_set_rate(setid, uri, val)</function> + <function moreinfo="none">ds_oc_set_attrs(setid, uri, rval, tval)</function> </title> <para> - Sets the overload control rate for the destination (setid, uri). + Sets the overload control rate and time internval limit + for the destination (setid, uri). </para> <para>Description of parameters:</para> <itemizedlist> @@ -2032,9 +2033,14 @@ onreply_route { <para><emphasis>uri</emphasis> - the URI of the destination.</para> </listitem> <listitem> - <para><emphasis>val</emphasis> - the value of the overload control + <para><emphasis>rval</emphasis> - the value of the overload control rate (from 1 to 100) - how many times to skip using this destination in 100 selections.</para> + </listitem> + <listitem> + <para><emphasis>tval</emphasis> - time interval limit to apply the + overload control rate (in milliseconds). If the value is 0 or + negative, then the default value 500 is used.</para> </listitem> </itemizedlist> @@ -2042,10 +2048,10 @@ onreply_route { This function can be used from ANY_ROUTE. </para> <example> - <title><function>ds_oc_set_rate()</function> usage</title> + <title><function>ds_oc_set_attrs()</function> usage</title> <programlisting format="linespecific"> ... - ds_oc_set_rate("1", "sip:127.0.0.1:5080", "30"); + ds_oc_set_attrs("1", "sip:127.0.0.1:5080", "30", "1000"); ... </programlisting> </example>

1 0

git:master:0f8b5349: dispatcher: replaced ds_oc_set_rate() with ds_oc_set_attrs()
by Daniel-Constantin Mierla 10 Jun '24

10 Jun '24

Module: kamailio Branch: master Commit: 0f8b5349e2e98333d9e3b578144bb5402d8443e0 URL: https://github.com/kamailio/kamailio/commit/0f8b5349e2e98333d9e3b578144bb54… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-10T12:41:30+02:00 dispatcher: replaced ds_oc_set_rate() with ds_oc_set_attrs() - used now to set both oc rate and time limit --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/0f8b5349e2e98333d9e3b578144bb54… Patch: https://github.com/kamailio/kamailio/commit/0f8b5349e2e98333d9e3b578144bb54…

1 0

git:master:818cced9: core: helper fixup for functions with int-str-int-int parameters
by Daniel-Constantin Mierla 10 Jun '24

10 Jun '24

Module: kamailio Branch: master Commit: 818cced90cdbb524acbc423c79fc6c2b696da77c URL: https://github.com/kamailio/kamailio/commit/818cced90cdbb524acbc423c79fc6c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-10T12:22:58+02:00 core: helper fixup for functions with int-str-int-int parameters --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/818cced90cdbb524acbc423c79fc6c2… Patch: https://github.com/kamailio/kamailio/commit/818cced90cdbb524acbc423c79fc6c2… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index ec4e016ed88..fa7e2c4b47a 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -1061,3 +1061,37 @@ int fixup_free_isi(void **param, int param_no) return E_UNSPEC; } } + +/** + * + */ +int fixup_isii(void **param, int param_no) +{ + switch(param_no) { + case 1: + case 3: + case 4: + return fixup_igp_null(param, 1); + case 2: + return fixup_spve_null(param, 1); + default: + return E_UNSPEC; + } +} + +/** + * + */ +int fixup_free_isii(void **param, int param_no) +{ + switch(param_no) { + case 1: + case 3: + case 4: + return fixup_free_igp_null(param, 1); + case 2: + return fixup_free_spve_null(param, 1); + default: + return E_UNSPEC; + } +} diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index aafb3a4cbff..76c57bc9bf6 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -187,4 +187,7 @@ int fixup_free_ssii(void **param, int param_no); int fixup_isi(void **param, int param_no); int fixup_free_isi(void **param, int param_no); +int fixup_isii(void **param, int param_no); +int fixup_free_isii(void **param, int param_no); + #endif

1 0

git:5.8:955c6e02: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 08 Jun '24

08 Jun '24

Module: kamailio Branch: 5.8 Commit: 955c6e02ed0e31a4c7f148518bf44edb12c37a07 URL: https://github.com/kamailio/kamailio/commit/955c6e02ed0e31a4c7f148518bf44ed… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-06-08T20:31:20+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/ims_ipsec_pcscf/README --- Diff: https://github.com/kamailio/kamailio/commit/955c6e02ed0e31a4c7f148518bf44ed… Patch: https://github.com/kamailio/kamailio/commit/955c6e02ed0e31a4c7f148518bf44ed… --- diff --git a/src/modules/ims_ipsec_pcscf/README b/src/modules/ims_ipsec_pcscf/README index bce99b791da..3d831eb2c47 100644 --- a/src/modules/ims_ipsec_pcscf/README +++ b/src/modules/ims_ipsec_pcscf/README @@ -361,7 +361,7 @@ ipsec_destroy("location"); recv_host - received host to match the record. recv_port - received port to match the record. - The last three parameters have to be string valies and can contain + The last three parameters have to be string values and can contain variables. Example 1.14. ipsec_destroy_by_contact()

1 0

git: new commits in branch 5.8
by Daniel-Constantin Mierla 08 Jun '24

08 Jun '24

- URL: https://github.com/kamailio/kamailio/commit/f9bd2c5a4341913ac3e887e0324a19d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-08T12:28:02+02:00 tcpops: reformat exported structures (cherry picked from commit 9b087fd618ab6c5cbd6a29c352b09c7198f1b594) - URL: https://github.com/kamailio/kamailio/commit/5c4f687d0ed06d6c7a5696917982b1c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-08T12:28:19+02:00 sipcapture: use local static buffers for ip address and port - GH #3835 (cherry picked from commit d1f377ff23f491bfd5162cb7bf510759440dd8e5) - URL: https://github.com/kamailio/kamailio/commit/d53843c75da9115a9c3cb6b1b909fd3… Author: Sergey Safarov <s.safarov(a)gmail.com> Date: 2024-06-08T12:28:32+02:00 db_mysql: fixed build on CentOS 7 (cherry picked from commit 767b3faee3af450d6482b919c81431ea6d707807) - URL: https://github.com/kamailio/kamailio/commit/deb11ee814e1591698d120a113630aa… Author: Rick Barenthin <rick(a)ng-voice.com> Date: 2024-06-08T12:29:15+02:00 usrloc: delete location_attrs in db_only mode on delete_urecord When calling delete_urecord in DB_ONLY mode the location_attrs are not deleted. This fix makes sure to delete location_attrs when calling db_delete_urecord is called. (cherry picked from commit 6b8f6d3b5d563d91234b8d4b7e155b7e74b9d313) - URL: https://github.com/kamailio/kamailio/commit/9a7e3e54f1c52ee69c68b1165de1158… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-08T12:30:01+02:00 htable: error on not finding htable in pv set (cherry picked from commit 82cfea317fd8d02a6c94347bc1be18c8a06e580f) - URL: https://github.com/kamailio/kamailio/commit/7087ce6aa496de9b6015e5054d8fd70… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-08T12:30:14+02:00 htable: error on not finding htable in pv get (cherry picked from commit 24b27214231166366cceb88fcb3724298cc53b32) - URL: https://github.com/kamailio/kamailio/commit/f4eea76a15b220b15337b60a77f7978… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2024-06-08T12:30:26+02:00 rtpengine: Fix extra process in pkg.stats When DTMF events socket is not configured, pkg.stats RPC method returns an empty entry. { entry: 13 pid: 0 rank: -128 used: 0 free: 0 real_used: 0 total_size: 67108864 total_frags: 0 desc: } Fixes: 26f6e57c8f ("Register a new worker process for dtmf event listener") (cherry picked from commit e67f6048f4883d446df2d88fe7a7d7f2ff6daf8c) - URL: https://github.com/kamailio/kamailio/commit/833b93563f43fa95e4bfdd175b14467… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-08T12:30:35+02:00 siputils: free head of params list for get_uri_param() - GH #3857 (cherry picked from commit d72a3fbc903da02ae3b26f3aae2ea228c9f8b255) - URL: https://github.com/kamailio/kamailio/commit/ebc8acef7617a69dcc06b163c47e88a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-08T12:30:46+02:00 siputils: free head of params list for get_uri_param() - GH #3857 (cherry picked from commit 8363208fff7c101a2779ff64783e5b7dbf8ffd7c) - URL: https://github.com/kamailio/kamailio/commit/5c9c13080be2b15252492dca388777d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-06-08T12:31:20+02:00 regex: fix pcre2 migration instead of reserving an array in pkg_mem and later copy the pointers to shm_mem just use shm_mem in the first place. fixes #3812 (cherry picked from commit d89333748662c0e7c72e3579d41fd14ef05c0fee) - URL: https://github.com/kamailio/kamailio/commit/614b5601170578c2d0eb79e7e5c64e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-08T12:31:31+02:00 geoip2: init MMDB_s global pointer and check on destroy (cherry picked from commit 8ba4ee4e00798ca015adc48542d0e4de8ed9daad) - URL: https://github.com/kamailio/kamailio/commit/2cc901e8be63791432a49f87d434eeb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-08T12:31:39+02:00 geoip2: do not close global MMDB_s on destroy - GH #3861 (cherry picked from commit e066613cac308d1129baebc47d7c245b36eba4b0) - URL: https://github.com/kamailio/kamailio/commit/ae3be6af4ea8d50c29fe8e523c95482… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-08T12:31:50+02:00 geoip2: rename global lock variable (cherry picked from commit 4bd619d3517f129362de3ce50eed2620d5002b42) - URL: https://github.com/kamailio/kamailio/commit/45f2e2670a3eac768b97b58eeec228b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-08T12:32:00+02:00 geoip2: keep global structure per process - parsing db file allocates private memory - reworked reload to rely on a global counter - GH #3861 (cherry picked from commit baccbe0298f9fa46db285505bc4386f997de5a47) - URL: https://github.com/kamailio/kamailio/commit/c27094b8288b7a949fbfc766eb9223c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-08T12:32:08+02:00 geoip2: clang format module file (cherry picked from commit 293193c55caaf5d0c39dc456babe92f574b58b3b) - URL: https://github.com/kamailio/kamailio/commit/54f9adb03ebbacf35eb0785dc46b55c… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2024-06-08T12:32:16+02:00 geoip2: Reload database before accessing it Re-add reloading of database. GH #3861 Fixes: 293193c55c ("geoip2: clang format module file") (cherry picked from commit 51dcab019a42e5b1f3b81247ca71ffcaf46180de) - URL: https://github.com/kamailio/kamailio/commit/eb4a8e326b10d0c3e922cc524d8f46d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-08T12:32:55+02:00 iims_registrar_scscf: include header for common c functions - GH #3855 (cherry picked from commit b508ef253cf996a5efd8bf13ded0c804f3557ada) - URL: https://github.com/kamailio/kamailio/commit/5999529be9ac2187dad465518bea3de… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-06-08T12:33:18+02:00 core/resolve: Check dns_cache_init and choose appropriate functions (cherry picked from commit 06d583e356351ae9d8a559c9f5de3e57fb128a38) - URL: https://github.com/kamailio/kamailio/commit/eb4ec6f9305e334d9749e1fd56ad195… Author: codenot <codenot(a)msn.com> Date: 2024-06-08T12:33:34+02:00 nathelper: fixed handle_ruri_alias_mode(1) cannot proper handle multi alias (cherry picked from commit 8e0b2e4b6450fa50bd573fa013dc888aaaccd2bf) - URL: https://github.com/kamailio/kamailio/commit/e8dc8506dbc4d8964e02c3be175d7f1… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-06-08T12:33:43+02:00 nathelper: remove magic constant (cherry picked from commit 3d187336f22e30800acefd28e4d0f98e0f677a49) - URL: https://github.com/kamailio/kamailio/commit/5571ea0ff8877a8a19b3fb76030af19… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-08T12:34:06+02:00 dmq_usrloc: reformat exported structures (cherry picked from commit e94812149c6f2867a5b23f1218a9af139590bf51) - URL: https://github.com/kamailio/kamailio/commit/ed0cdf3a3c85a8d05aacec8917fe35a… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2024-06-08T12:35:18+02:00 ims_ipsec_pcscf: Fix typo (cherry picked from commit 16e1b38fcc1593ad09eb03d86cd056ab8ff7f7f7) - URL: https://github.com/kamailio/kamailio/commit/8ef8db05dbc3a4cf5246354ce31dff1… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-06-08T12:35:24+02:00 pua_dialoginfo: Fix ruri length (cherry picked from commit 2c7c2d215ec9277fa706053579a38f058f15ae85)

1 0

[kamailio/kamailio] pua_dialoginfo fails to publish the caller when not using avps (Issue #3838)
by michelpelletier07 08 Jun '24

08 Jun '24

### Description What I did: I enabled the pua_dialoginfo module to publish changes for both the caller and the callee. What I expected: PUBLISH to be generated for the caller and the callee What actually happened: PUBLISH is only generated for the callee. ### Troubleshooting I troubleshooted the issue by adding LM_ERR messages at various point in the pua_dialoginfo.c #### Reproduction Add a db-url as modparam to pua Do not add any modparam to pua_dialoginfo. Then make a phone call while making sure dialog.dlg_manage() is called to track the call. #### Debugging Data Not applicable #### Log Messages pua_dialoginfo [dialog_publish.c:303]: dialog_publish(): failed to parse the PUBLISH R-URI ### Possible Solutions I tracked the issue to line 840 of pua_dialoginfo.c (see enclosed patch file), where dlginfo->pubruris_caller->s.s is set to the value of dlginfo->from_uri but dlginfo->pubruris_caller->s.len is not set to anything (left at zero). So I added a line to set the len value to the len value of dlginfo->from_uri.len See patch below: ``` diff -ru a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c 2024-05-02 11:14:34.150097771 -0600 +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c 2024-05-02 11:09:30.855960974 -0600 @@ -838,6 +838,8 @@ } memset(dlginfo->pubruris_caller, 0, sizeof(struct str_list)); dlginfo->pubruris_caller->s.s = shm_str2char_dup(&dlginfo->from_uri); + dlginfo->pubruris_caller->s.len = dlginfo->from_uri.len; + if(!dlginfo->pubruris_caller->s.s) { free_dlginfo_cell(dlginfo); return NULL; ``` ### Additional Information version: kamailio 5.8.1 (x86_64/linux) 384843 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_SEND_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 384843 compiled on 13:45:08 May 2 2024 with gcc 10.2.1 * **Operating System**: Linux yto11-stg-smf-vtr1.vcn.ms 5.10.0-27-amd64 #1 SMP Debian 5.10.205-2 (2023-12-31) x86_64 GNU/Linux -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3838 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3838(a)github.com>

3 4

[kamailio/kamailio] pua_dialoginfo: Fix ruri length (PR #3871)
by Xenofon Karamanos 08 Jun '24

08 Jun '24

#### 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #3838 #### Description  This PR fixes a bug where R-URI couldn't be parsed correctly by assing the correct length to the str variable You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3871 -- Commit Summary -- * pua_dialoginfo: Fix ruri length -- File Changes -- M src/modules/pua_dialoginfo/pua_dialoginfo.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3871.patch https://github.com/kamailio/kamailio/pull/3871.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3871 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3871(a)github.com>

2 2

git:master:2c7c2d21: pua_dialoginfo: Fix ruri length
by Henning Westerholt 08 Jun '24

08 Jun '24

Module: kamailio Branch: master Commit: 2c7c2d215ec9277fa706053579a38f058f15ae85 URL: https://github.com/kamailio/kamailio/commit/2c7c2d215ec9277fa706053579a38f0… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-06-08T08:52:02+02:00 pua_dialoginfo: Fix ruri length --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/2c7c2d215ec9277fa706053579a38f0… Patch: https://github.com/kamailio/kamailio/commit/2c7c2d215ec9277fa706053579a38f0… --- diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index 22a2fb11da7..c8a8a6f31a3 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -838,6 +838,7 @@ struct dlginfo_cell *get_dialog_data(struct dlg_cell *dlg, int type, } memset(dlginfo->pubruris_caller, 0, sizeof(struct str_list)); dlginfo->pubruris_caller->s.s = shm_str2char_dup(&dlginfo->from_uri); + dlginfo->pubruris_caller->s.len = dlginfo->from_uri.len; if(!dlginfo->pubruris_caller->s.s) { free_dlginfo_cell(dlginfo); return NULL;

1 0

[kamailio/kamailio] Less predictive algorithm for carrierroute hashing (Issue #3786)
by Ben Kaufman 08 Jun '24

08 Jun '24

### Description Carrierroute's CRC32 algorithm over call_id tends to produce poor call distribution under real world examples. Having 4 records for a given carrier/domain combo (assuming no flags, mask, or scan_prefix) and a probability of `0.25` using a hash source of `call_id` I observed over 800 hundred consecutive calls from a carrier (bandwidth.com) where `CRC32(call_id) % 1000` was less than 250. To be fair, the module does what it says - it uses a CRC32 hash over the call id, however the data from the UA generating the call is yielding poor results. Would it be possible to change to an alternate hashing mechanism (or add another hashing mechanism, selectable via `modparam`) such as MD5? ### Expected behavior Even distribution across all hosts provided. #### Actual observed behavior Uneven distribution under real-world conditions. #### Debugging Data I can provide a list of > 800 call-ids observed that all routed to the same endpoint. These are pulled from real world calls, and while there's not much danger in just having call-id's I would still prefer not to post it into github for posterity. #### Log Messages Log messages end up looking similar to this. I validated that the number is the CRC32 hash of the call id, so it's not a bug in the module. ``` proxy-1 | 1(7) DEBUG: carrierroute [cr_func.c:449]: rewrite_on_rule(): searching for matching routing rules 1(7) DEBUG: carrierroute [prime_hash.c:66]: hash_func(): hash: 2417021133 % 1000 = 133 proxy-1 | 1(7) INFO: carrierroute [cr_func.c:689]: ki_cr_do_route_helper(): uri service was rewritten to sip:service@host-d, carrier 1, domain 1 ``` ### Possible Solutions Ability to use MD5, kamailio's core hash function or other such hashing function ### Additional Information Problem validate in 5.7.3, but since it's *correct* by module design, it shouldn't have changed in 5.8 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3786 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3786(a)github.com>

3 4

[kamailio/kamailio] microhttpd cannot be build on CentOS 8 (Issue #3504)
by sergey-safarov 08 Jun '24

08 Jun '24

``` LD (gcc) [M memcached.so] memcached.so CC (gcc) [M microhttpd.so] microhttpd_mod.o microhttpd_mod.c:374:24: error: return type is an incomplete type static enum MHD_Result ksr_microhttpd_request(void *cls, ^~~~~~~~~~~~~~~~~~~~~~ microhttpd_mod.c: In function 'ksr_microhttpd_request': microhttpd_mod.c:390:10: warning: 'return' with a value, in function returning void return MHD_YES; ^~~~~~~ microhttpd_mod.c:374:24: note: declared here static enum MHD_Result ksr_microhttpd_request(void *cls, ^~~~~~~~~~~~~~~~~~~~~~ microhttpd_mod.c:411:10: warning: 'return' with a value, in function returning void return MHD_NO; ^~~~~~ microhttpd_mod.c:374:24: note: declared here static enum MHD_Result ksr_microhttpd_request(void *cls, ^~~~~~~~~~~~~~~~~~~~~~ microhttpd_mod.c:433:10: warning: 'return' with a value, in function returning void return MHD_NO; ^~~~~~ microhttpd_mod.c:374:24: note: declared here static enum MHD_Result ksr_microhttpd_request(void *cls, ^~~~~~~~~~~~~~~~~~~~~~ microhttpd_mod.c:436:9: warning: 'return' with a value, in function returning void return MHD_YES; ^~~~~~~ microhttpd_mod.c:374:24: note: declared here static enum MHD_Result ksr_microhttpd_request(void *cls, ^~~~~~~~~~~~~~~~~~~~~~ microhttpd_mod.c: In function 'microhttpd_server_run': microhttpd_mod.c:462:17: warning: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Wincompatible-p ointer-types] NULL, NULL, &ksr_microhttpd_request, KSR_MICROHTTPD_PAGE, ^~~~~~~~~~~~~~~~~~~~~~~ In file included from microhttpd_mod.c:29: /usr/include/microhttpd.h:2148:1: note: expected 'MHD_AccessHandlerCallback' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'void (*)( void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'void (*) (void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} MHD_start_daemon (unsigned int flags, ^~~~~~~~~~~~~~~~ microhttpd_mod.c:467:17: warning: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Wincompatible-p ointer-types] NULL, NULL, &ksr_microhttpd_request, KSR_MICROHTTPD_PAGE, ^~~~~~~~~~~~~~~~~~~~~~~ In file included from microhttpd_mod.c:29: /usr/include/microhttpd.h:2148:1: note: expected 'MHD_AccessHandlerCallback' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'void (*)( void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'void (*) (void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} MHD_start_daemon (unsigned int flags, ^~~~~~~~~~~~~~~~ make[2]: *** [../../Makefile.rules:100: microhttpd_mod.o] Error 1 make[1]: Leaving directory '/root/rpmbuild/BUILD/kamailio-5.8.0-dev1/src' make[1]: *** [Makefile:508: modules] Error 1 make: *** [Makefile:34: every-module] Error 2 error: Bad exit status from /var/tmp/rpm-tmp.K7wkd7 (%build) Bad exit status from /var/tmp/rpm-tmp.K7wkd7 (%build) ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3504 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3504(a)github.com>

3 3

git:master:637c5ce2: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 07 Jun '24

07 Jun '24

Module: kamailio Branch: master Commit: 637c5ce2a9f2a9f82937f9102545f896a5a8abed URL: https://github.com/kamailio/kamailio/commit/637c5ce2a9f2a9f82937f9102545f89… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-06-07T19:46:11+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README Modified: src/modules/ims_ipsec_pcscf/README --- Diff: https://github.com/kamailio/kamailio/commit/637c5ce2a9f2a9f82937f9102545f89… Patch: https://github.com/kamailio/kamailio/commit/637c5ce2a9f2a9f82937f9102545f89… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index c915f552809..c095bc201be 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1644,7 +1644,7 @@ onreply_route { * setid - the set (group) id. The parameter can be an integer or a variable holding an integer value. * uri - the URI of the destination. - * val - the valie of the overload control rate (from 1 to 100) - how + * val - the value of the overload control rate (from 1 to 100) - how many times to skip using this destination in 100 selections. This function can be used from ANY_ROUTE. diff --git a/src/modules/ims_ipsec_pcscf/README b/src/modules/ims_ipsec_pcscf/README index bce99b791da..3d831eb2c47 100644 --- a/src/modules/ims_ipsec_pcscf/README +++ b/src/modules/ims_ipsec_pcscf/README @@ -361,7 +361,7 @@ ipsec_destroy("location"); recv_host - received host to match the record. recv_port - received port to match the record. - The last three parameters have to be string valies and can contain + The last three parameters have to be string values and can contain variables. Example 1.14. ipsec_destroy_by_contact()

1 0

[kamailio/kamailio] Fix typos (PR #3870)
by Bastian Triller 07 Jun '24

07 Jun '24

#### 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  Fix two small typos You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3870 -- Commit Summary -- * dispatcher: Fix typo * ims_ipsec_pcscf: Fix typo -- File Changes -- M src/modules/dispatcher/doc/dispatcher_admin.xml (2) M src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3870.patch https://github.com/kamailio/kamailio/pull/3870.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3870 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3870(a)github.com>

2 1

git:master:16e1b38f: ims_ipsec_pcscf: Fix typo
by Victor Seva 07 Jun '24

07 Jun '24

Module: kamailio Branch: master Commit: 16e1b38fcc1593ad09eb03d86cd056ab8ff7f7f7 URL: https://github.com/kamailio/kamailio/commit/16e1b38fcc1593ad09eb03d86cd056a… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-06-07T19:37:57+02:00 ims_ipsec_pcscf: Fix typo --- Modified: src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/16e1b38fcc1593ad09eb03d86cd056a… Patch: https://github.com/kamailio/kamailio/commit/16e1b38fcc1593ad09eb03d86cd056a… --- diff --git a/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml b/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml index ee58f16fb63..f4a388ee777 100644 --- a/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml +++ b/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml @@ -405,7 +405,7 @@ ipsec_destroy("location"); </para> </listitem> </itemizedlist> - <para>The last three parameters have to be string valies and can contain + <para>The last three parameters have to be string values and can contain variables.</para> <example> <title>ipsec_destroy_by_contact()</title>

1 0

git:master:e10a629a: dispatcher: Fix typo
by Victor Seva 07 Jun '24

07 Jun '24

Module: kamailio Branch: master Commit: e10a629a7737c12cc58a8abebf1fe67ed1f30ab9 URL: https://github.com/kamailio/kamailio/commit/e10a629a7737c12cc58a8abebf1fe67… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-06-07T19:37:57+02:00 dispatcher: Fix typo --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e10a629a7737c12cc58a8abebf1fe67… Patch: https://github.com/kamailio/kamailio/commit/e10a629a7737c12cc58a8abebf1fe67… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index cdd1ebc896e..e0e8d1beed8 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -2032,7 +2032,7 @@ onreply_route { <para><emphasis>uri</emphasis> - the URI of the destination.</para> </listitem> <listitem> - <para><emphasis>val</emphasis> - the valie of the overload control + <para><emphasis>val</emphasis> - the value of the overload control rate (from 1 to 100) - how many times to skip using this destination in 100 selections.</para> </listitem>

1 0

git:master:a366c9a3: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 07 Jun '24

07 Jun '24

Module: kamailio Branch: master Commit: a366c9a30f953571f89f539e87448ff0c5ac8585 URL: https://github.com/kamailio/kamailio/commit/a366c9a30f953571f89f539e87448ff… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-06-07T12:31:09+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/a366c9a30f953571f89f539e87448ff… Patch: https://github.com/kamailio/kamailio/commit/a366c9a30f953571f89f539e87448ff… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 209d77f4c87..c915f552809 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -122,6 +122,7 @@ Federico Cabiddu 4.14. ds_load_unset() 4.15. ds_reload() 4.16. ds_dsg_fetch(setid) + 4.17. ds_oc_set_rate(setid, uri, val) 5. RPC Commands @@ -211,8 +212,9 @@ Federico Cabiddu 1.57. ds_load_unset usage 1.58. ds_reload usage 1.59. ds_dsg_fetch() usage - 1.60. dispatcher list file - 1.61. Kamailio config script - sample dispatcher usage + 1.60. ds_oc_set_rate() usage + 1.61. dispatcher list file + 1.62. Kamailio config script - sample dispatcher usage Chapter 1. Admin Guide @@ -289,6 +291,7 @@ Chapter 1. Admin Guide 4.14. ds_load_unset() 4.15. ds_reload() 4.16. ds_dsg_fetch(setid) + 4.17. ds_oc_set_rate(setid, uri, val) 5. RPC Commands @@ -1115,6 +1118,7 @@ modparam("dispatcher", "ds_interval_mode", 7200) 4.14. ds_load_unset() 4.15. ds_reload() 4.16. ds_dsg_fetch(setid) + 4.17. ds_oc_set_rate(setid, uri, val) 4.1. ds_select_dst(set, alg[, limit]) @@ -1227,6 +1231,9 @@ GATEWAY | PRIORITY | ESTIMATED | ADJUSTED | LOAD With congestion control the formula becomes : CONGESTION_MS = CURRENT_LATENCY_MS - NORMAL_CONDITION_LATENCY_MS ADJUSTED_PRIORITY = PRIORITY - (CONGESTION_MS/PRIORITY) + + ��64�� - round-robin (next destination) with over load control + (destination record is skipped based on over load control + rate). + ��X�� - if the algorithm is not implemented, the first entry in set is chosen. * limit - the maximum number of items to be stored in XAVP list for @@ -1629,6 +1636,24 @@ onreply_route { xinfo("set id: 1 - all: $dsg(count); active: $dsg(active)\n"); ... +4.17. ds_oc_set_rate(setid, uri, val) + + Sets the overload control rate for the destination (setid, uri). + + Description of parameters: + * setid - the set (group) id. The parameter can be an integer or a + variable holding an integer value. + * uri - the URI of the destination. + * val - the valie of the overload control rate (from 1 to 100) - how + many times to skip using this destination in 100 selections. + + This function can be used from ANY_ROUTE. + + Example 1.60. ds_oc_set_rate() usage +... + ds_oc_set_rate("1", "sip:127.0.0.1:5080", "30"); +... + 5. RPC Commands 5.1. dispatcher.set_state @@ -1890,6 +1915,10 @@ kamctl rpc dispatcher.hash 4 bob server.com * 'obproxy' - SIP URI of outbound proxy to be used when sending pings. It overwrites the general ds_outbound_proxy parameter. * 'latency' - latency_stats initialization in ms. + * 'ocmin' - minimum limit for over load control rate (value between 0 + and 100, default 10). + * 'ocrate' - over load control rate (value between 0 and 100, default + 100). 6.1.2. File Format @@ -1907,7 +1936,7 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt) For database, each element of a line resides in a different column. Next is a dispatcher.list file example: - Example 1.60. dispatcher list file + Example 1.61. dispatcher list file ... # # dispatcher destination sets (groups) @@ -1932,7 +1961,7 @@ r,opt) Next listing shows a sample config for using the dispatcher module. - Example 1.61. Kamailio config script - sample dispatcher usage + Example 1.62. Kamailio config script - sample dispatcher usage ... #!KAMAILIO #

1 0

git:master:331ca628: dispatcher: overload control rate is how many times to skip destination
by Daniel-Constantin Mierla 07 Jun '24

07 Jun '24

Module: kamailio Branch: master Commit: 331ca62818df5956676e9f99ebb41917e8d08d2a URL: https://github.com/kamailio/kamailio/commit/331ca62818df5956676e9f99ebb4191… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-07T12:29:23+02:00 dispatcher: overload control rate is how many times to skip destination - counted as in 100 selections --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/331ca62818df5956676e9f99ebb4191… Patch: https://github.com/kamailio/kamailio/commit/331ca62818df5956676e9f99ebb4191… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 20fb6f7e85b..288ac38f75c 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -408,14 +408,14 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) str2int(&pit->body, &dest->attrs.ocmin); } } - if(dest->attrs.ocmax <= 0 || dest->attrs.ocmax > 100) { + if(dest->attrs.ocmax < 0 || dest->attrs.ocmax > 100) { dest->attrs.ocmax = 100; } - if(dest->attrs.ocmin <= 0 || dest->attrs.ocmin > 100) { + if(dest->attrs.ocmin < 0 || dest->attrs.ocmin > 100) { dest->attrs.ocmin = 10; } if(dest->attrs.ocrate <= 0 || dest->attrs.ocrate > 100) { - dest->attrs.ocrate = 100; + dest->attrs.ocrate = 0; } if(dest->attrs.ocrate < dest->attrs.ocmin) { dest->attrs.ocrate = dest->attrs.ocmin; @@ -435,10 +435,10 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) void ds_oc_prepare(ds_dest_t *dp) { int i; - for(i = 0; i < dp->attrs.ocrate; i++) { + for(i = 0; i < 100 - dp->attrs.ocrate; i++) { dp->ocdist[i] = 1; } - for(i = dp->attrs.ocrate; i < 100; i++) { + for(i = 100 - dp->attrs.ocrate; i < 100; i++) { dp->ocdist[i] = 0; } shuffle_uint100array(dp->ocdist);

1 0

git:master:cd8f551f: dispatcher: docs for ds_oc_set_rate(...) function
by Daniel-Constantin Mierla 07 Jun '24

07 Jun '24

Module: kamailio Branch: master Commit: cd8f551f40c6d3a3c30d7bb9d96e601c0c3087ae URL: https://github.com/kamailio/kamailio/commit/cd8f551f40c6d3a3c30d7bb9d96e601… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-07T12:18:21+02:00 dispatcher: docs for ds_oc_set_rate(...) function --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cd8f551f40c6d3a3c30d7bb9d96e601… Patch: https://github.com/kamailio/kamailio/commit/cd8f551f40c6d3a3c30d7bb9d96e601… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 979b59798af..cdd1ebc896e 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -2011,6 +2011,42 @@ onreply_route { ds_dsg_fetch("1"); xinfo("set id: 1 - all: $dsg(count); active: $dsg(active)\n"); ... +</programlisting> + </example> + </section> + <section id="dispatcher.f.ds_oc_set_rate"> + <title> + <function moreinfo="none">ds_oc_set_rate(setid, uri, val)</function> + </title> + <para> + Sets the overload control rate for the destination (setid, uri). + </para> + <para>Description of parameters:</para> + <itemizedlist> + <listitem> + <para><emphasis>setid</emphasis> - the set (group) id. The parameter + can be an integer or a variable holding an integer value. + </para> + </listitem> + <listitem> + <para><emphasis>uri</emphasis> - the URI of the destination.</para> + </listitem> + <listitem> + <para><emphasis>val</emphasis> - the valie of the overload control + rate (from 1 to 100) - how many times to skip using this destination + in 100 selections.</para> + </listitem> + </itemizedlist> + + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>ds_oc_set_rate()</function> usage</title> + <programlisting format="linespecific"> +... + ds_oc_set_rate("1", "sip:127.0.0.1:5080", "30"); +... </programlisting> </example> </section>

1 0

git:master:55f82b77: dispatcher: use ds_oc_set_rate() function name
by Daniel-Constantin Mierla 07 Jun '24

07 Jun '24

Module: kamailio Branch: master Commit: 55f82b772e53910d94c100903fc5c2c147aa91ea URL: https://github.com/kamailio/kamailio/commit/55f82b772e53910d94c100903fc5c2c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-07T12:10:25+02:00 dispatcher: use ds_oc_set_rate() function name - suggests better its purpose --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/55f82b772e53910d94c100903fc5c2c… Patch: https://github.com/kamailio/kamailio/commit/55f82b772e53910d94c100903fc5c2c… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index d3ddb81ee82..20fb6f7e85b 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -447,7 +447,7 @@ void ds_oc_prepare(ds_dest_t *dp) /** * */ -int ds_oc_set(sip_msg_t *msg, int setid, str *duri, int ival) +int ds_oc_set_rate(sip_msg_t *msg, int setid, str *duri, int ival) { int i = 0; int ret = -1; diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index 074771c54c6..f38cd56f255 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -300,5 +300,5 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate); ds_rctx_t *ds_get_rctx(void); unsigned int ds_get_hash(str *x, str *y); -int ds_oc_set(sip_msg_t *msg, int setid, str *uri, int ival); +int ds_oc_set_rate(sip_msg_t *msg, int setid, str *uri, int ival); #endif diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 1d838eee818..d8e81f0855a 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -185,7 +185,7 @@ static int w_ds_reload(struct sip_msg* msg, char*, char*); static int w_ds_is_active(sip_msg_t *msg, char *pset, char *p2); static int w_ds_is_active_uri(sip_msg_t *msg, char *pset, char *puri); static int w_ds_dsg_fetch(sip_msg_t *msg, char *pset, char *p2); -static int w_ds_oc_set(sip_msg_t*, char*, char*, char*); +static int w_ds_oc_set_rate(sip_msg_t*, char*, char*, char*); static int fixup_ds_is_from_list(void** param, int param_no); static int fixup_ds_list_exist(void** param,int param_no); @@ -262,7 +262,7 @@ static cmd_export_t cmds[]={ 0, 0, 0}, {"ds_reload", (cmd_function)w_ds_reload, 0, 0, 0, ANY_ROUTE}, - {"ds_oc_set", (cmd_function)w_ds_oc_set, 3, + {"ds_oc_set_rate", (cmd_function)w_ds_oc_set_rate, 3, fixup_isi, fixup_free_isi, ANY_ROUTE}, {"ds_dsg_fetch", (cmd_function)w_ds_dsg_fetch, 1, fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, @@ -1392,7 +1392,7 @@ static int w_ds_dsg_fetch(sip_msg_t *msg, char *pset, char *p2) /** * */ -static int w_ds_oc_set(sip_msg_t *msg, char *pset, char *puri, char *pval) +static int w_ds_oc_set_rate(sip_msg_t *msg, char *pset, char *puri, char *pval) { int iset; str suri; @@ -1411,7 +1411,7 @@ static int w_ds_oc_set(sip_msg_t *msg, char *pset, char *puri, char *pval) return -1; } - return ds_oc_set(msg, iset, &suri, ival); + return ds_oc_set_rate(msg, iset, &suri, ival); } /**

1 0

git:master:c2bde271: dispatcher: docs for algorithm 64 - round robin with overload control
by Daniel-Constantin Mierla 07 Jun '24

07 Jun '24

Module: kamailio Branch: master Commit: c2bde271f9d606e6cef987a223f746092c59d306 URL: https://github.com/kamailio/kamailio/commit/c2bde271f9d606e6cef987a223f7460… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-07T12:02:04+02:00 dispatcher: docs for algorithm 64 - round robin with overload control --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c2bde271f9d606e6cef987a223f7460… Patch: https://github.com/kamailio/kamailio/commit/c2bde271f9d606e6cef987a223f7460… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 83ef06285a0..979b59798af 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1418,6 +1418,13 @@ With congestion control the formula becomes : </programlisting> </example> </listitem> + <listitem> + <para> + <quote>64</quote> - round-robin (next destination) with over + load control (destination record is skipped based on over + load control rate). + </para> + </listitem> <listitem> <para> <quote>X</quote> - if the algorithm is not implemented, the @@ -2388,6 +2395,14 @@ kamctl rpc dispatcher.hash 4 bob server.com <listitem> <para>'latency' - latency_stats initialization in ms.</para> </listitem> + <listitem> + <para>'ocmin' - minimum limit for over load control rate + (value between 0 and 100, default 10).</para> + </listitem> + <listitem> + <para>'ocrate' - over load control rate + (value between 0 and 100, default 100).</para> + </listitem> </itemizedlist> </para> </section>

1 0

git:master:199f7cc4: dispatcher: set DS_ALG_OVERLOAD to 64 to be able to use as a flag
by Daniel-Constantin Mierla 07 Jun '24

07 Jun '24

Module: kamailio Branch: master Commit: 199f7cc4f29e6bab5f462d0db1942a8a583f8a67 URL: https://github.com/kamailio/kamailio/commit/199f7cc4f29e6bab5f462d0db1942a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-07T11:40:17+02:00 dispatcher: set DS_ALG_OVERLOAD to 64 to be able to use as a flag --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/199f7cc4f29e6bab5f462d0db1942a8… Patch: https://github.com/kamailio/kamailio/commit/199f7cc4f29e6bab5f462d0db1942a8… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 0466f09d9d4..d3ddb81ee82 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -79,7 +79,7 @@ #define DS_ALG_RELWEIGHT 11 #define DS_ALG_PARALLEL 12 #define DS_ALG_LATENCY 13 -#define DS_ALG_OVERLOAD 14 +#define DS_ALG_OVERLOAD 64 /* 2^6 - can be also used as a flag */ #define DS_HN_SIZE 256 @@ -2618,7 +2618,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) return -1; xavp_filled = 1; break; - case DS_ALG_OVERLOAD: /* 14 - round robin with overload control */ + case DS_ALG_OVERLOAD: /* 64 - round robin with overload control */ lock_get(&idx->lock); hash = idx->last; idx->last = (idx->last + 1) % idx->nr;

1 0

git:master:42998ac2: dispatcher: function to set oc rate for destination records
by Daniel-Constantin Mierla 07 Jun '24

07 Jun '24

Module: kamailio Branch: master Commit: 42998ac2b33ec9fd47d3b1491b48f4d75d842e55 URL: https://github.com/kamailio/kamailio/commit/42998ac2b33ec9fd47d3b1491b48f4d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-07T11:09:58+02:00 dispatcher: function to set oc rate for destination records --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/42998ac2b33ec9fd47d3b1491b48f4d… Patch: https://github.com/kamailio/kamailio/commit/42998ac2b33ec9fd47d3b1491b48f4d…

1 0

git:master:b7d7c6e2: core: fixup helpers for int-str-int params
by Daniel-Constantin Mierla 07 Jun '24

07 Jun '24

Module: kamailio Branch: master Commit: b7d7c6e24a906ed4f58bda603ec4574786919caf URL: https://github.com/kamailio/kamailio/commit/b7d7c6e24a906ed4f58bda603ec4574… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-07T10:50:28+02:00 core: fixup helpers for int-str-int params --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/b7d7c6e24a906ed4f58bda603ec4574… Patch: https://github.com/kamailio/kamailio/commit/b7d7c6e24a906ed4f58bda603ec4574… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index bba3a469028..ec4e016ed88 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -1029,3 +1029,35 @@ int fixup_free_ssii(void **param, int param_no) return E_UNSPEC; } } + +/** + * + */ +int fixup_isi(void **param, int param_no) +{ + switch(param_no) { + case 1: + case 3: + return fixup_igp_null(param, 1); + case 2: + return fixup_spve_null(param, 1); + default: + return E_UNSPEC; + } +} + +/** + * + */ +int fixup_free_isi(void **param, int param_no) +{ + switch(param_no) { + case 1: + case 3: + return fixup_free_igp_null(param, 1); + case 2: + return fixup_free_spve_null(param, 1); + default: + return E_UNSPEC; + } +} diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index d3f954fb1c2..aafb3a4cbff 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -184,4 +184,7 @@ int fixup_free_sssi(void **param, int param_no); int fixup_ssii(void **param, int param_no); int fixup_free_ssii(void **param, int param_no); +int fixup_isi(void **param, int param_no); +int fixup_free_isi(void **param, int param_no); + #endif

1 0

git:master:f900e332: dispatcher: round robin with overload control algorithm
by Daniel-Constantin Mierla 07 Jun '24

07 Jun '24

Module: kamailio Branch: master Commit: f900e3325eb80ce8a266663e5fc251537436d449 URL: https://github.com/kamailio/kamailio/commit/f900e3325eb80ce8a266663e5fc2515… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-07T07:44:33+02:00 dispatcher: round robin with overload control algorithm --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/f900e3325eb80ce8a266663e5fc2515… Patch: https://github.com/kamailio/kamailio/commit/f900e3325eb80ce8a266663e5fc2515… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 8a225f35418..02e1f6e4a83 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -421,6 +421,25 @@ void ds_oc_prepare(ds_dest_t *dp) shuffle_uint100array(dp->ocdist); } +/** + * + */ +static inline int ds_oc_skip(ds_set_t *dsg, int alg, int n) +{ + int ret = 0; + + if(alg != DS_ALG_OVERLOAD) { + return 0; + } + + if(dsg->dlist[n].ocdist[dsg->dlist[n].ocidx] == 1) { + ret = 0; + } + dsg->dlist[n].ocidx = (dsg->dlist[n].ocidx + 1) % 100; + + return ret; +} + /** * */ @@ -2556,6 +2575,14 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) return -1; xavp_filled = 1; break; + case DS_ALG_OVERLOAD: /* 14 - round robin with overload control */ + lock_get(&idx->lock); + hash = idx->last; + idx->last = (idx->last + 1) % idx->nr; + vlast = idx->last; + lock_release(&idx->lock); + ulast = 1; + break; default: LM_WARN("algo %d not implemented - using first entry...\n", rstate->alg); @@ -2571,7 +2598,9 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) i = hash; /* if selected address is inactive, find next active */ - while(!xavp_filled && ds_skip_dst(idx->dlist[i].flags)) { + while(!xavp_filled + && (ds_skip_dst(idx->dlist[i].flags) + || ds_oc_skip(idx, rstate->alg, i))) { if(ds_use_default != 0 && idx->nr != 1) i = (i + 1) % (idx->nr - 1); else @@ -2580,7 +2609,8 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) /* back to start -- looks like no active dst */ if(ds_use_default != 0) { i = idx->nr - 1; - if(ds_skip_dst(idx->dlist[i].flags)) + if(ds_skip_dst(idx->dlist[i].flags) + || ds_oc_skip(idx, rstate->alg, i)) return -1; break; } else {

1 0

git:master:f7c41e66: dispatcher: prepare oc-based distribution
by Daniel-Constantin Mierla 06 Jun '24

06 Jun '24

Module: kamailio Branch: master Commit: f7c41e6602f397987470d4ff8a50b51ff16dd521 URL: https://github.com/kamailio/kamailio/commit/f7c41e6602f397987470d4ff8a50b51… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-06T20:32:36+02:00 dispatcher: prepare oc-based distribution --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/f7c41e6602f397987470d4ff8a50b51… Patch: https://github.com/kamailio/kamailio/commit/f7c41e6602f397987470d4ff8a50b51… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index d22188ada1f..8a225f35418 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -409,6 +409,18 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) return 0; } +/** + * + */ +void ds_oc_prepare(ds_dest_t *dp) +{ + int i; + for(i = 0; i < dp->attrs.ocrate; i++) { + dp->ocdist[i] = 1; + } + shuffle_uint100array(dp->ocdist); +} + /** * */ @@ -562,6 +574,8 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs, int dload) } } + ds_oc_prepare(dp); + return dp; err: if(dp != NULL) {

1 0

git:master:b6cd84b9: dispatcher: new set of attributes oc-based routing
by Daniel-Constantin Mierla 06 Jun '24

06 Jun '24

Module: kamailio Branch: master Commit: b6cd84b999030acb2db03ce9ff9d3de4d942fff9 URL: https://github.com/kamailio/kamailio/commit/b6cd84b999030acb2db03ce9ff9d3de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-06T20:32:36+02:00 dispatcher: new set of attributes oc-based routing - ocmin, ocmax and ocrate --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h --- Diff: https://github.com/kamailio/kamailio/commit/b6cd84b999030acb2db03ce9ff9d3de… Patch: https://github.com/kamailio/kamailio/commit/b6cd84b999030acb2db03ce9ff9d3de… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 9e27f998c25..d22188ada1f 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -79,6 +79,7 @@ #define DS_ALG_RELWEIGHT 11 #define DS_ALG_PARALLEL 12 #define DS_ALG_LATENCY 13 +#define DS_ALG_OVERLOAD 14 #define DS_HN_SIZE 256 @@ -376,8 +377,33 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) } else if(pit->name.len == 7 && strncasecmp(pit->name.s, "obproxy", 7) == 0) { dest->attrs.obproxy = pit->body; + } else if(pit->name.len == 5 + && strncasecmp(pit->name.s, "ocmin", 5) == 0) { + str2int(&pit->body, &dest->attrs.ocmin); + } else if(pit->name.len == 5 + && strncasecmp(pit->name.s, "ocmax", 5) == 0) { + str2int(&pit->body, &dest->attrs.ocmax); + } else if(pit->name.len == 6 + && strncasecmp(pit->name.s, "ocrate", 6) == 0) { + str2int(&pit->body, &dest->attrs.ocmin); } } + if(dest->attrs.ocmax <= 0 || dest->attrs.ocmax > 100) { + dest->attrs.ocmax = 100; + } + if(dest->attrs.ocmin <= 0 || dest->attrs.ocmin > 100) { + dest->attrs.ocmin = 10; + } + if(dest->attrs.ocrate <= 0 || dest->attrs.ocrate > 100) { + dest->attrs.ocrate = 10; + } + if(dest->attrs.ocrate < dest->attrs.ocmin) { + dest->attrs.ocrate = dest->attrs.ocmin; + } + if(dest->attrs.ocrate > dest->attrs.ocmax) { + dest->attrs.ocrate = dest->attrs.ocmax; + } + if(params_list) free_params(params_list); return 0; diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index a887c555932..296097b7e97 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -204,6 +204,9 @@ typedef struct _ds_attrs { str ping_from; str obproxy; int rpriority; + uint32_t ocmin; + uint32_t ocmax; + uint32_t ocrate; } ds_attrs_t; typedef struct _ds_latency_stats { @@ -236,6 +239,8 @@ typedef struct _ds_dest { unsigned short int proto; /*!< protocol of the URI */ int message_count; struct timeval dnstime; + uint32_t ocidx; + uint32_t ocdist[100]; struct _ds_dest *next; } ds_dest_t;

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev