sr-dev January 2022

sr-dev@lists.kamailio.org

13 participants
261 discussions

[kamailio/kamailio] dispatcher: Fix handling of inactive destination for alg 13 (PR #2964)

by mtryfoss

#### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Alg 13 did try to distribute calls to inactive destinations. If the highest priority destination is inactive, hash is not updated and the xavp is not set. This is resulting in failover mechanism not working at all for the given call. When the hash variable is not updated, it makes alg 13 behave like round robin if the scenario above occurs. If you got two destinations and the highest priority is out of service, 50% of the calls will fail. Now I tried a more simple approach updating hash with the first entry of the sorted list. Also fixed a typo in a variable name. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2964 -- Commit Summary -- * dispatcher: Fix handling of inactive destination for alg 13 -- File Changes -- M src/modules/dispatcher/dispatch.c (21) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2964.patch https://github.com/kamailio/kamailio/pull/2964.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2964

2 years, 10 months

git:master:adba3caa: dispatcher: Fix handling of inactive destination for alg 13

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: adba3caa2d12d1f8b89d720fbb9a6a9cdc8b2573 URL: https://github.com/kamailio/kamailio/commit/adba3caa2d12d1f8b89d720fbb9a6a9… Author: Morten Tryfoss <morten(a)tryfoss.no> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-11T12:46:33+01:00 dispatcher: Fix handling of inactive destination for alg 13 Alg 13 did try to distribute calls to inactive destinations. If the highest priority destination is inactive, hash is not updated and the xavp is not set. This is resulting in failover mechanism not working at all for the given call. When the hash variable is not updated, it makes alg 13 behave like round robin if the scenario above occurs. If you got two destinations and the highest priority is out of service, 50% of the calls will fail. Now I tried a more simple approach updating hash with the first entry of the sorted list. --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/adba3caa2d12d1f8b89d720fbb9a6a9… Patch: https://github.com/kamailio/kamailio/commit/adba3caa2d12d1f8b89d720fbb9a6a9… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 26836433f1..fad6334fa4 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2201,7 +2201,7 @@ int ds_manage_route_algo13(ds_set_t *idx, ds_select_state_t *rstate) { } for(y=0; y<idx->nr ;y++) { - int latency_proirity_handicap = 0; + int latency_priority_handicap = 0; ds_dest_t * ds_dest = &idx->dlist[z]; int gw_priority = ds_dest->priority; int gw_latency = ds_dest->latency_stats.estimate; @@ -2211,19 +2211,15 @@ int ds_manage_route_algo13(ds_set_t *idx, ds_select_state_t *rstate) { gw_latency = ds_dest->latency_stats.estimate - ds_dest->latency_stats.average; if(!gw_inactive) { if(gw_latency > gw_priority && gw_priority > 0) - latency_proirity_handicap = gw_latency / gw_priority; - ds_dest->attrs.rpriority = gw_priority - latency_proirity_handicap; + latency_priority_handicap = gw_latency / gw_priority; + ds_dest->attrs.rpriority = gw_priority - latency_priority_handicap; if(ds_dest->attrs.rpriority < 1 && gw_priority > 0) ds_dest->attrs.rpriority = 1; - if(ds_dest->attrs.rpriority > active_priority) { - hash = z; - active_priority = ds_dest->attrs.rpriority; - } ds_sorted[y].idx = z; ds_sorted[y].priority = ds_dest->attrs.rpriority; LM_DBG("[active]idx[%d]uri[%.*s]priority[%d-%d=%d]latency[%dms]flag[%d]\n", z, ds_dest->uri.len, ds_dest->uri.s, - gw_priority, latency_proirity_handicap, + gw_priority, latency_priority_handicap, ds_dest->attrs.rpriority, gw_latency, ds_dest->flags); } else { ds_sorted[y].idx = -1; @@ -2237,10 +2233,15 @@ int ds_manage_route_algo13(ds_set_t *idx, ds_select_state_t *rstate) { else z = (z + 1) % idx->nr; } - idx->last = (hash + 1) % idx->nr; - LM_DBG("priority[%d]gateway_selected[%d]next_index[%d]\n", active_priority, hash, idx->last); ds_sorted_by_priority(ds_sorted, idx->nr); + // the list order might have changed after sorting - update hash + if(idx->nr > 0) { + hash = ds_sorted[0].idx; + active_priority = ds_sorted[0].priority; + } ds_manage_routes_fill_reodered_xavp(ds_sorted, idx, rstate); + idx->last = (hash + 1) % idx->nr; + LM_DBG("priority[%d]gateway_selected[%d]next_index[%d]\n", active_priority, hash, idx->last); pkg_free(ds_sorted); return hash; }

2 years, 10 months

git:master:1c43e8b4: modules: readme files regenerated - dialog ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 1c43e8b4ed63d29ef912211e368faaea6a62dcd8 URL: https://github.com/kamailio/kamailio/commit/1c43e8b4ed63d29ef912211e368faae… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-01-11T12:46:26+01:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/1c43e8b4ed63d29ef912211e368faae… Patch: https://github.com/kamailio/kamailio/commit/1c43e8b4ed63d29ef912211e368faae… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index 8b85f1f05e..533a41caab 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -1985,10 +1985,13 @@ kamcmd dlg.list_ctx * mkey - matching key. It can be: 'ruri' - match against R-URI of the dialog; 'furi' - match against From header URI of the dialog; 'turi' - match against the To header URI of the dialog; 'callid' - - match against Call-Id value. + match against Call-Id value; 'start_ts' - match against start + timestamp. * mop - matching operator. It can be: 'eq' - match using string comparison; 're' - match using regular expression; 'sw' - match - using starts-with (prefix) comparison. + using starts-with (prefix) comparison; 'gt' - match using integer + greater comparison; 'lt' - match using integer lesser comparison. + Integer comparison can be used only with 'start_ts' key. * mval - matching value. RPC Command Format: @@ -1997,6 +2000,8 @@ kamcmd dlg.list_match furi eq sip:alice@test.com 2 ... kamcmd dlg.list_match furi sw sip:alice@ ... +kamcmd dlg.list_match start_ts gt s:1641550904 +... 9.4. dlg.list_match_ctx

2 years, 10 months

[kamailio/kamailio] add filtering based on start timestamp to dlg.list_match (PR #2997)

by Riccardo-78

#### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2997 -- Commit Summary -- * dialog: add filter based on start timestamp to dlg.list_match * dialog: update documentation -- File Changes -- M src/modules/dialog/dialog.c (49) M src/modules/dialog/doc/dialog_admin.xml (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2997.patch https://github.com/kamailio/kamailio/pull/2997.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2997 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/2997(a)github.com>

2 years, 10 months

git:master:97293a53: dialog: update documentation

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 97293a53060b2b2329018ca7bbeb02a26b0a4afe URL: https://github.com/kamailio/kamailio/commit/97293a53060b2b2329018ca7bbeb02a… Author: Riccardo Villa <riccardo.villa(a)netaxis.be> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-11T12:45:40+01:00 dialog: update documentation --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/97293a53060b2b2329018ca7bbeb02a… Patch: https://github.com/kamailio/kamailio/commit/97293a53060b2b2329018ca7bbeb02a… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index d456d545ef..290e68d4d6 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -2500,12 +2500,16 @@ dlg_reset_property("timeout-noreset"); <emphasis>mkey</emphasis> - matching key. It can be: 'ruri' - match against R-URI of the dialog; 'furi' - match against From header URI of the dialog; 'turi' - match against the To header - URI of the dialog; 'callid' - match against Call-Id value. + URI of the dialog; 'callid' - match against Call-Id value; + 'start_ts' - match against start timestamp. </para></listitem> <listitem><para> <emphasis>mop</emphasis> - matching operator. It can be: 'eq' - match using string comparison; 're' - match using regular - expression; 'sw' - match using starts-with (prefix) comparison. + expression; 'sw' - match using starts-with (prefix) comparison; + 'gt' - match using integer greater comparison; 'lt' - match + using integer lesser comparison. Integer comparison can be used + only with 'start_ts' key. </para></listitem> <listitem><para> <emphasis>mval</emphasis> - matching value. @@ -2517,6 +2521,8 @@ dlg_reset_property("timeout-noreset"); &kamcmd; dlg.list_match furi eq sip:alice@test.com 2 ... &kamcmd; dlg.list_match furi sw sip:alice@ +... +&kamcmd; dlg.list_match start_ts gt s:1641550904 ... </programlisting> </section>

2 years, 10 months

git:master:b177f05e: dialog: add filter based on start timestamp to dlg.list_match

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b177f05ee8b3a6bf553160ececdb3508a99a65b0 URL: https://github.com/kamailio/kamailio/commit/b177f05ee8b3a6bf553160ececdb350… Author: Riccardo Villa <riccardo.villa(a)netaxis.be> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-11T12:45:40+01:00 dialog: add filter based on start timestamp to dlg.list_match --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/b177f05ee8b3a6bf553160ececdb350… Patch: https://github.com/kamailio/kamailio/commit/b177f05ee8b3a6bf553160ececdb350… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index da3ce7cbfd..a25224318c 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -2932,6 +2932,8 @@ static void rpc_dlg_list_match_ex(rpc_t *rpc, void *c, int with_context) str mop = {NULL, 0}; str mval = {NULL, 0}; str sval = {NULL, 0}; + unsigned int ival = 0; + unsigned int mival = 0; int n = 0; int m = 0; int vkey = 0; @@ -2960,6 +2962,8 @@ static void rpc_dlg_list_match_ex(rpc_t *rpc, void *c, int with_context) vkey = 2; } else if(mkey.len==6 && strncmp(mkey.s, "callid", mkey.len)==0) { vkey = 3; + } else if(mkey.len==8 && strncmp(mkey.s, "start_ts", mkey.len)==0) { + vkey = 4; } else { LM_ERR("invalid key %.*s\n", mkey.len, mkey.s); rpc->fault(c, 500, "Invalid matching key parameter"); @@ -2983,6 +2987,10 @@ static void rpc_dlg_list_match_ex(rpc_t *rpc, void *c, int with_context) } } else if(strncmp(mop.s, "sw", 2)==0) { vop = 2; + } else if(strncmp(mop.s, "gt", 2)==0) { + vop = 3; + } else if(strncmp(mop.s, "lt", 2)==0) { + vop = 4; } else { LM_ERR("invalid matching operator %.*s\n", mop.len, mop.s); rpc->fault(c, 500, "Invalid matching operator parameter"); @@ -2992,6 +3000,18 @@ static void rpc_dlg_list_match_ex(rpc_t *rpc, void *c, int with_context) n = 0; } + if (vkey == 4 && vop <= 2) { + LM_ERR("Matching operator %.*s not supported with start_ts key\n", mop.len, mop.s); + rpc->fault(c, 500, "Matching operator not supported with start_ts key"); + return; + } + + if (vkey != 4 && vop >= 3) { + LM_ERR("Matching operator %.*s not supported with key %.*s\n", mop.len, mop.s, mkey.len, mkey.s); + rpc->fault(c, 500, "Matching operator not supported"); + return; + } + for(i=0; i<d_table->size; i++) { dlg_lock(d_table, &(d_table->entries[i])); for(dlg=d_table->entries[i].first; dlg!=NULL; dlg=dlg->next) { @@ -3009,6 +3029,9 @@ static void rpc_dlg_list_match_ex(rpc_t *rpc, void *c, int with_context) case 3: sval = dlg->callid; break; + case 4: + ival = dlg->start_ts; + break; } switch(vop) { case 0: @@ -3031,6 +3054,17 @@ static void rpc_dlg_list_match_ex(rpc_t *rpc, void *c, int with_context) matched = 1; } break; + case 3: + /* greater than */ + if (str2int(&mval, &mival) == 0 && ival > mival) { + matched = 1; + } + break; + case 4: + if (str2int(&mval, &mival) == 0 && ival < mival) { + matched = 1; + } + break; } if (matched==1) { m++;

2 years, 10 months

[kamailio/kamailio] cannot use ring_insert_callid when defined log_prefix (Issue #2989)

by sergey-safarov

### Description I want to convert 183 messages to 180 using the `ring_insert_callid` function. This does not work when used `log_prefix`. Generated error like > siputils [ring.c:300]: conv183(): 183 message got parsed too far! #### Reproduction you can start kamailio using config file like ``` log_prefix="{$mt $hdr(CSeq) $ci} " listen=udp:eth0:5060 loadmodule "xlog.so" loadmodule "pv.so" loadmodule "sl.so" loadmodule "siputils.so" modparam("siputils", "ring_timeout", 30) request_route { xlog("L_ERR", "Test1: $rc\n"); if (is_request()) { ring_insert_callid(); } $du = "sip:192.168.0.1;tranport=udp"; forward(); } ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2989 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/2989(a)github.com>

2 years, 10 months

git:5.5:2ab37358: pkg/kamailio/deb: add --atexit=no

by Victor Seva

Module: kamailio Branch: 5.5 Commit: 2ab373588c1052da3b92739f7ac92e23ed4f0561 URL: https://github.com/kamailio/kamailio/commit/2ab373588c1052da3b92739f7ac92e2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-01-11T09:38:11+01:00 pkg/kamailio/deb: add --atexit=no This helps with openssl1.1 see #2912 (cherry picked from commit b5258d9b0e88de4b9a7c58997b651e790e2cc87e) --- Modified: pkg/kamailio/deb/bionic/kamailio.init Modified: pkg/kamailio/deb/bionic/kamailio.service Modified: pkg/kamailio/deb/bullseye/kamailio.init Modified: pkg/kamailio/deb/bullseye/kamailio.service Modified: pkg/kamailio/deb/buster/kamailio.init Modified: pkg/kamailio/deb/buster/kamailio.service Modified: pkg/kamailio/deb/debian/kamailio.init Modified: pkg/kamailio/deb/debian/kamailio.service Modified: pkg/kamailio/deb/focal/kamailio.init Modified: pkg/kamailio/deb/focal/kamailio.service Modified: pkg/kamailio/deb/jessie/kamailio.init Modified: pkg/kamailio/deb/jessie/kamailio.service Modified: pkg/kamailio/deb/precise/kamailio.init Modified: pkg/kamailio/deb/sid/kamailio.init Modified: pkg/kamailio/deb/sid/kamailio.service Modified: pkg/kamailio/deb/stretch/kamailio.init Modified: pkg/kamailio/deb/stretch/kamailio.service Modified: pkg/kamailio/deb/trusty/kamailio.init Modified: pkg/kamailio/deb/wheezy/kamailio.init Modified: pkg/kamailio/deb/xenial/kamailio.init Modified: pkg/kamailio/deb/xenial/kamailio.service --- Diff: https://github.com/kamailio/kamailio/commit/2ab373588c1052da3b92739f7ac92e2… Patch: https://github.com/kamailio/kamailio/commit/2ab373588c1052da3b92739f7ac92e2…

2 years, 10 months

git:master:b5258d9b: pkg/kamailio/deb: add --atexit=no

by Victor Seva

Module: kamailio Branch: master Commit: b5258d9b0e88de4b9a7c58997b651e790e2cc87e URL: https://github.com/kamailio/kamailio/commit/b5258d9b0e88de4b9a7c58997b651e7… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-01-11T09:35:08+01:00 pkg/kamailio/deb: add --atexit=no This helps with openssl1.1 see #2912 --- Modified: pkg/kamailio/deb/bionic/kamailio.init Modified: pkg/kamailio/deb/bionic/kamailio.service Modified: pkg/kamailio/deb/bookworm/kamailio.init Modified: pkg/kamailio/deb/bookworm/kamailio.service Modified: pkg/kamailio/deb/bullseye/kamailio.init Modified: pkg/kamailio/deb/bullseye/kamailio.service Modified: pkg/kamailio/deb/buster/kamailio.init Modified: pkg/kamailio/deb/buster/kamailio.service Modified: pkg/kamailio/deb/debian/kamailio.init Modified: pkg/kamailio/deb/debian/kamailio.service Modified: pkg/kamailio/deb/focal/kamailio.init Modified: pkg/kamailio/deb/focal/kamailio.service Modified: pkg/kamailio/deb/jessie/kamailio.init Modified: pkg/kamailio/deb/jessie/kamailio.service Modified: pkg/kamailio/deb/precise/kamailio.init Modified: pkg/kamailio/deb/sid/kamailio.init Modified: pkg/kamailio/deb/sid/kamailio.service Modified: pkg/kamailio/deb/stretch/kamailio.init Modified: pkg/kamailio/deb/stretch/kamailio.service Modified: pkg/kamailio/deb/trusty/kamailio.init Modified: pkg/kamailio/deb/wheezy/kamailio.init Modified: pkg/kamailio/deb/xenial/kamailio.init Modified: pkg/kamailio/deb/xenial/kamailio.service --- Diff: https://github.com/kamailio/kamailio/commit/b5258d9b0e88de4b9a7c58997b651e7… Patch: https://github.com/kamailio/kamailio/commit/b5258d9b0e88de4b9a7c58997b651e7…

2 years, 10 months

git:master:9f679c6e: pkg/kamailio/deb: version set 5.6.0~dev3

by Victor Seva

Module: kamailio Branch: master Commit: 9f679c6e1c036a8bda42807fea6a42b8d1d2230c URL: https://github.com/kamailio/kamailio/commit/9f679c6e1c036a8bda42807fea6a42b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-01-11T09:29:51+01:00 pkg/kamailio/deb: version set 5.6.0~dev3 --- 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/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/9f679c6e1c036a8bda42807fea6a42b… Patch: https://github.com/kamailio/kamailio/commit/9f679c6e1c036a8bda42807fea6a42b…

2 years, 10 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2022