sr-dev August 2019

sr-dev@lists.kamailio.org

17 participants
339 discussions

[kamailio/kamailio] topos module does not update topos_d timestamp at re-INVITE (#2024)

by Henning Westerholt

The topos module fails to update the dialog data in the topos_d table after the processing of re-INVITEs. I have setup a call at 11:55, and triggered a re-INVITE at 12:08. The respective topos_d table entry is not updated. This causes the entry to expire after topos dialog_timeout value. I would expect that the timestamp of the call in the topos_d table is updated. Is this assumption correct? If the current behavior is expected, it should documented in the module README. No error messages from topos module in kamailio.log. Output from tables: ``` MariaDB [kamailio]> select id, rectime, s_method, a_callid from topos_t; select id, rectime, s_method, a_callid from topos_d; +-----+---------------------+----------+----------------------------------+ | id | rectime | s_method | a_callid | +-----+---------------------+----------+----------------------------------+ | 305 | 2019-08-04 12:08:12 | INVITE | q0Jeh9g49GeYdJXqcjCo-G0CW4dQ0iav | | 306 | 2019-08-04 12:08:12 | ACK | q0Jeh9g49GeYdJXqcjCo-G0CW4dQ0iav | | 307 | 2019-08-04 12:08:14 | INVITE | q0Jeh9g49GeYdJXqcjCo-G0CW4dQ0iav | | 308 | 2019-08-04 12:08:14 | ACK | q0Jeh9g49GeYdJXqcjCo-G0CW4dQ0iav | +-----+---------------------+----------+----------------------------------+ +-----+---------------------+----------+----------------------------------+ | id | rectime | s_method | a_callid | +-----+---------------------+----------+----------------------------------+ | 156 | 2019-08-04 11:55:22 | INVITE | q0Jeh9g49GeYdJXqcjCo-G0CW4dQ0iav | +-----+---------------------+----------+----------------------------------+ ``` -- 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/issues/2024

4 years, 9 months

git:5.2:c1eaf335: dispatcher: skip inactive destinations for pointing next to be used record

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: c1eaf3353f43d34f164f28a871399ca785c40b4f URL: https://github.com/kamailio/kamailio/commit/c1eaf3353f43d34f164f28a871399ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T20:18:12+02:00 dispatcher: skip inactive destinations for pointing next to be used record (cherry picked from commit 18eeda012a711584239b03d5cfef8b7720f0ef31) --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/c1eaf3353f43d34f164f28a871399ca… Patch: https://github.com/kamailio/kamailio/commit/c1eaf3353f43d34f164f28a871399ca… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 372adda056..cdec4843eb 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2026,6 +2026,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) int i; unsigned int hash; ds_set_t *idx = NULL; + int ulast = 0; if(msg == NULL) { LM_ERR("bad parameters\n"); @@ -2082,6 +2083,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) case DS_ALG_ROUNDROBIN: /* 4 - round robin */ hash = idx->last; idx->last = (idx->last + 1) % idx->nr; + ulast = 1; break; case DS_ALG_HASHAUTHUSER: /* 5 - hash auth username */ i = ds_hash_authusername(msg, &hash); @@ -2093,6 +2095,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) /* No Authorization found: Use round robin */ hash = idx->last; idx->last = (idx->last + 1) % idx->nr; + ulast = 1; break; default: LM_ERR("can't get authorization hash\n"); @@ -2194,6 +2197,11 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) rstate->emode = 1; } + /* update last field for next select to point after the current active used */ + if(ulast) { + idx->last = (hash + 1) % idx->nr; + } + LM_DBG("selected [%d-%d-%d/%d] <%.*s>\n", rstate->alg, rstate->setid, rstate->umode, hash, idx->dlist[hash].uri.len, idx->dlist[hash].uri.s);

4 years, 9 months

git:master:18eeda01: dispatcher: skip inactive destinations for pointing next to be used record

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 18eeda012a711584239b03d5cfef8b7720f0ef31 URL: https://github.com/kamailio/kamailio/commit/18eeda012a711584239b03d5cfef8b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T20:15:17+02:00 dispatcher: skip inactive destinations for pointing next to be used record --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/18eeda012a711584239b03d5cfef8b7… Patch: https://github.com/kamailio/kamailio/commit/18eeda012a711584239b03d5cfef8b7… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 3d1098c462..43a7c8b8b2 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2023,6 +2023,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) int i; unsigned int hash; ds_set_t *idx = NULL; + int ulast = 0; if(msg == NULL) { LM_ERR("bad parameters\n"); @@ -2079,6 +2080,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) case DS_ALG_ROUNDROBIN: /* 4 - round robin */ hash = idx->last; idx->last = (idx->last + 1) % idx->nr; + ulast = 1; break; case DS_ALG_HASHAUTHUSER: /* 5 - hash auth username */ i = ds_hash_authusername(msg, &hash); @@ -2090,6 +2092,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) /* No Authorization found: Use round robin */ hash = idx->last; idx->last = (idx->last + 1) % idx->nr; + ulast = 1; break; default: LM_ERR("can't get authorization hash\n"); @@ -2191,6 +2194,11 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) rstate->emode = 1; } + /* update last field for next select to point after the current active used */ + if(ulast) { + idx->last = (hash + 1) % idx->nr; + } + LM_DBG("selected [%d-%d-%d/%d] <%.*s>\n", rstate->alg, rstate->setid, rstate->umode, hash, idx->dlist[hash].uri.len, idx->dlist[hash].uri.s);

4 years, 9 months

Re: [sr-dev] [SR-Users] Dispatcher round-robin problems in 5.2

by Henning Westerholt

Hi Alex, there have been many changes to the modules between 5.1 and 5.2. I just looked a bit to the code of dispatch.c and also the commits. I noticed something in commit 3933a64c464acfb285e - there was a block related to round-robin before which got removed in this refactoring (if I analyzed it correctly): - /* if alg is round-robin then update the shortcut to next to be used */ - if(alg == DS_ALG_ROUNDROBIN) - idx->last = (hash + 1) % idx->nr; It could be simple added back, because of the changed logic, though. Cheers, Henning Am 12.08.19 um 17:28 schrieb Alex Balashov: > Hi Daniel, > > Haven’t checked that, no. But all the external system does is issue RPC commands (`dispatcher.set_state`) maybe a few times a day. It’s nothing volatile or overly Byzantine. > > — > Sent from mobile, with due apologies for brevity and errors. > >> On Aug 12, 2019, at 11:24 AM, Daniel-Constantin Mierla <miconda(a)gmail.com> wrote: >> >> Hello, >> >> could you observe similar behavior on other dispatchers that don't use >> an external system tomanage activation and deactivation of the gateways? >> Or you haven't checked such one so far? >> >> Cheers, >> Daniel >> >>> On 12.08.19 15:23, Alex Balashov wrote: >>> Hi, >>> >>> I've got a proxy that does very basic round-robin distribution of calls >>> to an elastic pool of servers, defined in a simple SQLite database with >>> equal priorities. Nothing too complicated, just a vanilla >>> `ds_select_domain("1", "4")`. >>> >>> The only complication is that seldom are most of the gateways enabled. >>> Probing stuff was turned on, but didn't do quite what was desired, so it >>> was replaced with a system that manages activation and deactivation of >>> the gateways externally. Nevertheless, these are the left-over probing >>> settings: >>> >>> modparam("dispatcher", "ds_ping_method", "OPTIONS") >>> modparam("dispatcher", "ds_ping_from", "sip:pinger@domain") >>> modparam("dispatcher", "ds_ping_interval", 15) >>> modparam("dispatcher", "ds_probing_threshold", 256) >>> modparam("dispatcher", "ds_inactive_threshold", 1) >>> modparam("dispatcher", "ds_probing_mode", 0) >>> >>> After an upgrade from 5.1 to 5.2.3 (009f62), the round-robin has become >>> extremely "sticky" and tendentious. That is to say, it directs _almost_ >>> all calls to a single gateway -- the first gateway in the table -- >>> though not 100%. There is also a marked tendency to send lots of >>> consecutive calls to the same gateway, even if it's not the first one, >>> though most of the time it is. >>> >>> Has anyone experienced similar upon upgrading to 5.2? >>> >>> Thanks much! >>> >>> -- Alex >>> >> -- >> Daniel-Constantin Mierla -- www.asipto.com >> www.twitter.com/miconda -- www.linkedin.com/in/miconda >> > _______________________________________________ > Kamailio (SER) - Users Mailing List > sr-users(a)lists.kamailio.org > https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://skalatan.de/services

4 years, 9 months

[kamailio/kamailio] core: Fix the cfg framework variable input type default (#2022)

by Mancaș George

#### 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description What the affected line of code really wants to achieve is: if an accepted inputs type mask is not specified then default to accepting only the actual variable type. So we must mask the var type first, then shift it by `CFG_INPUT_SHIFT`, before or-ing it with the rest. What happened before was that the entire type was shifted, and that included var type, input type and flags. What we end up with is some additional higher bits set (for flags). I actually discovered this while adding an additional flag that was meant to mark variables as private, only accessible through an internal API (not available to modules such as cfg_rpc). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2022 -- Commit Summary -- * core: Fix the cfg framework variable input type default -- File Changes -- M src/core/cfg/cfg.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2022.patch https://github.com/kamailio/kamailio/pull/2022.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/2022

4 years, 9 months

git:master:0a161d19: Merge pull request #2022 from mancasg/master

by GitHub

Module: kamailio Branch: master Commit: 0a161d19707917f690b5823b64d120cccc354c8b URL: https://github.com/kamailio/kamailio/commit/0a161d19707917f690b5823b64d120c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-08-12T11:37:11+02:00 Merge pull request #2022 from mancasg/master core: Fix the cfg framework variable input type default --- Modified: src/core/cfg/cfg.c --- Diff: https://github.com/kamailio/kamailio/commit/0a161d19707917f690b5823b64d120c… Patch: https://github.com/kamailio/kamailio/commit/0a161d19707917f690b5823b64d120c… --- diff --git a/src/core/cfg/cfg.c b/src/core/cfg/cfg.c index 3822a9c94d..488d72f35a 100644 --- a/src/core/cfg/cfg.c +++ b/src/core/cfg/cfg.c @@ -94,7 +94,7 @@ int cfg_declare(char *group_name, cfg_def_t *def, void *values, int def_size, /* verify the type of the input */ if (CFG_INPUT_MASK(def[i].type)==0) { - def[i].type |= def[i].type << CFG_INPUT_SHIFT; + def[i].type |= CFG_VAR_MASK(def[i].type) << CFG_INPUT_SHIFT; } else { if ((CFG_INPUT_MASK(def[i].type) != CFG_VAR_MASK(def[i].type) << CFG_INPUT_SHIFT) && (def[i].on_change_cb == 0)) {

4 years, 9 months

git:master:c3b2eacb: core: Fix the cfg framework variable input type default

by MancaÈ George

Module: kamailio Branch: master Commit: c3b2eacbba1097ed3d40cff18ea2d51ebcad1c67 URL: https://github.com/kamailio/kamailio/commit/c3b2eacbba1097ed3d40cff18ea2d51… Author: MancaÈ George <mancas.f.george(a)gmail.com> Committer: MancaÈ George <mancas.f.george(a)gmail.com> Date: 2019-08-01T09:39:28Z core: Fix the cfg framework variable input type default What the affected line of code really wants to achieve is: if an accepted inputs type mask is not specified then default to accepting only the actual variable type. So we must mask the var type first, then shift it by `CFG_INPUT_SHIFT`, before or-ing it with the rest. What happened before was that the entire type was shifted, and that included var type, input type and flags. What we end up with is some additional higher bits set (for flags). I actually discovered this while adding an additional flag that was meant to mark variables as private, only accessible through an internal API (not available to modules such as cfg_rpc). --- Modified: src/core/cfg/cfg.c --- Diff: https://github.com/kamailio/kamailio/commit/c3b2eacbba1097ed3d40cff18ea2d51… Patch: https://github.com/kamailio/kamailio/commit/c3b2eacbba1097ed3d40cff18ea2d51… --- diff --git a/src/core/cfg/cfg.c b/src/core/cfg/cfg.c index 3822a9c94d..488d72f35a 100644 --- a/src/core/cfg/cfg.c +++ b/src/core/cfg/cfg.c @@ -94,7 +94,7 @@ int cfg_declare(char *group_name, cfg_def_t *def, void *values, int def_size, /* verify the type of the input */ if (CFG_INPUT_MASK(def[i].type)==0) { - def[i].type |= def[i].type << CFG_INPUT_SHIFT; + def[i].type |= CFG_VAR_MASK(def[i].type) << CFG_INPUT_SHIFT; } else { if ((CFG_INPUT_MASK(def[i].type) != CFG_VAR_MASK(def[i].type) << CFG_INPUT_SHIFT) && (def[i].on_change_cb == 0)) {

4 years, 9 months

git:master:c79dfbea: corex: free old outbound buffer inside SREV_NET_DATA_OUT callback

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c79dfbeab0bfefaa4dd5cefc41cba3ba157da0ce URL: https://github.com/kamailio/kamailio/commit/c79dfbeab0bfefaa4dd5cefc41cba3b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T11:18:39+02:00 corex: free old outbound buffer inside SREV_NET_DATA_OUT callback --- Modified: src/modules/corex/corex_nio.c --- Diff: https://github.com/kamailio/kamailio/commit/c79dfbeab0bfefaa4dd5cefc41cba3b… Patch: https://github.com/kamailio/kamailio/commit/c79dfbeab0bfefaa4dd5cefc41cba3b… --- diff --git a/src/modules/corex/corex_nio.c b/src/modules/corex/corex_nio.c index 96837e8a0c..6b79fcc648 100644 --- a/src/modules/corex/corex_nio.c +++ b/src/modules/corex/corex_nio.c @@ -141,6 +141,7 @@ int nio_msg_sent(sr_event_param_t *evp) int_str avp_value; struct usr_avp *avp; struct run_act_ctx ra_ctx; + str nbuf = STR_NULL; obuf = (str*)evp->data; @@ -163,7 +164,15 @@ int nio_msg_sent(sr_event_param_t *evp) if(avp!=NULL && is_avp_str_val(avp)) { msg.buf = avp_value.s.s; msg.len = avp_value.s.len; - obuf->s = nio_msg_update(&msg, (unsigned int*)&obuf->len); + nbuf.s = nio_msg_update(&msg, (unsigned int*)&nbuf.len); + if(nbuf.s!=NULL) { + LM_DBG("new outbound buffer generated\n"); + pkg_free(obuf->s); + obuf->s = nbuf.s; + obuf->len = nbuf.len; + } else { + LM_ERR("failed to generate new outbound buffer\n"); + } } else { LM_WARN("no value set for AVP %.*s, using unmodified message\n", nio_msg_avp_param.len, nio_msg_avp_param.s);

4 years, 9 months

git:master:d9a1cbc8: gzcompress: free old outbound buffer inside SREV_NET_DATA_OUT callback

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d9a1cbc8f66f9fd0991048e5e1ba1579916a092e URL: https://github.com/kamailio/kamailio/commit/d9a1cbc8f66f9fd0991048e5e1ba157… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T11:18:21+02:00 gzcompress: free old outbound buffer inside SREV_NET_DATA_OUT callback --- Modified: src/modules/gzcompress/gzcompress_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d9a1cbc8f66f9fd0991048e5e1ba157… Patch: https://github.com/kamailio/kamailio/commit/d9a1cbc8f66f9fd0991048e5e1ba157… --- diff --git a/src/modules/gzcompress/gzcompress_mod.c b/src/modules/gzcompress/gzcompress_mod.c index 3e06c1c267..3ff22d723d 100644 --- a/src/modules/gzcompress/gzcompress_mod.c +++ b/src/modules/gzcompress/gzcompress_mod.c @@ -338,6 +338,7 @@ int gzc_msg_sent(sr_event_param_t *evp) unsigned long olen; unsigned long nlen; int ret; + str nbuf = STR_NULL; obuf = (str*)evp->data; memset(&msg, 0, sizeof(sip_msg_t)); @@ -383,7 +384,15 @@ int gzc_msg_sent(sr_event_param_t *evp) goto done; } - obuf->s = gzc_msg_update(&msg, (unsigned int*)&obuf->len); + nbuf.s = gzc_msg_update(&msg, (unsigned int*)&nbuf.len); + if(nbuf.s!=NULL) { + LM_DBG("new outbound buffer generated\n"); + pkg_free(obuf->s); + obuf->s = nbuf.s; + obuf->len = nbuf.len; + } else { + LM_ERR("failed to generate new outbound buffer\n"); + } done: free_sip_msg(&msg);

4 years, 9 months

git:master:ad8d9628: dialog: free old outbound buffer inside SREV_NET_DATA_OUT callback

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ad8d9628da27a3ab68b005ef52842784af6bda3a URL: https://github.com/kamailio/kamailio/commit/ad8d9628da27a3ab68b005ef5284278… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T11:18:08+02:00 dialog: free old outbound buffer inside SREV_NET_DATA_OUT callback --- Modified: src/modules/dialog/dlg_cseq.c --- Diff: https://github.com/kamailio/kamailio/commit/ad8d9628da27a3ab68b005ef5284278… Patch: https://github.com/kamailio/kamailio/commit/ad8d9628da27a3ab68b005ef5284278… --- diff --git a/src/modules/dialog/dlg_cseq.c b/src/modules/dialog/dlg_cseq.c index 8986d0aaa6..fd993b076f 100644 --- a/src/modules/dialog/dlg_cseq.c +++ b/src/modules/dialog/dlg_cseq.c @@ -364,6 +364,7 @@ int dlg_cseq_msg_sent(sr_event_param_t *evp) struct via_body *via; hdr_field_t *hfk = NULL; sr_cfgenv_t *cenv = NULL; + str nbuf = STR_NULL; obuf = (str*)evp->data; memset(&msg, 0, sizeof(sip_msg_t)); @@ -520,11 +521,13 @@ int dlg_cseq_msg_sent(sr_event_param_t *evp) } } /* replace old msg content */ - obuf->s = pkg_malloc((tbuf_len+1)*sizeof(char)); - if(obuf->s==NULL) { + nbuf.s = pkg_malloc((tbuf_len+1)*sizeof(char)); + if(nbuf.s==NULL) { LM_ERR("not enough memory for new message\n"); goto done; } + pkg_free(obuf->s); + obuf->s = nbuf.s; memcpy(obuf->s, tbuf, tbuf_len); obuf->s[tbuf_len] = 0; obuf->len = tbuf_len;

4 years, 9 months

← Newer
1
...
23
24
25
26
27
28
29
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2019