sr-dev May 2019

sr-dev@lists.kamailio.org

29 participants
306 discussions

git:5.2:fcf6fd61: ims_qos: use msg_ctx_id_t to detect same msg/transaction processing

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: fcf6fd61e38da76e775fea6d38df3704a28f545c URL: https://github.com/kamailio/kamailio/commit/fcf6fd61e38da76e775fea6d38df370… Author: szcom <sergey(a)wgtwo.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-16T21:09:28+02:00 ims_qos: use msg_ctx_id_t to detect same msg/transaction processing - relies on msg id and pid, not only msg id (which is incremeted by each process and has potential conflicts with failure routing) - msg id and pid are enough to indentify the transaction thus dropping checks for the pointers (cherry picked from commit b951d88eea52e9fbbec62d2069b6169fc182ba91) --- Modified: src/modules/ims_qos/ims_qos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fcf6fd61e38da76e775fea6d38df370… Patch: https://github.com/kamailio/kamailio/commit/fcf6fd61e38da76e775fea6d38df370… --- diff --git a/src/modules/ims_qos/ims_qos_mod.c b/src/modules/ims_qos/ims_qos_mod.c index 5715a05275..6f68b39be1 100644 --- a/src/modules/ims_qos/ims_qos_mod.c +++ b/src/modules/ims_qos/ims_qos_mod.c @@ -153,9 +153,9 @@ struct _pv_req_data { struct cell *T; struct sip_msg msg; struct sip_msg *tmsgp; - unsigned int id; char *buf; int buf_size; + msg_ctx_id_t msg_ctx; }; static struct _pv_req_data _pv_treq; @@ -736,8 +736,7 @@ static int w_rx_aar(struct sip_msg *msg, char *route, char* dir, char *c_id, int (which we cannot assume) then we would pollute the shm_msg t->uas.request if we did any parsing on it. Instead, we need to make a private copy of the message and free it when we are done */ - if ((_pv_treq.T != t || t->uas.request != _pv_treq.tmsgp) - && t->uas.request->id != _pv_treq.id) { + if (msg_ctx_id_match(t->uas.request, &_pv_treq.msg_ctx) != 1) { /* make a copy */ if (_pv_treq.buf == NULL || _pv_treq.buf_size < t->uas.request->len + 1) { @@ -746,7 +745,8 @@ static int w_rx_aar(struct sip_msg *msg, char *route, char* dir, char *c_id, int if (_pv_treq.tmsgp) free_sip_msg(&_pv_treq.msg); _pv_treq.tmsgp = NULL; - _pv_treq.id = 0; + _pv_treq.msg_ctx.msgid=0; + _pv_treq.msg_ctx.pid=0; _pv_treq.T = NULL; _pv_treq.buf_size = t->uas.request->len + 1; _pv_treq.buf = (char*) pkg_malloc(_pv_treq.buf_size * sizeof(char)); @@ -764,7 +764,7 @@ static int w_rx_aar(struct sip_msg *msg, char *route, char* dir, char *c_id, int _pv_treq.msg.len = t->uas.request->len; _pv_treq.msg.buf = _pv_treq.buf; _pv_treq.tmsgp = t->uas.request; - _pv_treq.id = t->uas.request->id; + msg_ctx_id_set(t->uas.request, &_pv_treq.msg_ctx); _pv_treq.T = t;

5 years, 9 months

git:5.2:25640038: core: return negative on error adding pre-processor substdef

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: 256400382a9a4edac601c18cf2affe59b4dd93b4 URL: https://github.com/kamailio/kamailio/commit/256400382a9a4edac601c18cf2affe5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-16T21:08:59+02:00 core: return negative on error adding pre-processor substdef - expected by the checks when executing the functions (cherry picked from commit e648fd5e10a6ec694129be5fab0a84c2c90aa916) --- Modified: src/core/ppcfg.c --- Diff: https://github.com/kamailio/kamailio/commit/256400382a9a4edac601c18cf2affe5… Patch: https://github.com/kamailio/kamailio/commit/256400382a9a4edac601c18cf2affe5… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index d15e0f899e..844247faa5 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -163,7 +163,7 @@ int pp_substdef_add(char *data, int mode) return 0; error: - return 1; + return -1; } int pp_subst_run(char **data)

5 years, 9 months

