- sr-dev - kamailio.org

[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

git:master:388cc4fc: modules: readme files regenerated - p_usrloc ... [skip ci]
by Kamailio Dev 06 Jun '24

06 Jun '24

Module: kamailio Branch: master Commit: 388cc4fc7531f803cdd401384b9d6baaa0d81054 URL: https://github.com/kamailio/kamailio/commit/388cc4fc7531f803cdd401384b9d6ba… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-06-06T11:46:10+02:00 modules: readme files regenerated - p_usrloc ... [skip ci] --- Modified: src/modules/p_usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/388cc4fc7531f803cdd401384b9d6ba… Patch: https://github.com/kamailio/kamailio/commit/388cc4fc7531f803cdd401384b9d6ba… --- diff --git a/src/modules/p_usrloc/README b/src/modules/p_usrloc/README index ae0702db5bd..335d02e2efd 100644 --- a/src/modules/p_usrloc/README +++ b/src/modules/p_usrloc/README @@ -631,6 +631,7 @@ modparam("p_usrloc", "default_db_type", "cluster") * 0 uses the old style using aor, contact and call-id * 1 uses ruid value * 2 uses the new style using aor, contact and call-id + * 3 uses contact uniq value + ruid value Default value is 0

1 0

[kamailio/kamailio] p_usrloc: Add update/delete based on uniq (PR #3865)
by Stefan Mititelu 06 Jun '24

06 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Add a new update/delete function based on contact's uniq uniq. Some devices may use same uniq for multiple contacts, so I needed to restrain it further based on ruid value. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3865 -- Commit Summary -- * p_usrloc: Add update/delete based on uniq -- File Changes -- M src/modules/p_usrloc/doc/p_usrloc_admin.xml (5) M src/modules/p_usrloc/ucontact.c (307) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3865.patch https://github.com/kamailio/kamailio/pull/3865.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3865 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3865(a)github.com>

2 2

git:master:8b6b3881: p_usrloc: Add update/delete based on uniq
by Stefan Mititelu 06 Jun '24

06 Jun '24

Module: kamailio Branch: master Commit: 8b6b3881594b4f2ac1b50b9c83cd0e1dac3ec321 URL: https://github.com/kamailio/kamailio/commit/8b6b3881594b4f2ac1b50b9c83cd0e1… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)govoip.ro> Date: 2024-06-06T12:34:14+03:00 p_usrloc: Add update/delete based on uniq --- Modified: src/modules/p_usrloc/doc/p_usrloc_admin.xml Modified: src/modules/p_usrloc/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/8b6b3881594b4f2ac1b50b9c83cd0e1… Patch: https://github.com/kamailio/kamailio/commit/8b6b3881594b4f2ac1b50b9c83cd0e1…

1 0

[kamailio/kamailio] pdb: make 'timeout' runtime configurable (PR #3850)
by Stefan Mititelu 05 Jun '24

05 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Make timeout modparam runtime configurable. Also update timout execeded logs from NOTICE to ERR and add more info to them. Also update utils/pdbt.c query tool to allow 0 carrier id. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3850 -- Commit Summary -- * pdb: make 'timeout' runtime configurable -- File Changes -- A src/modules/pdb/config.c (42) A src/modules/pdb/config.h (37) M src/modules/pdb/pdb.c (40) M utils/pdbt/pdbt.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3850.patch https://github.com/kamailio/kamailio/pull/3850.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3850 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3850(a)github.com>

3 5

git:master:fc07aad0: pdbt: Allow to return carrier id 0
by Henning Westerholt 05 Jun '24

05 Jun '24

Module: kamailio Branch: master Commit: fc07aad0beaae9e133ca3252b088afd9eece0c53 URL: https://github.com/kamailio/kamailio/commit/fc07aad0beaae9e133ca3252b088afd… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-06-05T21:43:02+02:00 pdbt: Allow to return carrier id 0 --- Modified: utils/pdbt/pdbt.c --- Diff: https://github.com/kamailio/kamailio/commit/fc07aad0beaae9e133ca3252b088afd… Patch: https://github.com/kamailio/kamailio/commit/fc07aad0beaae9e133ca3252b088afd… --- diff --git a/utils/pdbt/pdbt.c b/utils/pdbt/pdbt.c index be670eeb7f8..d9fa0bca45d 100644 --- a/utils/pdbt/pdbt.c +++ b/utils/pdbt/pdbt.c @@ -628,15 +628,14 @@ int query_server(char *number, char *comment, void *data) { carrierid = query_udp(number, sdata->timeout, &(sdata->pfds), &(sdata->dstaddr), sdata->dstaddrlen); - if (carrierid<=0) { + if(carrierid < 0) { LINFO("%s: not_found: comment='%s', result=%d\n", number, comment, carrierid); if (carrierid < 0) { result = carrierid; } else { result = PDB_NOT_IN_PDB; } - } - else { + } else { LINFO("%s:%ld:%s\n", number, (long int)carrierid, carrierid2name(carrierid)); result = PDB_OK; }

1 0

git:master:f57be803: pdb: make 'timeout' runtime configurable
by Henning Westerholt 05 Jun '24

05 Jun '24

Module: kamailio Branch: master Commit: f57be8030834cdeb0bb509d0d25afc89f3cca6e8 URL: https://github.com/kamailio/kamailio/commit/f57be8030834cdeb0bb509d0d25afc8… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-06-05T21:43:02+02:00 pdb: make 'timeout' runtime configurable Also modify logs related to timeout from NOTICE to ERR and add a bit more info to them. --- Added: src/modules/pdb/config.c Added: src/modules/pdb/config.h Modified: src/modules/pdb/pdb.c --- Diff: https://github.com/kamailio/kamailio/commit/f57be8030834cdeb0bb509d0d25afc8… Patch: https://github.com/kamailio/kamailio/commit/f57be8030834cdeb0bb509d0d25afc8…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev