sr-dev June 2024

sr-dev@lists.kamailio.org

14 participants
223 discussions

git:master:e047f35a: dispatcher: debug messages for setting oc attributes

by Daniel-Constantin Mierla

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;

5 months, 2 weeks

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

by Kamailio Dev

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

5 months, 2 weeks

git:master:e92be0e1: docs: new parameter for ds_oc_set_attrs()

by Daniel-Constantin Mierla

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>

5 months, 2 weeks

git:master:803e8442: dispatcher: track oc-seq values

by Daniel-Constantin Mierla

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…

5 months, 2 weeks

git:master:b3eefcd3: core: additional fixup functions for int-str-int-int-int parameters

by Daniel-Constantin Mierla

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

5 months, 2 weeks

git:master:9eb117ab: dispatcher: print oc rate and time in rpc list full

by Daniel-Constantin Mierla

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;

5 months, 2 weeks

[kamailio/kamailio] pike: fix documentation for reqs_density_per_unit (PR #3806)

by tsearle

#### 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 months, 2 weeks

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

by Kamailio Dev

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

5 months, 2 weeks

git:master:851a839b: dispatcher: compare time interval validity for oveload control

by Daniel-Constantin Mierla

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

5 months, 2 weeks

git:master:244fc84a: dispatcher: docs for ds_oc_set_attrs(...)

by Daniel-Constantin Mierla

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>

5 months, 2 weeks

← Newer
1
...
13
14
15
16
17
18
19
...
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