git:5.2:1f4262b3: rtpengine: allocate space for one more rtp relay control socket

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: 1f4262b3f7db30e917eec36132c193c4be6c04c1 URL: https://github.com/kamailio/kamailio/commit/1f4262b3f7db30e917eec36132c193c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-16T21:08:25+02:00 rtpengine: allocate space for one more rtp relay control socket - keep it as safety end place holder - should make it work again for the case when starting with no rtp engine in the database - GH #1940 (cherry picked from commit c836f8ba2f4d3a32b8a4fecba332355df01daca6) --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/1f4262b3f7db30e917eec36132c193c… Patch: https://github.com/kamailio/kamailio/commit/1f4262b3f7db30e917eec36132c193c… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 484ce05f35..650ee9424b 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -1717,12 +1717,13 @@ static int build_rtpp_socks(int lmode, int rtest) { } rtpp_socks_size = current_rtpp_no; - rtpp_socks = (int*)pkg_reallocxf(rtpp_socks, sizeof(int)*(rtpp_socks_size)); + /* allocate one more to have a safety end place holder */ + rtpp_socks = (int*)pkg_reallocxf(rtpp_socks, sizeof(int)*(rtpp_socks_size+1)); if (!rtpp_socks) { LM_ERR("no more pkg memory for rtpp_socks\n"); return -1; } - memset(rtpp_socks, -1, sizeof(int)*(rtpp_socks_size)); + memset(rtpp_socks, -1, sizeof(int)*(rtpp_socks_size+1)); rtpe_reload_lock_get(rtpp_set_list->rset_head_lock); _rtpe_list_vernum_local = _rtpe_list_version->vernum;

5 years, 9 months

git:5.2:de94b66c: core: fix timer typo

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: de94b66c22a0ad9127bba331433c24564638ca5d URL: https://github.com/kamailio/kamailio/commit/de94b66c22a0ad9127bba331433c245… Author: Seven Du <dujinfang(a)x-y-t.cn> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-16T21:06:38+02:00 core: fix timer typo (cherry picked from commit c85ec2eed71c5d1bc3957437f27ffe9b6f18f4df) --- Modified: src/core/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/de94b66c22a0ad9127bba331433c245… Patch: https://github.com/kamailio/kamailio/commit/de94b66c22a0ad9127bba331433c245… --- diff --git a/src/core/timer.c b/src/core/timer.c index 0e0dc8812e..91141ed909 100644 --- a/src/core/timer.c +++ b/src/core/timer.c @@ -422,7 +422,7 @@ inline static void adjust_ticks(void) diff_time_ticks=(ticks_t)((diff_time*TIMER_TICKS_HZ)/1000000LL); delta=(s_ticks_t)(diff_time_ticks-diff_ticks_raw); if (delta<-1){ - LM_WARN("our timer runs faster then real-time" + LM_WARN("our timer runs faster than real-time" " (%lu ms / %u ticks our time .->" " %lu ms / %u ticks real time)\n", (unsigned long)(diff_ticks_raw*1000L/TIMER_TICKS_HZ),

5 years, 9 months

git:5.2:b7b1169a: core: adjust the value for _pv_cache_counter

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: b7b1169a36099a1175314892df3f2a49e677c9a9 URL: https://github.com/kamailio/kamailio/commit/b7b1169a36099a1175314892df3f2a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-16T21:08:09+02:00 core: adjust the value for _pv_cache_counter - reported by GH #1948 (cherry picked from commit 8e51acdd73e8e4ab95c79cc69fb53add7c6cfd38) --- Modified: src/core/pvapi.c --- Diff: https://github.com/kamailio/kamailio/commit/b7b1169a36099a1175314892df3f2a4… Patch: https://github.com/kamailio/kamailio/commit/b7b1169a36099a1175314892df3f2a4… --- diff --git a/src/core/pvapi.c b/src/core/pvapi.c index 8e55e77e1b..878ae30f8e 100644 --- a/src/core/pvapi.c +++ b/src/core/pvapi.c @@ -287,6 +287,7 @@ int pv_cache_drop(void) pvi->spec.pvp.pvn.nfree((void*)(&pvi->spec.pvp.pvn)); } pkg_free(pvi); + _pv_cache_counter--; return 1; } pvp = pvi; @@ -309,6 +310,7 @@ int pv_cache_drop(void) pvi->spec.pvp.pvn.nfree((void*)(&pvi->spec.pvp.pvn)); } pkg_free(pvi); + _pv_cache_counter--; return 1; } pvp = pvi; @@ -364,6 +366,7 @@ pv_spec_t* pv_cache_add(str *name) pvn->pvid = pvid; pvn->next = _pv_cache[pvid%PV_CACHE_SIZE]; _pv_cache[pvid%PV_CACHE_SIZE] = pvn; + _pv_cache_counter++; LM_DBG("pvar [%.*s] added in cache\n", name->len, name->s); return &pvn->spec;

