sr-dev June 2024

sr-dev@lists.kamailio.org

14 participants
223 discussions

[kamailio/kamailio] Fix typos (PR #3870)

by Bastian Triller

#### 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>

5 months, 3 weeks

git:master:16e1b38f: ims_ipsec_pcscf: Fix typo

by Victor Seva

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>

5 months, 3 weeks

git:master:e10a629a: dispatcher: Fix typo

by Victor Seva

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>

5 months, 3 weeks

git:master:a366c9a3: modules: readme files regenerated - dispatcher ... [skip ci]

by Kamailio Dev

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 #

5 months, 3 weeks

git:master:331ca628: dispatcher: overload control rate is how many times to skip destination

by Daniel-Constantin Mierla

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);

5 months, 3 weeks

git:master:cd8f551f: dispatcher: docs for ds_oc_set_rate(...) function

by Daniel-Constantin Mierla

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>

5 months, 3 weeks

git:master:55f82b77: dispatcher: use ds_oc_set_rate() function name

by Daniel-Constantin Mierla

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); } /**

5 months, 3 weeks

git:master:c2bde271: dispatcher: docs for algorithm 64 - round robin with overload control

by Daniel-Constantin Mierla

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>

5 months, 3 weeks

git:master:199f7cc4: dispatcher: set DS_ALG_OVERLOAD to 64 to be able to use as a flag

by Daniel-Constantin Mierla

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;

5 months, 3 weeks

git:master:42998ac2: dispatcher: function to set oc rate for destination records

by Daniel-Constantin Mierla

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…

5 months, 3 weeks

← Newer
1
...
15
16
17
18
19
20
21
22
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2024