5 years, 9 months

[kamailio/kamailio] 5.2.2: `pv_cache` is never drained and eventually results in perpetual OOM (#1948)

by gormania

### Description We are experiencing sticky OOM state after an extended period (several days). `kamcmd` inspection of mem use shows memory consumed (leaked) via `pv_cache_add(347)` calls. Inspection of that function suggests nothing can ever be dropped from the cache -- rendering it leaky. `_pv_cache_counter` is tested twice but after initialization (to zero) never appears to be assigned (incremented or otherwise) and so the conditions needed to call `pv_cache_drop` are never met. ### Troubleshooting #### Debugging Data ``` May 5 23:55:40 eng-X X[1107]: 1(105) INFO: qm_sums: count= 1 size= 2048 bytes from core: core/counters.c: cnt_hash_add(383) May 5 23:55:40 eng-X X[1107]: 1(105) INFO: qm_sums: count= 18473 size= 5571880 bytes from core: core/pvapi.c: pv_cache_add(347) May 5 23:55:40 eng-X X[1107]: 1(105) INFO: qm_sums: count= 162 size= 9344 bytes from core: core/pvapi.c: pv_parse_format(1150) ``` ### Additional Information ``` kamcmd> ver kamailio 5.2.2 (x86_64/linux) kamcmd> ``` * **Operating System**:  ``` Linux soak 4.15.0-48-generic #51-Ubuntu SMP Wed Apr 3 08:28:49 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux ``` -- 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/1948

5 years, 9 months

git:master:2d329711: app_ruby: implemented the handling of KEMI functions with 5 parameters

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2d3297116a1a864d5d62527a06c319bc12d3bdbf URL: https://github.com/kamailio/kamailio/commit/2d3297116a1a864d5d62527a06c319b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-16T12:16:32+02:00 app_ruby: implemented the handling of KEMI functions with 5 parameters --- Modified: src/modules/app_ruby/app_ruby_api.c --- Diff: https://github.com/kamailio/kamailio/commit/2d3297116a1a864d5d62527a06c319b… Patch: https://github.com/kamailio/kamailio/commit/2d3297116a1a864d5d62527a06c319b…

5 years, 9 months

git:master:4cdfda5a: app_ruby: completed the handling of KEMI functions with 4 parameters

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4cdfda5affea38e50ad263b469f56d11581e35ef URL: https://github.com/kamailio/kamailio/commit/4cdfda5affea38e50ad263b469f56d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-16T12:11:10+02:00 app_ruby: completed the handling of KEMI functions with 4 parameters --- Modified: src/modules/app_ruby/app_ruby_api.c --- Diff: https://github.com/kamailio/kamailio/commit/4cdfda5affea38e50ad263b469f56d1… Patch: https://github.com/kamailio/kamailio/commit/4cdfda5affea38e50ad263b469f56d1…

5 years, 9 months

git:master:671e9d8c: app_python3: completed the handling of KEMI functions with 4 parameters

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 671e9d8c449473bd875d6046290ca0ba09b96725 URL: https://github.com/kamailio/kamailio/commit/671e9d8c449473bd875d6046290ca0b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-16T12:01:09+02:00 app_python3: completed the handling of KEMI functions with 4 parameters --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/671e9d8c449473bd875d6046290ca0b… Patch: https://github.com/kamailio/kamailio/commit/671e9d8c449473bd875d6046290ca0b…

5 years, 9 months

git:master:e77c39e5: app_python: give address of last int param to kemi functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e77c39e55d34386ccedd1b160c4c5fa8475fab25 URL: https://github.com/kamailio/kamailio/commit/e77c39e55d34386ccedd1b160c4c5fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-16T11:54:54+02:00 app_python: give address of last int param to kemi functions - intoduced by previous commit --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/e77c39e55d34386ccedd1b160c4c5fa… Patch: https://github.com/kamailio/kamailio/commit/e77c39e55d34386ccedd1b160c4c5fa…

5 years, 9 months

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2019