- sr-dev - kamailio.org

git:master:d0f93bb7: app_sqlang: completed the handling of KEMI functions with 4 parameters
by Daniel-Constantin Mierla 17 May '19

17 May '19

Module: kamailio Branch: master Commit: d0f93bb7ea819364eed8e243355fcdf58ea12cf5 URL: https://github.com/kamailio/kamailio/commit/d0f93bb7ea819364eed8e243355fcdf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-17T08:58:00+02:00 app_sqlang: completed the handling of KEMI functions with 4 parameters --- Modified: src/modules/app_sqlang/app_sqlang_api.c --- Diff: https://github.com/kamailio/kamailio/commit/d0f93bb7ea819364eed8e243355fcdf… Patch: https://github.com/kamailio/kamailio/commit/d0f93bb7ea819364eed8e243355fcdf…

1 0

git:master:cc98356e: app_sqlang: implemented the handling of KEMI functions with 5 parameters
by Daniel-Constantin Mierla 17 May '19

17 May '19

Module: kamailio Branch: master Commit: cc98356e6d5af09a5ac20cdc9f54aed99253604e URL: https://github.com/kamailio/kamailio/commit/cc98356e6d5af09a5ac20cdc9f54aed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-17T08:48:27+02:00 app_sqlang: implemented the handling of KEMI functions with 5 parameters --- Modified: src/modules/app_sqlang/app_sqlang_api.c --- Diff: https://github.com/kamailio/kamailio/commit/cc98356e6d5af09a5ac20cdc9f54aed… Patch: https://github.com/kamailio/kamailio/commit/cc98356e6d5af09a5ac20cdc9f54aed…

1 0

git:master:a5781fc4: db_mongodb: catch the null values and set the type to DB1_STRING
by Daniel-Constantin Mierla 17 May '19

17 May '19

Module: kamailio Branch: master Commit: a5781fc4bb3063c6e7abf54d93178ef610617298 URL: https://github.com/kamailio/kamailio/commit/a5781fc4bb3063c6e7abf54d93178ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-16T12:35:46+02:00 db_mongodb: catch the null values and set the type to DB1_STRING - avoid the log message on unhandled type --- Modified: src/modules/db_mongodb/mongodb_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/a5781fc4bb3063c6e7abf54d93178ef… Patch: https://github.com/kamailio/kamailio/commit/a5781fc4bb3063c6e7abf54d93178ef… --- diff --git a/src/modules/db_mongodb/mongodb_dbase.c b/src/modules/db_mongodb/mongodb_dbase.c index 8d88049919..db7f67c1e9 100644 --- a/src/modules/db_mongodb/mongodb_dbase.c +++ b/src/modules/db_mongodb/mongodb_dbase.c @@ -504,13 +504,18 @@ int db_mongodb_get_columns(const db1_con_t* _h, db1_res_t* _r) RES_TYPES(_r)[col] = DB1_STRING; break; + case BSON_TYPE_NULL: + /* 'null' value - default to type DB1_STRING */ + LM_DBG("BSON_TYPE_NULL - use DB1_STRING result type\n"); + RES_TYPES(_r)[col] = DB1_STRING; + break; + #if 0 case BSON_TYPE_EOD: case BSON_TYPE_DOCUMENT: case BSON_TYPE_ARRAY: case BSON_TYPE_UNDEFINED: case BSON_TYPE_OID: - case BSON_TYPE_NULL: case BSON_TYPE_REGEX: case BSON_TYPE_DBPOINTER: case BSON_TYPE_CODE:

1 0

git:master:6ca77883: core: allow setting server id via --server-id command line param
by Daniel-Constantin Mierla 17 May '19

17 May '19

Module: kamailio Branch: master Commit: 6ca77883afc5cb91e20fc71252ed10de519a9549 URL: https://github.com/kamailio/kamailio/commit/6ca77883afc5cb91e20fc71252ed10d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-16T19:42:50+02:00 core: allow setting server id via --server-id command line param --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/6ca77883afc5cb91e20fc71252ed10d… Patch: https://github.com/kamailio/kamailio/commit/6ca77883afc5cb91e20fc71252ed10d… --- diff --git a/src/main.c b/src/main.c index 959602ebb3..95a7c9e001 100644 --- a/src/main.c +++ b/src/main.c @@ -204,7 +204,8 @@ Options:\n\ #ifdef STATS " -s file File where to write internal statistics on SIGUSR1\n" #endif -" --subst=exp set a subst preprocessor directive\n\ +" --server-id=num set the value for server_id\n\ + --subst=exp set a subst preprocessor directive\n\ --substdef=exp set a substdef preprocessor directive\n\ --substdefs=exp set a substdefs preprocessor directive\n" #ifdef USE_SCTP @@ -1906,6 +1907,7 @@ int main(int argc, char** argv) {"subst", required_argument, 0, KARGOPTVAL + 1}, {"substdef", required_argument, 0, KARGOPTVAL + 2}, {"substdefs", required_argument, 0, KARGOPTVAL + 3}, + {"server-id", required_argument, 0, KARGOPTVAL + 4}, {0, 0, 0, 0 } }; @@ -2157,6 +2159,13 @@ int main(int argc, char** argv) goto error; } break; + case KARGOPTVAL+4: + server_id=(int)strtol(optarg, &tmp, 10); + if ((tmp==0) || (*tmp)){ + LM_ERR("bad server_id value: %s\n", optarg); + goto error; + } + break; /* special cases */ case '?':

1 0

git:5.2:1f4262b3: rtpengine: allocate space for one more rtp relay control socket
by Daniel-Constantin Mierla 16 May '19

16 May '19

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;

1 0

git:5.2:25640038: core: return negative on error adding pre-processor substdef
by Daniel-Constantin Mierla 16 May '19

16 May '19

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)

1 0

git:5.2:fcf6fd61: ims_qos: use msg_ctx_id_t to detect same msg/transaction processing
by Daniel-Constantin Mierla 16 May '19

16 May '19

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;

1 0

git:5.2:b7b1169a: core: adjust the value for _pv_cache_counter
by Daniel-Constantin Mierla 16 May '19

16 May '19

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;

1 0

git:5.2:de94b66c: core: fix timer typo
by Daniel-Constantin Mierla 16 May '19

16 May '19

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

1 0

[kamailio/kamailio] 5.2.2: `pv_cache` is never drained and eventually results in perpetual OOM (#1948)
by gormania 16 May '19

16 May '19

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

3 6

git:master:4cdfda5a: app_ruby: completed the handling of KEMI functions with 4 parameters
by Daniel-Constantin Mierla 16 May '19

16 May '19

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…

1 0

git:master:2d329711: app_ruby: implemented the handling of KEMI functions with 5 parameters
by Daniel-Constantin Mierla 16 May '19

16 May '19

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…

1 0

git:master:e77c39e5: app_python: give address of last int param to kemi functions
by Daniel-Constantin Mierla 16 May '19

16 May '19

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…

1 0

git:master:671e9d8c: app_python3: completed the handling of KEMI functions with 4 parameters
by Daniel-Constantin Mierla 16 May '19

16 May '19

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…

1 0

git:master:8f51d662: app_python3: implemented the handling of KEMI functions with 5 parameters
by Daniel-Constantin Mierla 16 May '19

16 May '19

Module: kamailio Branch: master Commit: 8f51d6625df5b76303d1d7b03a13bc3cb56ff554 URL: https://github.com/kamailio/kamailio/commit/8f51d6625df5b76303d1d7b03a13bc3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-16T11:49:53+02:00 app_python3: implemented the handling of KEMI functions with 5 parameters --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/8f51d6625df5b76303d1d7b03a13bc3… Patch: https://github.com/kamailio/kamailio/commit/8f51d6625df5b76303d1d7b03a13bc3…

1 0

git:master:eda9f669: app_python: implemented the handling of KEMI functions with 5 parameters
by Daniel-Constantin Mierla 16 May '19

16 May '19

Module: kamailio Branch: master Commit: eda9f6691b38ad3e1f15a4cd5145ebd04c15c7a3 URL: https://github.com/kamailio/kamailio/commit/eda9f6691b38ad3e1f15a4cd5145ebd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-16T11:37:19+02:00 app_python: implemented the handling of KEMI functions with 5 parameters --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/eda9f6691b38ad3e1f15a4cd5145ebd… Patch: https://github.com/kamailio/kamailio/commit/eda9f6691b38ad3e1f15a4cd5145ebd…

1 0

git:master:3f69a6de: app_python: completed the handling of KEMI functions with 4 parameters
by Daniel-Constantin Mierla 16 May '19

16 May '19

Module: kamailio Branch: master Commit: 3f69a6deb53d04d300b558f15bc9a7da0489e951 URL: https://github.com/kamailio/kamailio/commit/3f69a6deb53d04d300b558f15bc9a7d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-16T11:29:22+02:00 app_python: completed the handling of KEMI functions with 4 parameters --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/3f69a6deb53d04d300b558f15bc9a7d… Patch: https://github.com/kamailio/kamailio/commit/3f69a6deb53d04d300b558f15bc9a7d…

1 0

git:master:d55d4fde: app_lua: implemented the handling of KEMI functions with 5 parameters
by Daniel-Constantin Mierla 16 May '19

16 May '19

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

1 0

git:master:b4c80c8a: app_lua: completed the handling of KEMI functions with 4 parameters
by Daniel-Constantin Mierla 16 May '19

16 May '19

Module: kamailio Branch: master Commit: b4c80c8a6553d545a08efd1ef59adefada20ee02 URL: https://github.com/kamailio/kamailio/commit/b4c80c8a6553d545a08efd1ef59adef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-16T09:30:05+02:00 app_lua: completed the handling of KEMI functions with 4 parameters --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/b4c80c8a6553d545a08efd1ef59adef… Patch: https://github.com/kamailio/kamailio/commit/b4c80c8a6553d545a08efd1ef59adef…

1 0

git:master:9d2476f7: app_jsdt: completed the handling of KEMI functions with 4 parameters
by Daniel-Constantin Mierla 16 May '19

16 May '19

Module: kamailio Branch: master Commit: 9d2476f7348ec40c3b20420360d0c75ebd79f776 URL: https://github.com/kamailio/kamailio/commit/9d2476f7348ec40c3b20420360d0c75… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-16T09:15:48+02:00 app_jsdt: completed the handling of KEMI functions with 4 parameters --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/9d2476f7348ec40c3b20420360d0c75… Patch: https://github.com/kamailio/kamailio/commit/9d2476f7348ec40c3b20420360d0c75…

1 0

git:master:e184648a: core: kemi - typedefs for functions with 5 parameters
by Daniel-Constantin Mierla 16 May '19

16 May '19

Module: kamailio Branch: master Commit: e184648a9cf9b7be2cc12ef64bbb978926384e2b URL: https://github.com/kamailio/kamailio/commit/e184648a9cf9b7be2cc12ef64bbb978… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-16T08:57:17+02:00 core: kemi - typedefs for functions with 5 parameters --- Modified: src/core/kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/e184648a9cf9b7be2cc12ef64bbb978… Patch: https://github.com/kamailio/kamailio/commit/e184648a9cf9b7be2cc12ef64bbb978… --- diff --git a/src/core/kemi.h b/src/core/kemi.h index 5d3c84ebb7..26e56e3087 100644 --- a/src/core/kemi.h +++ b/src/core/kemi.h @@ -108,7 +108,37 @@ typedef int (*sr_kemi_fmssss_f)(sip_msg_t*, str*, str*, str*, str*); /* sip_msg_t and five int|str params */ typedef int (*sr_kemi_fmsssss_f)(sip_msg_t*, str*, str*, str*, str*, str*); +typedef int (*sr_kemi_fmssssn_f)(sip_msg_t*, str*, str*, str*, str*, int); +typedef int (*sr_kemi_fmsssns_f)(sip_msg_t*, str*, str*, str*, int, str*); +typedef int (*sr_kemi_fmsssnn_f)(sip_msg_t*, str*, str*, str*, int, int); +typedef int (*sr_kemi_fmssnss_f)(sip_msg_t*, str*, str*, int, str*, str*); +typedef int (*sr_kemi_fmssnsn_f)(sip_msg_t*, str*, str*, int, str*, int); typedef int (*sr_kemi_fmssnns_f)(sip_msg_t*, str*, str*, int, int, str*); +typedef int (*sr_kemi_fmssnnn_f)(sip_msg_t*, str*, str*, int, int, int); +typedef int (*sr_kemi_fmsnsss_f)(sip_msg_t*, str*, int, str*, str*, str*); +typedef int (*sr_kemi_fmsnssn_f)(sip_msg_t*, str*, int, str*, str*, int); +typedef int (*sr_kemi_fmsnsns_f)(sip_msg_t*, str*, int, str*, int, str*); +typedef int (*sr_kemi_fmsnsnn_f)(sip_msg_t*, str*, int, str*, int, int); +typedef int (*sr_kemi_fmsnnss_f)(sip_msg_t*, str*, int, int, str*, str*); +typedef int (*sr_kemi_fmsnnsn_f)(sip_msg_t*, str*, int, int, str*, int); +typedef int (*sr_kemi_fmsnnns_f)(sip_msg_t*, str*, int, int, int, str*); +typedef int (*sr_kemi_fmsnnnn_f)(sip_msg_t*, str*, int, int, int, int); +typedef int (*sr_kemi_fmnssss_f)(sip_msg_t*, int, str*, str*, str*, str*); +typedef int (*sr_kemi_fmnsssn_f)(sip_msg_t*, int, str*, str*, str*, int); +typedef int (*sr_kemi_fmnssns_f)(sip_msg_t*, int, str*, str*, int, str*); +typedef int (*sr_kemi_fmnssnn_f)(sip_msg_t*, int, str*, str*, int, int); +typedef int (*sr_kemi_fmnsnss_f)(sip_msg_t*, int, str*, int, str*, str*); +typedef int (*sr_kemi_fmnsnsn_f)(sip_msg_t*, int, str*, int, str*, int); +typedef int (*sr_kemi_fmnsnns_f)(sip_msg_t*, int, str*, int, int, str*); +typedef int (*sr_kemi_fmnsnnn_f)(sip_msg_t*, int, str*, int, int, int); +typedef int (*sr_kemi_fmnnsss_f)(sip_msg_t*, int, int, str*, str*, str*); +typedef int (*sr_kemi_fmnnssn_f)(sip_msg_t*, int, int, str*, str*, int); +typedef int (*sr_kemi_fmnnsns_f)(sip_msg_t*, int, int, str*, int, str*); +typedef int (*sr_kemi_fmnnsnn_f)(sip_msg_t*, int, int, str*, int, int); +typedef int (*sr_kemi_fmnnnss_f)(sip_msg_t*, int, int, int, str*, str*); +typedef int (*sr_kemi_fmnnnsn_f)(sip_msg_t*, int, int, int, str*, int); +typedef int (*sr_kemi_fmnnnns_f)(sip_msg_t*, int, int, int, int, str*); +typedef int (*sr_kemi_fmnnnnn_f)(sip_msg_t*, int, int, int, int, int); /* sip_msg_t and six int|str params */ typedef int (*sr_kemi_fmssssss_f)(sip_msg_t*, str*, str*, str*, str*, str*, str*);

1 0

git:master:4190fab7: app_jsdt: implemented the handling of KEMI functions with 5 parameters
by Daniel-Constantin Mierla 16 May '19

16 May '19

Module: kamailio Branch: master Commit: 4190fab7e6026e24030b4e786bc780cdc08d45ea URL: https://github.com/kamailio/kamailio/commit/4190fab7e6026e24030b4e786bc780c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-16T09:09:44+02:00 app_jsdt: implemented the handling of KEMI functions with 5 parameters --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/4190fab7e6026e24030b4e786bc780c… Patch: https://github.com/kamailio/kamailio/commit/4190fab7e6026e24030b4e786bc780c…

1 0

[kamailio/kamailio] ims_qos: use msg_ctx_id_t to detect same msg/transaction processing (#1954)
by Sergey Zyrianov 15 May '19

15 May '19

- 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   #### 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 - [x] Related to issue #1613 (replace XXXX with an open issue number) #### Description Changed check to verify if response belongs to the saved request. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1954 -- Commit Summary -- * ims_qos: use msg_ctx_id_t to detect same msg/transaction processing -- File Changes -- M src/modules/ims_qos/ims_qos_mod.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1954.patch https://github.com/kamailio/kamailio/pull/1954.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/1954

2 5

git:master:d3770425: Merge pull request #1954 from omnicate/master
by GitHub 15 May '19

15 May '19

Module: kamailio Branch: master Commit: d377042513a5092ad2dc127ed500d50e97002d73 URL: https://github.com/kamailio/kamailio/commit/d377042513a5092ad2dc127ed500d50… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-05-15T18:33:43+02:00 Merge pull request #1954 from omnicate/master ims_qos: use msg_ctx_id_t to detect same msg/transaction processing --- Modified: src/modules/ims_qos/ims_qos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d377042513a5092ad2dc127ed500d50… Patch: https://github.com/kamailio/kamailio/commit/d377042513a5092ad2dc127ed500d50… --- 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;

1 0

git:master:b951d88e: ims_qos: use msg_ctx_id_t to detect same msg/transaction processing
by szcom 15 May '19

15 May '19

Module: kamailio Branch: master Commit: b951d88eea52e9fbbec62d2069b6169fc182ba91 URL: https://github.com/kamailio/kamailio/commit/b951d88eea52e9fbbec62d2069b6169… Author: szcom <sergey(a)wgtwo.com> Committer: szcom <sergey(a)wgtwo.com> Date: 2019-05-15T12:54:12+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 --- Modified: src/modules/ims_qos/ims_qos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b951d88eea52e9fbbec62d2069b6169… Patch: https://github.com/kamailio/kamailio/commit/b951d88eea52e9fbbec62d2069b6169… --- diff --git a/src/modules/ims_qos/ims_qos_mod.c b/src/modules/ims_qos/ims_qos_mod.c index 19fad55201..8e1e339d3a 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; @@ -732,8 +732,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) { @@ -742,7 +741,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)); @@ -760,7 +760,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;

1 0

git:master:b925c9c2: modules: readme files regenerated - db_text ... [skip ci]
by Kamailio Dev 15 May '19

15 May '19

Module: kamailio Branch: master Commit: b925c9c2799367d116c8594b340839a9039233c2 URL: https://github.com/kamailio/kamailio/commit/b925c9c2799367d116c8594b340839a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-05-15T16:32:26+02:00 modules: readme files regenerated - db_text ... [skip ci] --- Modified: src/modules/db_text/README --- Diff: https://github.com/kamailio/kamailio/commit/b925c9c2799367d116c8594b340839a… Patch: https://github.com/kamailio/kamailio/commit/b925c9c2799367d116c8594b340839a… --- diff --git a/src/modules/db_text/README b/src/modules/db_text/README index 61b524c4e2..eb4cfe1304 100644 --- a/src/modules/db_text/README +++ b/src/modules/db_text/README @@ -47,6 +47,7 @@ Olle E. Johansson 4.3. default_connection (string) 4.4. emptystring (integer) 4.5. file_buffer_size (integer) + 4.6. max_result_rows (integer) 5. Exported RPC Functions @@ -69,11 +70,12 @@ Olle E. Johansson 1.6. Set default_connection parameter 1.7. Set emptystring parameter 1.8. Set file_buffer_size parameter - 1.9. Load the dbtext module - 1.10. Definition of 'subscriber' table (one line) - 1.11. Definition of 'location' and 'aliases' tables (one line) - 1.12. Definition of 'version' table and sample records - 1.13. Configuration file + 1.9. Set max_result_rows parameter + 1.10. Load the dbtext module + 1.11. Definition of 'subscriber' table (one line) + 1.12. Definition of 'location' and 'aliases' tables (one line) + 1.13. Definition of 'version' table and sample records + 1.14. Configuration file Chapter 1. Admin Guide @@ -97,6 +99,7 @@ Chapter 1. Admin Guide 4.3. default_connection (string) 4.4. emptystring (integer) 4.5. file_buffer_size (integer) + 4.6. max_result_rows (integer) 5. Exported RPC Functions @@ -224,6 +227,7 @@ suser:supasswd:xxx:alpha.org:xxx 4.3. default_connection (string) 4.4. emptystring (integer) 4.5. file_buffer_size (integer) + 4.6. max_result_rows (integer) 4.1. db_mode (integer) @@ -281,13 +285,24 @@ modparam("db_text", "emptystring", 1) size of the buffer used to read the text file. Some presence tables have columns with large content. - Default value is “16384” (off). + Default value is “16384”. Example 1.8. Set file_buffer_size parameter ... modparam("db_text", "file_buffer_size", 8192) ... +4.6. max_result_rows (integer) + + number of rows to read from the text file. + + Default value is “100000”. + + Example 1.9. Set max_result_rows parameter +... +modparam("db_text", "max_result_rows", 1000000) +... + 5. Exported RPC Functions 5.1. db_text.dump @@ -328,7 +343,7 @@ modparam("db_text", "file_buffer_size", 8192) database path. So, either you provide an absolute path to database directory or a relative one to “CFG_DIR” directory. - Example 1.9. Load the dbtext module + Example 1.10. Load the dbtext module ... loadmodule "/path/to/kamailio/modules_k/db_text.so" ... @@ -347,7 +362,7 @@ modparam("module_name", "db_url", "text:///path/to/dbtext/database") in order to have authentication. To use with the given configuration file, the table files must be placed in the '/tmp/serdb' directory. - Example 1.10. Definition of 'subscriber' table (one line) + Example 1.11. Definition of 'subscriber' table (one line) ... username(str) domain(str) password(str) first_name(str) last_name(str) phone(str ) email_address(str) datetime_created(int) datetime_modified(int) confirmation(s @@ -355,14 +370,14 @@ tr) flag(str) sendnotification(str) greeting(str) ha1(str) ha1b(str) perms(str) allow_find(str) timezone(str,null) rpid(str,null) ... - Example 1.11. Definition of 'location' and 'aliases' tables (one line) + Example 1.12. Definition of 'location' and 'aliases' tables (one line) ... username(str) domain(str,null) contact(str,null) received(str) expires(int,null) q(double,null) callid(str,null) cseq(int,null) last_modified(str) flags(int) us er_agent(str) socket(str) ... - Example 1.12. Definition of 'version' table and sample records + Example 1.13. Definition of 'version' table and sample records ... table_name(str) table_version(int) subscriber:3 @@ -370,7 +385,7 @@ location:6 aliases:6 ... - Example 1.13. Configuration file + Example 1.14. Configuration file ... # #

1 0

git:5.2:9260a2bd: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 15 May '19

15 May '19

Module: kamailio Branch: 5.2 Commit: 9260a2bd11767d694dcb93c2600869b94abb5e27 URL: https://github.com/kamailio/kamailio/commit/9260a2bd11767d694dcb93c2600869b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-05-15T16:32:07+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/db_text/README --- Diff: https://github.com/kamailio/kamailio/commit/9260a2bd11767d694dcb93c2600869b… Patch: https://github.com/kamailio/kamailio/commit/9260a2bd11767d694dcb93c2600869b… --- diff --git a/src/modules/db_text/README b/src/modules/db_text/README index 61b524c4e2..eb4cfe1304 100644 --- a/src/modules/db_text/README +++ b/src/modules/db_text/README @@ -47,6 +47,7 @@ Olle E. Johansson 4.3. default_connection (string) 4.4. emptystring (integer) 4.5. file_buffer_size (integer) + 4.6. max_result_rows (integer) 5. Exported RPC Functions @@ -69,11 +70,12 @@ Olle E. Johansson 1.6. Set default_connection parameter 1.7. Set emptystring parameter 1.8. Set file_buffer_size parameter - 1.9. Load the dbtext module - 1.10. Definition of 'subscriber' table (one line) - 1.11. Definition of 'location' and 'aliases' tables (one line) - 1.12. Definition of 'version' table and sample records - 1.13. Configuration file + 1.9. Set max_result_rows parameter + 1.10. Load the dbtext module + 1.11. Definition of 'subscriber' table (one line) + 1.12. Definition of 'location' and 'aliases' tables (one line) + 1.13. Definition of 'version' table and sample records + 1.14. Configuration file Chapter 1. Admin Guide @@ -97,6 +99,7 @@ Chapter 1. Admin Guide 4.3. default_connection (string) 4.4. emptystring (integer) 4.5. file_buffer_size (integer) + 4.6. max_result_rows (integer) 5. Exported RPC Functions @@ -224,6 +227,7 @@ suser:supasswd:xxx:alpha.org:xxx 4.3. default_connection (string) 4.4. emptystring (integer) 4.5. file_buffer_size (integer) + 4.6. max_result_rows (integer) 4.1. db_mode (integer) @@ -281,13 +285,24 @@ modparam("db_text", "emptystring", 1) size of the buffer used to read the text file. Some presence tables have columns with large content. - Default value is “16384” (off). + Default value is “16384”. Example 1.8. Set file_buffer_size parameter ... modparam("db_text", "file_buffer_size", 8192) ... +4.6. max_result_rows (integer) + + number of rows to read from the text file. + + Default value is “100000”. + + Example 1.9. Set max_result_rows parameter +... +modparam("db_text", "max_result_rows", 1000000) +... + 5. Exported RPC Functions 5.1. db_text.dump @@ -328,7 +343,7 @@ modparam("db_text", "file_buffer_size", 8192) database path. So, either you provide an absolute path to database directory or a relative one to “CFG_DIR” directory. - Example 1.9. Load the dbtext module + Example 1.10. Load the dbtext module ... loadmodule "/path/to/kamailio/modules_k/db_text.so" ... @@ -347,7 +362,7 @@ modparam("module_name", "db_url", "text:///path/to/dbtext/database") in order to have authentication. To use with the given configuration file, the table files must be placed in the '/tmp/serdb' directory. - Example 1.10. Definition of 'subscriber' table (one line) + Example 1.11. Definition of 'subscriber' table (one line) ... username(str) domain(str) password(str) first_name(str) last_name(str) phone(str ) email_address(str) datetime_created(int) datetime_modified(int) confirmation(s @@ -355,14 +370,14 @@ tr) flag(str) sendnotification(str) greeting(str) ha1(str) ha1b(str) perms(str) allow_find(str) timezone(str,null) rpid(str,null) ... - Example 1.11. Definition of 'location' and 'aliases' tables (one line) + Example 1.12. Definition of 'location' and 'aliases' tables (one line) ... username(str) domain(str,null) contact(str,null) received(str) expires(int,null) q(double,null) callid(str,null) cseq(int,null) last_modified(str) flags(int) us er_agent(str) socket(str) ... - Example 1.12. Definition of 'version' table and sample records + Example 1.13. Definition of 'version' table and sample records ... table_name(str) table_version(int) subscriber:3 @@ -370,7 +385,7 @@ location:6 aliases:6 ... - Example 1.13. Configuration file + Example 1.14. Configuration file ... # #

1 0

git:5.1:01c3d06f: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 15 May '19

15 May '19

Module: kamailio Branch: 5.1 Commit: 01c3d06f5ee65d15693118d9cf55086a84b3b0c2 URL: https://github.com/kamailio/kamailio/commit/01c3d06f5ee65d15693118d9cf55086… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-05-15T16:31:47+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/db_text/README --- Diff: https://github.com/kamailio/kamailio/commit/01c3d06f5ee65d15693118d9cf55086… Patch: https://github.com/kamailio/kamailio/commit/01c3d06f5ee65d15693118d9cf55086…

1 0

git:5.0:c35e6930: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 15 May '19

15 May '19

Module: kamailio Branch: 5.0 Commit: c35e69302c246e8e24e2e0f0513fc602cab930d7 URL: https://github.com/kamailio/kamailio/commit/c35e69302c246e8e24e2e0f0513fc60… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-05-15T16:31:20+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/db_text/README --- Diff: https://github.com/kamailio/kamailio/commit/c35e69302c246e8e24e2e0f0513fc60… Patch: https://github.com/kamailio/kamailio/commit/c35e69302c246e8e24e2e0f0513fc60…

1 0

git:5.0:7c988639: db_text: add missing "max_result_rows" param to the doc
by Ovidiu Sas 15 May '19

15 May '19

Module: kamailio Branch: 5.0 Commit: 7c9886391094a6bc87886f8246edfbfefc21dbf2 URL: https://github.com/kamailio/kamailio/commit/7c9886391094a6bc87886f8246edfbf… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2019-05-15T10:19:35-04:00 db_text: add missing "max_result_rows" param to the doc (cherry picked from commit 6b7d02c9ed404abaa7c45dbcc86173533a838e01) --- Modified: src/modules/db_text/doc/db_text_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7c9886391094a6bc87886f8246edfbf… Patch: https://github.com/kamailio/kamailio/commit/7c9886391094a6bc87886f8246edfbf… --- diff --git a/src/modules/db_text/doc/db_text_admin.xml b/src/modules/db_text/doc/db_text_admin.xml index a5cb874848..01f109c9e4 100644 --- a/src/modules/db_text/doc/db_text_admin.xml +++ b/src/modules/db_text/doc/db_text_admin.xml @@ -302,7 +302,7 @@ modparam("db_text", "emptystring", 1) <para> <emphasis> - Default value is <quote>16384</quote> (off). + Default value is <quote>16384</quote>. </emphasis> </para> <example> @@ -311,6 +311,26 @@ modparam("db_text", "emptystring", 1) ... modparam("db_text", "file_buffer_size", 8192) ... +</programlisting> + </example> + </section> + <section> + <title><varname>max_result_rows</varname> (integer)</title> + <para> + number of rows to read from the text file. + </para> + + <para> + <emphasis> + Default value is <quote>100000</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>max_result_rows</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("db_text", "max_result_rows", 1000000) +... </programlisting> </example> </section>

1 0

git:5.1:aed2b5ca: db_text: add missing "max_result_rows" param to the doc
by Ovidiu Sas 15 May '19

15 May '19

Module: kamailio Branch: 5.1 Commit: aed2b5cacc6cd278693452e6e73eccb33fbcb4a1 URL: https://github.com/kamailio/kamailio/commit/aed2b5cacc6cd278693452e6e73eccb… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2019-05-15T10:18:36-04:00 db_text: add missing "max_result_rows" param to the doc (cherry picked from commit 6b7d02c9ed404abaa7c45dbcc86173533a838e01) --- Modified: src/modules/db_text/doc/db_text_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/aed2b5cacc6cd278693452e6e73eccb… Patch: https://github.com/kamailio/kamailio/commit/aed2b5cacc6cd278693452e6e73eccb… --- diff --git a/src/modules/db_text/doc/db_text_admin.xml b/src/modules/db_text/doc/db_text_admin.xml index 4f3aa5f67e..9c04f106dd 100644 --- a/src/modules/db_text/doc/db_text_admin.xml +++ b/src/modules/db_text/doc/db_text_admin.xml @@ -342,7 +342,7 @@ modparam("db_text", "emptystring", 1) <para> <emphasis> - Default value is <quote>16384</quote> (off). + Default value is <quote>16384</quote>. </emphasis> </para> <example> @@ -351,6 +351,26 @@ modparam("db_text", "emptystring", 1) ... modparam("db_text", "file_buffer_size", 8192) ... +</programlisting> + </example> + </section> + <section> + <title><varname>max_result_rows</varname> (integer)</title> + <para> + number of rows to read from the text file. + </para> + + <para> + <emphasis> + Default value is <quote>100000</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>max_result_rows</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("db_text", "max_result_rows", 1000000) +... </programlisting> </example> </section>

1 0

git:5.2:efa66015: db_text: add missing "max_result_rows" param to the doc
by Ovidiu Sas 15 May '19

15 May '19

Module: kamailio Branch: 5.2 Commit: efa660150a4e68e1af274d492acc7b05bf9b555a URL: https://github.com/kamailio/kamailio/commit/efa660150a4e68e1af274d492acc7b0… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2019-05-15T10:17:54-04:00 db_text: add missing "max_result_rows" param to the doc (cherry picked from commit 6b7d02c9ed404abaa7c45dbcc86173533a838e01) --- Modified: src/modules/db_text/doc/db_text_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/efa660150a4e68e1af274d492acc7b0… Patch: https://github.com/kamailio/kamailio/commit/efa660150a4e68e1af274d492acc7b0… --- diff --git a/src/modules/db_text/doc/db_text_admin.xml b/src/modules/db_text/doc/db_text_admin.xml index 4f3aa5f67e..9c04f106dd 100644 --- a/src/modules/db_text/doc/db_text_admin.xml +++ b/src/modules/db_text/doc/db_text_admin.xml @@ -342,7 +342,7 @@ modparam("db_text", "emptystring", 1) <para> <emphasis> - Default value is <quote>16384</quote> (off). + Default value is <quote>16384</quote>. </emphasis> </para> <example> @@ -351,6 +351,26 @@ modparam("db_text", "emptystring", 1) ... modparam("db_text", "file_buffer_size", 8192) ... +</programlisting> + </example> + </section> + <section> + <title><varname>max_result_rows</varname> (integer)</title> + <para> + number of rows to read from the text file. + </para> + + <para> + <emphasis> + Default value is <quote>100000</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>max_result_rows</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("db_text", "max_result_rows", 1000000) +... </programlisting> </example> </section>

1 0

git:master:6b7d02c9: db_text: add missing "max_result_rows" param to the doc
by Ovidiu Sas 15 May '19

15 May '19

Module: kamailio Branch: master Commit: 6b7d02c9ed404abaa7c45dbcc86173533a838e01 URL: https://github.com/kamailio/kamailio/commit/6b7d02c9ed404abaa7c45dbcc861735… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2019-05-15T10:16:27-04:00 db_text: add missing "max_result_rows" param to the doc --- Modified: src/modules/db_text/doc/db_text_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6b7d02c9ed404abaa7c45dbcc861735… Patch: https://github.com/kamailio/kamailio/commit/6b7d02c9ed404abaa7c45dbcc861735… --- diff --git a/src/modules/db_text/doc/db_text_admin.xml b/src/modules/db_text/doc/db_text_admin.xml index 4f3aa5f67e..9c04f106dd 100644 --- a/src/modules/db_text/doc/db_text_admin.xml +++ b/src/modules/db_text/doc/db_text_admin.xml @@ -342,7 +342,7 @@ modparam("db_text", "emptystring", 1) <para> <emphasis> - Default value is <quote>16384</quote> (off). + Default value is <quote>16384</quote>. </emphasis> </para> <example> @@ -351,6 +351,26 @@ modparam("db_text", "emptystring", 1) ... modparam("db_text", "file_buffer_size", 8192) ... +</programlisting> + </example> + </section> + <section> + <title><varname>max_result_rows</varname> (integer)</title> + <para> + number of rows to read from the text file. + </para> + + <para> + <emphasis> + Default value is <quote>100000</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>max_result_rows</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("db_text", "max_result_rows", 1000000) +... </programlisting> </example> </section>

1 0

git:master:94c2b4e3: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 15 May '19

15 May '19

Module: kamailio Branch: master Commit: 94c2b4e3d940f360a2efcbec121b9cab0261b094 URL: https://github.com/kamailio/kamailio/commit/94c2b4e3d940f360a2efcbec121b9ca… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-05-15T14:31:49+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/94c2b4e3d940f360a2efcbec121b9ca… Patch: https://github.com/kamailio/kamailio/commit/94c2b4e3d940f360a2efcbec121b9ca… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 5ba54572c1..639720e930 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -134,6 +134,8 @@ Daniel-Constantin Mierla 4.53. t_uac_send(method, ruri, nexthop, socket, headers, body) + 4.54. t_get_status_code() + 5. RPC Commands 5.1. tm.list @@ -266,8 +268,9 @@ Daniel-Constantin Mierla 1.93. t_use_uac_headers usage 1.94. t_is_retr_async_reply usage 1.95. t_uac_send usage - 1.96. event_route[tm:branch-failure] usage - 1.97. event_route[tm:local-response] usage + 1.96. t_get_status_code usage + 1.97. event_route[tm:branch-failure] usage + 1.98. event_route[tm:local-response] usage Chapter 1. Admin Guide @@ -382,6 +385,7 @@ Chapter 1. Admin Guide 4.51. t_use_uac_headers() 4.52. t_is_retr_async_reply() 4.53. t_uac_send(method, ruri, nexthop, socket, headers, body) + 4.54. t_get_status_code() 5. RPC Commands @@ -1724,6 +1728,7 @@ modparam("tm", "rich_redirect", 3) 4.51. t_use_uac_headers() 4.52. t_is_retr_async_reply() 4.53. t_uac_send(method, ruri, nexthop, socket, headers, body) + 4.54. t_get_status_code() 4.1. t_relay([host, port]) @@ -2865,6 +2870,17 @@ t_uac_send("OPTIONS", "sip:alice@kamailio.org", "", "", "From: bob(a)kamailio.org;tag=2w3e\r\nTo: bob(a)kamailio.org", ""); ... +4.54. t_get_status_code() + + Return the status code for transaction - the most relevant SIP reply + status code, or -1 in case of error or no status code was set. + + Example 1.96. t_get_status_code usage +... +$var(ts) = t_get_status_code(); +if($var(ts) == 500) { ... } +... + 5. RPC Commands 5.1. tm.list @@ -2977,7 +2993,7 @@ t_uac_send("OPTIONS", "sip:alice@kamailio.org", "", "", enabled with the t_on_branch_failure function. This event_route uses the BRANCH_FAILURE_ROUTE route type. - Example 1.96. event_route[tm:branch-failure] usage + Example 1.97. event_route[tm:branch-failure] usage ... request_route { ... @@ -2995,7 +3011,7 @@ event_route[tm:branch-failure:myroute] { Executed after the tm module has sent a local generated, transaction stateful response. - Example 1.97. event_route[tm:local-response] usage + Example 1.98. event_route[tm:local-response] usage ... event_route[tm:local-response] { xlog("tm:local-response replied locally\n");

1 0

git:master:4a4dbdbe: tm: docs for t_get_status_code()
by Daniel-Constantin Mierla 15 May '19

15 May '19

Module: kamailio Branch: master Commit: 4a4dbdbe8e683d4f3e081391e54a9f2489c7d5ae URL: https://github.com/kamailio/kamailio/commit/4a4dbdbe8e683d4f3e081391e54a9f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-15T14:25:24+02:00 tm: docs for t_get_status_code() --- Modified: src/modules/tm/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/4a4dbdbe8e683d4f3e081391e54a9f2… Patch: https://github.com/kamailio/kamailio/commit/4a4dbdbe8e683d4f3e081391e54a9f2… --- diff --git a/src/modules/tm/doc/functions.xml b/src/modules/tm/doc/functions.xml index 67cc5d017c..ce0e84261c 100644 --- a/src/modules/tm/doc/functions.xml +++ b/src/modules/tm/doc/functions.xml @@ -1845,6 +1845,24 @@ if (t_is_retr_async_reply()) { ... t_uac_send("OPTIONS", "sip:alice@kamailio.org", "", "", "From: bob(a)kamailio.org;tag=2w3e\r\nTo: bob(a)kamailio.org", ""); +... + </programlisting> + </example> + </section> + <section id="tm.f.t_get_status_code"> + <title> + <function>t_get_status_code()</function> + </title> + <para> + Return the status code for transaction - the most relevant SIP reply status + code, or -1 in case of error or no status code was set. + </para> + <example> + <title><function>t_get_status_code</function> usage</title> + <programlisting> +... +$var(ts) = t_get_status_code(); +if($var(ts) == 500) { ... } ... </programlisting> </example>

1 0

git:master:08714c23: tm: added t_get_status_code()
by Daniel-Constantin Mierla 15 May '19

15 May '19

Module: kamailio Branch: master Commit: 08714c23ac3a9785d5df3f04bdf5214cb0a81774 URL: https://github.com/kamailio/kamailio/commit/08714c23ac3a9785d5df3f04bdf5214… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-15T14:18:59+02:00 tm: added t_get_status_code() - return the status code of the transaction - the sip response code - in case of error or no status set, then it returns -1 --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/08714c23ac3a9785d5df3f04bdf5214… Patch: https://github.com/kamailio/kamailio/commit/08714c23ac3a9785d5df3f04bdf5214… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index b4d5b8ce9e..c67e8141f4 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -210,6 +210,7 @@ static int w_t_is_set(struct sip_msg* msg, char* target, char* bar); static int w_t_use_uac_headers(sip_msg_t* msg, char* foo, char* bar); static int w_t_uac_send(sip_msg_t* msg, char* pmethod, char* pruri, char* pnexthop, char* psock, char *phdrs, char* pbody); +static int w_t_get_status_code(sip_msg_t* msg, char *p1, char *p2); /* by default the fr timers avps are not set, so that the avps won't be @@ -404,6 +405,8 @@ static cmd_export_t cmds[]={ ANY_ROUTE }, {"t_uac_send", (cmd_function)w_t_uac_send, 6, fixup_spve_all, 0, ANY_ROUTE }, + {"t_get_status_code", w_t_get_status_code, 0, 0, 0, + REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, {"t_load_contacts", t_load_contacts, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE}, @@ -854,6 +857,74 @@ static int child_init(int rank) /**************************** wrapper functions ***************************/ + +static int ki_t_get_status_code(sip_msg_t* msg) +{ + int scode = -1; + int ret; + tm_cell_t *t = NULL; + + /* first get the transaction */ + if (t_check(msg, 0 ) == -1) return -1; + if ((t = get_t()) == 0) { + LM_ERR("cannot check status for a reply" + " which has no T-state established\n"); + goto error; + } + + switch(get_route_type()) { + case REQUEST_ROUTE: + /* use the status of the last sent reply */ + scode = t->uas.status; + break; + + case TM_ONREPLY_ROUTE: + case CORE_ONREPLY_ROUTE: + /* use the status of the current reply */ + scode = (int)msg->first_line.u.reply.statuscode; + break; + + case FAILURE_ROUTE: + /* use the status of the winning reply */ + ret = t_pick_branch( -1, 0, t, &scode); + if (ret == -1) { + /* t_pick_branch() retuns error also when there are only + * blind UACs. Let us give it another chance including the + * blind branches. */ + LM_DBG("t_pick_branch returned error," + " trying t_pick_branch_blind\n"); + ret = t_pick_branch_blind(t, &scode); + } + if (ret < 0) { + LM_CRIT("BUG: t_pick_branch failed to get" + " a final response in FAILURE_ROUTE\n"); + goto error; + } + break; + + case BRANCH_FAILURE_ROUTE: + scode = t->uac[get_t_branch()].last_received; + break; + + default: + LM_ERR("unsupported route type %d\n", + get_route_type()); + goto error; + } + + LM_DBG("t status code is <%d>\n", scode); + + return (scode!=0)?scode:-1; + +error: + return -1; +} + +static int w_t_get_status_code(sip_msg_t* msg, char *p1, char *p2) +{ + return ki_t_get_status_code(msg); +} + static int t_check_status(struct sip_msg* msg, char *p1, char *foo) { regmatch_t pmatch; @@ -3099,7 +3170,11 @@ static sr_kemi_t tm_kemi_exports[] = { { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - + { str_init("tm"), str_init("t_get_status_code"), + SR_KEMIP_INT, ki_t_get_status_code, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

[kamailio/kamailio] Terminated Websocket connection keeps logging "forcibly closing connection" (#1886)
by pwakano 15 May '19

15 May '19

### Description In my WebRTC setup, I have Kamailio receiving connections from the WebRTC clients (JSSip and SIPML5). Very frequently the logs starts showing the error messages below. These messages happen every second, so it flood the log files with this message. Besides that, since it keeps repeating for a very long time, it is also a concern that Kamailio didn't properly cleaned some internal data, and actually falls under a situation it can't do that anymore. This could consume resources and lead to some performance impact. ``` Mar 12 03:30:31 dev1-sbcaio-01 /usr/sbin/kamailio[6785]: WARNING: websocket [ws_frame.c:813]: ws_keepalive(): forcibly closing connection Mar 12 03:30:31 dev1-sbcaio-01 /usr/sbin/kamailio[6785]: ERROR: websocket [ws_conn.c:377]: wsconn_close_now(): getting TCP/TLS connection ```  ### Troubleshooting >From investigation it is not 100% sure, but it looks like the problem happens when the websocket connection is abruptly terminated (not from the browser). The kamcmd ws.dump command shows no active connections. #### Reproduction Register to Kamailio via websocket connection with JSSIP (https://tryit.jssip.net/) or SIPML5 (https://www.doubango.org/sipml5/call.htm) clients. After registered and with connection opened, put the computer to sleep. Some time after that the "ws_keepalive(): forcibly closing connection" will start happening in the logs. Unfortunately, sometimes this procedure does not cause the problem (I guess the browser properly terminates the websocket connection), but was the closest I got to reproducing the error.  #### Log Messages  Logs for debug=3 ``` Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:452]: wsconn_get(): wsconn_get for id [8] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:459]: wsconn_get(): wsconn_get returns wsc [0x7fe375617b30] refcnt [10627] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: WARNING: websocket [ws_frame.c:813]: ws_keepalive(): forcibly closing connection Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:333]: wsconn_rm(): wsconn_rm for [0x7fe375617b30] refcnt [10627] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:417]: wsconn_put_mode(): wsconn_put start for [0x7fe375617b30] refcnt [10627] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:431]: wsconn_put_mode(): wsconn_put end for [0x7fe375617b30] refcnt [10626] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: ERROR: websocket [ws_conn.c:377]: wsconn_close_now(): getting TCP/TLS connection Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:452]: wsconn_get(): wsconn_get for id [8] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:459]: wsconn_get(): wsconn_get returns wsc [0x7fe375617b30] refcnt [10627] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:452]: wsconn_get(): wsconn_get for id [5] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:459]: wsconn_get(): wsconn_get returns wsc [0x7fe3755bf3f8] refcnt [23851] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:452]: wsconn_get(): wsconn_get for id [5] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:459]: wsconn_get(): wsconn_get returns wsc [0x7fe3755bf3f8] refcnt [23852] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:452]: wsconn_get(): wsconn_get for id [7] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:459]: wsconn_get(): wsconn_get returns wsc [0x7fe3755f59d8] refcnt [20786] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:452]: wsconn_get(): wsconn_get for id [7] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:459]: wsconn_get(): wsconn_get returns wsc [0x7fe3755f59d8] refcnt [20787] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:452]: wsconn_get(): wsconn_get for id [12] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:459]: wsconn_get(): wsconn_get returns wsc [0x7fe375647ea8] refcnt [19629] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:452]: wsconn_get(): wsconn_get for id [12] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:459]: wsconn_get(): wsconn_get returns wsc [0x7fe375647ea8] refcnt [19630] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:452]: wsconn_get(): wsconn_get for id [6] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:459]: wsconn_get(): wsconn_get returns wsc [0x7fe3755e58b0] refcnt [20803] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:452]: wsconn_get(): wsconn_get for id [6] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:459]: wsconn_get(): wsconn_get returns wsc [0x7fe3755e58b0] refcnt [20804] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:452]: wsconn_get(): wsconn_get for id [1] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:459]: wsconn_get(): wsconn_get returns wsc [0x7fe375555858] refcnt [24906] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:452]: wsconn_get(): wsconn_get for id [1] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:459]: wsconn_get(): wsconn_get returns wsc [0x7fe375555858] refcnt [24907] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:452]: wsconn_get(): wsconn_get for id [10] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:459]: wsconn_get(): wsconn_get returns wsc [0x7fe375637d80] refcnt [19978] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:452]: wsconn_get(): wsconn_get for id [10] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:459]: wsconn_get(): wsconn_get returns wsc [0x7fe375637d80] refcnt [19979] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:452]: wsconn_get(): wsconn_get for id [9] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:459]: wsconn_get(): wsconn_get returns wsc [0x7fe375627c58] refcnt [20051] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:452]: wsconn_get(): wsconn_get for id [9] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:459]: wsconn_get(): wsconn_get returns wsc [0x7fe375627c58] refcnt [20052] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:452]: wsconn_get(): wsconn_get for id [3] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:459]: wsconn_get(): wsconn_get returns wsc [0x7fe375580708] refcnt [24018] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:452]: wsconn_get(): wsconn_get for id [3] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:459]: wsconn_get(): wsconn_get returns wsc [0x7fe375580708] refcnt [24019] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:452]: wsconn_get(): wsconn_get for id [13] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:459]: wsconn_get(): wsconn_get returns wsc [0x7fe37565d590] refcnt [17224] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:452]: wsconn_get(): wsconn_get for id [13] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:459]: wsconn_get(): wsconn_get returns wsc [0x7fe37565d590] refcnt [17225] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:452]: wsconn_get(): wsconn_get for id [4] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:459]: wsconn_get(): wsconn_get returns wsc [0x7fe3755a2860] refcnt [23904] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:452]: wsconn_get(): wsconn_get for id [4] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:459]: wsconn_get(): wsconn_get returns wsc [0x7fe3755a2860] refcnt [23905] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:653]: wsconn_put_list_ids(): wsconn put list id [0x7fe39338b538] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:476]: wsconn_put_id(): wsconn put id [8] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:482]: wsconn_put_id(): wsc [0x7fe375617b30] refcnt [10627] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:417]: wsconn_put_mode(): wsconn_put start for [0x7fe375617b30] refcnt [10627] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:431]: wsconn_put_mode(): wsconn_put end for [0x7fe375617b30] refcnt [10626] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:476]: wsconn_put_id(): wsconn put id [5] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:482]: wsconn_put_id(): wsc [0x7fe3755bf3f8] refcnt [23852] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:417]: wsconn_put_mode(): wsconn_put start for [0x7fe3755bf3f8] refcnt [23852] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:431]: wsconn_put_mode(): wsconn_put end for [0x7fe3755bf3f8] refcnt [23851] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:476]: wsconn_put_id(): wsconn put id [7] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:482]: wsconn_put_id(): wsc [0x7fe3755f59d8] refcnt [20787] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:417]: wsconn_put_mode(): wsconn_put start for [0x7fe3755f59d8] refcnt [20787] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:431]: wsconn_put_mode(): wsconn_put end for [0x7fe3755f59d8] refcnt [20786] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:476]: wsconn_put_id(): wsconn put id [12] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:482]: wsconn_put_id(): wsc [0x7fe375647ea8] refcnt [19630] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:417]: wsconn_put_mode(): wsconn_put start for [0x7fe375647ea8] refcnt [19630] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:431]: wsconn_put_mode(): wsconn_put end for [0x7fe375647ea8] refcnt [19629] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:476]: wsconn_put_id(): wsconn put id [6] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:482]: wsconn_put_id(): wsc [0x7fe3755e58b0] refcnt [20804] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:417]: wsconn_put_mode(): wsconn_put start for [0x7fe3755e58b0] refcnt [20804] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:431]: wsconn_put_mode(): wsconn_put end for [0x7fe3755e58b0] refcnt [20803] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:476]: wsconn_put_id(): wsconn put id [1] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:482]: wsconn_put_id(): wsc [0x7fe375555858] refcnt [24907] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:417]: wsconn_put_mode(): wsconn_put start for [0x7fe375555858] refcnt [24907] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:431]: wsconn_put_mode(): wsconn_put end for [0x7fe375555858] refcnt [24906] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:476]: wsconn_put_id(): wsconn put id [10] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:482]: wsconn_put_id(): wsc [0x7fe375637d80] refcnt [19979] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:417]: wsconn_put_mode(): wsconn_put start for [0x7fe375637d80] refcnt [19979] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:431]: wsconn_put_mode(): wsconn_put end for [0x7fe375637d80] refcnt [19978] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:476]: wsconn_put_id(): wsconn put id [9] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:482]: wsconn_put_id(): wsc [0x7fe375627c58] refcnt [20052] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:417]: wsconn_put_mode(): wsconn_put start for [0x7fe375627c58] refcnt [20052] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:431]: wsconn_put_mode(): wsconn_put end for [0x7fe375627c58] refcnt [20051] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:476]: wsconn_put_id(): wsconn put id [3] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:482]: wsconn_put_id(): wsc [0x7fe375580708] refcnt [24019] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:417]: wsconn_put_mode(): wsconn_put start for [0x7fe375580708] refcnt [24019] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:431]: wsconn_put_mode(): wsconn_put end for [0x7fe375580708] refcnt [24018] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:476]: wsconn_put_id(): wsconn put id [13] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:482]: wsconn_put_id(): wsc [0x7fe37565d590] refcnt [17225] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:417]: wsconn_put_mode(): wsconn_put start for [0x7fe37565d590] refcnt [17225] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:431]: wsconn_put_mode(): wsconn_put end for [0x7fe37565d590] refcnt [17224] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:476]: wsconn_put_id(): wsconn put id [4] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:482]: wsconn_put_id(): wsc [0x7fe3755a2860] refcnt [23905] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:417]: wsconn_put_mode(): wsconn_put start for [0x7fe3755a2860] refcnt [23905] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6785]: DEBUG: websocket [ws_conn.c:431]: wsconn_put_mode(): wsconn_put end for [0x7fe3755a2860] refcnt [23904] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6787]: DEBUG: db_postgres [km_dbase.c:250]: db_postgres_submit_query(): sending query ok: 0x7fe3934149a8 (2) - [select received,contact,socket,cflags,path,ruid from location where expires>'2019-03-12 03:30:36' AND partition=104] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6787]: DEBUG: <core> [db_res.c:120]: db_new_result(): allocate 56 bytes for result set at 0x7fe39338b538 Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6788]: DEBUG: db_postgres [km_dbase.c:250]: db_postgres_submit_query(): sending query ok: 0x7fe3934149a8 (2) - [select received,contact,socket,cflags,path,ruid from location where expires>'2019-03-12 03:30:36' AND partition=224] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6787]: DEBUG: db_postgres [km_dbase.c:532]: db_postgres_store_result(): 0x7fe3934149a8 PQresultStatus(PGRES_TUPLES_OK) PQgetResult(0x1bff100) Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6788]: DEBUG: <core> [db_res.c:120]: db_new_result(): allocate 56 bytes for result set at 0x7fe39338b538 Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6787]: DEBUG: db_postgres [km_res.c:95]: db_postgres_get_columns(): 6 columns returned from the query Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6788]: DEBUG: db_postgres [km_dbase.c:532]: db_postgres_store_result(): 0x7fe3934149a8 PQresultStatus(PGRES_TUPLES_OK) PQgetResult(0x1bff100) Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6788]: DEBUG: db_postgres [km_res.c:95]: db_postgres_get_columns(): 6 columns returned from the query Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6787]: DEBUG: <core> [db_res.c:158]: db_allocate_columns(): allocate 48 bytes for result names at 0x7fe393425758 Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6788]: DEBUG: <core> [db_res.c:158]: db_allocate_columns(): allocate 48 bytes for result names at 0x7fe39341d1b8 Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6787]: DEBUG: <core> [db_res.c:169]: db_allocate_columns(): allocate 24 bytes for result types at 0x7fe39364b6e8 Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6788]: DEBUG: <core> [db_res.c:169]: db_allocate_columns(): allocate 24 bytes for result types at 0x7fe39364b6e8 Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6788]: DEBUG: db_postgres [km_res.c:113]: db_postgres_get_columns(): allocate 16 bytes for RES_NAMES[0] at 0x7fe39338c678 Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6787]: DEBUG: db_postgres [km_res.c:113]: db_postgres_get_columns(): allocate 16 bytes for RES_NAMES[0] at 0x7fe3934bc480 Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6788]: DEBUG: db_postgres [km_res.c:120]: db_postgres_get_columns(): RES_NAMES(0x7fe39338c678)[0]=[received] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6787]: DEBUG: db_postgres [km_res.c:120]: db_postgres_get_columns(): RES_NAMES(0x7fe3934bc480)[0]=[received] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6788]: DEBUG: db_postgres [km_res.c:154]: db_postgres_get_columns(): use DB1_STRING result type Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6788]: DEBUG: db_postgres [km_res.c:113]: db_postgres_get_columns(): allocate 16 bytes for RES_NAMES[1] at 0x7fe393374450 Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6787]: DEBUG: db_postgres [km_res.c:154]: db_postgres_get_columns(): use DB1_STRING result type Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6788]: DEBUG: db_postgres [km_res.c:120]: db_postgres_get_columns(): RES_NAMES(0x7fe393374450)[1]=[contact] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6788]: DEBUG: db_postgres [km_res.c:154]: db_postgres_get_columns(): use DB1_STRING result type Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6787]: DEBUG: db_postgres [km_res.c:113]: db_postgres_get_columns(): allocate 16 bytes for RES_NAMES[1] at 0x7fe3934dcfc8 Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6788]: DEBUG: db_postgres [km_res.c:113]: db_postgres_get_columns(): allocate 16 bytes for RES_NAMES[2] at 0x7fe3934257f8 Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6788]: DEBUG: db_postgres [km_res.c:120]: db_postgres_get_columns(): RES_NAMES(0x7fe3934257f8)[2]=[socket] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6787]: DEBUG: db_postgres [km_res.c:120]: db_postgres_get_columns(): RES_NAMES(0x7fe3934dcfc8)[1]=[contact] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6788]: DEBUG: db_postgres [km_res.c:154]: db_postgres_get_columns(): use DB1_STRING result type Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6787]: DEBUG: db_postgres [km_res.c:154]: db_postgres_get_columns(): use DB1_STRING result type Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6788]: DEBUG: db_postgres [km_res.c:113]: db_postgres_get_columns(): allocate 16 bytes for RES_NAMES[3] at 0x7fe39325a550 Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6788]: DEBUG: db_postgres [km_res.c:120]: db_postgres_get_columns(): RES_NAMES(0x7fe39325a550)[3]=[cflags] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6787]: DEBUG: db_postgres [km_res.c:113]: db_postgres_get_columns(): allocate 16 bytes for RES_NAMES[2] at 0x7fe39338c678 Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6788]: DEBUG: db_postgres [km_res.c:126]: db_postgres_get_columns(): use DB1_INT result type Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6788]: DEBUG: db_postgres [km_res.c:113]: db_postgres_get_columns(): allocate 16 bytes for RES_NAMES[4] at 0x7fe3934be938 Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6787]: DEBUG: db_postgres [km_res.c:120]: db_postgres_get_columns(): RES_NAMES(0x7fe39338c678)[2]=[socket] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6788]: DEBUG: db_postgres [km_res.c:120]: db_postgres_get_columns(): RES_NAMES(0x7fe3934be938)[4]=[path] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6787]: DEBUG: db_postgres [km_res.c:154]: db_postgres_get_columns(): use DB1_STRING result type Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6788]: DEBUG: db_postgres [km_res.c:154]: db_postgres_get_columns(): use DB1_STRING result type Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6788]: DEBUG: db_postgres [km_res.c:113]: db_postgres_get_columns(): allocate 16 bytes for RES_NAMES[5] at 0x7fe3934bc480 Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6787]: DEBUG: db_postgres [km_res.c:113]: db_postgres_get_columns(): allocate 16 bytes for RES_NAMES[3] at 0x7fe393374450 Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6788]: DEBUG: db_postgres [km_res.c:120]: db_postgres_get_columns(): RES_NAMES(0x7fe3934bc480)[5]=[ruid] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6788]: DEBUG: db_postgres [km_res.c:154]: db_postgres_get_columns(): use DB1_STRING result type Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6787]: DEBUG: db_postgres [km_res.c:120]: db_postgres_get_columns(): RES_NAMES(0x7fe393374450)[3]=[cflags] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6788]: DEBUG: db_postgres [km_res.c:200]: db_postgres_convert_rows(): no rows returned from the query Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6787]: DEBUG: db_postgres [km_res.c:126]: db_postgres_get_columns(): use DB1_INT result type Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6788]: DEBUG: <core> [db_res.c:79]: db_free_columns(): freeing 6 columns Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6787]: DEBUG: db_postgres [km_res.c:113]: db_postgres_get_columns(): allocate 16 bytes for RES_NAMES[4] at 0x7fe3934257f8 Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6788]: DEBUG: <core> [db_res.c:83]: db_free_columns(): freeing RES_NAMES[0] at 0x7fe39338c678 Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6788]: DEBUG: <core> [db_res.c:83]: db_free_columns(): freeing RES_NAMES[1] at 0x7fe393374450 Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6787]: DEBUG: db_postgres [km_res.c:120]: db_postgres_get_columns(): RES_NAMES(0x7fe3934257f8)[4]=[path] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6788]: DEBUG: <core> [db_res.c:83]: db_free_columns(): freeing RES_NAMES[2] at 0x7fe3934257f8 Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6787]: DEBUG: db_postgres [km_res.c:154]: db_postgres_get_columns(): use DB1_STRING result type Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6788]: DEBUG: <core> [db_res.c:83]: db_free_columns(): freeing RES_NAMES[3] at 0x7fe39325a550 Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6788]: DEBUG: <core> [db_res.c:83]: db_free_columns(): freeing RES_NAMES[4] at 0x7fe3934be938 Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6787]: DEBUG: db_postgres [km_res.c:113]: db_postgres_get_columns(): allocate 16 bytes for RES_NAMES[5] at 0x7fe39325a550 Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6788]: DEBUG: <core> [db_res.c:83]: db_free_columns(): freeing RES_NAMES[5] at 0x7fe3934bc480 Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6787]: DEBUG: db_postgres [km_res.c:120]: db_postgres_get_columns(): RES_NAMES(0x7fe39325a550)[5]=[ruid] Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6788]: DEBUG: <core> [db_res.c:96]: db_free_columns(): freeing result names at 0x7fe39341d1b8 Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6788]: DEBUG: <core> [db_res.c:101]: db_free_columns(): freeing result types at 0x7fe39364b6e8 Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6788]: DEBUG: <core> [db_res.c:138]: db_free_result(): freeing result set at 0x7fe39338b538 Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6788]: DEBUG: db_postgres [km_dbase.c:412]: db_postgres_free_query(): PQclear(0x1bff100) result set Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6787]: DEBUG: db_postgres [km_res.c:154]: db_postgres_get_columns(): use DB1_STRING result type Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6787]: DEBUG: db_postgres [km_res.c:200]: db_postgres_convert_rows(): no rows returned from the query Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6787]: DEBUG: <core> [db_res.c:79]: db_free_columns(): freeing 6 columns Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6787]: DEBUG: <core> [db_res.c:83]: db_free_columns(): freeing RES_NAMES[0] at 0x7fe3934bc480 Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6787]: DEBUG: <core> [db_res.c:83]: db_free_columns(): freeing RES_NAMES[1] at 0x7fe3934dcfc8 Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6787]: DEBUG: <core> [db_res.c:83]: db_free_columns(): freeing RES_NAMES[2] at 0x7fe39338c678 Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6787]: DEBUG: <core> [db_res.c:83]: db_free_columns(): freeing RES_NAMES[3] at 0x7fe393374450 Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6787]: DEBUG: <core> [db_res.c:83]: db_free_columns(): freeing RES_NAMES[4] at 0x7fe3934257f8 Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6787]: DEBUG: <core> [db_res.c:83]: db_free_columns(): freeing RES_NAMES[5] at 0x7fe39325a550 Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6787]: DEBUG: <core> [db_res.c:96]: db_free_columns(): freeing result names at 0x7fe393425758 Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6787]: DEBUG: <core> [db_res.c:101]: db_free_columns(): freeing result types at 0x7fe39364b6e8 Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6787]: DEBUG: <core> [db_res.c:138]: db_free_result(): freeing result set at 0x7fe39338b538 Mar 12 03:30:36 kamailio-sbc /usr/sbin/kamailio[6787]: DEBUG: db_postgres [km_dbase.c:412]: db_postgres_free_query(): PQclear(0x1bff100) result set ``` ### Possible Solutions Message goes away after some time (could not confirm how much time, but it is hours)  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` # yum info kamailio Loaded plugins: fastestmirror Loading mirror speeds from cached hostfile * base: centos.melbourneitmirror.net * epel: fedora.mirror.serversaustralia.com.au * extras: centos.melbourneitmirror.net * remi: remi.conetix.com.au * remi-safe: remi.conetix.com.au * updates: centos.melbourneitmirror.net Installed Packages Name : kamailio Arch : x86_64 Version : 5.2.1 Release : 3.el7.centos Size : 25 M Repo : installed >From repo : home_kamailio_v5.2.x-rpms Summary : Kamailio (former OpenSER) - the Open Source SIP Server URL : http://kamailio.org/ License : GPL-2.0 Description : Kamailio (former OpenSER) is an Open Source SIP Server released under GPL, able : to handle thousands of call setups per second. Among features: asynchronous TCP, : UDP and SCTP, secure communication via TLS for VoIP (voice, video); IPv4 and : IPv6; SIMPLE instant messaging and presence with embedded XCAP server and MSRP : relay; ENUM; DID and least cost routing; load balancing; routing fail-over; : accounting, authentication and authorization; support for many backend systems : such as MySQL, Postgres, Oracle, Radius, LDAP, Redis, Cassandra; XMLRPC control : interface, SNMP monitoring. It can be used to build large VoIP servicing : platforms or to scale up SIP-to-PSTN gateways, PBX systems or media servers : like Asterisk™, FreeSWITCH™ or SEMS. # kamailio -v version: kamailio 5.2.1 (x86_64/linux) 947769 flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 947769 compiled on 20:48:14 Feb 26 2019 with gcc 4.8.5 ``` * **Operating System**:  ``` # cat /etc/redhat-release CentOS Linux release 7.6.1810 (Core) # uname -a Linux kamailio-sbc 3.10.0-957.5.1.el7.x86_64 #1 SMP Fri Feb 1 14:54:57 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/1886

4 6

review of siptrace adjustments
by Daniel-Constantin Mierla 15 May '19

15 May '19

Hello Ionut, writing also via email and sr-dev, just in case you are not receiving the github notification, as I mentioned you on the issue: * https://github.com/kamailio/kamailio/issues/1955 As I went through the code, It seemed that trace type (per message, transaction or dialog) was not used for KEMI function. I pushed a patch, it would be good that you take a look and eventually test and see if works as expected. Furthermore, I noticed linking local variables to a shared memory structure. I made some notes on the github. Let's discuss further via the github portal, the message here being sent to make you aware. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

[kamailio/kamailio] TOPOS module does not strip Via headers from ACK and BYE. (#1926)
by Kirill Usov 15 May '19

15 May '19

### Description I am using TOPOS module to hide internal topology. The module strips Via header from INVITE sip message correctly but do not strip from ACK and BYE. See Sip Traffic section for details. #### SIP Traffic ``` INVITE sip:79200204544@95.79.44.126:5060 SIP/2.0 Via: SIP/2.0/UDP 35.204.224.219:5060;branch=z9hG4bK6ede.37d0b08c7b0331a435a0943a939a4025.0 Max-Forwards: 70 From: "" <sip:testin2@35.228.92.211>;tag=S2363F7Qt7eNr To: <sip:79200204544@10.164.0.10:5060> Call-ID: cce13277-d70b-1237-a6b5-42010aa60002 CSeq: 2943281 INVITE User-Agent: FreeSWITCH-mod_sofia/1.8.5+git-20190227T164909Z~cb1f3ab6f2~64bit Allow: INVITE, ACK, BYE, CANCEL, OPTIONS, MESSAGE, INFO, UPDATE, REGISTER, REFER, NOTIFY Supported: timer, path, replaces Allow-Events: talk, hold, conference, refer Content-Type: application/sdp Content-Disposition: session Content-Length: 352 X-FS-Support: update_display,send_info Remote-Party-ID: <sip:"testin2"@35.228.92.211>;party=calling;screen=yes;privacy=off Contact: <sip:btpsh-5caf4729-2afa-2@35.204.224.219> v=0 o=FreeSWITCH 1554967661 1554967662 IN IP4 35.228.92.211 s=FreeSWITCH c=IN IP4 35.228.92.211 t=0 0 m=audio 26486 RTP/AVP 18 0 8 102 103 4 101 a=rtpmap:18 G729/8000 a=rtpmap:0 PCMU/8000 a=rtpmap:8 PCMA/8000 a=rtpmap:102 SPEEX/8000 a=rtpmap:103 L16/8000 a=rtpmap:4 G723/8000 a=rtpmap:101 telephone-event/8000 a=fmtp:101 0-16 a=ptime:20 SIP/2.0 100 Trying Via: SIP/2.0/UDP 35.204.224.219:5060;branch=z9hG4bK6ede.37d0b08c7b0331a435a0943a939a4025.0 From: "" <sip:testin2@35.228.92.211>;tag=S2363F7Qt7eNr To: <sip:79200204544@10.164.0.10:5060> Call-ID: cce13277-d70b-1237-a6b5-42010aa60002 CSeq: 2943281 INVITE Allow: INVITE,ACK,CANCEL,BYE,UPDATE,REGISTER,PRACK,INFO,NOTIFY,REFER,SUBSCRIBE Cisco-Guid: 52032-2942042128-2148574276-299034469 User-Agent: TELES CELLX Plus 20.5.36.1 58216060749209 Content-Length: 0 SIP/2.0 183 Session in Progress Via: SIP/2.0/UDP 35.204.224.219:5060;branch=z9hG4bK6ede.37d0b08c7b0331a435a0943a939a4025.0 From: "" <sip:testin2@35.228.92.211>;tag=S2363F7Qt7eNr To: <sip:79200204544@10.164.0.10:5060>;tag=242182414738912437015910463786 Call-ID: cce13277-d70b-1237-a6b5-42010aa60002 CSeq: 2943281 INVITE Allow: INVITE,ACK,CANCEL,BYE,UPDATE,REGISTER,PRACK,INFO,NOTIFY,REFER,SUBSCRIBE Cisco-Guid: 52032-2942042128-2148574276-299034469 Contact: <sip:79200204544@95.79.44.126> User-Agent: TELES CELLX Plus 20.5.36.1 58216060749209 Content-Type: application/sdp Content-Length: 175 v=0 o=- 16 1 IN IP4 95.79.44.126 s=- c=IN IP4 95.79.44.126 t=0 0 m=audio 29000 RTP/AVP 4 a=sendrecv a=ptime:1200 a=rtpmap:4 G723/8000 a=fmtp:4 bitrate=6.3;annexa=no SIP/2.0 180 Ringing Via: SIP/2.0/UDP 35.204.224.219:5060;branch=z9hG4bK6ede.37d0b08c7b0331a435a0943a939a4025.0 From: "" <sip:testin2@35.228.92.211>;tag=S2363F7Qt7eNr To: <sip:79200204544@10.164.0.10:5060>;tag=242182414738912437015910463786 Call-ID: cce13277-d70b-1237-a6b5-42010aa60002 CSeq: 2943281 INVITE Allow: INVITE,ACK,CANCEL,BYE,UPDATE,REGISTER,PRACK,INFO,NOTIFY,REFER,SUBSCRIBE Cisco-Guid: 52032-2942042128-2148574276-299034469 Contact: <sip:79200204544@95.79.44.126> User-Agent: TELES CELLX Plus 20.5.36.1 58216060749209 Content-Type: application/sdp Content-Length: 175 v=0 o=- 16 2 IN IP4 95.79.44.126 s=- c=IN IP4 95.79.44.126 t=0 0 m=audio 29000 RTP/AVP 4 a=sendrecv a=ptime:1200 a=rtpmap:4 G723/8000 a=fmtp:4 bitrate=6.3;annexa=no SIP/2.0 200 OK Via: SIP/2.0/UDP 35.204.224.219:5060;branch=z9hG4bK6ede.37d0b08c7b0331a435a0943a939a4025.0 From: "" <sip:testin2@35.228.92.211>;tag=S2363F7Qt7eNr To: <sip:79200204544@10.164.0.10:5060>;tag=242182414738912437015910463786 Call-ID: cce13277-d70b-1237-a6b5-42010aa60002 CSeq: 2943281 INVITE Allow: INVITE,ACK,CANCEL,BYE,UPDATE,REGISTER,PRACK,INFO,NOTIFY,REFER,SUBSCRIBE Cisco-Guid: 52032-2942042128-2148574276-299034469 Contact: <sip:79200204544@95.79.44.126> User-Agent: TELES CELLX Plus 20.5.36.1 58216060749209 Content-Type: application/sdp Content-Length: 175 v=0 o=- 16 3 IN IP4 95.79.44.126 s=- c=IN IP4 95.79.44.126 t=0 0 m=audio 29000 RTP/AVP 4 a=sendrecv a=ptime:1200 a=rtpmap:4 G723/8000 a=fmtp:4 bitrate=6.3;annexa=no ACK sip:79200204544@95.79.44.126:5060;transport=udp SIP/2.0 Record-Route: <sip:35.204.224.219;lr;ftag=S2363F7Qt7eNr> Via: SIP/2.0/UDP 35.204.224.219:5060;branch=z9hG4bK6ede.1e6c3211c8351ad95b4e6ab73b1edb93.0 Via: SIP/2.0/UDP 35.228.92.211;received=10.166.0.2;rport=5060;branch=z9hG4bK5025HQ19BgBve Max-Forwards: 70 From: "" <sip:testin2@35.228.92.211>;tag=S2363F7Qt7eNr To: <sip:79200204544@10.164.0.10:5060>;tag=242182414738912437015910463786 Call-ID: cce13277-d70b-1237-a6b5-42010aa60002 Contact: <sip:gw+kamailio@35.204.224.219:5060;gw=kamailio;transport=udp> CSeq: 2943281 ACK Content-Length: 0 BYE sip:79200204544@95.79.44.126:5060;transport=udp SIP/2.0 Record-Route: <sip:35.204.224.219;lr;ftag=S2363F7Qt7eNr> Via: SIP/2.0/UDP 35.204.224.219:5060;branch=z9hG4bK3ede.a79e492bc10c8b5d668d6925dd745145.0 Via: SIP/2.0/UDP 35.228.92.211;received=10.166.0.2;rport=5060;branch=z9hG4bK69UyKjjD9r1ea Max-Forwards: 70 From: "" <sip:testin2@35.228.92.211>;tag=S2363F7Qt7eNr To: <sip:79200204544@10.164.0.10:5060>;tag=242182414738912437015910463786 Call-ID: cce13277-d70b-1237-a6b5-42010aa60002 CSeq: 2943282 BYE User-Agent: FreeSWITCH-mod_sofia/1.8.5+git-20190227T164909Z~cb1f3ab6f2~64bit Allow: INVITE, ACK, BYE, CANCEL, OPTIONS, MESSAGE, INFO, UPDATE, REGISTER, REFER, NOTIFY Supported: timer, path, replaces Reason: Q.850;cause=16;text="NORMAL_CLEARING" Content-Length: 0 SIP/2.0 200 OK Via: SIP/2.0/UDP 35.204.224.219:5060;branch=z9hG4bK3ede.a79e492bc10c8b5d668d6925dd745145.0 Via: SIP/2.0/UDP 35.228.92.211;received=10.166.0.2;rport=5060;branch=z9hG4bK69UyKjjD9r1ea Record-Route: <sip:35.204.224.219;lr;ftag=S2363F7Qt7eNr> From: "" <sip:testin2@35.228.92.211>;tag=S2363F7Qt7eNr To: <sip:79200204544@10.164.0.10:5060>;tag=242182414738912437015910463786 Call-ID: cce13277-d70b-1237-a6b5-42010aa60002 CSeq: 2943282 BYE Allow: INVITE,ACK,CANCEL,BYE,UPDATE,REGISTER,PRACK,INFO,NOTIFY,REFER,SUBSCRIBE Cisco-Guid: 52032-2942042128-2148574276-299034469 Contact: <sip:79200204544@95.79.44.126> User-Agent: TELES CELLX Plus 20.5.36.1 58216060749209 Content-Length: 0 ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.8 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 6.3.0 ``` * **Operating System**: ``` Linux vp-balancer-dev-01 4.9.0-8-amd64 #1 SMP Debian 4.9.144-3 (2019-02-02) 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/1926

3 4

[kamailio/kamailio] git master siptrace (#1942)
by Henning Westerholt 15 May '19

15 May '19

Tracking ticket for the discussion on sr-dev list "current git master branch issue with the siptrace module". It seems that the changes from #1912 introduced a regression. The sip_trace() should work without duplicate uri because it can write directly to the database. It should be fixed to work without those parameters for module or function. Error message from logs: /usr/bin/sip-proxy[1659]: ERROR: siptrace [siptrace.c:908]: w_sip_trace3(): no duplicate_uri modparam nor duplicate uri sip_trace() argument provided! -- 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/1942

3 3

git:master:e8d76561: siptrace: use trace type for ki_sip_trace_dst_cid_flag()
by Daniel-Constantin Mierla 15 May '19

15 May '19

Module: kamailio Branch: master Commit: e8d765610c6926cc6cb4dfa490595214a3680f97 URL: https://github.com/kamailio/kamailio/commit/e8d765610c6926cc6cb4dfa49059521… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-15T13:03:28+02:00 siptrace: use trace type for ki_sip_trace_dst_cid_flag() --- Modified: src/modules/siptrace/siptrace.c Modified: src/modules/siptrace/siptrace_data.h --- Diff: https://github.com/kamailio/kamailio/commit/e8d765610c6926cc6cb4dfa49059521… Patch: https://github.com/kamailio/kamailio/commit/e8d765610c6926cc6cb4dfa49059521…

1 0

git:5.2:f4062669: siptrace: fix memory leak on sip trace function with dst uri
by Daniel-Constantin Mierla 15 May '19

15 May '19

Module: kamailio Branch: 5.2 Commit: f406266966b68fff9493c62ac5c9ccc5b8237e6b URL: https://github.com/kamailio/kamailio/commit/f406266966b68fff9493c62ac5c9ccc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-15T12:47:51+02:00 siptrace: fix memory leak on sip trace function with dst uri --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/f406266966b68fff9493c62ac5c9ccc… Patch: https://github.com/kamailio/kamailio/commit/f406266966b68fff9493c62ac5c9ccc… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 521ff113ab..08ddc07ef5 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -709,6 +709,7 @@ static int ki_sip_trace_dst_cid(sip_msg_t *msg, str *duri, str *cid) dest_info_t *dst = NULL; sip_uri_t uri; proxy_l_t *p = NULL; + int ret = 1; // If the dest is empty, use the module parameter, if set if(duri == NULL || duri->len <= 0) { @@ -750,7 +751,11 @@ static int ki_sip_trace_dst_cid(sip_msg_t *msg, str *duri, str *cid) pkg_free(p); } - return sip_trace(msg, dst, ((cid!=NULL && cid->len>0)?cid:NULL), NULL); + ret = sip_trace(msg, dst, ((cid!=NULL && cid->len>0)?cid:NULL), NULL); + + pkg_free(dst); + + return ret; } /**

1 0

git:5.1:5268c0b6: dialplan: don't try to translate on dp_match()
by Victor Seva 15 May '19

15 May '19

Module: kamailio Branch: 5.1 Commit: 5268c0b6b1ece7f6dffb0f77c15a86b379d309f1 URL: https://github.com/kamailio/kamailio/commit/5268c0b6b1ece7f6dffb0f77c15a86b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-05-15T11:39:13+02:00 dialplan: don't try to translate on dp_match() fix #1952 (cherry picked from commit cced23795582d9f4cc2bae545ea1c24664303036) --- Modified: src/modules/dialplan/dialplan.c Modified: src/modules/dialplan/dp_repl.c --- Diff: https://github.com/kamailio/kamailio/commit/5268c0b6b1ece7f6dffb0f77c15a86b… Patch: https://github.com/kamailio/kamailio/commit/5268c0b6b1ece7f6dffb0f77c15a86b… --- diff --git a/src/modules/dialplan/dialplan.c b/src/modules/dialplan/dialplan.c index 61aeae47f1..96bb183bd3 100644 --- a/src/modules/dialplan/dialplan.c +++ b/src/modules/dialplan/dialplan.c @@ -478,8 +478,9 @@ static int dp_replace_helper(sip_msg_t *msg, int dpid, str *input, pv_spec_t *pvd) { dpl_id_p idp; - str output = STR_NULL; + str tmp = STR_NULL; str attrs = STR_NULL; + str *output = NULL; str *outattrs = NULL; if ((idp = select_dpid(dpid)) ==0) { @@ -488,16 +489,19 @@ static int dp_replace_helper(sip_msg_t *msg, int dpid, str *input, } outattrs = (!attr_pvar)?NULL:&attrs; - if (dp_translate_helper(msg, input, &output, idp, outattrs)!=0) { + output = (!pvd)?NULL:&tmp; + if (dp_translate_helper(msg, input, output, idp, outattrs)!=0) { LM_DBG("could not translate %.*s " "with dpid %i\n", input->len, input->s, idp->dp_id); return -1; } - LM_DBG("input %.*s with dpid %i => output %.*s\n", - input->len, input->s, idp->dp_id, output.len, output.s); + if (output) { + LM_DBG("input %.*s with dpid %i => output %.*s\n", + input->len, input->s, idp->dp_id, output->len, output->s); + } /* set the output */ - if (dp_update(msg, pvd, &output, outattrs) !=0){ + if (dp_update(msg, pvd, output, outattrs) !=0){ LM_ERR("cannot set the output\n"); return -1; } diff --git a/src/modules/dialplan/dp_repl.c b/src/modules/dialplan/dp_repl.c index 06762ce6d2..093e48fd37 100644 --- a/src/modules/dialplan/dp_repl.c +++ b/src/modules/dialplan/dp_repl.c @@ -699,6 +699,9 @@ int dp_translate_helper(sip_msg_t *msg, str *input, str *output, dpl_id_p idp, attrs->len, attrs->s); } } + if(!output) { + return 0; + } if(rulep->tflags&DP_TFLAGS_PV_SUBST) { re_list = dpl_dynamic_pcre_list(msg, &rulep->match_exp); if(re_list==NULL) {

1 0

git:5.2:b536723c: dialplan: don't try to translate on dp_match()
by Victor Seva 15 May '19

15 May '19

Module: kamailio Branch: 5.2 Commit: b536723c66441203c2eaaa1ed1a68c981a0254be URL: https://github.com/kamailio/kamailio/commit/b536723c66441203c2eaaa1ed1a68c9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-05-15T11:38:24+02:00 dialplan: don't try to translate on dp_match() fix #1952 (cherry picked from commit cced23795582d9f4cc2bae545ea1c24664303036) --- Modified: src/modules/dialplan/dialplan.c Modified: src/modules/dialplan/dp_repl.c --- Diff: https://github.com/kamailio/kamailio/commit/b536723c66441203c2eaaa1ed1a68c9… Patch: https://github.com/kamailio/kamailio/commit/b536723c66441203c2eaaa1ed1a68c9… --- diff --git a/src/modules/dialplan/dialplan.c b/src/modules/dialplan/dialplan.c index d8685d52f2..9d68d5d64b 100644 --- a/src/modules/dialplan/dialplan.c +++ b/src/modules/dialplan/dialplan.c @@ -476,8 +476,9 @@ static int dp_replace_helper(sip_msg_t *msg, int dpid, str *input, pv_spec_t *pvd) { dpl_id_p idp; - str output = STR_NULL; + str tmp = STR_NULL; str attrs = STR_NULL; + str *output = NULL; str *outattrs = NULL; if ((idp = select_dpid(dpid)) ==0) { @@ -486,16 +487,19 @@ static int dp_replace_helper(sip_msg_t *msg, int dpid, str *input, } outattrs = (!attr_pvar)?NULL:&attrs; - if (dp_translate_helper(msg, input, &output, idp, outattrs)!=0) { + output = (!pvd)?NULL:&tmp; + if (dp_translate_helper(msg, input, output, idp, outattrs)!=0) { LM_DBG("could not translate %.*s " "with dpid %i\n", input->len, input->s, idp->dp_id); return -1; } - LM_DBG("input %.*s with dpid %i => output %.*s\n", - input->len, input->s, idp->dp_id, output.len, output.s); + if (output) { + LM_DBG("input %.*s with dpid %i => output %.*s\n", + input->len, input->s, idp->dp_id, output->len, output->s); + } /* set the output */ - if (dp_update(msg, pvd, &output, outattrs) !=0){ + if (dp_update(msg, pvd, output, outattrs) !=0){ LM_ERR("cannot set the output\n"); return -1; } diff --git a/src/modules/dialplan/dp_repl.c b/src/modules/dialplan/dp_repl.c index 06762ce6d2..093e48fd37 100644 --- a/src/modules/dialplan/dp_repl.c +++ b/src/modules/dialplan/dp_repl.c @@ -699,6 +699,9 @@ int dp_translate_helper(sip_msg_t *msg, str *input, str *output, dpl_id_p idp, attrs->len, attrs->s); } } + if(!output) { + return 0; + } if(rulep->tflags&DP_TFLAGS_PV_SUBST) { re_list = dpl_dynamic_pcre_list(msg, &rulep->match_exp); if(re_list==NULL) {

1 0

[kamailio/kamailio] dialplan: dp_match() does substitution and replace (#1952)
by Victor Seva 15 May '19

15 May '19

### Description dialplan ``dp_match()`` fails with a substitution error when subst_exp doesn't match the string. I was expecting to only match the rule to get the attrs no matter what is defined in ``subst_exp/repl_exp`` ### Troubleshooting #### Reproduction ``` => select * from dialplan where id = 24; ─[ RECORD 1 ]────────────────────────────────────── id │ 24 dpid │ 101000 pr │ 1 match_op │ 1 match_exp │ ^00([1-9][0-35-9]|[1-35-9][0-9])[0-9]+$ match_len │ 0 subst_exp │ ^([1-9][0-9]{8})$ repl_exp │ +34\1 attrs │ cli=+34654205682;action=0 ``` ``` route[SET_DST] { if($var(dpid_team)==0){ xdbg("SET_DST no $$var(dpid_team) - ci='$ci'"); return; } xinfo("SET_DST trying to get dialplan from dpid:$var(dpid_team) - ci'$ci'"); if(dp_translate("$(var(dpid_team){s.int})", "$rU/$var(dst)")){ if($rU != $var(dst)){ xinfo("SET_DST change from $$rU:'$rU' to '$var(dst)' - ci='$ci'"); $rU = $var(dst); } } else { xinfo("SET_DST no valid subst_exp for '$rU' trying to match - ci='$ci'"); dp_match("$(var(dpid_team){s.int})", "$rU"); } if($var(dp_attrs)!=0) { xdbg("SET_DST $$var(dp_attrs):$var(dp_attrs) " "action:$(var(dp_attrs){param.value,action}) - ci='$ci'"); $var(action) = $(var(dp_attrs){param.value,action}); if($var(action)=='1'){ xalert("Dialing rule group for '$rU' set to 'deny' - ci='$ci'"); route(ERROR_DEST_DENY); } } return; } ``` ``` INFO: <script>: SET_DST trying to get dialplan from dpid:101000 - ci'57f955434e6ca1e57727367e4abcff1f(a)PBX-2797.xpbx.foehn.co.uk' ERROR: dialplan [dp_repl.c:439]: rule_translate(): the string 0034654205681 matched the match_exp ^00([1-9][0-35-9]|[1-35-9][0-9])[0-9]+$ but not the subst_exp ^([1-9][0-9]{8})$! ERROR: dialplan [dp_repl.c:727]: dp_translate_helper(): could not build the output INFO: <script>: SET_DST no valid subst_exp for '0034654205681' trying to match - ci='57f955434e6ca1e57727367e4abcff1f(a)PBX-2797.xpbx.foehn.co.uk' ERROR: dialplan [dp_repl.c:439]: rule_translate(): the string 0034654205681 matched the match_exp ^00([1-9][0-35-9]|[1-35-9][0-9])[0-9]+$ but not the subst_exp ^([1-9][0-9]{8})$! ERROR: dialplan [dp_repl.c:727]: dp_translate_helper(): could not build the output ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.2 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 4.8.4 ``` -- 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/1952

2 2

[kamailio/kamailio] dialplan: don't try to translate on dp_match() (#1953)
by Victor Seva 15 May '19

15 May '19

``` INFO: <script>: SET_DST trying to get dialplan from dpid:101000 - ci'1cf77cbb5baebdbd0e8635e1116aa713(a)PBX-2797.xpbx.foehn.co.uk' DEBUG: dialplan [dialplan.c:232]: dp_get_ivalue(): searching 15 DEBUG: dialplan [dialplan.c:240]: dp_get_ivalue(): dpid is 101000 from pv argument DEBUG: dialplan [dialplan.c:249]: dp_get_svalue(): searching 7 DEBUG: dialplan [dialplan.c:345]: dp_translate_f(): input is 0034654205681 DEBUG: dialplan [dp_repl.c:606]: dp_translate_helper(): regex operator testing over [0034654205681] DEBUG: dialplan [dp_repl.c:681]: dp_translate_helper(): found a matching rule 0x7f065c2818d0: pr 1, match_exp ^00([1-9][0-35-9]|[1-35-9][0-9])[0-9]+$ DEBUG: dialplan [dp_repl.c:688]: dp_translate_helper(): the rule's attrs are cli=+34654205682;action=0 DEBUG: dialplan [dp_repl.c:699]: dp_translate_helper(): the copied attributes are: cli=+34654205682;action=0 ERROR: dialplan [dp_repl.c:439]: rule_translate(): the string 0034654205681 matched the match_exp ^00([1-9][0-35-9]|[1-35-9][0-9])[0-9]+$ but not the subst_exp ^([1-9][0-9]{8})$! ERROR: dialplan [dp_repl.c:730]: dp_translate_helper(): could not build the output DEBUG: dialplan [dialplan.c:350]: dp_translate_f(): could not translate 0034654205681 with dpid 101000 INFO: <script>: SET_DST no valid subst_exp for '0034654205681' trying to match - ci='1cf77cbb5baebdbd0e8635e1116aa713(a)PBX-2797.xpbx.foehn.co.uk' DEBUG: dialplan [dp_repl.c:606]: dp_translate_helper(): regex operator testing over [0034654205681] DEBUG: dialplan [dp_repl.c:681]: dp_translate_helper(): found a matching rule 0x7f065c2818d0: pr 1, match_exp ^00([1-9][0-35-9]|[1-35-9][0-9])[0-9]+$ DEBUG: dialplan [dp_repl.c:688]: dp_translate_helper(): the rule's attrs are cli=+34654205682;action=0 DEBUG: dialplan [dp_repl.c:699]: dp_translate_helper(): the copied attributes are: cli=+34654205682;action=0 DEBUG: <script>: SET_DST $var(dp_attrs):cli=+34654205682;action=0 action:0 - ci='1cf77cbb5baebdbd0e8635e1116aa713(a)PBX-2797.xpbx.foehn.co.uk' ``` #### 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 - [x] Related to issue #1952 #### Description changing ``dp_replace_helper()`` to pass a NULL value indicating no output is needed ( no need to do subst ) to ``dp_translate_helper()`` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1953 -- Commit Summary -- * dialplan: don't try to translate on dp_match() -- File Changes -- M src/modules/dialplan/dialplan.c (14) M src/modules/dialplan/dp_repl.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1953.patch https://github.com/kamailio/kamailio/pull/1953.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/1953

1 2

git:master:cced2379: dialplan: don't try to translate on dp_match()
by Victor Seva 15 May '19

15 May '19

Module: kamailio Branch: master Commit: cced23795582d9f4cc2bae545ea1c24664303036 URL: https://github.com/kamailio/kamailio/commit/cced23795582d9f4cc2bae545ea1c24… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-05-15T11:37:41+02:00 dialplan: don't try to translate on dp_match() fix #1952 --- Modified: src/modules/dialplan/dialplan.c Modified: src/modules/dialplan/dp_repl.c --- Diff: https://github.com/kamailio/kamailio/commit/cced23795582d9f4cc2bae545ea1c24… Patch: https://github.com/kamailio/kamailio/commit/cced23795582d9f4cc2bae545ea1c24… --- diff --git a/src/modules/dialplan/dialplan.c b/src/modules/dialplan/dialplan.c index 20b7744e21..7770679a45 100644 --- a/src/modules/dialplan/dialplan.c +++ b/src/modules/dialplan/dialplan.c @@ -481,8 +481,9 @@ static int dp_replace_helper(sip_msg_t *msg, int dpid, str *input, pv_spec_t *pvd) { dpl_id_p idp; - str output = STR_NULL; + str tmp = STR_NULL; str attrs = STR_NULL; + str *output = NULL; str *outattrs = NULL; if ((idp = select_dpid(dpid)) ==0) { @@ -491,16 +492,19 @@ static int dp_replace_helper(sip_msg_t *msg, int dpid, str *input, } outattrs = (!attr_pvar)?NULL:&attrs; - if (dp_translate_helper(msg, input, &output, idp, outattrs)!=0) { + output = (!pvd)?NULL:&tmp; + if (dp_translate_helper(msg, input, output, idp, outattrs)!=0) { LM_DBG("could not translate %.*s " "with dpid %i\n", input->len, input->s, idp->dp_id); return -1; } - LM_DBG("input %.*s with dpid %i => output %.*s\n", - input->len, input->s, idp->dp_id, output.len, output.s); + if (output) { + LM_DBG("input %.*s with dpid %i => output %.*s\n", + input->len, input->s, idp->dp_id, output->len, output->s); + } /* set the output */ - if (dp_update(msg, pvd, &output, outattrs) !=0){ + if (dp_update(msg, pvd, output, outattrs) !=0){ LM_ERR("cannot set the output\n"); return -1; } diff --git a/src/modules/dialplan/dp_repl.c b/src/modules/dialplan/dp_repl.c index 06534a9dab..05949c8289 100644 --- a/src/modules/dialplan/dp_repl.c +++ b/src/modules/dialplan/dp_repl.c @@ -699,6 +699,9 @@ int dp_translate_helper(sip_msg_t *msg, str *input, str *output, dpl_id_p idp, attrs->len, attrs->s); } } + if(!output) { + return 0; + } if(rulep->tflags&DP_TFLAGS_PV_SUBST) { re_list = dpl_dynamic_pcre_list(msg, &rulep->subst_exp); if(re_list==NULL) {

1 0

git:master:61b67197: janssonrpcc: remove compilation warning
by Victor Seva 15 May '19

15 May '19

Module: kamailio Branch: master Commit: 61b67197ba8b996abdaff1388362469563ba2202 URL: https://github.com/kamailio/kamailio/commit/61b67197ba8b996abdaff1388362469… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-05-15T11:13:17+02:00 janssonrpcc: remove compilation warning > janssonrpcc_mod.c:345:25: warning: comparison of unsigned expression < 0 is always false [-Wtautological-compare] > if (jsonrpc_keep_alive < 0) { > ~~~~~~~~~~~~~~~~~~ ^ ~ > 1 warning generated. --- Modified: src/modules/janssonrpcc/janssonrpcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/61b67197ba8b996abdaff1388362469… Patch: https://github.com/kamailio/kamailio/commit/61b67197ba8b996abdaff1388362469… --- diff --git a/src/modules/janssonrpcc/janssonrpcc_mod.c b/src/modules/janssonrpcc/janssonrpcc_mod.c index 9076f4a543..bad41ca2c5 100644 --- a/src/modules/janssonrpcc/janssonrpcc_mod.c +++ b/src/modules/janssonrpcc/janssonrpcc_mod.c @@ -342,9 +342,7 @@ int parse_keep_alive_param(modparam_t type, void* val) return -1; } jsonrpc_keep_alive = (int)(long)val; - if (jsonrpc_keep_alive < 0) { - jsonrpc_keep_alive = 0; - } + INFO("jsonrpc_keep_alive set to %d\n", jsonrpc_keep_alive); return 0; }

1 0

git:master:5f71e746: core: added command line parameter to set subst preprocessor directive
by Daniel-Constantin Mierla 14 May '19

14 May '19

Module: kamailio Branch: master Commit: 5f71e7460fabe839f57ee1c42434e986a823ab9d URL: https://github.com/kamailio/kamailio/commit/5f71e7460fabe839f57ee1c42434e98… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-14T17:09:13+02:00 core: added command line parameter to set subst preprocessor directive * --subst="expression" - like: #!subst "expression" --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/5f71e7460fabe839f57ee1c42434e98… Patch: https://github.com/kamailio/kamailio/commit/5f71e7460fabe839f57ee1c42434e98… --- diff --git a/src/main.c b/src/main.c index e124f6857e..959602ebb3 100644 --- a/src/main.c +++ b/src/main.c @@ -204,7 +204,8 @@ Options:\n\ #ifdef STATS " -s file File where to write internal statistics on SIGUSR1\n" #endif -" --substdef=exp set a substdef preprocessor directive\n\ +" --subst=exp set a subst preprocessor directive\n\ + --substdef=exp set a substdef preprocessor directive\n\ --substdefs=exp set a substdefs preprocessor directive\n" #ifdef USE_SCTP " -S disable sctp\n" @@ -1902,8 +1903,9 @@ int main(int argc, char** argv) {"version", no_argument, 0, 'v'}, /* long options without short variant */ {"alias", required_argument, 0, KARGOPTVAL}, - {"substdef", required_argument, 0, KARGOPTVAL + 1}, - {"substdefs", required_argument, 0, KARGOPTVAL + 2}, + {"subst", required_argument, 0, KARGOPTVAL + 1}, + {"substdef", required_argument, 0, KARGOPTVAL + 2}, + {"substdefs", required_argument, 0, KARGOPTVAL + 3}, {0, 0, 0, 0 } }; @@ -2138,14 +2140,20 @@ int main(int argc, char** argv) } break; case KARGOPTVAL+1: - if(pp_substdef_add(optarg, 0)<0) { - LM_ERR("failed to add substdef: %s\n", optarg); + if(pp_subst_add(optarg)<0) { + LM_ERR("failed to add subst expression: %s\n", optarg); goto error; } break; case KARGOPTVAL+2: + if(pp_substdef_add(optarg, 0)<0) { + LM_ERR("failed to add substdef expression: %s\n", optarg); + goto error; + } + break; + case KARGOPTVAL+3: if(pp_substdef_add(optarg, 1)<0) { - LM_ERR("failed to add substdefs: %s\n", optarg); + LM_ERR("failed to add substdefs expression: %s\n", optarg); goto error; } break;

1 0

git:master:38d61e4c: core: command line parameters for adding substdef and substdefs
by Daniel-Constantin Mierla 14 May '19

14 May '19

Module: kamailio Branch: master Commit: 38d61e4c7cc35f0b0b8fffc7725a882bff3e79b1 URL: https://github.com/kamailio/kamailio/commit/38d61e4c7cc35f0b0b8fffc7725a882… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-14T17:00:07+02:00 core: command line parameters for adding substdef and substdefs * --substdef="expression" - like a #!substdef "expression" * --substdefis="expression" - like a #!substdefs "expression" --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/38d61e4c7cc35f0b0b8fffc7725a882… Patch: https://github.com/kamailio/kamailio/commit/38d61e4c7cc35f0b0b8fffc7725a882… --- diff --git a/src/main.c b/src/main.c index a97fb6dba0..e124f6857e 100644 --- a/src/main.c +++ b/src/main.c @@ -204,6 +204,8 @@ Options:\n\ #ifdef STATS " -s file File where to write internal statistics on SIGUSR1\n" #endif +" --substdef=exp set a substdef preprocessor directive\n\ + --substdefs=exp set a substdefs preprocessor directive\n" #ifdef USE_SCTP " -S disable sctp\n" #endif @@ -1899,7 +1901,9 @@ int main(int argc, char** argv) {"help", no_argument, 0, 'h'}, {"version", no_argument, 0, 'v'}, /* long options without short variant */ - {"alias", required_argument, 0, KARGOPTVAL}, + {"alias", required_argument, 0, KARGOPTVAL}, + {"substdef", required_argument, 0, KARGOPTVAL + 1}, + {"substdefs", required_argument, 0, KARGOPTVAL + 2}, {0, 0, 0, 0 } }; @@ -2133,6 +2137,18 @@ int main(int argc, char** argv) goto error; } break; + case KARGOPTVAL+1: + if(pp_substdef_add(optarg, 0)<0) { + LM_ERR("failed to add substdef: %s\n", optarg); + goto error; + } + break; + case KARGOPTVAL+2: + if(pp_substdef_add(optarg, 1)<0) { + LM_ERR("failed to add substdefs: %s\n", optarg); + goto error; + } + break; /* special cases */ case '?':

1 0

git:master:e648fd5e: core: return negative on error adding pre-processor substdef
by Daniel-Constantin Mierla 14 May '19

14 May '19

Module: kamailio Branch: master Commit: e648fd5e10a6ec694129be5fab0a84c2c90aa916 URL: https://github.com/kamailio/kamailio/commit/e648fd5e10a6ec694129be5fab0a84c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-14T16:36:08+02:00 core: return negative on error adding pre-processor substdef - expected by the checks when executing the functions --- Modified: src/core/ppcfg.c --- Diff: https://github.com/kamailio/kamailio/commit/e648fd5e10a6ec694129be5fab0a84c… Patch: https://github.com/kamailio/kamailio/commit/e648fd5e10a6ec694129be5fab0a84c… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index a06795f760..3b026f9978 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -164,7 +164,7 @@ int pp_substdef_add(char *data, int mode) return 0; error: - return 1; + return -1; } int pp_subst_run(char **data)

1 0

git:master:c84a89a3: core: pv - define the string printed for null value
by Daniel-Constantin Mierla 14 May '19

14 May '19

Module: kamailio Branch: master Commit: c84a89a3ab5b3f3174203753e51926143b0309f8 URL: https://github.com/kamailio/kamailio/commit/c84a89a3ab5b3f3174203753e519261… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-14T11:02:49+02:00 core: pv - define the string printed for null value - added function to return the str null value --- Modified: src/core/pvapi.c Modified: src/core/pvar.h --- Diff: https://github.com/kamailio/kamailio/commit/c84a89a3ab5b3f3174203753e519261… Patch: https://github.com/kamailio/kamailio/commit/c84a89a3ab5b3f3174203753e519261… --- diff --git a/src/core/pvapi.c b/src/core/pvapi.c index 27a23612c7..bd0d3c2e98 100644 --- a/src/core/pvapi.c +++ b/src/core/pvapi.c @@ -674,7 +674,8 @@ static char pv_str_empty_buf[2]; static char pv_str_null_buf[8]; static str pv_str_empty = { "", 0 }; -static str pv_str_null = { "<null>", 6 }; +#define PV_STR_NULL_VAL "<null>" +static str pv_str_null = { PV_STR_NULL_VAL, sizeof(PV_STR_NULL_VAL)-1 }; int pv_get_null(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { if(res==NULL) @@ -686,6 +687,14 @@ int pv_get_null(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) return 0; } +/** + * + */ +str *pv_get_null_str(void) +{ + return &pv_str_null; +} + /** * */ @@ -2007,7 +2016,7 @@ int pv_init_api(void) pv_str_empty_buf[0] = '\0'; pv_str_empty_buf[1] = '\0'; pv_str_empty.s = pv_str_empty_buf; - strcpy(pv_str_null_buf, "<null>"); + strcpy(pv_str_null_buf, PV_STR_NULL_VAL); pv_str_null.s = pv_str_null_buf; if(register_pvars_mod("core", _core_pvs)<0) diff --git a/src/core/pvar.h b/src/core/pvar.h index 3e838e20f8..564bc03d90 100644 --- a/src/core/pvar.h +++ b/src/core/pvar.h @@ -209,6 +209,7 @@ int pv_free_extra_list(void); int pv_locate_name(str *in); pv_spec_t* pv_cache_get(str *name); str* pv_cache_get_name(pv_spec_t *spec); +str *pv_get_null_str(void); /*! \brief PV helper functions */ int pv_get_null(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

1 0

git:master:3619432d: siptrace: use the str for null values from pv core api
by Daniel-Constantin Mierla 14 May '19

14 May '19

Module: kamailio Branch: master Commit: 3619432d8bc27abde97081ba223d19f86b0932a7 URL: https://github.com/kamailio/kamailio/commit/3619432d8bc27abde97081ba223d19f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-14T11:04:49+02:00 siptrace: use the str for null values from pv core api --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/3619432d8bc27abde97081ba223d19f… Patch: https://github.com/kamailio/kamailio/commit/3619432d8bc27abde97081ba223d19f… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index dfdbdcd409..642526f63f 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -68,7 +68,7 @@ MODULE_VERSION || ((_msg->flags & trace_flag) == 0)) #define is_null_pv(_str) \ - (!str_strcmp(&_str, &null_pv_value_str)) + (!str_strcmp(&_str, pv_get_null_str())) struct tm_binds tmb; struct dlg_binds dlgb; @@ -136,8 +136,6 @@ static str totag_column = str_init("totag"); /* 11 */ static str siptrace_info_dlgkey = str_init("__siptrace_info_dlg_key__"); static str siptrace_info_avp_str = str_init("$avp(__siptrace_info_avp__)"); -static str null_pv_value_str = str_init("<null>"); - #define NR_KEYS 12 #define SIP_TRACE_TABLE_VERSION 4

1 0

git:master:c37e0032: siptrace: free trace_to_database_flag on module destroy
by Daniel-Constantin Mierla 14 May '19

14 May '19

Module: kamailio Branch: master Commit: c37e00326969c4be565a030708778a64714926e5 URL: https://github.com/kamailio/kamailio/commit/c37e00326969c4be565a030708778a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-14T10:48:44+02:00 siptrace: free trace_to_database_flag on module destroy --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/c37e00326969c4be565a030708778a6… Patch: https://github.com/kamailio/kamailio/commit/c37e00326969c4be565a030708778a6… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 92e2019917..dfdbdcd409 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -495,13 +495,16 @@ static int child_init(int rank) static void destroy(void) { - if(trace_to_database_flag != NULL && *trace_to_database_flag != 0) { - if(db_con != NULL) + if(trace_to_database_flag != NULL) { + if(db_con != NULL) { db_funcs.close(db_con); + } + shm_free(trace_to_database_flag); } - if(trace_on_flag) + if(trace_on_flag) { shm_free(trace_on_flag); + } } static inline str *siptrace_get_table(void)

1 0

git:master:659f822d: modules: readme files regenerated - siptrace ... [skip ci]
by Kamailio Dev 14 May '19

14 May '19

Module: kamailio Branch: master Commit: 659f822d3bfd3d37a15ee928bff4420f37d64a0c URL: https://github.com/kamailio/kamailio/commit/659f822d3bfd3d37a15ee928bff4420… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-05-14T10:47:08+02:00 modules: readme files regenerated - siptrace ... [skip ci] --- Modified: src/modules/siptrace/README --- Diff: https://github.com/kamailio/kamailio/commit/659f822d3bfd3d37a15ee928bff4420… Patch: https://github.com/kamailio/kamailio/commit/659f822d3bfd3d37a15ee928bff4420… --- diff --git a/src/modules/siptrace/README b/src/modules/siptrace/README index d6d9e33733..7ffcc90253 100644 --- a/src/modules/siptrace/README +++ b/src/modules/siptrace/README @@ -499,6 +499,10 @@ sip_trace("sip:10.1.1.2:5085"); ... sip_trace("sip:10.1.1.2:5085", "$ci-abc"); ... +/* trace current dialog; needs to be done on initial INVITE and dialog has to be + loaded */ +sip_trace("sip:10.1.1.2:5085", "$ci-abc", "d"); +... 4.2. hlog([correlation_id,] message)

1 0

[kamailio/kamailio] siptrace: fix tracing messages to database when destination uri not set (#1951)
by Ionut Ionita 14 May '19

14 May '19

New additions to siptrace module broke previous functionality. If sip_trace was used with no param and destination uri was not set then the current message would not have been traced to database. The current fix traces always the current message if siptrace function was called.   #### 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/1951 -- Commit Summary -- * siptrace: fix tracing messages to database when destination uri not set -- File Changes -- M src/modules/siptrace/siptrace.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1951.patch https://github.com/kamailio/kamailio/pull/1951.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/1951

3 8

git:master:7ce22d2c: siptrace: add sip_trace example with trace type set to docs
by iionita 14 May '19

14 May '19

Module: kamailio Branch: master Commit: 7ce22d2c7204e934601f577e0fc3cdf9a61dbd09 URL: https://github.com/kamailio/kamailio/commit/7ce22d2c7204e934601f577e0fc3cdf… Author: iionita <ionut-razvan.ionita(a)1and1.ro> Committer: iionita <ionut-razvan.ionita(a)1and1.ro> Date: 2019-05-14T11:22:32+03:00 siptrace: add sip_trace example with trace type set to docs --- Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7ce22d2c7204e934601f577e0fc3cdf… Patch: https://github.com/kamailio/kamailio/commit/7ce22d2c7204e934601f577e0fc3cdf… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index 288824ba93..b3cb739130 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -556,6 +556,9 @@ sip_trace("sip:10.1.1.2:5085"); ... sip_trace("sip:10.1.1.2:5085", "$ci-abc"); ... +/* trace current dialog; needs to be done on initial INVITE and dialog has to be loaded */ +sip_trace("sip:10.1.1.2:5085", "$ci-abc", "d"); +... </programlisting> </example> </section>

1 0

git:master:5436e1fe: Merge pull request #1951 from ionutionita92/siptrace-bugfix
by GitHub 14 May '19

14 May '19

Module: kamailio Branch: master Commit: 5436e1fe824dee419f0ceb5db836ad3d523c7313 URL: https://github.com/kamailio/kamailio/commit/5436e1fe824dee419f0ceb5db836ad3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-05-14T10:38:09+02:00 Merge pull request #1951 from ionutionita92/siptrace-bugfix siptrace: fix tracing messages to database when destination uri not set --- Modified: src/modules/siptrace/doc/siptrace_admin.xml Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/5436e1fe824dee419f0ceb5db836ad3… Patch: https://github.com/kamailio/kamailio/commit/5436e1fe824dee419f0ceb5db836ad3… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index 288824ba93..b3cb739130 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -556,6 +556,9 @@ sip_trace("sip:10.1.1.2:5085"); ... sip_trace("sip:10.1.1.2:5085", "$ci-abc"); ... +/* trace current dialog; needs to be done on initial INVITE and dialog has to be loaded */ +sip_trace("sip:10.1.1.2:5085", "$ci-abc", "d"); +... </programlisting> </example> </section> diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index fc97290285..92e2019917 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1011,7 +1011,7 @@ static int w_sip_trace3(sip_msg_t *msg, char *dest, char *correlation_id, char * } } - if(trace_is_off(msg)) { + if(trace_type != SIPTRACE_MESSAGE && trace_is_off(msg)) { LM_DBG("trace off...\n"); return 1; }

1 0

git:master:3ace6416: siptrace: fix tracing messages to database when destination uri not set
by iionita 14 May '19

14 May '19

Module: kamailio Branch: master Commit: 3ace6416387bcb487843f33bd45ec8f2344f60eb URL: https://github.com/kamailio/kamailio/commit/3ace6416387bcb487843f33bd45ec8f… Author: iionita <ionut-razvan.ionita(a)1and1.ro> Committer: iionita <ionut-razvan.ionita(a)1and1.ro> Date: 2019-05-14T11:22:22+03:00 siptrace: fix tracing messages to database when destination uri not set New additions to siptrace module broke previous functionality. If sip_trace was used with no param and destination uri was not set then the current message would not have been traced to database. The current fix traces always the current message if siptrace function was called. --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/3ace6416387bcb487843f33bd45ec8f… Patch: https://github.com/kamailio/kamailio/commit/3ace6416387bcb487843f33bd45ec8f… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index fc97290285..92e2019917 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1011,7 +1011,7 @@ static int w_sip_trace3(sip_msg_t *msg, char *dest, char *correlation_id, char * } } - if(trace_is_off(msg)) { + if(trace_type != SIPTRACE_MESSAGE && trace_is_off(msg)) { LM_DBG("trace off...\n"); return 1; }

1 0

[kamailio/kamailio] subscribe > Notify without xml body (#1930)
by Denis 13 May '19

13 May '19

hello, trying to get user status using subscription. But for some reason the notification comes without a body xml ` SUBSCRIBE sip:dendy@xxxxxxxx:xxxxx;transport=tcp SIP/2.0 Via: SIP/2.0/TCP xxxxxx.x:xxxxx;rport;branch=z9hG4bKPjDQwwW-dtn73uWvfKqpQhAo.BwcQhtj.X;alias Max-Forwards: 70 From: sip:1203@xxxxxx;tag=E-xtzmcTcV5OkvKZG3e5pF671Rv0ntn5 To: sip:dendy@xxxxxx Contact: <sip:1203@xxxxxx:xxxxx>;transport=tcp Call-ID: jymDoKAg4ffapLjQREv4qDGNqFN35.jb CSeq: 6797 SUBSCRIBE Event: presence Expires: 36000 Accept: application/pidf+xml, application/xpidf+xml Allow-Events: presence Content-Length: 0 2019/04/19 14:17:31.261866 xxxxxx:xxxxxx -> xxxxxx:xxxx NOTIFY sip:1203@xxxxxx:xxxxxx SIP/2.0 Via: SIP/2.0/TCP xxxxxx:xxxxxx;branch=z9hG4bK1afa.0124b9a6000000000000000000000000.0 To: <sip:1203@xxxxxx>;tag=E-xtzmcTcV5OkvKZG3e5pF671Rv0ntn5 From: <sip:dendy@xxxxxx>;tag=dbcd16266fcdb51ae84a18eeabb1faa3-b21b CSeq: 2 NOTIFY Call-ID: jymDoKAg4ffapLjQREv4qDGNqFN35.jb Content-Length: 0 User-Agent: kamailio (5.2.2 (x86_64/linux)) Max-Forwards: 70 Event: presence Contact: <xxxxxx:xxxxxx;transport=tcp> Subscription-State: active;expires=3600 ` kamailio.cfg ..... #!define WITH_PRESENCE #!define WITH_NAT #!define WITH_USRLOCDB #!define WITH_XCAPSRV loadmodule "db_text.so" loadmodule "jsonrpcs.so" loadmodule "kex.so" loadmodule "corex.so" loadmodule "tm.so" loadmodule "tmx.so" loadmodule "sl.so" loadmodule "rr.so" loadmodule "pv.so" loadmodule "maxfwd.so" loadmodule "usrloc.so" loadmodule "registrar.so" loadmodule "textops.so" loadmodule "siputils.so" loadmodule "xlog.so" loadmodule "sanity.so" loadmodule "ctl.so" loadmodule "cfg_rpc.so" loadmodule "acc.so" loadmodule "counters.so" ...... #!ifdef WITH_PRESENCE loadmodule "presence.so" loadmodule "presence_xml.so" #!endif ...... ` # ----- usrloc params ----- /* enable DB persistency for location entries */ #!ifdef WITH_USRLOCDB modparam("usrloc", "db_url", DBURL) modparam("usrloc", "db_mode", 2) modparam("usrloc", "use_domain", 0) #!endif ........... #!ifdef WITH_PRESENCE # ----- presence params ----- modparam("presence", "db_url", DBURL) modparam("presence", "server_address", "xxxxxx:xxxxx") # ----- presence_xml params ----- modparam("presence_xml", "db_url", DBURL) modparam("presence_xml", "force_active", 1) modparam("presence_xml", "integrated_xcap_server", 1) #!endif #!ifdef WITH_PRESENCE if (!t_newtran()) { sl_reply_error(); exit; } if(is_method("PUBLISH")) { handle_publish(); t_release(); } else if(is_method("SUBSCRIBE")) { handle_subscribe(); t_release(); } exit; #!endif ` I need to get the body of the form: ` <?xml version="1.0" encoding="UTF-8"?> <presence entity="sip:1201@xxxxxx:xxxxxx;transportTCP" xmlns="urn:ietf:params:xml:ns:pidf" xmlns:dm="urn:i f:params:xml:ns:pidf:data-model" xmlns:rpid="urn:ietf:pa ms:xml:ns:pidf:rpid"> <note>Ready</note> <tuple id="1201"> <status> <basic>open</basic> </status> <contact priority="1">sip:1203@хххх.com</contact> </tuple> <dm:person /> </presence> ` -- 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/1930

1 1

git:master:c836f8ba: rtpengine: allocate space for one more rtp relay control socket
by Daniel-Constantin Mierla 13 May '19

13 May '19

Module: kamailio Branch: master Commit: c836f8ba2f4d3a32b8a4fecba332355df01daca6 URL: https://github.com/kamailio/kamailio/commit/c836f8ba2f4d3a32b8a4fecba332355… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-13T15:27:08+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 --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/c836f8ba2f4d3a32b8a4fecba332355… Patch: https://github.com/kamailio/kamailio/commit/c836f8ba2f4d3a32b8a4fecba332355… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 21f03775d6..40844ddb2e 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -1768,12 +1768,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;

1 0

git:master:8e51acdd: core: adjust the value for _pv_cache_counter
by Daniel-Constantin Mierla 13 May '19

13 May '19

Module: kamailio Branch: master Commit: 8e51acdd73e8e4ab95c79cc69fb53add7c6cfd38 URL: https://github.com/kamailio/kamailio/commit/8e51acdd73e8e4ab95c79cc69fb53ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-13T12:40:24+02:00 core: adjust the value for _pv_cache_counter - reported by GH #1948 --- Modified: src/core/pvapi.c --- Diff: https://github.com/kamailio/kamailio/commit/8e51acdd73e8e4ab95c79cc69fb53ad… Patch: https://github.com/kamailio/kamailio/commit/8e51acdd73e8e4ab95c79cc69fb53ad… --- diff --git a/src/core/pvapi.c b/src/core/pvapi.c index 59a76831e8..27a23612c7 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;

1 0

git:5.2:bdced086: core: proper check for allocation of route_locks_size
by Daniel-Constantin Mierla 13 May '19

13 May '19

Module: kamailio Branch: 5.2 Commit: bdced08654188d70da6af776ac73c851196425b4 URL: https://github.com/kamailio/kamailio/commit/bdced08654188d70da6af776ac73c85… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-13T10:05:17+02:00 core: proper check for allocation of route_locks_size - regression added with relocation of code (cherry picked from commit 403de77c079a125ac101ff2ae58e08551a12a022) --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/bdced08654188d70da6af776ac73c85… Patch: https://github.com/kamailio/kamailio/commit/bdced08654188d70da6af776ac73c85… --- diff --git a/src/core/receive.c b/src/core/receive.c index d7e3effdd6..1dbe07ad96 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -49,6 +49,7 @@ #include "xavp.h" #endif #include "select_buf.h" +#include "locking.h" #include "tcp_server.h" /* for tcpconn_add_alias */ #include "tcp_options.h" /* for access to tcp_accept_aliases*/ @@ -78,7 +79,7 @@ int ksr_route_locks_set_init(void) return 0; ksr_route_locks_set = rec_lock_set_alloc(ksr_route_locks_size); - if(ksr_route_locks_set) { + if(ksr_route_locks_set==NULL) { LM_ERR("failed to allocate route locks set\n"); return -1; }

1 0

git:master:403de77c: core: proper check for allocation of route_locks_size
by Daniel-Constantin Mierla 13 May '19

13 May '19

Module: kamailio Branch: master Commit: 403de77c079a125ac101ff2ae58e08551a12a022 URL: https://github.com/kamailio/kamailio/commit/403de77c079a125ac101ff2ae58e085… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-13T10:03:43+02:00 core: proper check for allocation of route_locks_size - regression added with relocation of code --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/403de77c079a125ac101ff2ae58e085… Patch: https://github.com/kamailio/kamailio/commit/403de77c079a125ac101ff2ae58e085… --- diff --git a/src/core/receive.c b/src/core/receive.c index 3a2919cec2..8034ae9618 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -48,6 +48,7 @@ #include "usr_avp.h" #include "xavp.h" #include "select_buf.h" +#include "locking.h" #include "tcp_server.h" /* for tcpconn_add_alias */ #include "tcp_options.h" /* for access to tcp_accept_aliases*/ @@ -77,7 +78,7 @@ int ksr_route_locks_set_init(void) return 0; ksr_route_locks_set = rec_lock_set_alloc(ksr_route_locks_size); - if(ksr_route_locks_set) { + if(ksr_route_locks_set==NULL) { LM_ERR("failed to allocate route locks set\n"); return -1; }

1 0

git:master:94a51c88: core: main.c - show examples for use of -A for defines with values
by Daniel-Constantin Mierla 13 May '19

13 May '19

Module: kamailio Branch: master Commit: 94a51c887efaac2f85932922baf8e261abb8247c URL: https://github.com/kamailio/kamailio/commit/94a51c887efaac2f85932922baf8e26… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-13T09:29:55+02:00 core: main.c - show examples for use of -A for defines with values --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/94a51c887efaac2f85932922baf8e26… Patch: https://github.com/kamailio/kamailio/commit/94a51c887efaac2f85932922baf8e26… --- diff --git a/src/main.c b/src/main.c index 6d6d390306..a97fb6dba0 100644 --- a/src/main.c +++ b/src/main.c @@ -157,7 +157,8 @@ Options:\n\ disable with no or off\n\ --alias=val Add an alias, the value has to be '[proto:]hostname[:port]'\n\ (like for 'alias' global parameter)\n\ - -A define Add config pre-processor define (e.g., -A WITH_AUTH)\n\ + -A define Add config pre-processor define (e.g., -A WITH_AUTH,\n\ + -A 'FLT_ACC=1', -A 'DEFVAL=\"str-val\"')\n\ -b nr Maximum receive buffer size which will not be exceeded by\n\ auto-probing procedure even if OS allows\n\ -c Check configuration file for syntax errors\n\

1 0

[kamailio/kamailio] Kamailio-Master tcp request relaying problem (EAGAIN) (#1836)
by Yasin CANER 10 May '19

10 May '19

### Description Hello, Kamailio -master version couldnt relay tcp request to other sides. it gives EAGAIN error. When i test scenario on kamailio-5.2 version , it can relay. ### Troubleshooting #### Reproduction ``` route[TCPTEST]{ remove_hf("Route"); #loose_route(); if (!is_method("INVITE")) return; $du="sip: mykamailio1.test:5060;transport=tcp"; if(!t_newtran()){ xlog("L_WARN"," Couldnt create new transaction \r\n"); sl_send_reply("503", "Service not available"); exit; } if(!t_relay()){ send_reply("503", "Service not available"); exit; } exit; } ``` #### Debugging Data #### Log Messages  ``` 7(15781) DEBUG: <core> [core/tcp_main.c:1229]: tcpconn_new(): on port 5060, type 2 7(15781) DEBUG: <core> [core/tcp_main.c:1539]: tcpconn_add(): hashes: 507:2382:0, 2 7(15781) DEBUG: <core> [core/tcp_main.c:2873]: tcpconn_1st_send(): pending write on new connection 0x7fd15b5e7c98 (-1/1483 bytes written) (err: 11 - Resource temporarily unavailable) 7(15781) ERROR: <core> [core/tcp_main.c:2891]: tcpconn_1st_send(): [FD61:C23C:B3B6:0:0:0:0:5]:5060: EAGAIN and write queue full or failed for 0x7fd15b5e7c98 7(15781) DEBUG: <core> [core/tcp_main.c:3153]: tcpconn_chld_put(): destroying connection 0x7fd15b5e7c98 (2, -1) flags 0060 7(15781) ERROR: tm [../../core/forward.h:251]: msg_send_buffer(): tcp_send failed ``` #### SIP Traffic  ``` UAC: IPv6: TCP ---> Kamailio (5.2) :IPv6 :TCP ---> Client or Server IPv6:TCP ``` ### Possible Solutions  ### Additional Information ``` Kamailio master from git ``` * **Operating System**:  ``` NAME="CentOS Linux" VERSION="7 (Core)" 3.10.0-957.1.3.el7.x86_64 ``` -- 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/1836

8 18

Re: [sr-dev] [SR-Users] Sending in-dialog requests from custom module's C code
by Henning Westerholt 10 May '19

10 May '19

Hello Ivan, this type of questions are better suited to our developer list, not the users list - adding it to CC. I haven't looked yet that deep into your previous e-mail, but have you already looked e.g. to the dialog module? This does something similar, e.g. bridging an existing dialog. It uses uac_req_t and a TM callback. You find the implementation in dlg_transfer.c, e.g. function dlg_bridge(str *from, str *to, str *op, str *bd). Cheers, Henning Am 08.05.19 um 09:26 schrieb Ivan Ribakov: Anyone with module dev experience here who had to do something similar or used tm_load.h interface for other purposes? On 7 May 2019, at 16:39, Ivan Ribakov <i.ribakov(a)zaleos.net<mailto:i.ribakov@zaleos.net>> wrote: I’m working on a custom Kamailio module where I need to send new-dialog and in-dialog requests on timer (hence I’m being forced to generate new messages from C code). So far I’ve been using modules/tm/tm_load.h defined interface to generate messages and handle callbacks. New dialog messages are sent and processed normally. To do that I’m: 1. Calling set_uac_request() to define request parameters 2. Calling tmb.t_request_outside() to send it outside any existing dialog I was able to send in-dialog requests (or so I thought) in a similar fashion, but I soon realised that responses to those requests were dropped because they couldn’t be matched against any known existing transaction. I’m attaching log messages that I believe support this theory and I’ve also observed UDP retransmissions. tm [t_lookup.c:897]: t_reply_matching(): t_reply_matching: hash 50576 label 0 branch 0 tm [t_lookup.c:990]: t_reply_matching(): no matching transaction exists tm [t_lookup.c:993]: t_reply_matching(): failure to match a transaction tm [t_lookup.c:1088]: t_check_msg(): msg (0x5abcb50) id=1 global id=1 T end=(nil) tm [t_reply.c:2195]: reply_received(): transaction not found - (branch -1) The way I’m currently generating in-dialog requests is very similar to what tmb.t_request_outside() does, the main difference being that I do the dialog setup manually, based on the call-ID, cseq and from/to tags (I’m tracking transaction identifiers separately) and then pass resulting uac_req_t to tmb.t_request_within() - https://gist.github.com/IvanRibakov/3302cb286b1f4b786d109b406f2435a2 Now, the question part - does anyone know what I’m doing wrong/missing? As I mentioned, when looking at the generated message bodies, they look ok to me (left - initial request that started the dialog, right - first in-dialog request), so I’m guessing I’m missing some Kamailio internal steps needed to register new transaction. <kamailio_indialog_req.png> SIP flow (up to the point when first UDP retransmission happens) <PastedGraphic-1.png> I apologise in advance for the bulky question and will be extremely thankful for any guidance. Regards, Ivan _______________________________________________ Kamailio (SER) - Users Mailing List sr-users(a)lists.kamailio.org<mailto:sr-users@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

2 3

git:5.0:34752a8a: db_text: throw an error and abort instead of silently truncate tables
by Ovidiu Sas 10 May '19

10 May '19

Module: kamailio Branch: 5.0 Commit: 34752a8ab5beb0d71e2fddcde435b410b6825563 URL: https://github.com/kamailio/kamailio/commit/34752a8ab5beb0d71e2fddcde435b41… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2019-05-10T10:14:22-04:00 db_text: throw an error and abort instead of silently truncate tables (cherry picked from commit 3ed1fcdbb9247b1eb10d8d544f2a67b277bd1031) --- Modified: src/modules/db_text/dbt_base.c --- Diff: https://github.com/kamailio/kamailio/commit/34752a8ab5beb0d71e2fddcde435b41… Patch: https://github.com/kamailio/kamailio/commit/34752a8ab5beb0d71e2fddcde435b41… --- diff --git a/src/modules/db_text/dbt_base.c b/src/modules/db_text/dbt_base.c index f965b22d24..2229ecd1ad 100644 --- a/src/modules/db_text/dbt_base.c +++ b/src/modules/db_text/dbt_base.c @@ -295,6 +295,11 @@ int dbt_query(db1_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v, } _drp = _drp->next; } + if (_drp && counter == _db_text_max_result_rows) + { + LM_ERR("Truncated table at [%d] rows. Please increase 'max_result_rows' param!\n", counter); + goto error; + } if (_o_l) {

1 0

git:5.0:0bf66e01: db_text: avoid buffer overflow for large names and/or values in db_text files
by Ovidiu Sas 10 May '19

10 May '19

Module: kamailio Branch: 5.0 Commit: 0bf66e01329d4cfe8810586bb3735fbb11dbb0e0 URL: https://github.com/kamailio/kamailio/commit/0bf66e01329d4cfe8810586bb3735fb… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2019-05-10T10:14:31-04:00 db_text: avoid buffer overflow for large names and/or values in db_text files (cherry picked from commit 20febb28402a2e1ef3c23fda6db0825ae64affc6) --- Modified: src/modules/db_text/dbt_file.c --- Diff: https://github.com/kamailio/kamailio/commit/0bf66e01329d4cfe8810586bb3735fb… Patch: https://github.com/kamailio/kamailio/commit/0bf66e01329d4cfe8810586bb3735fb… --- diff --git a/src/modules/db_text/dbt_file.c b/src/modules/db_text/dbt_file.c index 66984bae5a..4a6a8a95e5 100644 --- a/src/modules/db_text/dbt_file.c +++ b/src/modules/db_text/dbt_file.c @@ -124,7 +124,7 @@ dbt_table_p dbt_load_file(const str *tbn, const str *dbn) return NULL; } - buf = pkg_malloc(_db_text_read_buffer_size); + buf = pkg_malloc(_db_text_read_buffer_size+1); if(!buf) { LM_ERR("error allocating read buffer, %i\n", _db_text_read_buffer_size); goto done; @@ -173,6 +173,12 @@ dbt_table_p dbt_load_file(const str *tbn, const str *dbn) if(c==EOF) goto clean; buf[bp++] = c; + if (bp==_db_text_read_buffer_size) { + LM_ERR("Buffer overflow for file [%s] row=[%d] col=[%d] c=[%c]." + " Please increase 'file_buffer_size' param!\n", + path, crow+1, ccol+1, c); + goto clean; + } c = fgetc(fin); } colp = dbt_column_new(buf, bp); @@ -454,6 +460,12 @@ dbt_table_p dbt_load_file(const str *tbn, const str *dbn) } } buf[bp++] = c; + if (bp==_db_text_read_buffer_size) { + LM_ERR("Buffer overflow for file [%s] row=[%d] col=[%d] c=[%c]." + " Please increase 'file_buffer_size' param!\n", + path, crow+1, ccol+1, c); + goto clean; + } c = fgetc(fin); } dtval.val.str_val.s = buf;

1 0

git:5.1:44d1fa36: db_text: avoid buffer overflow for large names and/or values in db_text files
by Ovidiu Sas 10 May '19

10 May '19

Module: kamailio Branch: 5.1 Commit: 44d1fa361c08f6e2be09f7f69bbc3d8fd10f5620 URL: https://github.com/kamailio/kamailio/commit/44d1fa361c08f6e2be09f7f69bbc3d8… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2019-05-10T10:13:36-04:00 db_text: avoid buffer overflow for large names and/or values in db_text files (cherry picked from commit 20febb28402a2e1ef3c23fda6db0825ae64affc6) --- Modified: src/modules/db_text/dbt_file.c --- Diff: https://github.com/kamailio/kamailio/commit/44d1fa361c08f6e2be09f7f69bbc3d8… Patch: https://github.com/kamailio/kamailio/commit/44d1fa361c08f6e2be09f7f69bbc3d8… --- diff --git a/src/modules/db_text/dbt_file.c b/src/modules/db_text/dbt_file.c index a2d35c2406..8b88ed8074 100644 --- a/src/modules/db_text/dbt_file.c +++ b/src/modules/db_text/dbt_file.c @@ -124,7 +124,7 @@ dbt_table_p dbt_load_file(const str *tbn, const str *dbn) return NULL; } - buf = pkg_malloc(_db_text_read_buffer_size); + buf = pkg_malloc(_db_text_read_buffer_size+1); if(!buf) { LM_ERR("error allocating read buffer, %i\n", _db_text_read_buffer_size); goto done; @@ -173,6 +173,12 @@ dbt_table_p dbt_load_file(const str *tbn, const str *dbn) if(c==EOF) goto clean; buf[bp++] = c; + if (bp==_db_text_read_buffer_size) { + LM_ERR("Buffer overflow for file [%s] row=[%d] col=[%d] c=[%c]." + " Please increase 'file_buffer_size' param!\n", + path, crow+1, ccol+1, c); + goto clean; + } c = fgetc(fin); } colp = dbt_column_new(buf, bp); @@ -453,6 +459,12 @@ dbt_table_p dbt_load_file(const str *tbn, const str *dbn) } } buf[bp++] = c; + if (bp==_db_text_read_buffer_size) { + LM_ERR("Buffer overflow for file [%s] row=[%d] col=[%d] c=[%c]." + " Please increase 'file_buffer_size' param!\n", + path, crow+1, ccol+1, c); + goto clean; + } c = fgetc(fin); } dtval.val.str_val.s = buf;

1 0

git:5.1:57a51ee1: db_text: throw an error and abort instead of silently truncate tables
by Ovidiu Sas 10 May '19

10 May '19

Module: kamailio Branch: 5.1 Commit: 57a51ee115ff11459107e76bd6bc98358874473f URL: https://github.com/kamailio/kamailio/commit/57a51ee115ff11459107e76bd6bc983… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2019-05-10T10:13:31-04:00 db_text: throw an error and abort instead of silently truncate tables (cherry picked from commit 3ed1fcdbb9247b1eb10d8d544f2a67b277bd1031) --- Modified: src/modules/db_text/dbt_base.c --- Diff: https://github.com/kamailio/kamailio/commit/57a51ee115ff11459107e76bd6bc983… Patch: https://github.com/kamailio/kamailio/commit/57a51ee115ff11459107e76bd6bc983… --- diff --git a/src/modules/db_text/dbt_base.c b/src/modules/db_text/dbt_base.c index c850501952..d6d9d73f21 100644 --- a/src/modules/db_text/dbt_base.c +++ b/src/modules/db_text/dbt_base.c @@ -296,6 +296,11 @@ int dbt_query(db1_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v, } _drp = _drp->next; } + if (_drp && counter == _db_text_max_result_rows) + { + LM_ERR("Truncated table at [%d] rows. Please increase 'max_result_rows' param!\n", counter); + goto error; + } if (_o_l) {

1 0

git:5.2:04a0a701: db_text: avoid buffer overflow for large names and/or values in db_text files
by Ovidiu Sas 10 May '19

10 May '19

Module: kamailio Branch: 5.2 Commit: 04a0a7014a605d9d332b70f966f8afc5fec4d448 URL: https://github.com/kamailio/kamailio/commit/04a0a7014a605d9d332b70f966f8afc… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2019-05-10T10:12:47-04:00 db_text: avoid buffer overflow for large names and/or values in db_text files (cherry picked from commit 20febb28402a2e1ef3c23fda6db0825ae64affc6) --- Modified: src/modules/db_text/dbt_file.c --- Diff: https://github.com/kamailio/kamailio/commit/04a0a7014a605d9d332b70f966f8afc… Patch: https://github.com/kamailio/kamailio/commit/04a0a7014a605d9d332b70f966f8afc… --- diff --git a/src/modules/db_text/dbt_file.c b/src/modules/db_text/dbt_file.c index a2d35c2406..8b88ed8074 100644 --- a/src/modules/db_text/dbt_file.c +++ b/src/modules/db_text/dbt_file.c @@ -124,7 +124,7 @@ dbt_table_p dbt_load_file(const str *tbn, const str *dbn) return NULL; } - buf = pkg_malloc(_db_text_read_buffer_size); + buf = pkg_malloc(_db_text_read_buffer_size+1); if(!buf) { LM_ERR("error allocating read buffer, %i\n", _db_text_read_buffer_size); goto done; @@ -173,6 +173,12 @@ dbt_table_p dbt_load_file(const str *tbn, const str *dbn) if(c==EOF) goto clean; buf[bp++] = c; + if (bp==_db_text_read_buffer_size) { + LM_ERR("Buffer overflow for file [%s] row=[%d] col=[%d] c=[%c]." + " Please increase 'file_buffer_size' param!\n", + path, crow+1, ccol+1, c); + goto clean; + } c = fgetc(fin); } colp = dbt_column_new(buf, bp); @@ -453,6 +459,12 @@ dbt_table_p dbt_load_file(const str *tbn, const str *dbn) } } buf[bp++] = c; + if (bp==_db_text_read_buffer_size) { + LM_ERR("Buffer overflow for file [%s] row=[%d] col=[%d] c=[%c]." + " Please increase 'file_buffer_size' param!\n", + path, crow+1, ccol+1, c); + goto clean; + } c = fgetc(fin); } dtval.val.str_val.s = buf;

1 0

git:5.2:5f811410: db_text: throw an error and abort instead of silently truncate tables
by Ovidiu Sas 10 May '19

10 May '19

Module: kamailio Branch: 5.2 Commit: 5f8114102fb64510b283ceba7f10a3345e632d70 URL: https://github.com/kamailio/kamailio/commit/5f8114102fb64510b283ceba7f10a33… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2019-05-10T10:12:30-04:00 db_text: throw an error and abort instead of silently truncate tables (cherry picked from commit 3ed1fcdbb9247b1eb10d8d544f2a67b277bd1031) --- Modified: src/modules/db_text/dbt_base.c --- Diff: https://github.com/kamailio/kamailio/commit/5f8114102fb64510b283ceba7f10a33… Patch: https://github.com/kamailio/kamailio/commit/5f8114102fb64510b283ceba7f10a33… --- diff --git a/src/modules/db_text/dbt_base.c b/src/modules/db_text/dbt_base.c index c850501952..d6d9d73f21 100644 --- a/src/modules/db_text/dbt_base.c +++ b/src/modules/db_text/dbt_base.c @@ -296,6 +296,11 @@ int dbt_query(db1_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v, } _drp = _drp->next; } + if (_drp && counter == _db_text_max_result_rows) + { + LM_ERR("Truncated table at [%d] rows. Please increase 'max_result_rows' param!\n", counter); + goto error; + } if (_o_l) {

1 0

Re: [sr-dev] still no fix to siptrace
by Henning Westerholt 10 May '19

10 May '19

Hello Juha, many developers are right now at Kamailio World. The developer here is in Berlin as well. He already acknowledged the bug on the tracker. In the end this is the git master development and should be not used in production. Cheers, Henning -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://skalatan.de/services -----Ursprüngliche Nachricht----- Von: sr-dev <sr-dev-bounces(a)lists.kamailio.org> Im Auftrag von Juha Heinanen Gesendet: Dienstag, 7. Mai 2019 16:26 An: sr-dev(a)lists.kamailio.org Betreff: [sr-dev] still no fix to siptrace siptrace module is still broken. would it be high time to revert back to 5.2 level and then make a new commit when the problem is fixed and fix properly tested? -- Juha _______________________________________________ Kamailio (SER) - Development Mailing List sr-dev(a)lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

4 6

git:master:b7a94208: modules: readme files regenerated - secfilter ... [skip ci]
by Kamailio Dev 09 May '19

09 May '19

Module: kamailio Branch: master Commit: b7a94208df3e4259a8f44d864e9712261fbb888a URL: https://github.com/kamailio/kamailio/commit/b7a94208df3e4259a8f44d864e97122… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-05-09T14:01:49+02:00 modules: readme files regenerated - secfilter ... [skip ci] --- Modified: src/modules/secfilter/README --- Diff: https://github.com/kamailio/kamailio/commit/b7a94208df3e4259a8f44d864e97122… Patch: https://github.com/kamailio/kamailio/commit/b7a94208df3e4259a8f44d864e97122… --- diff --git a/src/modules/secfilter/README b/src/modules/secfilter/README index c9bdf238d9..7cbabac6c8 100644 --- a/src/modules/secfilter/README +++ b/src/modules/secfilter/README @@ -341,11 +341,11 @@ klisted"); Example 1.9. secf_check_country usage ... - if (geoip_match("$si", "src")) { - secf_check_country($gip(src=>cc)); + if (geoip2_match("$si", "src")) { + secf_check_country($gip2(src=>cc)); if ($avp(secfilter) == -2) { xlog("L_ALERT", "$rm from $si blocked because Country '$ -gip(src=>cc)' is blacklisted"); +gip2(src=>cc)' is blacklisted"); exit; } }

1 0

[kamailio/kamailio] secfilter: Updated example in README file. Use geoip2 module instead geoip [skip ci] (#1950)
by Jose Luis Verdeguer 09 May '19

09 May '19

#### 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/1950 -- Commit Summary -- * secfilter: Updated example in README file. Use geoip2 module instead geoip [skip ci] -- File Changes -- M src/modules/secfilter/doc/secfilter_admin.xml (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1950.patch https://github.com/kamailio/kamailio/pull/1950.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/1950

1 1

git:master:61e57cb1: secfilter: Updated example in README file. Use geoip2 module instead geoip [skip ci]
by Jose Luis Verdeguer 09 May '19

09 May '19

Module: kamailio Branch: master Commit: 61e57cb14ed1efba4cea7ab5def4252a5fd16e04 URL: https://github.com/kamailio/kamailio/commit/61e57cb14ed1efba4cea7ab5def4252… Author: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Committer: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Date: 2019-05-09T13:51:46+02:00 secfilter: Updated example in README file. Use geoip2 module instead geoip [skip ci] --- Modified: src/modules/secfilter/doc/secfilter_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/61e57cb14ed1efba4cea7ab5def4252… Patch: https://github.com/kamailio/kamailio/commit/61e57cb14ed1efba4cea7ab5def4252… --- diff --git a/src/modules/secfilter/doc/secfilter_admin.xml b/src/modules/secfilter/doc/secfilter_admin.xml index da23baf906..ce7b6cea27 100644 --- a/src/modules/secfilter/doc/secfilter_admin.xml +++ b/src/modules/secfilter/doc/secfilter_admin.xml @@ -315,10 +315,10 @@ <programlisting format="linespecific"> ... - if (geoip_match("$si", "src")) { - secf_check_country($gip(src=>cc)); + if (geoip2_match("$si", "src")) { + secf_check_country($gip2(src=>cc)); if ($avp(secfilter) == -2) { - xlog("L_ALERT", "$rm from $si blocked because Country '$gip(src=>cc)' is blacklisted"); + xlog("L_ALERT", "$rm from $si blocked because Country '$gip2(src=>cc)' is blacklisted"); exit; } }

1 0

git:master:4e9a7601: siptrace: allow again siptrace without duplication uri
by Daniel-Constantin Mierla 09 May '19

09 May '19

Module: kamailio Branch: master Commit: 4e9a760123cb966349886254031f6d1dcb361525 URL: https://github.com/kamailio/kamailio/commit/4e9a760123cb966349886254031f6d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-09T11:37:22+02:00 siptrace: allow again siptrace without duplication uri - reported by Juha Heinanen --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/4e9a760123cb966349886254031f6d1… Patch: https://github.com/kamailio/kamailio/commit/4e9a760123cb966349886254031f6d1… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index e559d7874a..fc97290285 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -526,6 +526,8 @@ static inline str *siptrace_get_table(void) static int sip_trace_store(siptrace_data_t *sto, dest_info_t *dst, str *correlation_id_str) { + int ret = 1; + if(sto == NULL) { LM_DBG("invalid parameter\n"); return -1; @@ -535,16 +537,20 @@ static int sip_trace_store(siptrace_data_t *sto, dest_info_t *dst, if(sip_trace_xheaders_read(sto) != 0) return -1; - int ret = sip_trace_store_db(sto); + + ret = sip_trace_store_db(sto); if(sip_trace_xheaders_write(sto) != 0) return -1; - if(hep_mode_on) + if(hep_mode_on) { trace_send_hep_duplicate( &sto->body, &sto->fromip, &sto->toip, dst, correlation_id_str); - else - trace_send_duplicate(sto->body.s, sto->body.len, dst); + } else { + if(dst) { + trace_send_duplicate(sto->body.s, sto->body.len, dst); + } + } if(sip_trace_xheaders_free(sto) != 0) return -1; @@ -901,21 +907,23 @@ static int w_sip_trace3(sip_msg_t *msg, char *dest, char *correlation_id, char * LM_ERR("unable to parse the dest URI string\n"); return -1; } - } - if (dup_uri_param_str.s == 0 || (is_null_pv(dup_uri_param_str))) { - if (dup_uri_str.s == 0 || dup_uri_str.len == 0) { - LM_ERR("no duplicate_uri modparam nor duplicate uri sip_trace() argument provided!\n"); - return -1; - } + if (dup_uri_param_str.s == 0 || (is_null_pv(dup_uri_param_str))) { + if (dup_uri_str.s == 0 || dup_uri_str.len == 0) { + LM_ERR("no duplicate_uri modparam nor duplicate uri sip_trace() argument provided!\n"); + return -1; + } - dup_uri_param_str = dup_uri_str; - } + dup_uri_param_str = dup_uri_str; + } - /* if arg dest uri is null dup_uri_param_str will have length 0 and global dup_uri will be used */ - if (parse_siptrace_uri(&dup_uri_param_str, &dest_info) < 0) { - LM_ERR("failed to parse uri!\n"); - return -1; + /* if arg dest uri is null dup_uri_param_str will have length 0 and global dup_uri will be used */ + if (parse_siptrace_uri(&dup_uri_param_str, &dest_info) < 0) { + LM_ERR("failed to parse uri!\n"); + return -1; + } + } else { + memset(&dest_info, 0, sizeof(dest_info_t)); } if (correlation_id) { @@ -1009,7 +1017,7 @@ static int w_sip_trace3(sip_msg_t *msg, char *dest, char *correlation_id, char * } trace_current: - return sip_trace(msg, &dest_info, &correlation_id_str, NULL); + return sip_trace(msg, ((dest)?&dest_info:NULL), &correlation_id_str, NULL); } static int sip_trace(sip_msg_t *msg, dest_info_t *dst,

1 0

Call reconnect in case of loss network
by Gaurav Bmotra 09 May '19

09 May '19

HI i m gaurav i have installed kamailio 5.1.x on Ubuntu server 18.4 when i call from one to another extension , in case of loss network it disconnect the call or stuck there , how can i make it as re-connection when network loss , and it will try to reconnect for some seconds like 30 sec "Example for callingn skype it reconnectcall in case of lossnetwork " plz help -- *Regards:* Gaurav Kumar

1 0

git:master:be646da8: rtp_media_server: improve payload sdp parsing
by Julien Chavanton 09 May '19

09 May '19

Module: kamailio Branch: master Commit: be646da840ac3aef290ba9df01b4876d8b856f6d URL: https://github.com/kamailio/kamailio/commit/be646da840ac3aef290ba9df01b4876… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2019-05-09T05:51:13Z rtp_media_server: improve payload sdp parsing --- Modified: src/modules/rtp_media_server/rms_dialog_info.c Modified: src/modules/rtp_media_server/rms_sdp.c Modified: src/modules/rtp_media_server/rms_sdp.h Modified: src/modules/rtp_media_server/rtp_media_server.c --- Diff: https://github.com/kamailio/kamailio/commit/be646da840ac3aef290ba9df01b4876… Patch: https://github.com/kamailio/kamailio/commit/be646da840ac3aef290ba9df01b4876…

1 0

git:master:06f171cd: rtp_media_server: adding Opus support
by Julien Chavanton 09 May '19

09 May '19

Module: kamailio Branch: master Commit: 06f171cdc518844b002ab624c2b10e0aa0832185 URL: https://github.com/kamailio/kamailio/commit/06f171cdc518844b002ab624c2b10e0… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2019-05-09T05:07:37Z rtp_media_server: adding Opus support - first dynamic payload - fmtp parameters needs to be extracted as well --- Modified: src/modules/rtp_media_server/docker/Dockerfile Modified: src/modules/rtp_media_server/rms_dialog_info.c Modified: src/modules/rtp_media_server/rms_media.c Modified: src/modules/rtp_media_server/rms_media.h Modified: src/modules/rtp_media_server/rms_sdp.c --- Diff: https://github.com/kamailio/kamailio/commit/06f171cdc518844b002ab624c2b10e0… Patch: https://github.com/kamailio/kamailio/commit/06f171cdc518844b002ab624c2b10e0…

1 0

HELP ME
by khadime gaye 07 May '19

07 May '19

Good morning, How I can resolve this problem ? << ERROR: Could not load the script in /usr/local/lib64/kamailio//kamctl/kamdbctl.mysql for database engine MYSQL ERROR: database engine not loaded - tried 'MYSQL' >>

2 1

still no fix to siptrace
by Juha Heinanen 07 May '19

07 May '19

siptrace module is still broken. would it be high time to revert back to 5.2 level and then make a new commit when the problem is fixed and fix properly tested? -- Juha

1 0

[kamailio/kamailio] Move not core modules to own packages (#1862)
by sergey-safarov 07 May '19

07 May '19

### Description Current kamailio package (checked via RPM) is contains lot of modules. Some of this is not important to include in every kamailio installation. May be create own packages for this modules and other in next 5.3 branch? Modules examples: ``` benchmark.so db_cluster.so db_text.so rtpengine.so rtpproxy.so sipcapture.so siptrace.so sipt.so sms.so smsops.so ss7ops.so ``` -- 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/1862

3 5

git:5.2:75f743d9: usrloc: udomain_contact_expired_cb fix memory leak
by Victor Seva 07 May '19

07 May '19

Module: kamailio Branch: 5.2 Commit: 75f743d9501faaead7a173c8f459d4b2adfcb41d URL: https://github.com/kamailio/kamailio/commit/75f743d9501faaead7a173c8f459d4b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-05-07T09:29:45+02:00 usrloc: udomain_contact_expired_cb fix memory leak We need to call release_urecord in order to free the ucontacts generated at get_urecord() on shared memory (cherry picked from commit 48fd1a23cc3ddcb0df082bc24669dbf3a9fdc203) --- Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/75f743d9501faaead7a173c8f459d4b… Patch: https://github.com/kamailio/kamailio/commit/75f743d9501faaead7a173c8f459d4b… --- diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index c28c881790..11378aadee 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -1019,7 +1019,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) if ( (c=mem_insert_ucontact(r, &contact, ci)) == 0) { LM_ERR("inserting contact failed\n"); - free_ucontact(c); + release_urecord(r); unlock_udomain(_d, &user); goto error; } @@ -1029,7 +1029,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) run_ul_callbacks( UL_CONTACT_EXPIRE, c); } c->state = CS_SYNC; - free_ucontact(c); + release_urecord(r); unlock_udomain(_d, &user); }

1 0

[kamailio/kamailio] usrloc: udomain_contact_expired_cb fix memory leak (#1947)
by Victor Seva 07 May '19

07 May '19

#### 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 9757bb8c0e2fea5173f4fa3dd7798d61759f04af introduced a memory leak due to not cleaning all the ucontacts created at get_urecord() so every time that there are expired contacts in the db we will leave some ucontacts in shared mem and will be never free This only happens on DB_ONLY mode You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1947 -- Commit Summary -- * usrloc: udomain_contact_expired_cb fix memory leak -- File Changes -- M src/modules/usrloc/udomain.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1947.patch https://github.com/kamailio/kamailio/pull/1947.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/1947

2 2

git:master:48fd1a23: usrloc: udomain_contact_expired_cb fix memory leak
by Victor Seva 07 May '19

07 May '19

Module: kamailio Branch: master Commit: 48fd1a23cc3ddcb0df082bc24669dbf3a9fdc203 URL: https://github.com/kamailio/kamailio/commit/48fd1a23cc3ddcb0df082bc24669dbf… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-05-07T09:27:42+02:00 usrloc: udomain_contact_expired_cb fix memory leak We need to call release_urecord in order to free the ucontacts generated at get_urecord() on shared memory --- Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/48fd1a23cc3ddcb0df082bc24669dbf… Patch: https://github.com/kamailio/kamailio/commit/48fd1a23cc3ddcb0df082bc24669dbf… --- diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index c28c881790..11378aadee 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -1019,7 +1019,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) if ( (c=mem_insert_ucontact(r, &contact, ci)) == 0) { LM_ERR("inserting contact failed\n"); - free_ucontact(c); + release_urecord(r); unlock_udomain(_d, &user); goto error; } @@ -1029,7 +1029,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) run_ul_callbacks( UL_CONTACT_EXPIRE, c); } c->state = CS_SYNC; - free_ucontact(c); + release_urecord(r); unlock_udomain(_d, &user); }

1 0

git:master:db89b4ba: modules: readme files regenerated - dialplan ... [skip ci]
by Kamailio Dev 06 May '19

06 May '19

Module: kamailio Branch: master Commit: db89b4baca48c96df613d441703b63de3522e6d5 URL: https://github.com/kamailio/kamailio/commit/db89b4baca48c96df613d441703b63d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-05-06T16:31:53+02:00 modules: readme files regenerated - dialplan ... [skip ci] --- Modified: src/modules/dialplan/README --- Diff: https://github.com/kamailio/kamailio/commit/db89b4baca48c96df613d441703b63d… Patch: https://github.com/kamailio/kamailio/commit/db89b4baca48c96df613d441703b63d… --- diff --git a/src/modules/dialplan/README b/src/modules/dialplan/README index c5bdaea8eb..3b89fbd7da 100644 --- a/src/modules/dialplan/README +++ b/src/modules/dialplan/README @@ -55,6 +55,7 @@ Luis Martin 5.12. fetch_rows (int) 5.13. match_dynamic (int) 5.14. append_branch (int) + 5.15. reload_delta (int) 6. Functions @@ -89,11 +90,12 @@ Luis Martin 1.12. Set fetch_rows parameter 1.13. Set match_dynamic parameter 1.14. Set append_branch parameter - 1.15. dp_replace usage - 1.16. dp_match usage - 1.17. dp_translate usage + 1.15. Set reload_delta parameter + 1.16. dp_replace usage + 1.17. dp_match usage 1.18. dp_translate usage - 1.19. Example of rules + 1.19. dp_translate usage + 1.20. Example of rules Chapter 1. Admin Guide @@ -123,6 +125,7 @@ Chapter 1. Admin Guide 5.12. fetch_rows (int) 5.13. match_dynamic (int) 5.14. append_branch (int) + 5.15. reload_delta (int) 6. Functions @@ -223,6 +226,7 @@ Chapter 1. Admin Guide 5.12. fetch_rows (int) 5.13. match_dynamic (int) 5.14. append_branch (int) + 5.15. reload_delta (int) 5.1. db_url (string) @@ -393,6 +397,23 @@ modparam("dialplan", "match_dynamic", 1) modparam("dialplan", "append_branch", 0) ... +5.15. reload_delta (int) + + The number of seconds that have to be waited before executing a new + reload of dialplan rules. By default there is a rate limiting of + maximum one reload in five seconds. + + If set to 0, no rate limit is configured. Note carefully: use this + configuration only in tests environments because executing two dialplan + reloads at the same time can cause to kamailio to crash. + + Default value is “5”. + + Example 1.15. Set reload_delta parameter +... +modparam("dialplan", "reload_delta", 1) +... + 6. Functions 6.1. dp_replace(dpid, inval, outvar) @@ -423,7 +444,7 @@ modparam("dialplan", "append_branch", 0) This function can be used from ANY_ROUTE. - Example 1.15. dp_replace usage + Example 1.16. dp_replace usage ... dp_replace("240", "$rU", "$var(newru)"); xlog("'$rU' was translated to '$var(newru)'\n"); @@ -450,7 +471,7 @@ dp_replace("240", "+49$rU", "$var(newval)"); This function can be used from ANY_ROUTE. - Example 1.16. dp_match usage + Example 1.17. dp_match usage ... dp_match("240", "+49$rU"); xlog("the attributes associated with '+49$rU' are '$var(attrs)'\n"); @@ -491,13 +512,13 @@ xlog("the attributes associated with '+49$rU' are '$var(attrs)'\n"); This function can be used from ANY_ROUTE. - Example 1.17. dp_translate usage + Example 1.18. dp_translate usage ... dp_translate("240", "$ruri.user/$avp(s:dest)"); xlog("translated to var $avp(s:dest) \n"); ... - Example 1.18. dp_translate usage + Example 1.19. dp_translate usage ... $avp(s:src) = $ruri.user; dp_translate("$var(x)", "$avp(s:src)/$var(y)"); @@ -507,7 +528,8 @@ xlog("translated to var $var(y) \n"); 6.4. dp_reload() Reload the translation rules from the database. Note that there is a - rate limiting of maximum one reload in five seconds. + rate limiting defined by 'reload_delta' paramenter. By default is + allowed maximum one reload in five seconds. Name: dp_reload @@ -571,7 +593,7 @@ xlog("translated to var $var(y) \n"); Some sample records from a dialplan table are presented in the next figure. - Example 1.19. Example of rules + Example 1.20. Example of rules ... dpid: 1 pr: 1

1 0

[kamailio/kamailio] dialplan: add reload_delta parameter (#1946)
by Marco Capetta 06 May '19

06 May '19

#### 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  In commit 99d5da8d595961063249f871a5d150474fa6f317 a mechanism for basic safety in case of concurent rpc reload were added. This works fine but it is limiting our test scenarios where multiple changes should happen quickly. The new dialplan paramenter reload_delta allows everyone to configure rpc reload rate limit to the preferred number of seconds. In case the parameter is not specified. the default value is 5 seconds. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1946 -- Commit Summary -- * dialplan: add reload_delta parameter -- File Changes -- M src/modules/dialplan/dialplan.c (7) M src/modules/dialplan/doc/dialplan_admin.xml (32) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1946.patch https://github.com/kamailio/kamailio/pull/1946.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/1946

2 3

git:master:926a97f4: dialplan: add reload_delta parameter
by Victor Seva 06 May '19

06 May '19

Module: kamailio Branch: master Commit: 926a97f4eb741401b193fb711e6c439555c646ab URL: https://github.com/kamailio/kamailio/commit/926a97f4eb741401b193fb711e6c439… Author: Marco Capetta <mcapetta(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-05-06T16:29:48+02:00 dialplan: add reload_delta parameter - make the rate limit of maximum allowed dialplan reload configurable using the new 'reload_delta' paramenter. --- Modified: src/modules/dialplan/dialplan.c Modified: src/modules/dialplan/doc/dialplan_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/926a97f4eb741401b193fb711e6c439… Patch: https://github.com/kamailio/kamailio/commit/926a97f4eb741401b193fb711e6c439… --- diff --git a/src/modules/dialplan/dialplan.c b/src/modules/dialplan/dialplan.c index d8685d52f2..20b7744e21 100644 --- a/src/modules/dialplan/dialplan.c +++ b/src/modules/dialplan/dialplan.c @@ -87,6 +87,7 @@ dp_param_p default_par2 = NULL; int dp_fetch_rows = 1000; int dp_match_dynamic = 0; int dp_append_branch = 1; +int dp_reload_delta = 5; static time_t *dp_rpc_reload_time = NULL; @@ -105,6 +106,7 @@ static param_export_t mod_params[]={ { "fetch_rows", PARAM_INT, &dp_fetch_rows }, { "match_dynamic", PARAM_INT, &dp_match_dynamic }, { "append_branch", PARAM_INT, &dp_append_branch }, + { "reload_delta", PARAM_INT, &dp_reload_delta }, {0,0,0} }; @@ -182,6 +184,9 @@ static int mod_init(void) if(dp_fetch_rows<=0) dp_fetch_rows = 1000; + if(dp_reload_delta<0) + dp_reload_delta = 5; + if(init_data() != 0) { LM_ERR("could not initialize data\n"); return -1; @@ -619,7 +624,7 @@ static void dialplan_rpc_reload(rpc_t* rpc, void* ctx) rpc->fault(ctx, 500, "Not ready for reload"); return; } - if(*dp_rpc_reload_time!=0 && *dp_rpc_reload_time > time(NULL) - 5) { + if(*dp_rpc_reload_time!=0 && *dp_rpc_reload_time > time(NULL) - dp_reload_delta) { LM_ERR("ongoing reload\n"); rpc->fault(ctx, 500, "ongoing reload"); return; diff --git a/src/modules/dialplan/doc/dialplan_admin.xml b/src/modules/dialplan/doc/dialplan_admin.xml index 371120fac4..e524524fb8 100644 --- a/src/modules/dialplan/doc/dialplan_admin.xml +++ b/src/modules/dialplan/doc/dialplan_admin.xml @@ -410,6 +410,33 @@ modparam("dialplan", "append_branch", 0) </example> </section> + <section id="dialplan.p.reload_delta"> + <title><varname>reload_delta</varname> (int)</title> + <para> + The number of seconds that have to be waited before executing a new reload + of dialplan rules. By default there is a rate limiting of maximum one reload + in five seconds. + </para> + <para> + If set to 0, no rate limit is configured. Note carefully: use this configuration + only in tests environments because executing two dialplan reloads at the same + time can cause to kamailio to crash. + </para> + <para> + <emphasis> + Default value is <quote>5</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>reload_delta</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("dialplan", "reload_delta", 1) +... + </programlisting> + </example> + </section> + </section> @@ -620,8 +647,9 @@ xlog("translated to var $var(y) \n"); <function moreinfo="none">dp_reload()</function> </title> <para> - Reload the translation rules from the database. Note that there is - a rate limiting of maximum one reload in five seconds. + Reload the translation rules from the database. Note that there is a + rate limiting defined by 'reload_delta' paramenter. By default is allowed + maximum one reload in five seconds. </para> <para> Name: <emphasis>dp_reload</emphasis>

1 0

git:master:02d67f80: rtp_media_server: fix incompatible media format
by Julien Chavanton 05 May '19

05 May '19

Module: kamailio Branch: master Commit: 02d67f80580ca813b98198dcd408c3fcf0b7976a URL: https://github.com/kamailio/kamailio/commit/02d67f80580ca813b98198dcd408c3f… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2019-05-05T19:25:04Z rtp_media_server: fix incompatible media format --- Modified: src/modules/rtp_media_server/rms_dialog_info.c Modified: src/modules/rtp_media_server/rms_sdp.c --- Diff: https://github.com/kamailio/kamailio/commit/02d67f80580ca813b98198dcd408c3f… Patch: https://github.com/kamailio/kamailio/commit/02d67f80580ca813b98198dcd408c3f… --- diff --git a/src/modules/rtp_media_server/rms_dialog_info.c b/src/modules/rtp_media_server/rms_dialog_info.c index f312cff298..4b1d8269b4 100644 --- a/src/modules/rtp_media_server/rms_dialog_info.c +++ b/src/modules/rtp_media_server/rms_dialog_info.c @@ -25,6 +25,7 @@ extern int in_rms_process; static void rms_action_free(rms_dialog_info_t *si) { rms_action_t *a, *tmp; + if (!si->action.prev) return; clist_foreach(&si->action, a, next) { tmp = a; diff --git a/src/modules/rtp_media_server/rms_sdp.c b/src/modules/rtp_media_server/rms_sdp.c index 304fee2b9c..55277987b4 100644 --- a/src/modules/rtp_media_server/rms_sdp.c +++ b/src/modules/rtp_media_server/rms_sdp.c @@ -186,7 +186,7 @@ PayloadType *rms_sdp_check_payload(rms_sdp_info_t *sdp) char *payloads = sdp->payloads.s; char *payload_type_number = strtok(payloads, " "); if(!payload_type_number) { - payload_type_destroy(pt); + shm_free(pt); // payload_type_destroy(pt); return NULL; } pt->type = atoi(payload_type_number); @@ -225,7 +225,7 @@ PayloadType *rms_sdp_check_payload(rms_sdp_info_t *sdp) break; payload_type_number = strtok(NULL, " "); if(!payload_type_number) { - payload_type_destroy(pt); + shm_free(pt); // payload_type_destroy(pt); return NULL; } pt->type = atoi(payload_type_number);

1 0

git:master:e4af8e5a: rtp_media_server: adding docker files
by Julien Chavanton 05 May '19

05 May '19

Module: kamailio Branch: master Commit: e4af8e5a205342dd309493a7bdd1e2cd9335c881 URL: https://github.com/kamailio/kamailio/commit/e4af8e5a205342dd309493a7bdd1e2c… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2019-05-05T18:54:55Z rtp_media_server: adding docker files --- Added: src/modules/rtp_media_server/docker/Dockerfile Added: src/modules/rtp_media_server/docker/build.sh Added: src/modules/rtp_media_server/docker/rtp_media_server.sh Modified: src/modules/rtp_media_server/config_example/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/e4af8e5a205342dd309493a7bdd1e2c… Patch: https://github.com/kamailio/kamailio/commit/e4af8e5a205342dd309493a7bdd1e2c…

1 0

[kamailio/kamailio] KEMI: KSR.htable.sht_reset segfaults on 5.2.2 (#1941)
by gormania 05 May '19

05 May '19

### Description Resetting an htable from kemi causes a segfault. ```python KSR.htable.sht_reset(self._htable) ``` ### Troubleshooting #### Reproduction  #### Debugging Data ``` #0 0x00007f466dad1c06 in core_case_hash (s1=0x7f4672556ec8, s2=0x0, size=0) at ../../core/hashes.h:317 #1 0x00007f466dad3731 in ht_get_table (name=0x7f4672556ec8) at ht_api.c:240 #2 0x00007f466daeabf4 in ht_reset_by_name (hname=0x7f4672556ec8) at htable.c:669 #3 0x00007f466ed83515 in sr_apy_kemi_exec_func_ex (ket=0x7f466dd0f730 <sr_kemi_htable_exports+144>, self=0x0, args=0x7f4673504b10, idx=303) at apy_kemi.c:438 #4 0x00007f466ed87633 in sr_apy_kemi_exec_func (self=0x0, args=0x7f4673504b10, idx=303) at apy_kemi.c:692 #5 0x00007f466ed706ad in sr_apy_kemi_exec_func_303 (self=0x0, args=0x7f4673504b10) at apy_kemi_export.c:2467 #6 0x00007f466e854091 in PyEval_EvalFrameEx () from /usr/lib/x86_64-linux-gnu/libpython2.7.so.1.0 #7 0x00007f466e852390 in PyEval_EvalFrameEx () from /usr/lib/x86_64-linux-gnu/libpython2.7.so.1.0 #8 0x00007f466e852390 in PyEval_EvalFrameEx () from /usr/lib/x86_64-linux-gnu/libpython2.7.so.1.0 #9 0x00007f466e852390 in PyEval_EvalFrameEx () from /usr/lib/x86_64-linux-gnu/libpython2.7.so.1.0 #10 0x00007f466e852390 in PyEval_EvalFrameEx () from /usr/lib/x86_64-linux-gnu/libpython2.7.so.1.0 #11 0x00007f466e9bb29c in PyEval_EvalCodeEx () from /usr/lib/x86_64-linux-gnu/libpython2.7.so.1.0 #12 0x00007f466e90f76d in ?? () from /usr/lib/x86_64-linux-gnu/libpython2.7.so.1.0 #13 0x00007f466e8a75c3 in PyObject_Call () from /usr/lib/x86_64-linux-gnu/libpython2.7.so.1.0 #14 0x00007f466e84f247 in PyEval_EvalFrameEx () from /usr/lib/x86_64-linux-gnu/libpython2.7.so.1.0 #15 0x00007f466e9bb29c in PyEval_EvalCodeEx () from /usr/lib/x86_64-linux-gnu/libpython2.7.so.1.0 #16 0x00007f466e90f670 in ?? () from /usr/lib/x86_64-linux-gnu/libpython2.7.so.1.0 #17 0x00007f466e8a75c3 in PyObject_Call () from /usr/lib/x86_64-linux-gnu/libpython2.7.so.1.0 #18 0x00007f466e964dfc in ?? () from /usr/lib/x86_64-linux-gnu/libpython2.7.so.1.0 #19 0x00007f466e8a75c3 in PyObject_Call () from /usr/lib/x86_64-linux-gnu/libpython2.7.so.1.0 #20 0x00007f466e9ba6c7 in PyEval_CallObjectWithKeywords () from /usr/lib/x86_64-linux-gnu/libpython2.7.so.1.0 #21 0x00007f466eda041f in apy_exec (_msg=0x7f4672556ec8, fname=0x560e4d8eadf8 "ksr_reply_route", fparam=0x0, emode=0) at python_exec.c:145 #22 0x00007f466ed781ae in sr_kemi_config_engine_python (msg=0x7f4672556ec8, rtype=128, rname=0x0, rparam=0x0) at apy_kemi.c:67 #23 0x0000560e4d5fb64c in sr_kemi_route (keng=0x560e4dbdcf60 <_sr_kemi_eng_list>, msg=0x7f4672556ec8, rtype=128, ename=0x0, edata=0x0) at core/kemi.c:2421 #24 0x0000560e4d6d7c57 in receive_msg (buf=0x560e4ed34d30 "SIP/2.0 200 OK\r\nRecord-Route: <sip:sipcore;transport=tcp;lr;nat=yes>\r\nVia: SIP/2.0/TCP 172.16.214.19:5060;rport=41056;received=172.28.1.4;branch=z9hG4bK4c66.ff59d957", '0' <repeats 24 times>, ".0\r\nTo: <si"..., len=515, rcv_info=0x7f46694cc418) at core/receive.c:408 #25 0x0000560e4d776eb5 in receive_tcp_msg ( tcpbuf=0x7f46694cc6f8 "SIP/2.0 200 OK\r\nRecord-Route: <sip:sipcore;transport=tcp;lr;nat=yes>\r\nVia: SIP/2.0/TCP 172.16.214.19:5060;rport=41056;received=172.28.1.4;branch=z9hG4bK4c66.ff59d957", '0' <repeats 24 times>, ".0\r\nTo: <si"..., len=515, rcv_info=0x7f46694cc418, con=0x7f46694cc400) at core/tcp_read.c:1448 #26 0x0000560e4d779192 in tcp_read_req (con=0x7f46694cc400, bytes_read=0x7fff72893524, read_flags=0x7fff7289352c) at core/tcp_read.c:1631 #27 0x0000560e4d77cdb9 in handle_io (fm=0x7f4672544500, events=1, idx=-1) at core/tcp_read.c:1862 #28 0x0000560e4d7696ad in io_wait_loop_epoll (h=0x560e4dc371a0 <io_w>, t=2, repeat=0) at core/io_wait.h:1065 #29 0x0000560e4d77e18f in tcp_receive_loop (unix_sock=22) at core/tcp_read.c:1974 #30 0x0000560e4d6503b3 in tcp_init_children () at core/tcp_main.c:4853 #31 0x0000560e4d54a86d in main_loop () at main.c:1745 #32 0x0000560e4d55199d in main (argc=5, argv=0x7fff72893bc8) at main.c:2696 ``` ``` (gdb) frame #2 0x00007f466daeabf4 in ht_reset_by_name (hname=0x7f4672556ec8) at htable.c:669 669 ht = ht_get_table(hname); (gdb) list 664 } 665 666 static int ht_reset_by_name(str *hname) 667 { 668 ht_t *ht; 669 ht = ht_get_table(hname); 670 if(ht==NULL) { 671 LM_ERR("cannot get hash table [%.*s]\n", hname->len, hname->s); 672 return -1; 673 } (gdb) p hname hname hname_data hname_fixup (gdb) p hname. len s (gdb) p hname.len $10 = 1556597679 (gdb) p hname.s $11 = 0x720000000c <error: Cannot access memory at address 0x720000000c> ``` #### Log Messages  ``` May 1 10:18:56 ws3171 lmrncf[1893]: 0(1) INFO: <core> [main.c:772]: handle_sigs(): SIGCHLD received, but no child has stopped, ignoring it May 1 10:18:56 ws3171 lmrncf[1893]: 6(110) INFO: ctl [io_listener.c:214]: io_listen_loop(): io_listen_loop: using epoll_lt io watch method (config) May 1 10:18:59 ws3171 lmrncf[1893]: 7(111) INFO: [Media] Media connected to ('172.28.1.8', 53350) May 1 10:19:03 ws3171 lmrncf[1893]: 10(114) INFO: {1 1 REGISTER MLqF3GJQD6ZcDgNvd4clLg..} [LMR] Registered gateway IP: 172.16.195.127 May 1 10:19:03 ws3171 lmrncf[1893]: 10(114) INFO: {1 1 REGISTER MLqF3GJQD6ZcDgNvd4clLg..} <core> [core/tcp_main.c:2703]: tcpconn_1st_send(): quick connect for 0x7f2bf92a59e0 May 1 10:19:03 ws3171 lmrncf[1893]: 11(115) ERROR: {2 10 SUBSCRIBE 358eceb71627d8e0-114(a)172.28.1.4} [PoC] Subscribe failed with code 404 May 1 10:19:03 ws3171 lmrncf[1893]: 11(115) ERROR: {2 10 SUBSCRIBE 358eceb71627d8e0-114(a)172.28.1.4} crumb 1 May 1 10:19:03 ws3171 lmrncf[1893]: 11(115) ERROR: {2 10 SUBSCRIBE 358eceb71627d8e0-114(a)172.28.1.4} crumb -- hmmm here goes reset -- affiliation_groups May 1 10:19:03 ws3171 lmrncf[1893]: 12(116) CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 20 May 1 10:19:03 ws3171 lmrncf[1893]: 0(1) ALERT: <core> [main.c:755]: handle_sigs(): child process 115 exited by a signal 11 May 1 10:19:03 ws3171 lmrncf[1893]: 0(1) ALERT: <core> [main.c:758]: handle_sigs(): core was generated May 1 10:19:03 ws3171 lmrncf[1893]: 0(1) INFO: <core> [main.c:781]: handle_sigs(): terminating due to SIGCHLD ``` ### Possible Solutions  It appears that because the kemi htable jump-table references `ht_reset_by_name` (without `ki_` prefix) for `sht_reset` it will be called with `msg` as first argument but `ht_reset_by_name` doesn't accept msg context at all -- its only argument is the name of the htable of interest. ```c++ static sr_kemi_t sr_kemi_htable_exports[] = { { str_init("htable"), str_init("sht_lock"), SR_KEMIP_INT, ki_ht_slot_lock, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("htable"), str_init("sht_unlock"), SR_KEMIP_INT, ki_ht_slot_unlock, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("htable"), str_init("sht_reset"), SR_KEMIP_INT, ht_reset_by_name, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("htable"), str_init("sht_iterator_start"), SR_KEMIP_INT, ki_ht_iterator_start, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("htable"), str_init("sht_iterator_next"), SR_KEMIP_INT, ki_ht_iterator_next, ``` ```c++ static int ht_reset_by_name(str *hname); ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamcmd 1.5 Copyright 2006 iptelorg GmbH This is free software with ABSOLUTELY NO WARRANTY. For details type `warranty'. kamcmd> ver kamailio 5.2.2 (x86_64/linux) kamcmd> ``` * **Operating System**:  ``` Linux b8af694f9887 4.15.0-47-generic #50-Ubuntu SMP Wed Mar 13 10:44:52 UTC 2019 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/1941

2 2

git:5.2:e05a3f30: htable: fix export of kemi sht_reset()
by Daniel-Constantin Mierla 05 May '19

05 May '19

Module: kamailio Branch: 5.2 Commit: e05a3f30986244d1a1bdbefda63278416b8aa2af URL: https://github.com/kamailio/kamailio/commit/e05a3f30986244d1a1bdbefda632784… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-05T08:08:43+02:00 htable: fix export of kemi sht_reset() - GH #1941 (cherry picked from commit 5b9fb55b6697bf3cd16727110a4b4bcb8350357d) --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/e05a3f30986244d1a1bdbefda632784… Patch: https://github.com/kamailio/kamailio/commit/e05a3f30986244d1a1bdbefda632784… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index b35397f752..e48d1d4415 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -677,6 +677,11 @@ static int ht_reset_by_name(str *hname) } +static int ki_ht_reset_by_name(sip_msg_t* msg, str *hname) +{ + return ht_reset_by_name(hname); +} + static int ht_reset(struct sip_msg* msg, char* htname, char* foo) { str sname; @@ -1611,7 +1616,7 @@ static sr_kemi_t sr_kemi_htable_exports[] = { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("htable"), str_init("sht_reset"), - SR_KEMIP_INT, ht_reset_by_name, + SR_KEMIP_INT, ki_ht_reset_by_name, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } },

1 0

git:master:5b9fb55b: htable: fix export of kemi sht_reset()
by Daniel-Constantin Mierla 05 May '19

05 May '19

Module: kamailio Branch: master Commit: 5b9fb55b6697bf3cd16727110a4b4bcb8350357d URL: https://github.com/kamailio/kamailio/commit/5b9fb55b6697bf3cd16727110a4b4bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-05T08:04:55+02:00 htable: fix export of kemi sht_reset() - GH #1941 --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/5b9fb55b6697bf3cd16727110a4b4bc… Patch: https://github.com/kamailio/kamailio/commit/5b9fb55b6697bf3cd16727110a4b4bc… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 7997865f4d..1320330f35 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -677,6 +677,11 @@ static int ht_reset_by_name(str *hname) } +static int ki_ht_reset_by_name(sip_msg_t* msg, str *hname) +{ + return ht_reset_by_name(hname); +} + static int ht_reset(struct sip_msg* msg, char* htname, char* foo) { str sname; @@ -1635,7 +1640,7 @@ static sr_kemi_t sr_kemi_htable_exports[] = { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("htable"), str_init("sht_reset"), - SR_KEMIP_INT, ht_reset_by_name, + SR_KEMIP_INT, ki_ht_reset_by_name, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } },

1 0

[kamailio/kamailio] core: fix timer typo (#1945)
by Seven Du 04 May '19

04 May '19

#### 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/1945 -- Commit Summary -- * core: fix timer typo -- File Changes -- M src/core/timer.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1945.patch https://github.com/kamailio/kamailio/pull/1945.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/1945

2 2

git:master:0b9e0925: Merge pull request #1945 from seven1240/typo
by GitHub 04 May '19

04 May '19

Module: kamailio Branch: master Commit: 0b9e092579acbc3552a78b7f61186c3e47f71029 URL: https://github.com/kamailio/kamailio/commit/0b9e092579acbc3552a78b7f61186c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-05-04T08:46:14+02:00 Merge pull request #1945 from seven1240/typo core: fix timer typo --- Modified: src/core/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/0b9e092579acbc3552a78b7f61186c3… Patch: https://github.com/kamailio/kamailio/commit/0b9e092579acbc3552a78b7f61186c3… --- diff --git a/src/core/timer.c b/src/core/timer.c index 92e26ba5f1..8f6e305b24 100644 --- a/src/core/timer.c +++ b/src/core/timer.c @@ -405,7 +405,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),

1 0

git:master:c85ec2ee: core: fix timer typo
by Seven Du 04 May '19

04 May '19

Module: kamailio Branch: master Commit: c85ec2eed71c5d1bc3957437f27ffe9b6f18f4df URL: https://github.com/kamailio/kamailio/commit/c85ec2eed71c5d1bc3957437f27ffe9… Author: Seven Du <dujinfang(a)x-y-t.cn> Committer: Seven Du <dujinfang(a)x-y-t.cn> Date: 2019-05-04T07:30:23+08:00 core: fix timer typo --- Modified: src/core/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/c85ec2eed71c5d1bc3957437f27ffe9… Patch: https://github.com/kamailio/kamailio/commit/c85ec2eed71c5d1bc3957437f27ffe9… --- diff --git a/src/core/timer.c b/src/core/timer.c index 92e26ba5f1..8f6e305b24 100644 --- a/src/core/timer.c +++ b/src/core/timer.c @@ -405,7 +405,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),

1 0

git:5.2:7fd6ca67: auth_ephemeral: test the lenghts for compared passwords
by Daniel-Constantin Mierla 03 May '19

03 May '19

Module: kamailio Branch: 5.2 Commit: 7fd6ca67616077fb8aab4a279c8b251de94b4a95 URL: https://github.com/kamailio/kamailio/commit/7fd6ca67616077fb8aab4a279c8b251… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-03T11:54:46+02:00 auth_ephemeral: test the lenghts for compared passwords (cherry picked from commit 42129d35e4510092266322168f68f3019d28bdb8) --- Modified: src/modules/auth_ephemeral/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/7fd6ca67616077fb8aab4a279c8b251… Patch: https://github.com/kamailio/kamailio/commit/7fd6ca67616077fb8aab4a279c8b251… --- diff --git a/src/modules/auth_ephemeral/authorize.c b/src/modules/auth_ephemeral/authorize.c index 745f12d7ab..a70d451814 100644 --- a/src/modules/auth_ephemeral/authorize.c +++ b/src/modules/auth_ephemeral/authorize.c @@ -511,8 +511,9 @@ int ki_autheph_authenticate(sip_msg_t *_m, str *susername, str *spassword) { LM_DBG("generated password: %.*s\n", sgenerated_password.len, sgenerated_password.s); - if (strncmp(spassword->s, sgenerated_password.s, - spassword->len) == 0) + if (spassword->len == sgenerated_password.len + && strncmp(spassword->s, sgenerated_password.s, + spassword->len) == 0) { SECRET_UNLOCK; return AUTH_OK;

1 0

git:master:42129d35: auth_ephemeral: test the lenghts for compared passwords
by Daniel-Constantin Mierla 03 May '19

03 May '19

Module: kamailio Branch: master Commit: 42129d35e4510092266322168f68f3019d28bdb8 URL: https://github.com/kamailio/kamailio/commit/42129d35e4510092266322168f68f30… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-03T11:53:15+02:00 auth_ephemeral: test the lenghts for compared passwords --- Modified: src/modules/auth_ephemeral/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/42129d35e4510092266322168f68f30… Patch: https://github.com/kamailio/kamailio/commit/42129d35e4510092266322168f68f30… --- diff --git a/src/modules/auth_ephemeral/authorize.c b/src/modules/auth_ephemeral/authorize.c index 216332b321..bb92a4a219 100644 --- a/src/modules/auth_ephemeral/authorize.c +++ b/src/modules/auth_ephemeral/authorize.c @@ -523,8 +523,9 @@ int ki_autheph_authenticate(sip_msg_t *_m, str *susername, str *spassword) { LM_DBG("generated password: %.*s\n", sgenerated_password.len, sgenerated_password.s); - if (strncmp(spassword->s, sgenerated_password.s, - spassword->len) == 0) + if (spassword->len == sgenerated_password.len + && strncmp(spassword->s, sgenerated_password.s, + spassword->len) == 0) { SECRET_UNLOCK; return AUTH_OK;

1 0

[kamailio/kamailio] KEMI: app_python and app_python3 handles function with 4 parameters and more incorrectly (#1944)
by Thomas Weber 03 May '19

03 May '19

### Description app_python and, in some places, app_python3 handles KEMI calls with 4 and more parameters incorrectly. It uses "or" operations instead of "and" and thus it will always tries to convert the call into a "str-str-str-str" invocation. Also it's missing a "ssii" variant for calling e.g. KSR.htable.sht_setxi() #### Reproduction Try to call KSR.htable.sht_setxs() or KSR.htable.sht_setxi() with app_python. #### Log Messages ``` ERROR: app_python [apy_kemi.c:342]: sr_apy_kemi_exec_func_ex(): unable to retrieve str-str-str-str params 4 ``` ### Possible Solutions Clean up app_python and app_python3 by changing "or" to "and" in lines like this one: ``` if(ket->ptypes[0]==SR_KEMIP_STR || ket->ptypes[1]==SR_KEMIP_STR || ket->ptypes[2]==SR_KEMIP_INT || ket->ptypes[3]==SR_KEMIP_INT) ``` Further, app_python lacks a "ssii" parameter handler so using KSR.htable.sht_setxi() is not possible. **I could contribute a pull request if no core developer has time to fix it.** ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.2 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 5.3.1 ``` -- 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/1944

2 3

[kamailio/kamailio] KEMI: htable.sht_setxs() ignores expiration parameter on 5.2.2 (#1943)
by Thomas Weber 03 May '19

03 May '19

### Description The KEMI function htable.sht_setx() allows us to set a expiration parameter "exval": `int sht_setxs(str "htname", str "itname", str "itval", int exval)` Setting "exval" shows no effect, however. ### Possible Solutions It seems that the "exval" parameter is not passed into ht_set_cell() at all: `if(ht_set_cell(ht, itname, AVP_VAL_STR, &isval, 1)!=0) {` So it should be enough to fix this function call. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.2 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 5.3.1 ``` -- 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/1943

2 2

git:5.2:290eafbd: htable: set expires for kemi htable.sht_setxs()
by Daniel-Constantin Mierla 03 May '19

03 May '19

Module: kamailio Branch: 5.2 Commit: 290eafbdd9423219defdfdc56bad9eeabc036b80 URL: https://github.com/kamailio/kamailio/commit/290eafbdd9423219defdfdc56bad9ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-03T10:41:44+02:00 htable: set expires for kemi htable.sht_setxs() - GH #1943 (cherry picked from commit f64da295f6c3cfa3e340616fcc12564ae2689746) --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/290eafbdd9423219defdfdc56bad9ee… Patch: https://github.com/kamailio/kamailio/commit/290eafbdd9423219defdfdc56bad9ee… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 8c4cdea09b..b35397f752 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1041,7 +1041,7 @@ static int ki_ht_setxs(sip_msg_t *msg, str *htname, str *itname, str *itval, } } isval.s = *itval; - if(ht_set_cell(ht, itname, AVP_VAL_STR, &isval, 1)!=0) { + if(ht_set_cell_ex(ht, itname, AVP_VAL_STR, &isval, 1, exval)!=0) { LM_ERR("cannot set hash table: %.*s key: %.*s\n", htname->len, htname->s, itname->len, itname->s); return -1;

1 0

git:master:f64da295: htable: set expires for kemi htable.sht_setxs()
by Daniel-Constantin Mierla 03 May '19

03 May '19

Module: kamailio Branch: master Commit: f64da295f6c3cfa3e340616fcc12564ae2689746 URL: https://github.com/kamailio/kamailio/commit/f64da295f6c3cfa3e340616fcc12564… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-03T10:39:22+02:00 htable: set expires for kemi htable.sht_setxs() - GH #1943 --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/f64da295f6c3cfa3e340616fcc12564… Patch: https://github.com/kamailio/kamailio/commit/f64da295f6c3cfa3e340616fcc12564… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 4d70d6e317..7997865f4d 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1041,7 +1041,7 @@ static int ki_ht_setxs(sip_msg_t *msg, str *htname, str *itname, str *itval, } } isval.s = *itval; - if(ht_set_cell(ht, itname, AVP_VAL_STR, &isval, 1)!=0) { + if(ht_set_cell_ex(ht, itname, AVP_VAL_STR, &isval, 1, exval)!=0) { LM_ERR("cannot set hash table: %.*s key: %.*s\n", htname->len, htname->s, itname->len, itname->s); return -1;

1 0

git:5.2:c19ab2e8: app_python3: use PyBytes_AS_STRING() instead of PyString_AsString()
by Daniel-Constantin Mierla 03 May '19

03 May '19

Module: kamailio Branch: 5.2 Commit: c19ab2e81ed68379b58df60005f954fe8112ceba URL: https://github.com/kamailio/kamailio/commit/c19ab2e81ed68379b58df60005f954f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-03T10:30:56+02:00 app_python3: use PyBytes_AS_STRING() instead of PyString_AsString() - PyString_AsString() is no longer in Python3 API (cherry picked from commit 48bb059d8ff9b009d3c8afda83e0c964ab604d5a) --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/c19ab2e81ed68379b58df60005f954f… Patch: https://github.com/kamailio/kamailio/commit/c19ab2e81ed68379b58df60005f954f… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 78e5194914..15820cafd0 100755 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -777,8 +777,8 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) " took too long [%u ms] (file:%s func:%s line:%d)\n", (ket->mname.len>0)?ket->mname.s:"", (ket->mname.len>0)?".":"", ket->fname.s, tdiff, - (pframe)?PyString_AsString(pframe->f_code->co_filename):"", - (pframe)?PyString_AsString(pframe->f_code->co_name):"", + (pframe)?PyBytes_AS_STRING(pframe->f_code->co_filename):"", + (pframe)?PyBytes_AS_STRING(pframe->f_code->co_name):"", (pframe)?PyCode_Addr2Line(pframe->f_code, pframe->f_lasti):0); } }

1 0

git:master:48bb059d: app_python3: use PyBytes_AS_STRING() instead of PyString_AsString()
by Daniel-Constantin Mierla 03 May '19

03 May '19

Module: kamailio Branch: master Commit: 48bb059d8ff9b009d3c8afda83e0c964ab604d5a URL: https://github.com/kamailio/kamailio/commit/48bb059d8ff9b009d3c8afda83e0c96… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-03T10:28:18+02:00 app_python3: use PyBytes_AS_STRING() instead of PyString_AsString() - PyString_AsString() is no longer in Python3 API --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/48bb059d8ff9b009d3c8afda83e0c96… Patch: https://github.com/kamailio/kamailio/commit/48bb059d8ff9b009d3c8afda83e0c96… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index b01ac53890..7a93e7ca98 100755 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -777,8 +777,8 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) " took too long [%u ms] (file:%s func:%s line:%d)\n", (ket->mname.len>0)?ket->mname.s:"", (ket->mname.len>0)?".":"", ket->fname.s, tdiff, - (pframe)?PyString_AsString(pframe->f_code->co_filename):"", - (pframe)?PyString_AsString(pframe->f_code->co_name):"", + (pframe)?PyBytes_AS_STRING(pframe->f_code->co_filename):"", + (pframe)?PyBytes_AS_STRING(pframe->f_code->co_name):"", (pframe)?PyCode_Addr2Line(pframe->f_code, pframe->f_lasti):0); } }

1 0

git:5.2:8dcb2442: app_python3: proper cast for ssiis function execution
by Daniel-Constantin Mierla 03 May '19

03 May '19

Module: kamailio Branch: 5.2 Commit: 8dcb244225aa93554e5de6272420dc5cbec84ee1 URL: https://github.com/kamailio/kamailio/commit/8dcb244225aa93554e5de6272420dc5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-03T09:38:37+02:00 app_python3: proper cast for ssiis function execution --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/8dcb244225aa93554e5de6272420dc5… Patch: https://github.com/kamailio/kamailio/commit/8dcb244225aa93554e5de6272420dc5… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index cee8e6037f..78e5194914 100755 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -701,8 +701,8 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, PyObject *arg && ket->ptypes[2]==SR_KEMIP_INT && ket->ptypes[3]==SR_KEMIP_INT && ket->ptypes[4]==SR_KEMIP_STR) { - /* sssss */ - ret = ((sr_kemi_fmsssss_f)(ket->func))(lmsg, + /* ssnns */ + ret = ((sr_kemi_fmssnns_f)(ket->func))(lmsg, &vps[0].s, &vps[1].s, vps[2].n, vps[3].n, &vps[4].s); return sr_kemi_apy_return_int(ket, ret);

1 0

git:5.2:42117d15: apy_python: fixed condition in matching parameter types
by Daniel-Constantin Mierla 03 May '19

03 May '19

Module: kamailio Branch: 5.2 Commit: 42117d15568025c5604f5aa82d47deec5f996b5a URL: https://github.com/kamailio/kamailio/commit/42117d15568025c5604f5aa82d47dee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-03T09:35:06+02:00 apy_python: fixed condition in matching parameter types - GH #1944 (cherry picked from commit cbec7f92213de1ff096ea00c5a7a3b6354f7ede9) --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/42117d15568025c5604f5aa82d47dee… Patch: https://github.com/kamailio/kamailio/commit/42117d15568025c5604f5aa82d47dee…

1 0

git:5.2:63185483: core: kemi - define for function type with (str*, str*, int, int, str*) params
by Daniel-Constantin Mierla 03 May '19

03 May '19

Module: kamailio Branch: 5.2 Commit: 63185483ae8f13e7199c9eedd30d0794a1598a05 URL: https://github.com/kamailio/kamailio/commit/63185483ae8f13e7199c9eedd30d079… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-03T09:36:51+02:00 core: kemi - define for function type with (str*, str*, int, int, str*) params (cherry picked from commit a23f98c1751fffb80463ea61c4de76f62f8dbb6f) --- Modified: src/core/kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/63185483ae8f13e7199c9eedd30d079… Patch: https://github.com/kamailio/kamailio/commit/63185483ae8f13e7199c9eedd30d079… --- diff --git a/src/core/kemi.h b/src/core/kemi.h index 96ecf98cd2..5d3c84ebb7 100644 --- a/src/core/kemi.h +++ b/src/core/kemi.h @@ -108,6 +108,7 @@ typedef int (*sr_kemi_fmssss_f)(sip_msg_t*, str*, str*, str*, str*); /* sip_msg_t and five int|str params */ typedef int (*sr_kemi_fmsssss_f)(sip_msg_t*, str*, str*, str*, str*, str*); +typedef int (*sr_kemi_fmssnns_f)(sip_msg_t*, str*, str*, int, int, str*); /* sip_msg_t and six int|str params */ typedef int (*sr_kemi_fmssssss_f)(sip_msg_t*, str*, str*, str*, str*, str*, str*);

1 0

git:5.2:babd8c28: app_python: handle kemi sssi parameters
by Daniel-Constantin Mierla 03 May '19

03 May '19

Module: kamailio Branch: 5.2 Commit: babd8c28b27a2f4154ca3997b04d181f019c82c8 URL: https://github.com/kamailio/kamailio/commit/babd8c28b27a2f4154ca3997b04d181… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-03T09:37:04+02:00 app_python: handle kemi sssi parameters (cherry picked from commit a36f2c050ff607b5f3c08b7fc8ed01e082e91dc8) --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/babd8c28b27a2f4154ca3997b04d181… Patch: https://github.com/kamailio/kamailio/commit/babd8c28b27a2f4154ca3997b04d181… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index d9d2cf08d7..d621eae774 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -351,6 +351,22 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, fname.len, fname.s, vps[0].s.len, vps[0].s.s, vps[1].s.len, vps[1].s.s, vps[2].s.len, vps[2].s.s, vps[3].s.len, vps[3].s.s); + } else if(ket->ptypes[0]==SR_KEMIP_STR + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_INT) { + if(!PyArg_ParseTuple(args, "sssi:kemi-param-sssn", + &vps[0].s.s, &vps[1].s.s, &vps[2].s.s, &vps[3].n)) { + LM_ERR("unable to retrieve str-str-int-int params %d\n", i); + return sr_kemi_apy_return_false(); + } + vps[0].s.len = strlen(vps[0].s.s); + vps[1].s.len = strlen(vps[1].s.s); + vps[2].s.len = strlen(vps[2].s.s); + LM_DBG("params[%d] for: %.*s are str: [%.*s] [%.*s]" + " [%.*s] [%d]\n", i, + fname.len, fname.s, vps[0].s.len, vps[0].s.s, + vps[1].s.len, vps[1].s.s, vps[2].s.len, vps[2].s.s, vps[3].n); } else if(ket->ptypes[0]==SR_KEMIP_STR && ket->ptypes[1]==SR_KEMIP_STR && ket->ptypes[2]==SR_KEMIP_INT

1 0

git:5.2:c4cda7ba: app_python3: fixed condition for function with siis params
by Daniel-Constantin Mierla 03 May '19

03 May '19

Module: kamailio Branch: 5.2 Commit: c4cda7ba406215ec8b84176ea533038770fd4485 URL: https://github.com/kamailio/kamailio/commit/c4cda7ba406215ec8b84176ea533038… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-03T09:14:58+02:00 app_python3: fixed condition for function with siis params - GH #1944 (cherry picked from commit 5d5b9786d3cd765a9cf957e34d849fec34bf5e9f) --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/c4cda7ba406215ec8b84176ea533038… Patch: https://github.com/kamailio/kamailio/commit/c4cda7ba406215ec8b84176ea533038… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 32d99913a4..0b78c29107 100755 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -415,6 +415,25 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, PyObject *arg fname.len, fname.s, vps[0].s.len, vps[0].s.s, vps[1].s.len, vps[1].s.s, vps[2].s.len, vps[2].s.s, vps[3].s.len, vps[3].s.s, vps[4].s.len, vps[4].s.s); + } else if(ket->ptypes[0]==SR_KEMIP_STR + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_INT + && ket->ptypes[4]==SR_KEMIP_STR) { + if(!PyArg_ParseTuple(args, "ssiis:kemi-param-ssnns", + &vps[0].s.s, &vps[1].s.s, &vps[2].n, &vps[3].n, + &vps[4].s.s)) { + LM_ERR("unable to retrieve str-str-int-int-str params %d\n", i); + return sr_kemi_apy_return_false(); + } + vps[0].s.len = strlen(vps[0].s.s); + vps[1].s.len = strlen(vps[1].s.s); + vps[4].s.len = strlen(vps[4].s.s); + LM_DBG("params[%d] for: %.*s are str: [%.*s] [%.*s]" + " [%d] [%d] [%.*s]\n", i, + fname.len, fname.s, vps[0].s.len, vps[0].s.s, + vps[1].s.len, vps[1].s.s, vps[2].n, vps[3].n, + vps[4].s.len, vps[4].s.s); } else { LM_ERR("not implemented yet\n"); return sr_kemi_apy_return_false(); @@ -661,6 +680,16 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, PyObject *arg &vps[0].s, &vps[1].s, &vps[2].s, &vps[3].s, &vps[4].s); return sr_kemi_apy_return_int(ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_STR + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_INT + && ket->ptypes[4]==SR_KEMIP_STR) { + /* sssss */ + ret = ((sr_kemi_fmsssss_f)(ket->func))(lmsg, + &vps[0].s, &vps[1].s, vps[2].n, vps[3].n, + &vps[4].s); + return sr_kemi_apy_return_int(ket, ret); } else { LM_ERR("invalid parameters for: %.*s\n", fname.len, fname.s);

1 0

git:5.2:c4018e1b: app_python3: handle kemi sssi parameters
by Daniel-Constantin Mierla 03 May '19

03 May '19

Module: kamailio Branch: 5.2 Commit: c4018e1bba7c84274c9bfa1d2380d39232e1de46 URL: https://github.com/kamailio/kamailio/commit/c4018e1bba7c84274c9bfa1d2380d39… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-03T09:15:10+02:00 app_python3: handle kemi sssi parameters (cherry picked from commit 6bc7853a114fb000744cba3a43f346f71e640452) --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/c4018e1bba7c84274c9bfa1d2380d39… Patch: https://github.com/kamailio/kamailio/commit/c4018e1bba7c84274c9bfa1d2380d39… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 0b78c29107..cee8e6037f 100755 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -358,6 +358,22 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, PyObject *arg fname.len, fname.s, vps[0].s.len, vps[0].s.s, vps[1].s.len, vps[1].s.s, vps[2].s.len, vps[2].s.s, vps[3].s.len, vps[3].s.s); + } else if(ket->ptypes[0]==SR_KEMIP_STR + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_INT) { + if(!PyArg_ParseTuple(args, "sssi:kemi-param-sssn", + &vps[0].s.s, &vps[1].s.s, &vps[2].s.s, &vps[3].n)) { + LM_ERR("unable to retrieve str-str-str-int params %d\n", i); + return sr_kemi_apy_return_false(); + } + vps[0].s.len = strlen(vps[0].s.s); + vps[1].s.len = strlen(vps[1].s.s); + vps[2].s.len = strlen(vps[2].s.s); + LM_DBG("params[%d] for: %.*s are str: [%.*s] [%.*s]" + " [%.*s] [%d]\n", i, + fname.len, fname.s, vps[0].s.len, vps[0].s.s, + vps[1].s.len, vps[1].s.s, vps[2].s.len, vps[2].s.s, vps[3].n); } else if(ket->ptypes[0]==SR_KEMIP_STR && ket->ptypes[1]==SR_KEMIP_STR && ket->ptypes[2]==SR_KEMIP_INT

1 0

git:5.2:562287f4: app_python3: execution log message based on core latency_limit_action
by Daniel-Constantin Mierla 03 May '19

03 May '19

Module: kamailio Branch: 5.2 Commit: 562287f4c43e1dc8b1a0ff74f76a80118df06508 URL: https://github.com/kamailio/kamailio/commit/562287f4c43e1dc8b1a0ff74f76a801… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-03T09:11:14+02:00 app_python3: execution log message based on core latency_limit_action (cherry picked from commit cce69dad4682c8bdc4085fe1513dece44643bd9c) --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/562287f4c43e1dc8b1a0ff74f76a801… Patch: https://github.com/kamailio/kamailio/commit/562287f4c43e1dc8b1a0ff74f76a801… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 9f78e53089..b3812a6237 100755 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -23,6 +23,7 @@ #include <stdlib.h> #include <Python.h> +#include <frameobject.h> #include "../../core/dprint.h" #include "../../core/route.h" @@ -30,6 +31,7 @@ #include "../../core/kemi.h" #include "../../core/locking.h" #include "../../core/pvar.h" +#include "../../core/timer.h" #include "../../core/mem/pkg.h" #include "../../core/mem/shm.h" #include "../../core/rpc.h" @@ -166,12 +168,11 @@ PyObject *sr_apy_kemi_return_str(sr_kemi_t *ket, char *sval, int slen) /** * */ -PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) +PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, PyObject *args, int idx) { str fname; int i; int ret; - sr_kemi_t *ket = NULL; sr_kemi_val_t vps[SR_KEMI_PARAMS_MAX]; sr_apy_env_t *env_P; sip_msg_t *lmsg = NULL; @@ -188,10 +189,6 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) lmsg = env_P->msg; } - ket = sr_apy_kemi_export_get(idx); - if(ket==NULL) { - return sr_kemi_apy_return_false(); - } if(ket->mname.len>0) { LM_DBG("execution of method: %.*s\n", ket->fname.len, ket->fname.s); } else { @@ -695,6 +692,50 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) } } +/** + * + */ +PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) +{ + sr_kemi_t *ket = NULL; + PyObject *ret = NULL; + unsigned int ms = 0; + PyThreadState *pstate = NULL; + PyFrameObject *pframe = NULL; + + ket = sr_apy_kemi_export_get(idx); + if(ket==NULL) { + return sr_kemi_apy_return_false(); + } + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) { + ms = TICKS_TO_MS(get_ticks_raw()); + } + + ret = sr_apy_kemi_exec_func_ex(ket, self, args, idx); + + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) { + ms = TICKS_TO_MS(get_ticks_raw()) - ms; + if(ms >= cfg_get(core, core_cfg, latency_limit_action) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + pstate = PyThreadState_GET(); + if (pstate != NULL && pstate->frame != NULL) { + pframe = pstate->frame; + } + + LOG(cfg_get(core, core_cfg, latency_log), + "alert - action KSR.%s%s%s(...)" + " took too long [%u ms] (file:%s func:%s line:%d)\n", + (ket->mname.len>0)?ket->mname.s:"", + (ket->mname.len>0)?".":"", ket->fname.s, ms, + (pframe)?PyString_AsString(pframe->f_code->co_filename):"", + (pframe)?PyString_AsString(pframe->f_code->co_name):"", + (pframe)?PyCode_Addr2Line(pframe->f_code, pframe->f_lasti):0); + } + } + + return ret; +} + /** * */

1 0

git:5.2:76908b45: app_python3: use system time to compute execution duration
by Daniel-Constantin Mierla 03 May '19

03 May '19

Module: kamailio Branch: 5.2 Commit: 76908b459b0ca65a4df0413726a1f465436ebc8c URL: https://github.com/kamailio/kamailio/commit/76908b459b0ca65a4df0413726a1f46… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-03T09:11:22+02:00 app_python3: use system time to compute execution duration (cherry picked from commit 9af0f27f664a2514e1b471411a2b8c362763fccf) --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/76908b459b0ca65a4df0413726a1f46… Patch: https://github.com/kamailio/kamailio/commit/76908b459b0ca65a4df0413726a1f46… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index b3812a6237..32d99913a4 100755 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -699,24 +699,29 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) { sr_kemi_t *ket = NULL; PyObject *ret = NULL; - unsigned int ms = 0; PyThreadState *pstate = NULL; PyFrameObject *pframe = NULL; + struct timeval tvb, tve; + struct timezone tz; + unsigned int tdiff; ket = sr_apy_kemi_export_get(idx); if(ket==NULL) { return sr_kemi_apy_return_false(); } - if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) { - ms = TICKS_TO_MS(get_ticks_raw()); + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tvb, &tz); } ret = sr_apy_kemi_exec_func_ex(ket, self, args, idx); - if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) { - ms = TICKS_TO_MS(get_ticks_raw()) - ms; - if(ms >= cfg_get(core, core_cfg, latency_limit_action) - && is_printable(cfg_get(core, core_cfg, latency_log))) { + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tve, &tz); + tdiff = (tve.tv_sec - tvb.tv_sec) * 1000000 + + (tve.tv_usec - tvb.tv_usec); + if(tdiff >= cfg_get(core, core_cfg, latency_limit_action)) { pstate = PyThreadState_GET(); if (pstate != NULL && pstate->frame != NULL) { pframe = pstate->frame; @@ -726,7 +731,7 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) "alert - action KSR.%s%s%s(...)" " took too long [%u ms] (file:%s func:%s line:%d)\n", (ket->mname.len>0)?ket->mname.s:"", - (ket->mname.len>0)?".":"", ket->fname.s, ms, + (ket->mname.len>0)?".":"", ket->fname.s, tdiff, (pframe)?PyString_AsString(pframe->f_code->co_filename):"", (pframe)?PyString_AsString(pframe->f_code->co_name):"", (pframe)?PyCode_Addr2Line(pframe->f_code, pframe->f_lasti):0);

1 0

git:master:6bc7853a: app_python3: handle kemi sssi parameters
by Daniel-Constantin Mierla 03 May '19

03 May '19

Module: kamailio Branch: master Commit: 6bc7853a114fb000744cba3a43f346f71e640452 URL: https://github.com/kamailio/kamailio/commit/6bc7853a114fb000744cba3a43f346f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-03T09:06:07+02:00 app_python3: handle kemi sssi parameters --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/6bc7853a114fb000744cba3a43f346f… Patch: https://github.com/kamailio/kamailio/commit/6bc7853a114fb000744cba3a43f346f… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 380821389a..b01ac53890 100755 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -358,6 +358,22 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, PyObject *arg fname.len, fname.s, vps[0].s.len, vps[0].s.s, vps[1].s.len, vps[1].s.s, vps[2].s.len, vps[2].s.s, vps[3].s.len, vps[3].s.s); + } else if(ket->ptypes[0]==SR_KEMIP_STR + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_INT) { + if(!PyArg_ParseTuple(args, "sssi:kemi-param-sssn", + &vps[0].s.s, &vps[1].s.s, &vps[2].s.s, &vps[3].n)) { + LM_ERR("unable to retrieve str-str-str-int params %d\n", i); + return sr_kemi_apy_return_false(); + } + vps[0].s.len = strlen(vps[0].s.s); + vps[1].s.len = strlen(vps[1].s.s); + vps[2].s.len = strlen(vps[2].s.s); + LM_DBG("params[%d] for: %.*s are str: [%.*s] [%.*s]" + " [%.*s] [%d]\n", i, + fname.len, fname.s, vps[0].s.len, vps[0].s.s, + vps[1].s.len, vps[1].s.s, vps[2].s.len, vps[2].s.s, vps[3].n); } else if(ket->ptypes[0]==SR_KEMIP_STR && ket->ptypes[1]==SR_KEMIP_STR && ket->ptypes[2]==SR_KEMIP_INT

1 0

git:master:cbec7f92: apy_python: fixed condition in matching parameter types
by Daniel-Constantin Mierla 03 May '19

03 May '19

Module: kamailio Branch: master Commit: cbec7f92213de1ff096ea00c5a7a3b6354f7ede9 URL: https://github.com/kamailio/kamailio/commit/cbec7f92213de1ff096ea00c5a7a3b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-03T08:54:28+02:00 apy_python: fixed condition in matching parameter types - GH #1944 --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/cbec7f92213de1ff096ea00c5a7a3b6… Patch: https://github.com/kamailio/kamailio/commit/cbec7f92213de1ff096ea00c5a7a3b6… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index f89ff5252a..634fa53bfd 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -334,9 +334,9 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, } else if(ket->ptypes[4]==SR_KEMIP_NONE) { i = 4; if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_STR - || ket->ptypes[3]==SR_KEMIP_STR) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR) { if(!PyArg_ParseTuple(args, "ssss:kemi-param-ssss", &vps[0].s.s, &vps[1].s.s, &vps[2].s.s, &vps[3].s.s)) { LM_ERR("unable to retrieve str-str-str-str params %d\n", i); @@ -352,9 +352,9 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, vps[1].s.len, vps[1].s.s, vps[2].s.len, vps[2].s.s, vps[3].s.len, vps[3].s.s); } else if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_INT - || ket->ptypes[3]==SR_KEMIP_INT) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_INT) { if(!PyArg_ParseTuple(args, "ssii:kemi-param-ssnn", &vps[0].s.s, &vps[1].s.s, &vps[2].n, &vps[3].n)) { LM_ERR("unable to retrieve str-str-int-int params %d\n", i); @@ -373,10 +373,10 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, } else if(ket->ptypes[5]==SR_KEMIP_NONE) { i = 5; if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_STR - || ket->ptypes[3]==SR_KEMIP_STR - || ket->ptypes[4]==SR_KEMIP_STR) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR + && ket->ptypes[4]==SR_KEMIP_STR) { if(!PyArg_ParseTuple(args, "sssss:kemi-param-sssss", &vps[0].s.s, &vps[1].s.s, &vps[2].s.s, &vps[3].s.s, &vps[4].s.s)) { @@ -394,10 +394,10 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, vps[1].s.len, vps[1].s.s, vps[2].s.len, vps[2].s.s, vps[3].s.len, vps[3].s.s, vps[4].s.len, vps[4].s.s); } else if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_INT - || ket->ptypes[3]==SR_KEMIP_INT - || ket->ptypes[4]==SR_KEMIP_STR) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_INT + && ket->ptypes[4]==SR_KEMIP_STR) { if(!PyArg_ParseTuple(args, "ssiis:kemi-param-ssnns", &vps[0].s.s, &vps[1].s.s, &vps[2].n, &vps[3].n, &vps[4].s.s)) { @@ -419,11 +419,11 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, } else { i = 6; if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_STR - || ket->ptypes[3]==SR_KEMIP_STR - || ket->ptypes[4]==SR_KEMIP_STR - || ket->ptypes[5]==SR_KEMIP_STR) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR + && ket->ptypes[4]==SR_KEMIP_STR + && ket->ptypes[5]==SR_KEMIP_STR) { if(!PyArg_ParseTuple(args, "ssssss:kemi-param-ssssss", &vps[0].s.s, &vps[1].s.s, &vps[2].s.s, &vps[3].s.s, &vps[4].s.s, &vps[5].s.s)) {

1 0

git:master:a36f2c05: app_python: handle kemi sssi parameters
by Daniel-Constantin Mierla 03 May '19

03 May '19

Module: kamailio Branch: master Commit: a36f2c050ff607b5f3c08b7fc8ed01e082e91dc8 URL: https://github.com/kamailio/kamailio/commit/a36f2c050ff607b5f3c08b7fc8ed01e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-03T09:05:26+02:00 app_python: handle kemi sssi parameters --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/a36f2c050ff607b5f3c08b7fc8ed01e… Patch: https://github.com/kamailio/kamailio/commit/a36f2c050ff607b5f3c08b7fc8ed01e… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index 634fa53bfd..66430fa843 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -351,6 +351,22 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, fname.len, fname.s, vps[0].s.len, vps[0].s.s, vps[1].s.len, vps[1].s.s, vps[2].s.len, vps[2].s.s, vps[3].s.len, vps[3].s.s); + } else if(ket->ptypes[0]==SR_KEMIP_STR + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_INT) { + if(!PyArg_ParseTuple(args, "sssi:kemi-param-sssn", + &vps[0].s.s, &vps[1].s.s, &vps[2].s.s, &vps[3].n)) { + LM_ERR("unable to retrieve str-str-int-int params %d\n", i); + return sr_kemi_apy_return_false(); + } + vps[0].s.len = strlen(vps[0].s.s); + vps[1].s.len = strlen(vps[1].s.s); + vps[2].s.len = strlen(vps[2].s.s); + LM_DBG("params[%d] for: %.*s are str: [%.*s] [%.*s]" + " [%.*s] [%d]\n", i, + fname.len, fname.s, vps[0].s.len, vps[0].s.s, + vps[1].s.len, vps[1].s.s, vps[2].s.len, vps[2].s.s, vps[3].n); } else if(ket->ptypes[0]==SR_KEMIP_STR && ket->ptypes[1]==SR_KEMIP_STR && ket->ptypes[2]==SR_KEMIP_INT

1 0

git:master:5d5b9786: app_python3: fixed condition for function with siis params
by Daniel-Constantin Mierla 03 May '19

03 May '19

Module: kamailio Branch: master Commit: 5d5b9786d3cd765a9cf957e34d849fec34bf5e9f URL: https://github.com/kamailio/kamailio/commit/5d5b9786d3cd765a9cf957e34d849fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-03T08:48:32+02:00 app_python3: fixed condition for function with siis params - GH #1944 --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/5d5b9786d3cd765a9cf957e34d849fe… Patch: https://github.com/kamailio/kamailio/commit/5d5b9786d3cd765a9cf957e34d849fe… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 18f9dd6aa6..380821389a 100755 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -416,10 +416,10 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, PyObject *arg vps[1].s.len, vps[1].s.s, vps[2].s.len, vps[2].s.s, vps[3].s.len, vps[3].s.s, vps[4].s.len, vps[4].s.s); } else if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_INT - || ket->ptypes[3]==SR_KEMIP_INT - || ket->ptypes[4]==SR_KEMIP_STR) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_INT + && ket->ptypes[4]==SR_KEMIP_STR) { if(!PyArg_ParseTuple(args, "ssiis:kemi-param-ssnns", &vps[0].s.s, &vps[1].s.s, &vps[2].n, &vps[3].n, &vps[4].s.s)) {

1 0

master siptrace not backwards compatible
by Juha Heinanen 02 May '19

02 May '19

I built K master and tried to use 5.2 config. That resulted in error: Apr 30 15:47:10 salmon /usr/bin/sip-proxy[1659]: ERROR: siptrace [siptrace.c:908]: w_sip_trace3(): no duplicate_uri modparam nor duplicate uri sip_trace() argument provided! I think it has been practice that backwards compatibility is provided by the next version.

3 4

siptrace module of master back to 5.2 level
by Juha Heinanen 01 May '19

01 May '19

I haven't got any response about the misery with siptrace module. I checked its commit history and become to the conclusion that many commits to master were done without any review whatsoever. For example, there was this commit: siptrace: remove unused trace flag ionutionita92 authored and henningw committed on Mar 19 which obviously badly broke normal use of the module. Then 10 days later the commit was reverted: siptrace: add trace_flag after it was removed ionutionita92 authored and henningw committed 29 days ago This is not how Kamailio should be developed. I'm proposing to revert the module back to 5.2 level after which new commits can be made to it provided that each commit is carefully tested before deployed. -- Juha

3 3

git:master:20febb28: db_text: avoid buffer overflow for large names and/or values in db_text files
by Ovidiu Sas 30 Apr '19

30 Apr '19

Module: kamailio Branch: master Commit: 20febb28402a2e1ef3c23fda6db0825ae64affc6 URL: https://github.com/kamailio/kamailio/commit/20febb28402a2e1ef3c23fda6db0825… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2019-04-30T14:21:38-04:00 db_text: avoid buffer overflow for large names and/or values in db_text files --- Modified: src/modules/db_text/dbt_file.c --- Diff: https://github.com/kamailio/kamailio/commit/20febb28402a2e1ef3c23fda6db0825… Patch: https://github.com/kamailio/kamailio/commit/20febb28402a2e1ef3c23fda6db0825… --- diff --git a/src/modules/db_text/dbt_file.c b/src/modules/db_text/dbt_file.c index a2d35c2406..8b88ed8074 100644 --- a/src/modules/db_text/dbt_file.c +++ b/src/modules/db_text/dbt_file.c @@ -124,7 +124,7 @@ dbt_table_p dbt_load_file(const str *tbn, const str *dbn) return NULL; } - buf = pkg_malloc(_db_text_read_buffer_size); + buf = pkg_malloc(_db_text_read_buffer_size+1); if(!buf) { LM_ERR("error allocating read buffer, %i\n", _db_text_read_buffer_size); goto done; @@ -173,6 +173,12 @@ dbt_table_p dbt_load_file(const str *tbn, const str *dbn) if(c==EOF) goto clean; buf[bp++] = c; + if (bp==_db_text_read_buffer_size) { + LM_ERR("Buffer overflow for file [%s] row=[%d] col=[%d] c=[%c]." + " Please increase 'file_buffer_size' param!\n", + path, crow+1, ccol+1, c); + goto clean; + } c = fgetc(fin); } colp = dbt_column_new(buf, bp); @@ -453,6 +459,12 @@ dbt_table_p dbt_load_file(const str *tbn, const str *dbn) } } buf[bp++] = c; + if (bp==_db_text_read_buffer_size) { + LM_ERR("Buffer overflow for file [%s] row=[%d] col=[%d] c=[%c]." + " Please increase 'file_buffer_size' param!\n", + path, crow+1, ccol+1, c); + goto clean; + } c = fgetc(fin); } dtval.val.str_val.s = buf;

1 0

git:master:3ed1fcdb: db_text: throw an error and abort instead of silently truncate tables
by Ovidiu Sas 30 Apr '19

30 Apr '19

Module: kamailio Branch: master Commit: 3ed1fcdbb9247b1eb10d8d544f2a67b277bd1031 URL: https://github.com/kamailio/kamailio/commit/3ed1fcdbb9247b1eb10d8d544f2a67b… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2019-04-30T13:31:20-04:00 db_text: throw an error and abort instead of silently truncate tables --- Modified: src/modules/db_text/dbt_base.c --- Diff: https://github.com/kamailio/kamailio/commit/3ed1fcdbb9247b1eb10d8d544f2a67b… Patch: https://github.com/kamailio/kamailio/commit/3ed1fcdbb9247b1eb10d8d544f2a67b… --- diff --git a/src/modules/db_text/dbt_base.c b/src/modules/db_text/dbt_base.c index c850501952..d6d9d73f21 100644 --- a/src/modules/db_text/dbt_base.c +++ b/src/modules/db_text/dbt_base.c @@ -296,6 +296,11 @@ int dbt_query(db1_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v, } _drp = _drp->next; } + if (_drp && counter == _db_text_max_result_rows) + { + LM_ERR("Truncated table at [%d] rows. Please increase 'max_result_rows' param!\n", counter); + goto error; + } if (_o_l) {

1 0

git:master:e5983e4c: core: skip link local interfaces in auto-discovery only if bind_ipv6_link_local=0
by Daniel-Constantin Mierla 30 Apr '19

30 Apr '19

Module: kamailio Branch: master Commit: e5983e4c7dc0bb506fcf38a1ad628df880cf0569 URL: https://github.com/kamailio/kamailio/commit/e5983e4c7dc0bb506fcf38a1ad628df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-30T09:24:02+02:00 core: skip link local interfaces in auto-discovery only if bind_ipv6_link_local=0 --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/e5983e4c7dc0bb506fcf38a1ad628df… Patch: https://github.com/kamailio/kamailio/commit/e5983e4c7dc0bb506fcf38a1ad628df… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 4ed7b56487..472be175c0 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1187,8 +1187,11 @@ static int build_iface_list(void) } } if(is_link_local) { - pkg_free(entry); - continue; /* link local addresses are not bindable */ + if(sr_bind_ipv6_link_local==0) { + /* skip - link local addresses are not bindable without scope */ + pkg_free(entry); + continue; + } } if(strlen(ifaces[index].name)==0)

1 0

git:master:3a9fd554: core: tcp - set the scope of IPv6 interface if bind_ipv6_link_local is set
by Daniel-Constantin Mierla 29 Apr '19

29 Apr '19

Module: kamailio Branch: master Commit: 3a9fd55427cf7419587ec087f61f0ef6cbc60f2d URL: https://github.com/kamailio/kamailio/commit/3a9fd55427cf7419587ec087f61f0ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-29T17:27:40+02:00 core: tcp - set the scope of IPv6 interface if bind_ipv6_link_local is set --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/3a9fd55427cf7419587ec087f61f0ef… Patch: https://github.com/kamailio/kamailio/commit/3a9fd55427cf7419587ec087f61f0ef… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 85e06e9513..54288e908f 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -3041,6 +3041,11 @@ int tcp_init(struct socket_info* sock_info) LM_WARN("setsockopt v6 tos: %s (%d)\n", strerror(errno), tos); /* continue since this is not critical */ } + if(sr_bind_ipv6_link_local!=0) { + LM_INFO("setting scope of %s\n", sock_info->address_str.s); + addr->sin6.sin6_scope_id = + ipv6_get_netif_scope(sock_info->address_str.s); + } } #if defined(IP_FREEBIND)

1 0

Vide SIP conferencing kamailio with freeswitch
by Gaurav Bmotra 28 Apr '19

28 Apr '19

HI i m gaurav i have installed kamailio 5.1.x on Ubuntu server 18.4 i want a solution for video conferencing with kamailio as i am using freeswitch with it is there reference guide for that plz help

2 1

git:5.1:d8e930a1: pkg/kamailio/obs: Defined missing RPM macros for RHEL/CentOS 6
by Sergey Safarov 25 Apr '19

25 Apr '19

Module: kamailio Branch: 5.1 Commit: d8e930a1a9708591ee05d2fb79aadf3c7dc4d61d URL: https://github.com/kamailio/kamailio/commit/d8e930a1a9708591ee05d2fb79aadf3… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-04-25T23:08:24+03:00 pkg/kamailio/obs: Defined missing RPM macros for RHEL/CentOS 6 (cherry picked from commit d7c117b961b6c5b6d40cec9b81de94780578d5f2) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/d8e930a1a9708591ee05d2fb79aadf3… Patch: https://github.com/kamailio/kamailio/commit/d8e930a1a9708591ee05d2fb79aadf3… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index ae7832c4c8..7e5301b2d3 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -179,6 +179,11 @@ %bcond_without xmlrpc %endif +# Defining missing macros on RHEL/CentOS 6 +%if 0%{?rhel} == 6 +%define _rundir %{_localstatedir}/run +%endif + # redefine buggy openSUSE Leap _sharedstatedir macro. More info at https://bugzilla.redhat.com/show_bug.cgi?id=183370 %if 0%{?suse_version} == 1315 %define _sharedstatedir /var/lib

1 0

git:5.2:9bc44f9f: pkg/kamailio/obs: Defined missing RPM macros for RHEL/CentOS 6
by Sergey Safarov 25 Apr '19

25 Apr '19

Module: kamailio Branch: 5.2 Commit: 9bc44f9ff53a4dd1b4e291d6c89ea2a6f0166c8d URL: https://github.com/kamailio/kamailio/commit/9bc44f9ff53a4dd1b4e291d6c89ea2a… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-04-25T23:07:23+03:00 pkg/kamailio/obs: Defined missing RPM macros for RHEL/CentOS 6 (cherry picked from commit d7c117b961b6c5b6d40cec9b81de94780578d5f2) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/9bc44f9ff53a4dd1b4e291d6c89ea2a… Patch: https://github.com/kamailio/kamailio/commit/9bc44f9ff53a4dd1b4e291d6c89ea2a… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 1b99719050..b2ca027d5a 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -219,6 +219,11 @@ %bcond_without xmlrpc %endif +# Defining missing macros on RHEL/CentOS 6 +%if 0%{?rhel} == 6 +%define _rundir %{_localstatedir}/run +%endif + # redefine buggy openSUSE Leap _sharedstatedir macro. More info at https://bugzilla.redhat.com/show_bug.cgi?id=183370 %if 0%{?suse_version} == 1315 %define _sharedstatedir /var/lib

1 0

[kamailio/kamailio] Cannot install 5.2.2 in docker container (#1935)
by Manfred 25 Apr '19

25 Apr '19

### Description I'm trying to install Kamailio 5.2.2 from the official rpm-repos in a CentOS6 docker-container. I'm running it on Ubuntu 18.04 in docker 18.09.2. I'm getting errors about `Package does not match intended download`. #### Reproduction ``` $ docker run -it centos:6.9 bash [root@8d05c1d9a3d7 /]# yum install -y wget && \ > cd /etc/yum.repos.d && \ > wget 'http://download.opensuse.org/repositories/home:/kamailio:/v5.2.x-rpms/CentO…' && \ > yum install -y kamailio Loaded plugins: fastestmirror, ovl Setting up Install Process base | 3.7 kB 00:00 base/primary_db | 4.7 MB 00:02 extras | 3.4 kB 00:00 extras/primary_db | 29 kB 00:00 updates | 3.4 kB 00:00 updates/primary_db | 3.7 MB 00:01 Resolving Dependencies --> Running transaction check ---> Package wget.x86_64 0:1.12-10.el6 will be installed --> Finished Dependency Resolution Dependencies Resolved ================================================================================================================= Package Arch Version Repository Size ================================================================================================================= Installing: wget x86_64 1.12-10.el6 base 484 k Transaction Summary ================================================================================================================= Install 1 Package(s) Total download size: 484 k Installed size: 1.8 M Downloading Packages: wget-1.12-10.el6.x86_64.rpm | 484 kB 00:00 warning: rpmts_HdrFromFdno: Header V3 RSA/SHA1 Signature, key ID c105b9de: NOKEY Retrieving key from file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 Importing GPG key 0xC105B9DE: Userid : CentOS-6 Key (CentOS 6 Official Signing Key) <centos-6-key(a)centos.org> Package: centos-release-6-9.el6.12.3.x86_64 (@CentOS/6.9) From : /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 Running rpm_check_debug Running Transaction Test Transaction Test Succeeded Running Transaction Installing : wget-1.12-10.el6.x86_64 1/1 install-info: No such file or directory for /usr/share/info/wget.info.gz Verifying : wget-1.12-10.el6.x86_64 1/1 Installed: wget.x86_64 0:1.12-10.el6 Complete! --2019-04-23 14:22:48-- http://download.opensuse.org/repositories/home:/kamailio:/v5.2.x-rpms/CentO… Resolving download.opensuse.org... 195.135.221.134, 2620:113:80c0:8::13 Connecting to download.opensuse.org|195.135.221.134|:80... connected. HTTP request sent, awaiting response... 200 OK Length: 308 Saving to: `home:kamailio:v5.2.x-rpms.repo' 100%[=======================================================================>] 308 --.-K/s in 0s 2019-04-23 14:22:48 (41.6 MB/s) - `home:kamailio:v5.2.x-rpms.repo' saved [308/308] Loaded plugins: fastestmirror, ovl Setting up Install Process Determining fastest mirrors * base: mirror.nsc.liu.se * extras: mirror.nsc.liu.se * updates: mirror.nsc.liu.se home_kamailio_v5.2.x-rpms | 1.3 kB 00:00 home_kamailio_v5.2.x-rpms/primary | 8.9 kB 00:00 home_kamailio_v5.2.x-rpms 47/47 Resolving Dependencies --> Running transaction check ---> Package kamailio.x86_64 0:5.2.2-4.el6 will be installed --> Finished Dependency Resolution Dependencies Resolved ================================================================================================================= Package Arch Version Repository Size ================================================================================================================= Installing: kamailio x86_64 5.2.2-4.el6 home_kamailio_v5.2.x-rpms 5.5 M Transaction Summary ================================================================================================================= Install 1 Package(s) Total download size: 5.5 M Installed size: 25 M Downloading Packages: kamailio-5.2.2-4.el6.x86_64.rpm | 5.5 MB 00:02 http://download.opensuse.org/repositories/home%3A/kamailio%3A/v5.2.x-rpms/C…: [Errno -1] Package does not match intended download. Suggestion: run yum --enablerepo=home_kamailio_v5.2.x-rpms clean metadata Trying other mirror. Error Downloading Packages: kamailio-5.2.2-4.el6.x86_64: failure: x86_64/kamailio-5.2.2-4.el6.x86_64.rpm from home_kamailio_v5.2.x-rpms: [Errno 256] No more mirrors to try. ``` The error reads `kamailio-5.2.2-4.el6.x86_64.rpm: [Errno -1] Package does not match intended download. Suggestion: run yum --enablerepo=home_kamailio_v5.2.x-rpms clean metadata`. The suggestion doesn't help. Have I made a mistake or is the repo broken? * **Operating System**:  ``` $ lsb_release -a No LSB modules are available. Distributor ID: Ubuntu Description: Ubuntu 18.04.2 LTS Release: 18.04 Codename: bionic $ uname -a Linux madell-thinkpad 4.15.0-47-generic #50-Ubuntu SMP Wed Mar 13 10:44:52 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux $ docker version Client: Version: 18.09.2 API version: 1.39 Go version: go1.10.4 Git commit: 6247962 Built: Tue Feb 26 23:52:23 2019 OS/Arch: linux/amd64 Experimental: false Server: Engine: Version: 18.09.2 API version: 1.39 (minimum version 1.12) Go version: go1.10.4 Git commit: 6247962 Built: Wed Feb 13 00:24:14 2019 OS/Arch: linux/amd64 Experimental: false $ docker image inspect centos:6.9 [ { "Id": "sha256:2199b8eb8390197d175b1dd57ed79f53ed92ffa58e23826ada54113262237e56", "RepoTags": [ "centos:6.9" ], "RepoDigests": [ "centos@sha256:8c538ac91da5eb1be8f4962cb02f7171043aa782eac22b6046fecc0fd4d006c5" ], "Parent": "", "Comment": "", "Created": "2019-03-14T21:22:46.023197937Z", "Container": "d3e1bd47b7bc5704e90893c57f35b4b446adc24229e93cec053e5dbddfbd56ce", "ContainerConfig": { "Hostname": "d3e1bd47b7bc", "Domainname": "", "User": "", "AttachStdin": false, "AttachStdout": false, "AttachStderr": false, "Tty": false, "OpenStdin": false, "StdinOnce": false, "Env": [ "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" ], "Cmd": [ "/bin/sh", "-c", "#(nop) ", "CMD [\"/bin/bash\"]" ], "ArgsEscaped": true, "Image": "sha256:2949d2914bc8bcf330ffdea46d30b8798fe9be92c6bfdca14ffb8b3ed4a9afc9", "Volumes": null, "WorkingDir": "", "Entrypoint": null, "OnBuild": null, "Labels": { "build-date": "20170406", "license": "GPLv2", "name": "CentOS Base Image", "vendor": "CentOS" } }, "DockerVersion": "18.06.1-ce", "Author": "", "Config": { "Hostname": "", "Domainname": "", "User": "", "AttachStdin": false, "AttachStdout": false, "AttachStderr": false, "Tty": false, "OpenStdin": false, "StdinOnce": false, "Env": [ "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" ], "Cmd": [ "/bin/bash" ], "ArgsEscaped": true, "Image": "sha256:2949d2914bc8bcf330ffdea46d30b8798fe9be92c6bfdca14ffb8b3ed4a9afc9", "Volumes": null, "WorkingDir": "", "Entrypoint": null, "OnBuild": null, "Labels": { "build-date": "20170406", "license": "GPLv2", "name": "CentOS Base Image", "vendor": "CentOS" } }, "Architecture": "amd64", "Os": "linux", "Size": 194752565, "VirtualSize": 194752565, "GraphDriver": { "Data": null, "Name": "aufs" }, "RootFS": { "Type": "layers", "Layers": [ "sha256:aaa5621d7c0157cae5916c9cca66dd8fc2fb4bdb74813ed463b73d5b58cccfdf" ] }, "Metadata": { "LastTagTime": "0001-01-01T00:00:00Z" } } ] ``` -- 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/1935

2 4

git:master:4b160fd7: lcr: make rpc command lcr.load_gw more verbose
by Ovidiu Sas 25 Apr '19

25 Apr '19

Module: kamailio Branch: master Commit: 4b160fd72bc0e532d189d565b86e3f7c1e15926b URL: https://github.com/kamailio/kamailio/commit/4b160fd72bc0e532d189d565b86e3f7… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2019-04-25T14:58:55-05:00 lcr: make rpc command lcr.load_gw more verbose --- Modified: src/modules/lcr/lcr_mod.c Modified: src/modules/lcr/lcr_mod.h Modified: src/modules/lcr/lcr_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/4b160fd72bc0e532d189d565b86e3f7… Patch: https://github.com/kamailio/kamailio/commit/4b160fd72bc0e532d189d565b86e3f7…

1 0

[kamailio/kamailio] cfgt: wrong flow if route has no last action return (#569)
by Victor Seva 25 Apr '19

25 Apr '19

The actual implementation is based on the cfg actions, so when there is no 'return' action defined the route flow detected is wrong. --- 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/569

3 4

git:master:280eabf1: pv: clone string in all substr operations, related to GH #1937
by Henning Westerholt 25 Apr '19

25 Apr '19

Module: kamailio Branch: master Commit: 280eabf16a45f522655f8b49677e46c75d34024f URL: https://github.com/kamailio/kamailio/commit/280eabf16a45f522655f8b49677e46c… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-04-25T21:38:44+02:00 pv: clone string in all substr operations, related to GH #1937 --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/280eabf16a45f522655f8b49677e46c… Patch: https://github.com/kamailio/kamailio/commit/280eabf16a45f522655f8b49677e46c… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index efbf8e8cf2..17c6a3e204 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -614,6 +614,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, } val->rs.s += i; val->rs.len = j; + tr_string_clone_result; break; } i = -i;

1 0

git:master:d7c117b9: pkg/kamailio/obs: Defined missing RPM macros for RHEL/CentOS 6
by Sergey Safarov 25 Apr '19

25 Apr '19

Module: kamailio Branch: master Commit: d7c117b961b6c5b6d40cec9b81de94780578d5f2 URL: https://github.com/kamailio/kamailio/commit/d7c117b961b6c5b6d40cec9b81de947… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-04-25T22:18:14+03:00 pkg/kamailio/obs: Defined missing RPM macros for RHEL/CentOS 6 --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/d7c117b961b6c5b6d40cec9b81de947… Patch: https://github.com/kamailio/kamailio/commit/d7c117b961b6c5b6d40cec9b81de947… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index e38d1b9770..5706b5178e 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -219,6 +219,11 @@ %bcond_without xmlrpc %endif +# Defining missing macros on RHEL/CentOS 6 +%if 0%{?rhel} == 6 +%define _rundir %{_localstatedir}/run +%endif + # redefine buggy openSUSE Leap _sharedstatedir macro. More info at https://bugzilla.redhat.com/show_bug.cgi?id=183370 %if 0%{?suse_version} == 1315 %define _sharedstatedir /var/lib

1 0

git:master:600490c5: core: new global parameter bind_ipv6_link_local
by Daniel-Constantin Mierla 25 Apr '19

25 Apr '19

Module: kamailio Branch: master Commit: 600490c546502786eaef1f2bfbeb18a5bb2a2ee1 URL: https://github.com/kamailio/kamailio/commit/600490c546502786eaef1f2bfbeb18a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-25T21:01:12+02:00 core: new global parameter bind_ipv6_link_local - if set to 1, try to bind also IPv6 link local addresses by discovering the scope of the interface - apply it for udp socket for now, to be added for the other cases --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/core/udp_server.c Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/600490c546502786eaef1f2bfbeb18a… Patch: https://github.com/kamailio/kamailio/commit/600490c546502786eaef1f2bfbeb18a… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 706c1b05ce..dd1b935d8f 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -329,6 +329,7 @@ DNS_CACHE_DEL_NONEXP dns_cache_del_nonexp|dns_cache_delete_nonexpired DNS_CACHE_REC_PREF dns_cache_rec_pref /* ipv6 auto bind */ AUTO_BIND_IPV6 auto_bind_ipv6 +BIND_IPV6_LINK_LOCAL bind_ipv6_link_local /* blacklist */ DST_BLST_INIT dst_blacklist_init USE_DST_BLST use_dst_blacklist @@ -763,6 +764,8 @@ IMPORTFILE "import_file" return DNS_CACHE_REC_PREF; } <INITIAL>{AUTO_BIND_IPV6} { count(); yylval.strval=yytext; return AUTO_BIND_IPV6; } +<INITIAL>{BIND_IPV6_LINK_LOCAL} { count(); yylval.strval=yytext; + return BIND_IPV6_LINK_LOCAL; } <INITIAL>{DST_BLST_INIT} { count(); yylval.strval=yytext; return DST_BLST_INIT; } <INITIAL>{USE_DST_BLST} { count(); yylval.strval=yytext; diff --git a/src/core/cfg.y b/src/core/cfg.y index 2610364481..4c7dcd1307 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -357,6 +357,7 @@ extern char *default_routename; /* ipv6 auto bind */ %token AUTO_BIND_IPV6 +%token BIND_IPV6_LINK_LOCAL /*blacklist*/ %token DST_BLST_INIT @@ -867,6 +868,8 @@ assign_stm: | DNS_CACHE_REC_PREF error { yyerror("boolean value expected"); } | AUTO_BIND_IPV6 EQUAL NUMBER {IF_AUTO_BIND_IPV6(auto_bind_ipv6 = $3);} | AUTO_BIND_IPV6 error { yyerror("boolean value expected"); } + | BIND_IPV6_LINK_LOCAL EQUAL NUMBER {sr_bind_ipv6_link_local = $3;} + | BIND_IPV6_LINK_LOCAL error { yyerror("boolean value expected"); } | DST_BLST_INIT EQUAL NUMBER { IF_DST_BLACKLIST(dst_blacklist_init=$3); } | DST_BLST_INIT error { yyerror("boolean value expected"); } | USE_DST_BLST EQUAL NUMBER { diff --git a/src/core/globals.h b/src/core/globals.h index 0e9e950c62..3790058075 100644 --- a/src/core/globals.h +++ b/src/core/globals.h @@ -140,6 +140,7 @@ extern char* mcast; #endif /* USE_MCAST */ extern int auto_bind_ipv6; +extern int sr_bind_ipv6_link_local; extern int tos; extern int pmtu_discovery; diff --git a/src/core/udp_server.c b/src/core/udp_server.c index 7017b85c7b..2b874ab2ed 100644 --- a/src/core/udp_server.c +++ b/src/core/udp_server.c @@ -49,6 +49,7 @@ #include "receive.h" #include "mem/mem.h" #include "ip_addr.h" +#include "socket_info.h" #include "cfg/cfg_struct.h" #include "events.h" #include "stun.h" @@ -319,6 +320,11 @@ int udp_init(struct socket_info* sock_info) LM_WARN("setsockopt v6 tos: %s\n", strerror(errno)); /* continue since this is not critical */ } + if(sr_bind_ipv6_link_local!=0) { + LM_INFO("setting scope of %s\n", sock_info->address_str.s); + addr->sin6.sin6_scope_id = + ipv6_get_netif_scope(sock_info->address_str.s); + } } #if defined (__OS_linux) && defined(UDP_ERRORS) @@ -397,8 +403,9 @@ int udp_init(struct socket_info* sock_info) (unsigned)sockaddru_len(*addr), sock_info->address_str.s, strerror(errno)); - if (addr->s.sa_family==AF_INET6) - LM_ERR("might be caused by using a link local address, try site local or global\n"); + if (addr->s.sa_family==AF_INET6) { + LM_ERR("might be caused by using a link local address, is 'bind_ipv6_link_local' set?\n"); + } goto error; } diff --git a/src/main.c b/src/main.c index d052ee4e97..6d6d390306 100644 --- a/src/main.c +++ b/src/main.c @@ -426,6 +426,7 @@ int tos = IPTOS_LOWDELAY; int pmtu_discovery = 0; int auto_bind_ipv6 = 0; +int sr_bind_ipv6_link_local = 0; struct socket_info* udp_listen=0; #ifdef USE_TCP

1 0

[kamailio/kamailio] app_jsdt: KSR.x.exit() not working as intended (#1936)
by Sebastian Damm 24 Apr '19

24 Apr '19

### Description  In a project, we implemented parts of our routing logic with javascript. We don't use KEMI at the moment. So most of the routing logic still happens in kamailio.cfg. We have implemented the t_relay part in JS, and after that we want to stop the execution of the routing logic. In kamailio config we would do that with return or exit. In our implementation we used KSR.x.exit(), but the execution of the kamailio config continues. This is how our kamailio config section looks like: ``` # No Accounting special calls if ( $fU =~ "^1234567$") { resetflag(doAccounting); } if (!jsdt_run("routeSomeCallsHere")) { xlog("L_ERR", "JS Call of routeSomeCallsHere route failed.\n"); } # routing decision route(makeRoutingDecision); ``` This is what the JS does: ``` function relayPacket() { KSR.dbg("Sending out packet " + KSR.pv.get("$rm") + " statefully.\n"); if (KSR.tm.t_relay() < 0) { KSR.err("statefulForward: error to <" + KSR.pv.get("$tu") + "> from <" + KSR.pv.get("$fu") + ">\n"); if (KSR.is_method_in("IA")) { KSR.rtpengine.rtpengine_delete0(); } KSR.sl.sl_reply_error(); KSR.x.exit(); return false; } KSR.info("DONE relaying!!!"); KSR.x.exit(); return true; }; ``` Looks to us as if KSR.x.exit() does not work in our scenario. Did we miss something? In the end, Kamailio sends out two INVITEs, one from JS and one from the old routing logic. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.4 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 4.7.2 ``` * **Operating System**: Debian Wheezy -- 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/1936

2 4

git:master:b02b8e82: dialog: handle case of null contact->s value
by Daniel-Constantin Mierla 24 Apr '19

24 Apr '19

Module: kamailio Branch: master Commit: b02b8e82a3afec2c0f7f954b5a996476808ee3c6 URL: https://github.com/kamailio/kamailio/commit/b02b8e82a3afec2c0f7f954b5a99647… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-23T20:51:10+02:00 dialog: handle case of null contact->s value - get over static analyzer report --- Modified: src/modules/dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/b02b8e82a3afec2c0f7f954b5a99647… Patch: https://github.com/kamailio/kamailio/commit/b02b8e82a3afec2c0f7f954b5a99647… --- diff --git a/src/modules/dialog/dlg_hash.c b/src/modules/dialog/dlg_hash.c index 5c11bada52..6035a74f6e 100644 --- a/src/modules/dialog/dlg_hash.c +++ b/src/modules/dialog/dlg_hash.c @@ -584,7 +584,13 @@ int dlg_set_leg_info(struct dlg_cell *dlg, str* tag, str *rr, str *contact, /* contact */ dlg->contact[leg].len = contact->len; - memcpy(dlg->contact[leg].s, contact->s, contact->len); + if(contact->s) { + memcpy(dlg->contact[leg].s, contact->s, contact->len); + } else { + if(contact->len>0) { + memset(dlg->contact[leg].s, 0, contact->len); + } + } /* cseq */ dlg->cseq[leg].len = cs.len; memcpy( dlg->cseq[leg].s, cs.s, cs.len);

1 0

git:master:cd6d509d: core: compare parsed ipv6 addresses in ipv6_get_netif_scope()
by Daniel-Constantin Mierla 24 Apr '19

24 Apr '19

Module: kamailio Branch: master Commit: cd6d509d4030143364a50971870d02ffdc83c175 URL: https://github.com/kamailio/kamailio/commit/cd6d509d4030143364a50971870d02f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-24T11:33:53+02:00 core: compare parsed ipv6 addresses in ipv6_get_netif_scope() --- Modified: src/core/socket_info.c Modified: src/core/socket_info.h --- Diff: https://github.com/kamailio/kamailio/commit/cd6d509d4030143364a50971870d02f… Patch: https://github.com/kamailio/kamailio/commit/cd6d509d4030143364a50971870d02f… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index c77e4b8227..4ed7b56487 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -105,7 +105,7 @@ * return the scope for IPv6 interface matching the ipval parameter * - needed for binding to link local IPv6 addresses */ -unsigned int ipv6_get_netif_scope(const char *ipval) +unsigned int ipv6_get_netif_scope(char *ipval) { struct ifaddrs *netiflist = NULL; struct ifaddrs *netif = NULL; @@ -113,6 +113,20 @@ unsigned int ipv6_get_netif_scope(const char *ipval) unsigned int iscope = 0; int i = 0; int r = 0; + ip_addr_t *ipa = NULL; + ip_addr_t vaddr; + str ips; + + ips.s = ipval; + ips.len = strlen(ipval); + + ipa = str2ip6(&ips); + if(ipa==NULL) { + LM_ERR("could not parse ipv6 address: %s\n", ipval); + return 0; + } + memcpy(&vaddr, ipa, sizeof(ip_addr_t)); + ipa = NULL; /* walk over the list of all network interface addresses */ if(getifaddrs(&netiflist)!=0) { @@ -136,10 +150,15 @@ unsigned int ipv6_get_netif_scope(const char *ipval) break; } } - /* if the ips matche, get scope index from interface name */ - if(strcmp(ipaddr, ipval)==0){ - iscope=if_nametoindex(netif->ifa_name); - goto done; + ips.s = ipaddr; + ips.len = strlen(ipaddr); + ipa = str2ip6(&ips); + if(ipa!=NULL) { + /* if the ips match, get scope index from interface name */ + if(ip_addr_cmp(&vaddr, ipa)) { + iscope=if_nametoindex(netif->ifa_name); + goto done; + } } } } diff --git a/src/core/socket_info.h b/src/core/socket_info.h index e8c684407c..37bfd897f1 100644 --- a/src/core/socket_info.h +++ b/src/core/socket_info.h @@ -151,6 +151,6 @@ typedef struct _sr_phostp { struct socket_info* lookup_local_socket(str *phostp); int parse_protohostport(str* ins, sr_phostp_t *r); -unsigned int ipv6_get_netif_scope(const char *ipval); +unsigned int ipv6_get_netif_scope(char *ipval); #endif

1 0

[kamailio/kamailio] core: fix compilation error (#1934)
by Mikko Lehto 23 Apr '19

23 Apr '19

#### Pre-Submission Checklist - [✓] Commit message has the format required by CONTRIBUTING guide - [✓] Commits are split per component - [✓] Each component has a single commit - [✓] No commits to README files for modules #### 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 #1765 #### Description Macro constant UINT32_MAX is defined in <stdint.h>. GCC and Clang does not complain on Ubuntu 16 GCC and Clang complains on FreeBSD 11. Backporting not needed, PROXY feature only in development branch 5.3. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1934 -- Commit Summary -- * core: fix compilation error -- File Changes -- M src/core/tcp_main.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1934.patch https://github.com/kamailio/kamailio/pull/1934.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/1934

2 1

git:master:285a6710: Merge pull request #1934 from mslehto/UINT32_MAX
by GitHub 23 Apr '19

23 Apr '19

Module: kamailio Branch: master Commit: 285a67101c4b412fcac0b1a6a7f28ab8f25216e0 URL: https://github.com/kamailio/kamailio/commit/285a67101c4b412fcac0b1a6a7f28ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-04-23T14:05:27+02:00 Merge pull request #1934 from mslehto/UINT32_MAX core: fix compilation error --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/285a67101c4b412fcac0b1a6a7f28ab… Patch: https://github.com/kamailio/kamailio/commit/285a67101c4b412fcac0b1a6a7f28ab… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 20e16606c0..85e06e9513 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -50,6 +50,7 @@ #include <sys/uio.h> /* writev*/ #include <netdb.h> #include <stdlib.h> /*exit() */ +#include <stdint.h> /* UINT32_MAX */ #include <unistd.h>

1 0

git:master:3fd0cea8: core: fix compilation error
by Mikko Lehto 23 Apr '19

23 Apr '19

Module: kamailio Branch: master Commit: 3fd0cea891b13c4ba831a2e6d8d5620dc4106efb URL: https://github.com/kamailio/kamailio/commit/3fd0cea891b13c4ba831a2e6d8d5620… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2019-04-23T11:26:14+03:00 core: fix compilation error - UINT32_MAX is defined in <stdint.h> > CC (clang) [kamailio] core/tcp_main.o > core/tcp_main.c:1134:16: error: use of undeclared identifier 'UINT32_MAX' > if (port == UINT32_MAX || port == 0 || port >= (1 << 16)) { > ^ --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/3fd0cea891b13c4ba831a2e6d8d5620… Patch: https://github.com/kamailio/kamailio/commit/3fd0cea891b13c4ba831a2e6d8d5620… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 20e16606c0..85e06e9513 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -50,6 +50,7 @@ #include <sys/uio.h> /* writev*/ #include <netdb.h> #include <stdlib.h> /*exit() */ +#include <stdint.h> /* UINT32_MAX */ #include <unistd.h>

1 0

[kamailio/kamailio] ndb_mongodb: fix initialization crash (#1932)
by Nuno Ferreira 23 Apr '19

23 Apr '19

#### 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 - Initialize mongodb c driver before any other mongo api call. Without this, kamailio would crash with a segmentation fault. This probably won't happen if a module was also already being used with a db_mongodb setup. This issue was initially reported here: https://lists.kamailio.org/pipermail/sr-users/2019-April/105382.html You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1932 -- Commit Summary -- * ndb_mongodb: fix initialization crash -- File Changes -- M src/modules/ndb_mongodb/mongodb_client.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1932.patch https://github.com/kamailio/kamailio/pull/1932.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/1932

2 3

[kamailio/kamailio] modules:sipcapture Fixed wrong pointer for payload buffer. (#1928)
by Alexandr Dubovikov 23 Apr '19

23 Apr '19

#### 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/1928 -- Commit Summary -- * modules:sipcapture Fixed wrong pointer for payload buffer. -- File Changes -- M src/modules/sipcapture/hep.c (4) M src/modules/sipcapture/sipcapture.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1928.patch https://github.com/kamailio/kamailio/pull/1928.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/1928

2 3

git:master:e8ea999b: Merge pull request #1932 from nferreyra/ndb_mongodb_mongoc_init
by GitHub 23 Apr '19

23 Apr '19

Module: kamailio Branch: master Commit: e8ea999b3f208d71fb8bdaa282c5f1d31296860b URL: https://github.com/kamailio/kamailio/commit/e8ea999b3f208d71fb8bdaa282c5f1d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-04-23T08:56:20+02:00 Merge pull request #1932 from nferreyra/ndb_mongodb_mongoc_init ndb_mongodb: fix initialization crash --- Modified: src/modules/ndb_mongodb/mongodb_client.c --- Diff: https://github.com/kamailio/kamailio/commit/e8ea999b3f208d71fb8bdaa282c5f1d… Patch: https://github.com/kamailio/kamailio/commit/e8ea999b3f208d71fb8bdaa282c5f1d… --- diff --git a/src/modules/ndb_mongodb/mongodb_client.c b/src/modules/ndb_mongodb/mongodb_client.c index 746c5876fd..b49f111998 100644 --- a/src/modules/ndb_mongodb/mongodb_client.c +++ b/src/modules/ndb_mongodb/mongodb_client.c @@ -53,6 +53,7 @@ int mongodbc_init(void) return -1; } + mongoc_init(); for(rsrv=_mongodbc_srv_list; rsrv; rsrv=rsrv->next) { if(rsrv->uri==NULL || rsrv->uri->len<=0) {

1 0

git:master:7c9b5c8a: ndb_mongodb: fix initialization crash
by Nuno Ferreira 23 Apr '19

23 Apr '19

Module: kamailio Branch: master Commit: 7c9b5c8ada2933086a7665bca4aaea016a394b1f URL: https://github.com/kamailio/kamailio/commit/7c9b5c8ada2933086a7665bca4aaea0… Author: Nuno Ferreira <nferreira(a)fuze.com> Committer: Nuno Ferreira <nferreira(a)fuze.com> Date: 2019-04-22T19:36:25+01:00 ndb_mongodb: fix initialization crash - Initialize mongodb c driver before any other mongo api call. Without this, kamailio would crash with a segmentation fault. This probably won't happen if a module was also already being used with a db_mongodb setup. --- Modified: src/modules/ndb_mongodb/mongodb_client.c --- Diff: https://github.com/kamailio/kamailio/commit/7c9b5c8ada2933086a7665bca4aaea0… Patch: https://github.com/kamailio/kamailio/commit/7c9b5c8ada2933086a7665bca4aaea0… --- diff --git a/src/modules/ndb_mongodb/mongodb_client.c b/src/modules/ndb_mongodb/mongodb_client.c index 746c5876fd..b49f111998 100644 --- a/src/modules/ndb_mongodb/mongodb_client.c +++ b/src/modules/ndb_mongodb/mongodb_client.c @@ -53,6 +53,7 @@ int mongodbc_init(void) return -1; } + mongoc_init(); for(rsrv=_mongodbc_srv_list; rsrv; rsrv=rsrv->next) { if(rsrv->uri==NULL || rsrv->uri->len<=0) {

1 0

git:master:270af568: modules:sipcapture Fixed wrong pointer for payload buffer.
by Alexandr Dubovikov 23 Apr '19

23 Apr '19

Module: kamailio Branch: master Commit: 270af568892cece36cdd4c3eea05e3afc99634fa URL: https://github.com/kamailio/kamailio/commit/270af568892cece36cdd4c3eea05e3a… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: 2019-04-16T13:28:23+02:00 modules:sipcapture Fixed wrong pointer for payload buffer. --- Modified: src/modules/sipcapture/hep.c Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/270af568892cece36cdd4c3eea05e3a… Patch: https://github.com/kamailio/kamailio/commit/270af568892cece36cdd4c3eea05e3a… --- diff --git a/src/modules/sipcapture/hep.c b/src/modules/sipcapture/hep.c index 0430b96969..f435477a09 100644 --- a/src/modules/sipcapture/hep.c +++ b/src/modules/sipcapture/hep.c @@ -739,7 +739,11 @@ int hepv3_message_parse(char *buf, unsigned int len, sip_msg_t *msg) msg->rcv.proto = PROTO_UDP; if(payload != NULL) + { ret = len - payload_len; + msg->buf = payload; + msg->len = payload_len; + } done: diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index dbb53c0537..a7a7564608 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -2969,11 +2969,8 @@ static int nosip_hep_msg(sr_event_param_t *evp) return 0; } - buf = msg->buf + len; - len = msg->len - len; - - msg->buf = buf; - msg->len = len; + buf = msg->buf; + len = msg->len; } else { LOG(L_ERR, "ERROR: sipcapture:hep_msg_received: not supported version " "or bad length: v:[%d] l:[%d]\n",

1 0

git:master:8df2a65a: Merge pull request #1928 from adubovikov/master
by GitHub 23 Apr '19

23 Apr '19

Module: kamailio Branch: master Commit: 8df2a65a9d39cd929e7e2554d0ff7fa6b176458f URL: https://github.com/kamailio/kamailio/commit/8df2a65a9d39cd929e7e2554d0ff7fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-04-23T08:55:08+02:00 Merge pull request #1928 from adubovikov/master modules:sipcapture Fixed wrong pointer for payload buffer. --- Modified: src/modules/sipcapture/hep.c Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/8df2a65a9d39cd929e7e2554d0ff7fa… Patch: https://github.com/kamailio/kamailio/commit/8df2a65a9d39cd929e7e2554d0ff7fa… --- diff --git a/src/modules/sipcapture/hep.c b/src/modules/sipcapture/hep.c index 0430b96969..f435477a09 100644 --- a/src/modules/sipcapture/hep.c +++ b/src/modules/sipcapture/hep.c @@ -739,7 +739,11 @@ int hepv3_message_parse(char *buf, unsigned int len, sip_msg_t *msg) msg->rcv.proto = PROTO_UDP; if(payload != NULL) + { ret = len - payload_len; + msg->buf = payload; + msg->len = payload_len; + } done: diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index dbb53c0537..a7a7564608 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -2969,11 +2969,8 @@ static int nosip_hep_msg(sr_event_param_t *evp) return 0; } - buf = msg->buf + len; - len = msg->len - len; - - msg->buf = buf; - msg->len = len; + buf = msg->buf; + len = msg->len; } else { LOG(L_ERR, "ERROR: sipcapture:hep_msg_received: not supported version " "or bad length: v:[%d] l:[%d]\n",

1 0

[kamailio/kamailio] siptrace: fix coverity found issue (#1931)
by Ionut Ionita 23 Apr '19

23 Apr '19

#### 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  Fix coverity found issue. Unlikely to happen but still it was a bug leading to potential crashes. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1931 -- Commit Summary -- * siptrace: fix coverity found issue -- File Changes -- M src/modules/siptrace/siptrace.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1931.patch https://github.com/kamailio/kamailio/pull/1931.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/1931

2 4

git:master:ff1ce230: Merge pull request #1931 from ionutionita92/master
by GitHub 23 Apr '19

23 Apr '19

Module: kamailio Branch: master Commit: ff1ce23083387e15cdd7dde5d5b59e5564d2409c URL: https://github.com/kamailio/kamailio/commit/ff1ce23083387e15cdd7dde5d5b59e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-04-23T08:53:28+02:00 Merge pull request #1931 from ionutionita92/master siptrace: safety check for tm callback parameter --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/ff1ce23083387e15cdd7dde5d5b59e5… Patch: https://github.com/kamailio/kamailio/commit/ff1ce23083387e15cdd7dde5d5b59e5… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index c34d25d249..e559d7874a 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1956,6 +1956,12 @@ static void trace_dialog_transaction(struct dlg_cell* dlg, int type, struct dlg_ return; } + /* coverity fix - there shouldn't be a scenario for this to happen */ + if (params == NULL) { + LM_ERR("NULL tm params!\n"); + return; + } + /** * DUAL BYE - internally generated BYE from kamailio * set flag to signal request_in callback which will register

1 0

git:master:c49b50a2: siptrace: safety check for tm callback parameter
by iionita 23 Apr '19

23 Apr '19

Module: kamailio Branch: master Commit: c49b50a26aa7f478c135df39b5d91b17b75b88ff URL: https://github.com/kamailio/kamailio/commit/c49b50a26aa7f478c135df39b5d91b1… Author: iionita <ionut-razvan.ionita(a)1and1.ro> Committer: iionita <ionut-razvan.ionita(a)1and1.ro> Date: 2019-04-23T08:25:06+03:00 siptrace: safety check for tm callback parameter Found via coverity scan. --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/c49b50a26aa7f478c135df39b5d91b1… Patch: https://github.com/kamailio/kamailio/commit/c49b50a26aa7f478c135df39b5d91b1… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index c34d25d249..e559d7874a 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1956,6 +1956,12 @@ static void trace_dialog_transaction(struct dlg_cell* dlg, int type, struct dlg_ return; } + /* coverity fix - there shouldn't be a scenario for this to happen */ + if (params == NULL) { + LM_ERR("NULL tm params!\n"); + return; + } + /** * DUAL BYE - internally generated BYE from kamailio * set flag to signal request_in callback which will register

1 0

git:master:ce1138d2: core: helper function to get scope id for ipv6 network interface
by Daniel-Constantin Mierla 22 Apr '19

22 Apr '19

Module: kamailio Branch: master Commit: ce1138d2d8962296de2867d5751abf770b035da3 URL: https://github.com/kamailio/kamailio/commit/ce1138d2d8962296de2867d5751abf7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-22T20:20:18+02:00 core: helper function to get scope id for ipv6 network interface --- Modified: src/core/socket_info.c Modified: src/core/socket_info.h --- Diff: https://github.com/kamailio/kamailio/commit/ce1138d2d8962296de2867d5751abf7… Patch: https://github.com/kamailio/kamailio/commit/ce1138d2d8962296de2867d5751abf7… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 1f2850a67b..c77e4b8227 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -42,6 +42,7 @@ #include <sys/ioctl.h> #include <net/if.h> #include <ifaddrs.h> +#include <netdb.h> #ifdef HAVE_SYS_SOCKIO_H #include <sys/sockio.h> #endif @@ -100,6 +101,54 @@ #define addr_info_listins sock_listins #define addr_info_listrm sock_listrm +/** + * return the scope for IPv6 interface matching the ipval parameter + * - needed for binding to link local IPv6 addresses + */ +unsigned int ipv6_get_netif_scope(const char *ipval) +{ + struct ifaddrs *netiflist = NULL; + struct ifaddrs *netif = NULL; + char ipaddr[NI_MAXHOST]; + unsigned int iscope = 0; + int i = 0; + int r = 0; + + /* walk over the list of all network interface addresses */ + if(getifaddrs(&netiflist)!=0) { + LM_ERR("failed to get network interfaces - errno: %d\n", errno); + return 0; + } + for(netif = netiflist; netif; netif = netif->ifa_next) { + /* only active and ipv6 */ + if (netif->ifa_addr && (netif->ifa_flags & IFF_UP) + && netif->ifa_addr->sa_family==AF_INET6) { + r = getnameinfo(netif->ifa_addr, sizeof(struct sockaddr_in6), + ipaddr, sizeof(ipaddr), NULL, 0, NI_NUMERICHOST); + if(r!=0) { + LM_ERR("failed to get the name info - ret: %d\n", r); + goto done; + } + /* strip the interface name after */ + for(i=0; ipaddr[i]; i++) { + if(ipaddr[i]=='%') { + ipaddr[i]='\0'; + break; + } + } + /* if the ips matche, get scope index from interface name */ + if(strcmp(ipaddr, ipval)==0){ + iscope=if_nametoindex(netif->ifa_name); + goto done; + } + } + } + +done: + freeifaddrs(netiflist); + return iscope; +} + inline static void addr_info_list_ins_lst(struct addr_info* lst, struct addr_info* after) { diff --git a/src/core/socket_info.h b/src/core/socket_info.h index abc6a150aa..e8c684407c 100644 --- a/src/core/socket_info.h +++ b/src/core/socket_info.h @@ -151,4 +151,6 @@ typedef struct _sr_phostp { struct socket_info* lookup_local_socket(str *phostp); int parse_protohostport(str* ins, sr_phostp_t *r); +unsigned int ipv6_get_netif_scope(const char *ipval); + #endif

1 0

git:master:88997dc3: CONTRIBUTING.md: restructured the chapter about commit message rules
by Daniel-Constantin Mierla 22 Apr '19

22 Apr '19

Module: kamailio Branch: master Commit: 88997dc3cce73c939c5da00b73405773c32fefd7 URL: https://github.com/kamailio/kamailio/commit/88997dc3cce73c939c5da00b7340577… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-22T18:50:46+02:00 CONTRIBUTING.md: restructured the chapter about commit message rules - relocated content from basic rules to a dedicated section about commit message content - notes that references to non-public resources should not be part of commit messages - commits related to code analyzer reports have to describe what was changed, not be just a referenced to the report --- Modified: .github/CONTRIBUTING.md --- Diff: https://github.com/kamailio/kamailio/commit/88997dc3cce73c939c5da00b7340577… Patch: https://github.com/kamailio/kamailio/commit/88997dc3cce73c939c5da00b7340577…

1 0

git:master:ccb8ba34: modules: readme files regenerated - rtp_media_server ... [skip ci]
by Kamailio Dev 21 Apr '19

21 Apr '19

Module: kamailio Branch: master Commit: ccb8ba34736556a628497dcc6ac8b525cf201453 URL: https://github.com/kamailio/kamailio/commit/ccb8ba34736556a628497dcc6ac8b52… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-04-21T22:46:39+02:00 modules: readme files regenerated - rtp_media_server ... [skip ci] --- Modified: src/modules/rtp_media_server/README --- Diff: https://github.com/kamailio/kamailio/commit/ccb8ba34736556a628497dcc6ac8b52… Patch: https://github.com/kamailio/kamailio/commit/ccb8ba34736556a628497dcc6ac8b52… --- diff --git a/src/modules/rtp_media_server/README b/src/modules/rtp_media_server/README index 3ed260c03e..5d4a74cbd2 100644 --- a/src/modules/rtp_media_server/README +++ b/src/modules/rtp_media_server/README @@ -38,7 +38,7 @@ Julien Chavanton 4.1. rms_answer (event_route) 4.2. rms_hangup () 4.3. rms_bridge (target URI, event_route) - 4.4. rms_session_check () + 4.4. rms_dialog_check () 4.5. rms_sip_request () 4.6. rms_play (file, event_route) @@ -48,7 +48,7 @@ Julien Chavanton 1.2. rms_answer usage example 1.3. rms_hangup usage example 1.4. rms_bridge usage example - 1.5. rms_session_check usage example + 1.5. rms_dialog_check usage example 1.6. rms_sip_request usage example 1.7. rms_play usage example @@ -71,7 +71,7 @@ Chapter 1. Admin Guide 4.1. rms_answer (event_route) 4.2. rms_hangup () 4.3. rms_bridge (target URI, event_route) - 4.4. rms_session_check () + 4.4. rms_dialog_check () 4.5. rms_sip_request () 4.6. rms_play (file, event_route) @@ -142,13 +142,14 @@ modparam("rtp_media_server", "log_file_name", "/var/log/rms/rms_ortp.log") 4.1. rms_answer (event_route) 4.2. rms_hangup () 4.3. rms_bridge (target URI, event_route) - 4.4. rms_session_check () + 4.4. rms_dialog_check () 4.5. rms_sip_request () 4.6. rms_play (file, event_route) 4.1. rms_answer (event_route) - Create a session and a call leg and call the event_route + Create a call leg : with a SIP dialog and an RTP session call the + event_route This function can be used from REQUEST_ROUTE, REPLY_ROUTE and FAILURE_ROUTE. @@ -217,12 +218,12 @@ route { t_reply("503", "server error"); } } - if(rms_session_check()) // If the dialog is managed by the RMS module, t -he in-dialog request needs to be handled by it. + if(rms_dialog_check()) // If the dialog is managed by the RMS module, th +e in-dialog request needs to be handled by it. rms_sip_request(); ... -4.4. rms_session_check () +4.4. rms_dialog_check () Returns true if the current SIP message it handled/known by the RMS module, else it may be handle in any other way by Kamailio. @@ -230,10 +231,10 @@ he in-dialog request needs to be handled by it. This function can be used from REQUEST_ROUTE, REPLY_ROUTE and FAILURE_ROUTE. - Example 1.5. rms_session_check usage example + Example 1.5. rms_dialog_check usage example ... - if (rms_session_check()) { - xnotice("This session is handled by the RMS module\n"); + if (rms_dialog_check()) { + xnotice("This dialog is handled by the RMS module\n"); rms_sip_request(); } ... @@ -244,15 +245,15 @@ he in-dialog request needs to be handled by it. forwarded behaving as a B2BUA, the transaction will be suspended until the second leg replies. - If the SIP session is not found "481 Call/Transaction Does Not Exist" - is returned. + If the SIP dialog is not found "481 Call/Transaction Does Not Exist" is + returned. This function can be used from REQUEST_ROUTE, REPLY_ROUTE and FAILURE_ROUTE. Example 1.6. rms_sip_request usage example ... - if (rms_session_check()) { + if (rms_dialog_check()) { rms_sip_request(); } ...

1 0

git:master:f4056ebf: rtp_media_server: bridging refactoring
by Julien Chavanton 21 Apr '19

21 Apr '19

Module: kamailio Branch: master Commit: f4056ebf61952b9e2140031ee0bb63e7340d5709 URL: https://github.com/kamailio/kamailio/commit/f4056ebf61952b9e2140031ee0bb63e… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2019-04-21T20:29:30Z rtp_media_server: bridging refactoring support bridging after answer, play, etc. --- Modified: src/modules/rtp_media_server/rms_media.c Modified: src/modules/rtp_media_server/rms_sdp.c Modified: src/modules/rtp_media_server/rms_session_info.c Modified: src/modules/rtp_media_server/rms_session_info.h Modified: src/modules/rtp_media_server/rtp_media_server.c Modified: src/modules/rtp_media_server/rtp_media_server.h --- Diff: https://github.com/kamailio/kamailio/commit/f4056ebf61952b9e2140031ee0bb63e… Patch: https://github.com/kamailio/kamailio/commit/f4056ebf61952b9e2140031ee0bb63e…

1 0

git:master:3bfbea5f: rtp_media_server: rename rms sessions to rms dialogs
by Julien Chavanton 21 Apr '19

21 Apr '19

Module: kamailio Branch: master Commit: 3bfbea5fc0737aebe29559267cc21e3a10ab0cb4 URL: https://github.com/kamailio/kamailio/commit/3bfbea5fc0737aebe29559267cc21e3… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2019-04-21T20:30:15Z rtp_media_server: rename rms sessions to rms dialogs This was creating confusion, the term session is reserved for the RTP sessions --- Added: src/modules/rtp_media_server/rms_dialog_info.c Added: src/modules/rtp_media_server/rms_dialog_info.h Modified: src/modules/rtp_media_server/config_example/kamailio.cfg Modified: src/modules/rtp_media_server/doc/design_notes.txt Modified: src/modules/rtp_media_server/doc/rtp_media_server_admin.xml Modified: src/modules/rtp_media_server/rms_media.c Modified: src/modules/rtp_media_server/rms_media.h Modified: src/modules/rtp_media_server/rtp_media_server.c Modified: src/modules/rtp_media_server/rtp_media_server.h Removed: src/modules/rtp_media_server/rms_session_info.c Removed: src/modules/rtp_media_server/rms_session_info.h --- Diff: https://github.com/kamailio/kamailio/commit/3bfbea5fc0737aebe29559267cc21e3… Patch: https://github.com/kamailio/kamailio/commit/3bfbea5fc0737aebe29559267cc21e3…

1 0

git:master:bd828828: More string buffer handling improvements in imc module
by Jan Janak 20 Apr '19

20 Apr '19

Module: kamailio Branch: master Commit: bd82882807ad89c7564709db414ddbe26bd70728 URL: https://github.com/kamailio/kamailio/commit/bd82882807ad89c7564709db414ddbe… Author: Jan Janak <janakj(a)cs.columbia.edu> Committer: Jan Janak <janakj(a)cs.columbia.edu> Date: 2019-04-20T12:18:52-04:00 More string buffer handling improvements in imc module Let the compiler do the work of figuring out the size of the string buffer being written to using the sizeof operator. Hopefully, this will make the source code less error-prone and more Coverity friendly. Properly handle all return values of snprintf. In particular, do not fail silently if the function returns -1. --- Modified: src/modules/imc/imc_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/bd82882807ad89c7564709db414ddbe… Patch: https://github.com/kamailio/kamailio/commit/bd82882807ad89c7564709db414ddbe…

1 0

git:master:413b6d57: Fix incorrect length of static string
by GitHub 20 Apr '19

20 Apr '19

Module: kamailio Branch: master Commit: 413b6d572683c0d8e7a40f0788d881112b5a1aa2 URL: https://github.com/kamailio/kamailio/commit/413b6d572683c0d8e7a40f0788d8811… Author: Jan Janak <janakj(a)cs.columbia.edu> Committer: GitHub <noreply(a)github.com> Date: 2019-04-19T16:13:44-04:00 Fix incorrect length of static string This change fixes Coverity bug "185775 Out-of-bounds access". --- Modified: src/modules/imc/imc_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/413b6d572683c0d8e7a40f0788d8811… Patch: https://github.com/kamailio/kamailio/commit/413b6d572683c0d8e7a40f0788d8811… --- diff --git a/src/modules/imc/imc_cmd.c b/src/modules/imc/imc_cmd.c index 391c7840a0..2dd6d834db 100644 --- a/src/modules/imc/imc_cmd.c +++ b/src/modules/imc/imc_cmd.c @@ -991,9 +991,9 @@ int imc_handle_rooms(struct sip_msg* msg, imc_cmd_t *cmd, p = imc_body_buf; left = IMC_BUF_SIZE; - memcpy(p, "Rooms:\n", 9); - p += 9; - left -= 9; + memcpy(p, "Rooms:\n", 7); + p += 7; + left -= 7; for (i = 0; i < imc_hash_size; i++) { lock_get(&_imc_htable[i].lock);

2 1

Kamailio, TLS, and LetsEncrypt
by Gaurav Bmotra 19 Apr '19

19 Apr '19

HI this is Gaurav im using kamailio 5.1.2 on ubuntu 18.4 i am trying to configure LetsEncrypt (tls) for kamailio sing following link https://www.fredposner.com/1836/kamailio-tls-and-letsencrypt/ but unable to start kamailio ,i m getting these error ------->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Apr 19 11:23:57 ubuntufresh systemd[1]: Starting Kamailio (OpenSER) - the Open Source SIP Server... Apr 19 11:23:58 ubuntufresh kamailio[5365]: INFO: <core> [core/sctp_core.c:74]: sctp_core_check_support(): SCTP API not enabled - if you want to use it, load sctp module Apr 19 11:23:58 ubuntufresh kamailio[5365]: INFO: <core> [core/tcp_main.c:4721]: init_tcp(): using epoll_lt as the io watch method (auto detected) Apr 19 11:23:58 ubuntufresh kamailio[5365]: Listening on Apr 19 11:23:58 ubuntufresh kamailio[5365]: Aliases: Apr 19 11:23:58 ubuntufresh kernel: kamailio[5378]: segfault at 0 ip 00007f8d6fdac646 sp 00007ffe8e2337f8 error 4 in libc-2.27.so [7f8d6fcfb000+1e7000] Apr 19 11:23:58 ubuntufresh kamailio[5365]: ERROR: <core> [core/daemonize.c:303]: daemonize(): Main process exited before writing to pipe Apr 19 11:23:58 ubuntufresh systemd[1]: kamailio.service: Control process exited, code=exited status=255 Apr 19 11:23:58 ubuntufresh systemd[1]: kamailio.service: Failed with result 'exit-code'. Apr 19 11:23:58 ubuntufresh systemd[1]: Failed to start Kamailio (OpenSER) - the Open Source SIP Server. <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<------------------------------------ plz help -- *Regards:* Gaurav Kumar

2 1

git:master:4b1b3502: siptrace: fixed kemi export parameters for sip_trace_dst_cid_type()
by Daniel-Constantin Mierla 19 Apr '19

19 Apr '19

Module: kamailio Branch: master Commit: 4b1b3502c4bae9bf28f6b538b2a180da5bee3ec2 URL: https://github.com/kamailio/kamailio/commit/4b1b3502c4bae9bf28f6b538b2a180d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-19T08:16:04+02:00 siptrace: fixed kemi export parameters for sip_trace_dst_cid_type() --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/4b1b3502c4bae9bf28f6b538b2a180d… Patch: https://github.com/kamailio/kamailio/commit/4b1b3502c4bae9bf28f6b538b2a180d… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index df848c7ad2..c34d25d249 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2214,7 +2214,7 @@ static sr_kemi_t sr_kemi_siptrace_exports[] = { }, { str_init("siptrace"), str_init("sip_trace_dst_cid_type"), SR_KEMIP_INT, ki_sip_trace_dst_cid_flag, - { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("siptrace"), str_init("hlog"),

1 0

TLS implementation for kamailio
by Gaurav Bmotra 19 Apr '19

19 Apr '19

HI this is Gaurav im using kamailio 5.1.2 on ubuntu 18.4 i want to implement TLs for kamailio plz help -- *Regards:* Gaurav Kumar

1 0

git:master:5d6f35d8: pkg/kamailio/deb: version set to 5.3.0~dev5
by Victor Seva 18 Apr '19

18 Apr '19

Module: kamailio Branch: master Commit: 5d6f35d825cd2d688c3618bd37d11f12634d7c8f URL: https://github.com/kamailio/kamailio/commit/5d6f35d825cd2d688c3618bd37d11f1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-04-18T17:09:25+02:00 pkg/kamailio/deb: version set to 5.3.0~dev5 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/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/5d6f35d825cd2d688c3618bd37d11f1… Patch: https://github.com/kamailio/kamailio/commit/5d6f35d825cd2d688c3618bd37d11f1…

1 0

git:master:092f3b53: usrloc: removed ifdefs for WITH_XAVP
by Daniel-Constantin Mierla 18 Apr '19

18 Apr '19

Module: kamailio Branch: master Commit: 092f3b53d6c554eed2de0d2c62093c091a7d1e89 URL: https://github.com/kamailio/kamailio/commit/092f3b53d6c554eed2de0d2c62093c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-18T14:08:49+02:00 usrloc: removed ifdefs for WITH_XAVP --- Modified: src/modules/usrloc/ucontact.c Modified: src/modules/usrloc/usrloc.h --- Diff: https://github.com/kamailio/kamailio/commit/092f3b53d6c554eed2de0d2c62093c0… Patch: https://github.com/kamailio/kamailio/commit/092f3b53d6c554eed2de0d2c62093c0… --- diff --git a/src/modules/usrloc/ucontact.c b/src/modules/usrloc/ucontact.c index 93b30fab05..fe04d2af3d 100644 --- a/src/modules/usrloc/ucontact.c +++ b/src/modules/usrloc/ucontact.c @@ -50,7 +50,6 @@ void ul_set_xavp_contact_clone(int v) ul_xavp_contact_clone = v; } -#ifdef WITH_XAVP /*! * \brief Store xavp list per contact * \param _c contact structure @@ -74,7 +73,6 @@ void ucontact_xavp_store(ucontact_t *_c) _c->xavp = xavp_clone_level_nodata(xavp); return; } -#endif int uldb_delete_attrs_ruid(str* _dname, str *_ruid); @@ -135,9 +133,7 @@ ucontact_t* new_ucontact(str* _dom, str* _aor, str* _contact, ucontact_info_t* _ c->tcpconn_id = _ci->tcpconn_id; c->server_id = _ci->server_id; c->keepalive = (_ci->cflags & nat_bflag)?1:0; -#ifdef WITH_XAVP ucontact_xavp_store(c); -#endif return c; @@ -150,9 +146,7 @@ ucontact_t* new_ucontact(str* _dom, str* _aor, str* _contact, ucontact_info_t* _ if (c->c.s) shm_free(c->c.s); if (c->ruid.s) shm_free(c->ruid.s); if (c->instance.s) shm_free(c->instance.s); -#ifdef WITH_XAVP if (c->xavp) xavp_destroy_list(&c->xavp); -#endif shm_free(c); return 0; } @@ -173,9 +167,7 @@ void free_ucontact(ucontact_t* _c) if (_c->c.s) shm_free(_c->c.s); if (_c->ruid.s) shm_free(_c->ruid.s); if (_c->instance.s) shm_free(_c->instance.s); -#ifdef WITH_XAVP if (_c->xavp) xavp_destroy_list(&_c->xavp); -#endif shm_free( _c ); } @@ -286,7 +278,7 @@ int mem_update_ucontact(ucontact_t* _c, ucontact_info_t* _ci) _c->received.s = 0; _c->received.len = 0; } - + if (_ci->path) { update_str( &_c->path, _ci->path); } else { @@ -295,9 +287,7 @@ int mem_update_ucontact(ucontact_t* _c, ucontact_info_t* _ci) _c->path.len = 0; } -#ifdef WITH_XAVP ucontact_xavp_store(_c); -#endif _c->sock = _ci->sock; _c->expires = _ci->expires; diff --git a/src/modules/usrloc/usrloc.h b/src/modules/usrloc/usrloc.h index 6fb4965539..fed89d1c70 100644 --- a/src/modules/usrloc/usrloc.h +++ b/src/modules/usrloc/usrloc.h @@ -30,9 +30,7 @@ #include "ul_callback.h" #include "../../core/qvalue.h" #include "../../core/str.h" -#ifdef WITH_XAVP #include "../../core/xavp.h" -#endif #define NO_DB 0 #define WRITE_THROUGH 1 @@ -96,9 +94,7 @@ typedef struct ucontact { int server_id; /*!< server id */ int tcpconn_id; /*!< unique tcp connection id */ int keepalive; /*!< keepalive */ -#ifdef WITH_XAVP sr_xavp_t * xavp; /*!< per contact xavps */ -#endif struct ucontact* next; /*!< Next contact in the linked list */ struct ucontact* prev; /*!< Previous contact in the linked list */ } ucontact_t; @@ -124,9 +120,7 @@ typedef struct ucontact_info { int server_id; /*!< server id */ int tcpconn_id; /*!< connection id */ int keepalive; /*!< keepalive */ -#ifdef WITH_XAVP sr_xavp_t * xavp; /*!< per contact xavps */ -#endif time_t last_modified; /*!< last modified */ } ucontact_info_t;

1 0

git:master:25b1f199: tm: removed ifdefs for WITH_XAVP
by Daniel-Constantin Mierla 18 Apr '19

18 Apr '19

Module: kamailio Branch: master Commit: 25b1f199294ae857bf0cdf8c219ee8576fd60f8f URL: https://github.com/kamailio/kamailio/commit/25b1f199294ae857bf0cdf8c219ee85… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-18T14:08:49+02:00 tm: removed ifdefs for WITH_XAVP --- Modified: src/modules/tm/h_table.c Modified: src/modules/tm/h_table.h Modified: src/modules/tm/t_hooks.c Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/25b1f199294ae857bf0cdf8c219ee85… Patch: https://github.com/kamailio/kamailio/commit/25b1f199294ae857bf0cdf8c219ee85…

1 0

git:master:e1a6f39a: sqlops: removed ifdefs for WITH_XAVP
by Daniel-Constantin Mierla 18 Apr '19

18 Apr '19

Module: kamailio Branch: master Commit: e1a6f39a7366d9275f4a2bca1affbf04be459de8 URL: https://github.com/kamailio/kamailio/commit/e1a6f39a7366d9275f4a2bca1affbf0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-18T14:08:49+02:00 sqlops: removed ifdefs for WITH_XAVP --- Modified: src/modules/sqlops/sql_api.c Modified: src/modules/sqlops/sql_api.h Modified: src/modules/sqlops/sqlops.c --- Diff: https://github.com/kamailio/kamailio/commit/e1a6f39a7366d9275f4a2bca1affbf0… Patch: https://github.com/kamailio/kamailio/commit/e1a6f39a7366d9275f4a2bca1affbf0… --- diff --git a/src/modules/sqlops/sql_api.c b/src/modules/sqlops/sql_api.c index f39da7fed8..54c123f85e 100644 --- a/src/modules/sqlops/sql_api.c +++ b/src/modules/sqlops/sql_api.c @@ -31,9 +31,7 @@ #include "../../core/hashes.h" #include "../../core/ut.h" #include "../../lib/srdb1/db_ut.h" -#ifdef WITH_XAVP #include "../../core/xavp.h" -#endif #include "sql_api.h" @@ -461,7 +459,6 @@ int sql_do_query_async(sql_con_t *con, str *query) return 1; } -#ifdef WITH_XAVP int sql_exec_xquery(struct sip_msg *msg, sql_con_t *con, str *query, str *xavp) { @@ -560,6 +557,7 @@ int sql_exec_xquery(struct sip_msg *msg, sql_con_t *con, str *query, return 1; } + int sql_do_xquery(struct sip_msg *msg, sql_con_t *con, pv_elem_t *query, pv_elem_t *res) { @@ -583,8 +581,6 @@ int sql_do_xquery(struct sip_msg *msg, sql_con_t *con, pv_elem_t *query, return sql_exec_xquery(msg, con, &sv, &xavp); } -#endif - int sql_do_pvquery(struct sip_msg *msg, sql_con_t *con, pv_elem_t *query, pvname_list_t *res) diff --git a/src/modules/sqlops/sql_api.h b/src/modules/sqlops/sql_api.h index 9502de91a6..ec7a55eb8b 100644 --- a/src/modules/sqlops/sql_api.h +++ b/src/modules/sqlops/sql_api.h @@ -72,10 +72,8 @@ int sql_reconnect(sql_con_t *sc); int sql_do_query(sql_con_t *con, str *query, sql_result_t *res); int sql_do_query_async(sql_con_t *con, str *query); -#ifdef WITH_XAVP int sql_do_xquery(sip_msg_t *msg, sql_con_t *con, pv_elem_t *query, pv_elem_t *res); -#endif int sql_do_pvquery(sip_msg_t *msg, sql_con_t *con, pv_elem_t *query, pvname_list_t *res); int pv_get_sqlrows(sip_msg_t *msg, pv_param_t *param, diff --git a/src/modules/sqlops/sqlops.c b/src/modules/sqlops/sqlops.c index 7c248ab887..1b16c06ed7 100644 --- a/src/modules/sqlops/sqlops.c +++ b/src/modules/sqlops/sqlops.c @@ -62,9 +62,7 @@ static int sql_check_connection(sql_con_t*); static int sql_query(struct sip_msg*, char*, char*, char*); static int sql_query2(struct sip_msg*, char*, char*); static int sql_query_async(struct sip_msg*, char*, char*); -#ifdef WITH_XAVP static int sql_xquery(struct sip_msg *msg, char *dbl, char *query, char *res); -#endif static int sql_pvquery(struct sip_msg *msg, char *dbl, char *query, char *res); static int sql_rfree(struct sip_msg*, char*, char*); static int mod_init(void); @@ -72,9 +70,7 @@ static int child_init(int rank); static void destroy(void); static int fixup_sql_query(void** param, int param_no); -#ifdef WITH_XAVP static int fixup_sql_xquery(void** param, int param_no); -#endif static int fixup_sql_pvquery(void** param, int param_no); static int fixup_sql_rfree(void** param, int param_no); @@ -100,10 +96,8 @@ static cmd_export_t cmds[]={ ANY_ROUTE}, {"sql_query_async", (cmd_function)sql_query_async, 2, fixup_sql_query, 0, ANY_ROUTE}, -#ifdef WITH_XAVP {"sql_xquery", (cmd_function)sql_xquery, 3, fixup_sql_xquery, 0, ANY_ROUTE}, -#endif {"sql_pvquery", (cmd_function)sql_pvquery, 3, fixup_sql_pvquery, 0, ANY_ROUTE}, {"sql_result_free", (cmd_function)sql_rfree, 1, fixup_sql_rfree, 0, @@ -276,7 +270,6 @@ static int sql_query_async(struct sip_msg *msg, char *dbl, char *query) } -#ifdef WITH_XAVP /** * */ @@ -288,7 +281,6 @@ static int sql_xquery(struct sip_msg *msg, char *dbl, char *query, char *res) } return sql_do_xquery(msg, (sql_con_t*)dbl, (pv_elem_t*)query, (pv_elem_t*)res); } -#endif /** * @@ -351,7 +343,6 @@ static int fixup_sql_query(void** param, int param_no) return 0; } -#ifdef WITH_XAVP /** * */ @@ -389,7 +380,6 @@ static int fixup_sql_xquery(void** param, int param_no) } return 0; } -#endif /** *

1 0

git:master:3d58bdfc: core: removed ifdefs for WITH_XAVP
by Daniel-Constantin Mierla 18 Apr '19

18 Apr '19

Module: kamailio Branch: master Commit: 3d58bdfc699b5fbeac18536604a3cd8217eaef8c URL: https://github.com/kamailio/kamailio/commit/3d58bdfc699b5fbeac18536604a3cd8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-18T14:08:49+02:00 core: removed ifdefs for WITH_XAVP - xavps are enabled for about 10 years and used extensively --- Modified: src/core/receive.c Modified: src/core/xavp.c Modified: src/core/xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/3d58bdfc699b5fbeac18536604a3cd8… Patch: https://github.com/kamailio/kamailio/commit/3d58bdfc699b5fbeac18536604a3cd8… --- diff --git a/src/core/receive.c b/src/core/receive.c index dd9248c721..3a2919cec2 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -46,9 +46,7 @@ #include "dset.h" #include "fmsg.h" #include "usr_avp.h" -#ifdef WITH_XAVP #include "xavp.h" -#endif #include "select_buf.h" #include "tcp_server.h" /* for tcpconn_add_alias */ @@ -583,7 +581,5 @@ int receive_msg(char *buf, unsigned int len, struct receive_info *rcv_info) void ksr_msg_env_reset(void) { reset_avps(); -#ifdef WITH_XAVP xavp_reset_list(); -#endif } diff --git a/src/core/xavp.c b/src/core/xavp.c index be3bba423f..f9b0fd627f 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -20,8 +20,6 @@ * Module: \ref core */ -#ifdef WITH_XAVP - #include <stdio.h> #include <string.h> @@ -1041,4 +1039,3 @@ int xavp_serialize_fields(str *rname, char *obuf, int olen) } return rlen; } -#endif diff --git a/src/core/xavp.h b/src/core/xavp.h index 4cd333eaaf..4f440ea612 100644 --- a/src/core/xavp.h +++ b/src/core/xavp.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Daniel-Constantin Mierla (asipto.com) + * Copyright (C) 2009 Daniel-Constantin Mierla (asipto.com) * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -18,8 +18,6 @@ #ifndef _SR_XAVP_H_ #define _SR_XAVP_H_ -#ifdef WITH_XAVP - #include <time.h> #include "str.h" #include "str_list.h" @@ -111,6 +109,5 @@ int xavp_serialize_fields(str *rname, char *obuf, int olen); int xavp_set_child_ival(str *rname, str *cname, int ival); int xavp_set_child_sval(str *rname, str *cname, str *sval); -#endif #endif

1 0

git:master:7e8b5ea7: pv: removed ifdefs for WITH_XAVP
by Daniel-Constantin Mierla 18 Apr '19

18 Apr '19

Module: kamailio Branch: master Commit: 7e8b5ea7a4068e5432589975b40aea59f85742d9 URL: https://github.com/kamailio/kamailio/commit/7e8b5ea7a4068e5432589975b40aea5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-18T14:08:49+02:00 pv: removed ifdefs for WITH_XAVP --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_xavp.c Modified: src/modules/pv/pv_xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/7e8b5ea7a4068e5432589975b40aea5… Patch: https://github.com/kamailio/kamailio/commit/7e8b5ea7a4068e5432589975b40aea5… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index c065dca5d2..515321e313 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -40,9 +40,7 @@ #include "pv_time.h" #include "pv_trans.h" #include "pv_select.h" -#ifdef WITH_XAVP #include "pv_xavp.h" -#endif #include "pv_api.h" MODULE_VERSION @@ -92,12 +90,9 @@ static pv_export_t mod_pvs[] = { pv_parse_snd_name, 0, 0, 0 }, { {"rcv", (sizeof("rcv")-1)}, PVT_OTHER, pv_get_rcv, 0, pv_parse_rcv_name, 0, 0, 0 }, -#ifdef WITH_XAVP { {"xavp", sizeof("xavp")-1}, /* xavp */ PVT_XAVP, pv_get_xavp, pv_set_xavp, pv_parse_xavp_name, 0, 0, 0 }, -#endif - {{"avp", (sizeof("avp")-1)}, PVT_AVP, pv_get_avp, pv_set_avp, pv_parse_avp_name, pv_parse_index, 0, 0}, {{"hdr", (sizeof("hdr")-1)}, PVT_HDR, pv_get_hdr, 0, pv_parse_hdr_name, @@ -565,14 +560,12 @@ static cmd_export_t cmds[]={ ANY_ROUTE }, {"pv_unset", (cmd_function)pv_unset, 1, fixup_pvar_null, 0, ANY_ROUTE }, -#ifdef WITH_XAVP {"pv_xavp_print", (cmd_function)pv_xavp_print, 0, 0, 0, ANY_ROUTE }, {"pv_var_to_xavp", (cmd_function)w_var_to_xavp, 2, fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE }, {"pv_xavp_to_var", (cmd_function)w_xavp_to_var, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE }, -#endif {"is_int", (cmd_function)is_int, 1, fixup_pvar_null, fixup_free_pvar_null, ANY_ROUTE}, {"typeof", (cmd_function)pv_typeof, 2, fixup_pvar_none, diff --git a/src/modules/pv/pv_xavp.c b/src/modules/pv/pv_xavp.c index c36a6c6f1f..a627f2ae1b 100644 --- a/src/modules/pv/pv_xavp.c +++ b/src/modules/pv/pv_xavp.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Daniel-Constantin Mierla (asipto.com) + * Copyright (C) 2009 Daniel-Constantin Mierla (asipto.com) * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -14,8 +14,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifdef WITH_XAVP - #include <stdio.h> #include "../../core/dprint.h" @@ -753,4 +751,3 @@ int pv_xavp_to_var(str *xname) { } while(xavp); return 1; } -#endif diff --git a/src/modules/pv/pv_xavp.h b/src/modules/pv/pv_xavp.h index 90bc9da762..35c410931e 100644 --- a/src/modules/pv/pv_xavp.h +++ b/src/modules/pv/pv_xavp.h @@ -13,12 +13,10 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ - + #ifndef _PV_XAVP_H_ #define _PV_XAVP_H_ -#ifdef WITH_XAVP - #include "../../core/pvar.h" #include "pv_svar.h" @@ -36,4 +34,3 @@ int pv_var_to_xavp(str *varname, str *xname); int pv_xavp_to_var(str *xname); #endif -#endif

1 0

[kamailio/kamailio] dmq_usrloc: output AoR on warning message (#1929)
by Emmanuel Schmidbauer 18 Apr '19

18 Apr '19

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1929 -- Commit Summary -- * dmq_usrloc: output AoR on warning message -- File Changes -- M src/modules/dmq_usrloc/usrloc_sync.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1929.patch https://github.com/kamailio/kamailio/pull/1929.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/1929

2 2

git:master:63f95447: dmq_usrloc: output AoR on warning message
by Emmanuel Schmidbauer 18 Apr '19

18 Apr '19

Module: kamailio Branch: master Commit: 63f95447c40739be91203739cfca4bc5523226fa URL: https://github.com/kamailio/kamailio/commit/63f95447c40739be91203739cfca4bc… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Date: 2019-04-18T07:26:08-04:00 dmq_usrloc: output AoR on warning message --- Modified: src/modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/63f95447c40739be91203739cfca4bc… Patch: https://github.com/kamailio/kamailio/commit/63f95447c40739be91203739cfca4bc… --- diff --git a/src/modules/dmq_usrloc/usrloc_sync.c b/src/modules/dmq_usrloc/usrloc_sync.c index 1a7eef0ab8..5f7b55fb94 100644 --- a/src/modules/dmq_usrloc/usrloc_sync.c +++ b/src/modules/dmq_usrloc/usrloc_sync.c @@ -144,7 +144,7 @@ static int delete_contact(str aor, ucontact_info_t* ci) /* it locks the udomain on success */ if (dmq_ul.get_urecord_by_ruid(_d, dmq_ul.get_aorhash(&aor), &ci->ruid, &r, &c) != 0) { - LM_WARN("AOR/Contact not found\n"); + LM_WARN("AOR/Contact ['%.*s'] not found\n", aor.len, aor.s); return -1; } if (dmq_ul.delete_ucontact(r, c) != 0) {

1 0

git:master:caaa8650: Merge pull request #1929 from kamailio/usrloc_sync-better-warn-log
by GitHub 18 Apr '19

18 Apr '19

Module: kamailio Branch: master Commit: caaa8650c2882eb665dd97b4fa4518ee0f27c759 URL: https://github.com/kamailio/kamailio/commit/caaa8650c2882eb665dd97b4fa4518e… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: GitHub <noreply(a)github.com> Date: 2019-04-18T13:01:02+01:00 Merge pull request #1929 from kamailio/usrloc_sync-better-warn-log dmq_usrloc: output AoR on warning message --- Modified: src/modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/caaa8650c2882eb665dd97b4fa4518e… Patch: https://github.com/kamailio/kamailio/commit/caaa8650c2882eb665dd97b4fa4518e… --- diff --git a/src/modules/dmq_usrloc/usrloc_sync.c b/src/modules/dmq_usrloc/usrloc_sync.c index 1a7eef0ab8..5f7b55fb94 100644 --- a/src/modules/dmq_usrloc/usrloc_sync.c +++ b/src/modules/dmq_usrloc/usrloc_sync.c @@ -144,7 +144,7 @@ static int delete_contact(str aor, ucontact_info_t* ci) /* it locks the udomain on success */ if (dmq_ul.get_urecord_by_ruid(_d, dmq_ul.get_aorhash(&aor), &ci->ruid, &r, &c) != 0) { - LM_WARN("AOR/Contact not found\n"); + LM_WARN("AOR/Contact ['%.*s'] not found\n", aor.len, aor.s); return -1; } if (dmq_ul.delete_ucontact(r, c) != 0) {

1 0

uac dialog callback and kamailio restarts
by Henning Westerholt 18 Apr '19

18 Apr '19

Hello, I am working right now on another difficult topic related to the usage of uac dialog callbacks for the usual replace from/to header logic after a kamailio restart. The uac/dialog module combination works just fine - but after a kamailio restart the dialog callback information is lost. So this means that for already established dialogs no from/to replacement operations are done. This causes errors later on during BYE or Re-INVITE signalization. I verified this with debug logging and can easily test this on a test system. One obvious workaround is of course not use the dialog module to store the data inside dialog variables. An approach to work on this problem would be to store the uac callback in the dialog table(s) as well, and then during kamailio startup use this to re-install the uac callback. Does this approach sounds feasible? Any other ideas how to tackle this issue? Thanks and regards, Henning

2 6

git:master:5e029186: modules: readme files regenerated - pv ... [skip ci]
by Kamailio Dev 18 Apr '19

18 Apr '19

Module: kamailio Branch: master Commit: 5e029186d3c6b8aa530834ffd7ab54d4f5b1c1e5 URL: https://github.com/kamailio/kamailio/commit/5e029186d3c6b8aa530834ffd7ab54d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-04-18T10:02:00+02:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/5e029186d3c6b8aa530834ffd7ab54d… Patch: https://github.com/kamailio/kamailio/commit/5e029186d3c6b8aa530834ffd7ab54d…

1 0

git:master:9838774e: pv: docs for xavp_rm(...) and xavp_rm_child(...)
by Daniel-Constantin Mierla 18 Apr '19

18 Apr '19

Module: kamailio Branch: master Commit: 9838774e11f071324e6d6691570d2029cfb26c43 URL: https://github.com/kamailio/kamailio/commit/9838774e11f071324e6d6691570d202… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-18T09:51:21+02:00 pv: docs for xavp_rm(...) and xavp_rm_child(...) --- Modified: src/modules/pv/doc/pv_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9838774e11f071324e6d6691570d202… Patch: https://github.com/kamailio/kamailio/commit/9838774e11f071324e6d6691570d202… --- diff --git a/src/modules/pv/doc/pv_admin.xml b/src/modules/pv/doc/pv_admin.xml index 98aded0063..464d5ac80b 100644 --- a/src/modules/pv/doc/pv_admin.xml +++ b/src/modules/pv/doc/pv_admin.xml @@ -375,6 +375,56 @@ xavp_set_child_ival("x", "y", "$var(n)"); $var(n) = 10; xavp_set_child_sval("x", "y", "Count: $var(n)"); # results in: $xavp(x=>y) is "Count: 10" +... + </programlisting> + </example> + </section> + <section id="pv.f.xavp_rm"> + <title> + <function moreinfo="none">xavp_rm(rname)</function> + </title> + <para> + Remove the value of $xavp(rname). + </para> + <para> + The parameter has to be the name of XAVP in the root list. + It can be static or dynamic string (to include variables). + </para> + <para> + Function can be used from ANY ROUTE. + </para> + <example> + <title><function>xavp_rm</function> usage</title> + <programlisting format="linespecific"> +... +xavp_rm_child_sval("x"); +# same result as: $xavp(x) = $null; +... + </programlisting> + </example> + </section> + + <section id="pv.f.xavp_rm_child"> + <title> + <function moreinfo="none">xavp_rm_child(rname, cname)</function> + </title> + <para> + Remove the value of $xavp(rname=>cname). + </para> + <para> + The first parameter has to be the name of XAVP in the root list. + The second parameter name of child XAVP. Both parameters can be + static or dynamic strings (to include variables). + </para> + <para> + Function can be used from ANY ROUTE. + </para> + <example> + <title><function>xavp_rm_child</function> usage</title> + <programlisting format="linespecific"> +... +xavp_rm_child_sval("x", "y"); +# same result as: $xavp(x=>y) = $null; ... </programlisting> </example>

1 0

git:master:0d8c0fd7: pv: exported functions to delete first root and child xavp
by Daniel-Constantin Mierla 18 Apr '19

18 Apr '19

Module: kamailio Branch: master Commit: 0d8c0fd732d88164f622f2ee8848b8e931a57d9a URL: https://github.com/kamailio/kamailio/commit/0d8c0fd732d88164f622f2ee8848b8e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-18T09:40:30+02:00 pv: exported functions to delete first root and child xavp - xavp_rm(rname) - delete first xavp matching rname in root list - xavp_rm_child(rname, cname) - delete first child xavp matching cname in sublist from root xavp rname - functions exported to native scripting and kemi languages --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/0d8c0fd732d88164f622f2ee8848b8e… Patch: https://github.com/kamailio/kamailio/commit/0d8c0fd732d88164f622f2ee8848b8e… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 5364b18d0d..c065dca5d2 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -543,6 +543,8 @@ static int w_xavp_set_child_ival(sip_msg_t *msg, char *prname, char *pcname, char *pval); static int w_xavp_set_child_sval(sip_msg_t *msg, char *prname, char *pcname, char *pval); +static int w_xavp_rm(sip_msg_t *msg, char *prname, char *p2); +static int w_xavp_rm_child(sip_msg_t *msg, char *prname, char *pcname); static int w_sbranch_set_ruri(sip_msg_t *msg, char p1, char *p2); static int w_sbranch_append(sip_msg_t *msg, char p1, char *p2); static int w_sbranch_reset(sip_msg_t *msg, char p1, char *p2); @@ -591,6 +593,12 @@ static cmd_export_t cmds[]={ {"xavp_set_child_sval", (cmd_function)w_xavp_set_child_sval, 3, fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, + {"xavp_rm", (cmd_function)w_xavp_rm, + 1, fixup_spve_null, fixup_free_spve_null, + ANY_ROUTE}, + {"xavp_rm_child", (cmd_function)w_xavp_rm_child, + 2, fixup_spve_spve, fixup_free_spve_spve, + ANY_ROUTE}, {"sbranch_set_ruri", (cmd_function)w_sbranch_set_ruri, 0, 0, 0, ANY_ROUTE }, {"sbranch_append", (cmd_function)w_sbranch_append, 0, 0, 0, @@ -1001,6 +1009,65 @@ static int fixup_free_xavp_set_child_ival(void** param, int param_no) return 0; } +/** + * + */ +static int ki_xavp_rm(sip_msg_t *msg, str *rname) +{ + int ret; + + ret = xavp_rm_by_index(rname, 0, NULL); + + return (ret==0)?1:ret; +} + +/** + * + */ +static int w_xavp_rm(sip_msg_t *msg, char *prname, char *p2) +{ + str rname; + + if(fixup_get_svalue(msg, (gparam_t*)prname, &rname)<0) { + LM_ERR("failed to get root xavp name\n"); + return -1; + } + + return ki_xavp_rm(msg, &rname); +} + +/** + * + */ +static int ki_xavp_rm_child(sip_msg_t *msg, str *rname, str *cname) +{ + int ret; + + ret = xavp_rm_child_by_index(rname, cname, 0); + + return (ret==0)?1:ret; +} + +/** + * + */ +static int w_xavp_rm_child(sip_msg_t *msg, char *prname, char *pcname) +{ + str rname; + str cname; + + if(fixup_get_svalue(msg, (gparam_t*)prname, &rname)<0) { + LM_ERR("failed to get root xavp name\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_t*)pcname, &cname)<0) { + LM_ERR("failed to get child xavp name\n"); + return -1; + } + + return ki_xavp_rm_child(msg, &rname, &cname); +} + /** * */ @@ -1258,6 +1325,16 @@ static sr_kemi_t sr_kemi_pvx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pvx"), str_init("xavp_rm"), + SR_KEMIP_INT, ki_xavp_rm, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("pvx"), str_init("xavp_rm_child"), + SR_KEMIP_INT, ki_xavp_rm_child, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("pvx"), str_init("evalx"), SR_KEMIP_INT, ki_pv_evalx, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,

1 0

git:master:d9a4b292: core: xavp - helper function to remove child value
by Daniel-Constantin Mierla 18 Apr '19

18 Apr '19

Module: kamailio Branch: master Commit: d9a4b2929ec999127c46256a6f497520df017488 URL: https://github.com/kamailio/kamailio/commit/d9a4b2929ec999127c46256a6f49752… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-18T09:37:36+02:00 core: xavp - helper function to remove child value --- Modified: src/core/xavp.c Modified: src/core/xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/d9a4b2929ec999127c46256a6f49752… Patch: https://github.com/kamailio/kamailio/commit/d9a4b2929ec999127c46256a6f49752… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index 1e25862650..be3bba423f 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -447,6 +447,20 @@ int xavp_rm_by_index(str *name, int idx, sr_xavp_t **head) return xavp_rm_internal(name, head, idx); } +int xavp_rm_child_by_index(str *rname, str *cname, int idx) +{ + sr_xavp_t *avp=NULL; + + if (idx<0) { + return 0; + } + avp = xavp_get(rname, NULL); + + if(avp == NULL || avp->val.type!=SR_XTYPE_XAVP) { + return 0; + } + return xavp_rm_internal(cname, &avp->val.v.xavp, idx); +} int xavp_count(str *name, sr_xavp_t **start) { diff --git a/src/core/xavp.h b/src/core/xavp.h index c97123e190..4cd333eaaf 100644 --- a/src/core/xavp.h +++ b/src/core/xavp.h @@ -88,6 +88,7 @@ sr_xavp_t *xavp_get_last(str *xname, sr_xavp_t **list); int xavp_rm_by_name(str *name, int all, sr_xavp_t **head); int xavp_rm_by_index(str *name, int idx, sr_xavp_t **head); int xavp_rm(sr_xavp_t *xa, sr_xavp_t **head); +int xavp_rm_child_by_index(str *rname, str *cname, int idx); int xavp_count(str *name, sr_xavp_t **start); void xavp_destroy_list_unsafe(sr_xavp_t **head); void xavp_destroy_list(sr_xavp_t **head);

1 0

git:master:24ca2e77: core: rpc command core.tcp_list returns an array of items
by Daniel-Constantin Mierla 17 Apr '19

17 Apr '19

Module: kamailio Branch: master Commit: 24ca2e7760a8dada433b188348c768e7e224f10d URL: https://github.com/kamailio/kamailio/commit/24ca2e7760a8dada433b188348c768e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-17T15:47:32+02:00 core: rpc command core.tcp_list returns an array of items --- Modified: src/core/core_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/24ca2e7760a8dada433b188348c768e… Patch: https://github.com/kamailio/kamailio/commit/24ca2e7760a8dada433b188348c768e… --- diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index ea38e60bae..5b1c4624ed 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -1090,7 +1090,7 @@ static rpc_export_t core_rpc_methods[] = { #endif {"core.tcp_info", core_tcpinfo, core_tcpinfo_doc, 0}, {"core.tcp_options", core_tcp_options, core_tcp_options_doc,0}, - {"core.tcp_list", core_tcp_list, core_tcp_list_doc,0}, + {"core.tcp_list", core_tcp_list, core_tcp_list_doc, RET_ARRAY}, {"core.udp4_raw_info", core_udp4rawinfo, core_udp4rawinfo_doc, 0}, {"core.aliases_list", core_aliases_list, core_aliases_list_doc, 0},

1 0

git:master:8d3d43c9: app_lua: safety check for anchor lump in old api hdr insert
by Daniel-Constantin Mierla 17 Apr '19

17 Apr '19

Module: kamailio Branch: master Commit: 8d3d43c9d8f768894e7ed89b17eca5be8d181b53 URL: https://github.com/kamailio/kamailio/commit/8d3d43c9d8f768894e7ed89b17eca5b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-17T15:42:49+02:00 app_lua: safety check for anchor lump in old api hdr insert --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/8d3d43c9d8f768894e7ed89b17eca5b… Patch: https://github.com/kamailio/kamailio/commit/8d3d43c9d8f768894e7ed89b17eca5b… --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index 9334a67835..d30d73ef5a 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -835,7 +835,7 @@ static int lua_sr_hdr_insert (lua_State *L) memcpy(hdr, txt, len); anchor = anchor_lump(env_L->msg, hf->name.s + hf->len - env_L->msg->buf, 0, 0); - if(insert_new_lump_before(anchor, hdr, len, 0) == 0) + if((anchor==NULL) || (insert_new_lump_before(anchor, hdr, len, 0) == 0)) { LM_ERR("can't insert lump\n"); pkg_free(hdr);

1 0

git:master:5ce98491: app_mono: safety check for anchor lump
by Daniel-Constantin Mierla 17 Apr '19

17 Apr '19

Module: kamailio Branch: master Commit: 5ce984913f54849b841675955f971b73b8d76eb5 URL: https://github.com/kamailio/kamailio/commit/5ce984913f54849b841675955f971b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-17T15:40:47+02:00 app_mono: safety check for anchor lump --- Modified: src/modules/app_mono/app_mono_api.c --- Diff: https://github.com/kamailio/kamailio/commit/5ce984913f54849b841675955f971b7… Patch: https://github.com/kamailio/kamailio/commit/5ce984913f54849b841675955f971b7… --- diff --git a/src/modules/app_mono/app_mono_api.c b/src/modules/app_mono/app_mono_api.c index efd17e8226..2343b1d922 100644 --- a/src/modules/app_mono/app_mono_api.c +++ b/src/modules/app_mono/app_mono_api.c @@ -778,7 +778,7 @@ static int sr_mono_hdr_append (MonoString *hv) hdr[txt.len] = '\0'; anchor = anchor_lump(env_M->msg, hf->name.s + hf->len - env_M->msg->buf, 0, 0); - if(insert_new_lump_before(anchor, hdr, txt.len, 0) == 0) + if((anchor==NULL) || (insert_new_lump_before(anchor, hdr, txt.len, 0) == 0)) { LM_ERR("can't insert lump\n"); pkg_free(hdr); @@ -873,7 +873,7 @@ static int sr_mono_hdr_insert (MonoString *hv) hdr[txt.len] = '\0'; anchor = anchor_lump(env_M->msg, hf->name.s + hf->len - env_M->msg->buf, 0, 0); - if(insert_new_lump_before(anchor, hdr, txt.len, 0) == 0) + if((anchor==NULL) || (insert_new_lump_before(anchor, hdr, txt.len, 0) == 0)) { LM_ERR("can't insert lump\n"); pkg_free(hdr);

1 0

git:master:875bd485: core: kemi - safety check for lump archor for hdr operations
by Daniel-Constantin Mierla 17 Apr '19

17 Apr '19

Module: kamailio Branch: master Commit: 875bd485267cf77783ecab0f09f518304c1d2cd2 URL: https://github.com/kamailio/kamailio/commit/875bd485267cf77783ecab0f09f5183… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-17T15:31:12+02:00 core: kemi - safety check for lump archor for hdr operations --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/875bd485267cf77783ecab0f09f5183… Patch: https://github.com/kamailio/kamailio/commit/875bd485267cf77783ecab0f09f5183… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 039ba1557f..6a1d61af43 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1679,7 +1679,8 @@ static int sr_kemi_hdr_append(sip_msg_t *msg, str *txt) memcpy(hdr, txt->s, txt->len); /* anchor after last header */ anchor = anchor_lump(msg, msg->unparsed - msg->buf, 0, 0); - if(insert_new_lump_before(anchor, hdr, txt->len, 0) == 0) { + if((anchor==NULL) + || (insert_new_lump_before(anchor, hdr, txt->len, 0) == 0)) { LM_ERR("can't insert lump\n"); pkg_free(hdr); return -1; @@ -1744,13 +1745,15 @@ static int sr_kemi_hdr_append_after(sip_msg_t *msg, str *txt, str *hname) anchor = anchor_lump(msg, hf->name.s + hf->len - msg->buf, 0, 0); } - LM_DBG("append after [%.*s] the hf: [%.*s]\n", hname->len, hname->s, - txt->len, txt->s); - if(insert_new_lump_before(anchor, hdr, txt->len, 0) == 0) { + if((anchor==NULL) + || (insert_new_lump_before(anchor, hdr, txt->len, 0) == 0)) { LM_ERR("can't insert lump\n"); pkg_free(hdr); return -1; } + LM_DBG("appended after [%.*s] the hf: [%.*s]\n", hname->len, hname->s, + txt->len, txt->s); + return 1; } @@ -1871,7 +1874,8 @@ static int sr_kemi_hdr_insert(sip_msg_t *msg, str *txt) memcpy(hdr, txt->s, txt->len); /* anchor before first header */ anchor = anchor_lump(msg, msg->headers->name.s - msg->buf, 0, 0); - if(insert_new_lump_before(anchor, hdr, txt->len, 0) == 0) { + if((anchor==NULL) + || (insert_new_lump_before(anchor, hdr, txt->len, 0) == 0)) { LM_ERR("can't insert lump\n"); pkg_free(hdr); return -1; @@ -1934,13 +1938,15 @@ static int sr_kemi_hdr_insert_before(sip_msg_t *msg, str *txt, str *hname) } else { /* before hf */ anchor = anchor_lump(msg, hf->name.s - msg->buf, 0, 0); } - LM_DBG("insert before [%.*s] the hf: %.*s\n", hname->len, hname->s, - txt->len, txt->s); - if(insert_new_lump_before(anchor, hdr, txt->len, 0) == 0) { + if((anchor==NULL) + || (insert_new_lump_before(anchor, hdr, txt->len, 0) == 0)) { LM_ERR("can't insert lump\n"); pkg_free(hdr); return -1; } + LM_DBG("inserted before [%.*s] the hf: %.*s\n", hname->len, hname->s, + txt->len, txt->s); + return 1; }

1 0

git:master:7660f30c: tm: debug message if kemi on-reply route callback returns negative
by Daniel-Constantin Mierla 17 Apr '19

17 Apr '19

Module: kamailio Branch: master Commit: 7660f30cabfcca004e6eed1cf60d7530fc2cc7ee URL: https://github.com/kamailio/kamailio/commit/7660f30cabfcca004e6eed1cf60d753… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-17T15:25:09+02:00 tm: debug message if kemi on-reply route callback returns negative --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/7660f30cabfcca004e6eed1cf60d753… Patch: https://github.com/kamailio/kamailio/commit/7660f30cabfcca004e6eed1cf60d753… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 202b8d826f..60518e15e0 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -2421,8 +2421,10 @@ int reply_received( struct sip_msg *p_msg ) bctx = sr_kemi_act_ctx_get(); init_run_actions_ctx(&ctx); sr_kemi_act_ctx_set(&ctx); - sr_kemi_route(keng, p_msg, TM_ONREPLY_ROUTE, - sr_kemi_cbname_lookup_idx(onreply_route), NULL); + if(sr_kemi_route(keng, p_msg, TM_ONREPLY_ROUTE, + sr_kemi_cbname_lookup_idx(onreply_route), NULL)<0) { + LM_DBG("negative return from on-reply kemi callback\n"); + } sr_kemi_act_ctx_set(bctx); } else { run_top_route(onreply_rt.rlist[onreply_route], p_msg, &ctx);

1 0

git:master:a1d9adb3: core: init timeval variables to avoid compile warning
by Daniel-Constantin Mierla 17 Apr '19

17 Apr '19

Module: kamailio Branch: master Commit: a1d9adb329d261b8b3856a39c5ccaa27ce8f0849 URL: https://github.com/kamailio/kamailio/commit/a1d9adb329d261b8b3856a39c5ccaa2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-17T15:18:22+02:00 core: init timeval variables to avoid compile warning --- Modified: src/core/action.c --- Diff: https://github.com/kamailio/kamailio/commit/a1d9adb329d261b8b3856a39c5ccaa2… Patch: https://github.com/kamailio/kamailio/commit/a1d9adb329d261b8b3856a39c5ccaa2… --- diff --git a/src/core/action.c b/src/core/action.c index 06775a88fc..8b6725598c 100644 --- a/src/core/action.c +++ b/src/core/action.c @@ -1527,7 +1527,7 @@ int run_actions(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) { struct action* t; int ret; - struct timeval tvb, tve; + struct timeval tvb = {0}, tve = {0}; struct timezone tz; unsigned int tdiff;

1 0

git:master:313fc935: siptrace: safety check for msg pointer in trace_transaction()
by Daniel-Constantin Mierla 17 Apr '19

17 Apr '19

Module: kamailio Branch: master Commit: 313fc93529cb61dbf1e7c173dd2e4fa6ffc4af70 URL: https://github.com/kamailio/kamailio/commit/313fc93529cb61dbf1e7c173dd2e4fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-17T15:08:46+02:00 siptrace: safety check for msg pointer in trace_transaction() --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/313fc93529cb61dbf1e7c173dd2e4fa… Patch: https://github.com/kamailio/kamailio/commit/313fc93529cb61dbf1e7c173dd2e4fa… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 7bfa5a60ee..e3ddfeda76 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1844,6 +1844,11 @@ static void trace_sl_onreply_out(sl_cbp_t *slcbp) static void trace_transaction(sip_msg_t* msg, siptrace_info_t* info) { + if(msg == NULL) { + LM_DBG("nothing to trace\n"); + return; + } + /* trace current message on out */ msg->msg_flags |= FL_SIPTRACE; if (info->uriState == STRACE_RAW_URI) {

1 0

git:master:2f12d7e1: siptrace: do not free unallocated dest_info_t structure on error
by Daniel-Constantin Mierla 17 Apr '19

17 Apr '19

Module: kamailio Branch: master Commit: 2f12d7e1b497346bb6569781dfa83a85a586b595 URL: https://github.com/kamailio/kamailio/commit/2f12d7e1b497346bb6569781dfa83a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-17T15:12:17+02:00 siptrace: do not free unallocated dest_info_t structure on error --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/2f12d7e1b497346bb6569781dfa83a8… Patch: https://github.com/kamailio/kamailio/commit/2f12d7e1b497346bb6569781dfa83a8… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index e3ddfeda76..df848c7ad2 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -800,7 +800,6 @@ static int parse_siptrace_uri(str* duri, dest_info_t* dst) p = mk_proxy(&uri.host, (uri.port_no) ? uri.port_no : SIP_PORT, dst->proto); if(p == 0) { LM_ERR("bad host name in uri\n"); - pkg_free(dst); return -1; }

1 0

git:master:0956a130: Makefile.defs: version set to 5.3.0-dev5
by Daniel-Constantin Mierla 17 Apr '19

17 Apr '19

Module: kamailio Branch: master Commit: 0956a130db0343bc334038c388ae25cacd54fb71 URL: https://github.com/kamailio/kamailio/commit/0956a130db0343bc334038c388ae25c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-17T12:40:28+02:00 Makefile.defs: version set to 5.3.0-dev5 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/0956a130db0343bc334038c388ae25c… Patch: https://github.com/kamailio/kamailio/commit/0956a130db0343bc334038c388ae25c… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 9b1f9e50c6..21ca28e097 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 3 SUBLEVEL = 0 -EXTRAVERSION = -dev4 +EXTRAVERSION = -dev5 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:1c4ddc7e: modules: readme files regenerated - kex ... [skip ci]
by Kamailio Dev 17 Apr '19

17 Apr '19

Module: kamailio Branch: master Commit: 1c4ddc7ebe538d8dbbe824203ef3537b07b1e624 URL: https://github.com/kamailio/kamailio/commit/1c4ddc7ebe538d8dbbe824203ef3537… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-04-17T10:16:50+02:00 modules: readme files regenerated - kex ... [skip ci] --- Modified: src/modules/kex/README --- Diff: https://github.com/kamailio/kamailio/commit/1c4ddc7ebe538d8dbbe824203ef3537… Patch: https://github.com/kamailio/kamailio/commit/1c4ddc7ebe538d8dbbe824203ef3537… --- diff --git a/src/modules/kex/README b/src/modules/kex/README index 3b58fbae06..318f48e3fb 100644 --- a/src/modules/kex/README +++ b/src/modules/kex/README @@ -84,7 +84,9 @@ Ovidiu Sas 4.27. system.listMethods 4.28. system.methodHelp 4.29. system.methodSignature - 4.30. mod.stats module_name/all pkg/shm/all + 4.30. mod.mem_stats + 4.31. mod.stats + 4.32. mod.mem_statsx List of Examples @@ -160,7 +162,9 @@ Chapter 1. Admin Guide 4.27. system.listMethods 4.28. system.methodHelp 4.29. system.methodSignature - 4.30. mod.stats module_name/all pkg/shm/all + 4.30. mod.mem_stats + 4.31. mod.stats + 4.32. mod.mem_statsx 1. Overview @@ -460,7 +464,9 @@ resetdebug(); 4.27. system.listMethods 4.28. system.methodHelp 4.29. system.methodSignature - 4.30. mod.stats module_name/all pkg/shm/all + 4.30. mod.mem_stats + 4.31. mod.stats + 4.32. mod.mem_statsx 4.1. core.aliases_list @@ -716,7 +722,7 @@ kamcmd system.listMethods Returns signature of given method. -4.30. mod.stats module_name/all pkg/shm/all +4.30. mod.mem_stats Print private(pkg) or shared(shm) memory currently allocated a given module or by all modules. @@ -760,3 +766,15 @@ loc pkg_proc_stats_init(79): 864 Total: 864 } + +4.31. mod.stats + + Same as RPC command "mod.mem_stats", this is an alias command to + preserve backward compatibility. + +4.32. mod.mem_statsx + + Similar to RPC command "mod.mem_stats", but the output has an extended + format, printing info that includes the allocated size and the count of + allocated chunks in a combined string value. The parameters are the + same like for "mod.mem_stats".

1 0

git:master:68d437a7: kex: docs for rpc command mod.mem_statsx
by Daniel-Constantin Mierla 17 Apr '19

17 Apr '19

Module: kamailio Branch: master Commit: 68d437a745b67516953aa77c31863e8d79a850c6 URL: https://github.com/kamailio/kamailio/commit/68d437a745b67516953aa77c31863e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-17T10:04:05+02:00 kex: docs for rpc command mod.mem_statsx --- Modified: src/modules/kex/doc/kex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/68d437a745b67516953aa77c31863e8… Patch: https://github.com/kamailio/kamailio/commit/68d437a745b67516953aa77c31863e8… --- diff --git a/src/modules/kex/doc/kex_admin.xml b/src/modules/kex/doc/kex_admin.xml index 9d2a203425..53380b7676 100644 --- a/src/modules/kex/doc/kex_admin.xml +++ b/src/modules/kex/doc/kex_admin.xml @@ -847,9 +847,9 @@ resetdebug(); </para> </section> - <section id="kex.r.mod.stats"> + <section id="kex.r.mod.mem_stats"> <title> - <function moreinfo="none">mod.stats module_name/all pkg/shm/all</function> + <function moreinfo="none">mod.mem_stats</function> </title> <para> Print private(pkg) or shared(shm) memory currently allocated a given module or by all modules. @@ -923,6 +923,27 @@ Module: kex } </programlisting> </section> + <section id="kex.r.mod.stats"> + <title> + <function moreinfo="none">mod.stats</function> + </title> + <para> + Same as RPC command "mod.mem_stats", this is an alias command to + preserve backward compatibility. + </para> + </section> + <section id="kex.r.mod.mem_statsx"> + <title> + <function moreinfo="none">mod.mem_statsx</function> + </title> + <para> + Similar to RPC command "mod.mem_stats", but the output has an + extended format, printing info that includes the allocated size + and the count of allocated chunks in a combined string value. The + parameters are the same like for "mod.mem_stats". + </para> + </section> + </section> </chapter>

1 0

git:master:99896b1f: kex: use snprintf() for rpc memory mod stats
by Daniel-Constantin Mierla 17 Apr '19

17 Apr '19

Module: kamailio Branch: master Commit: 99896b1f05830777decaa70384982c14f45a8a60 URL: https://github.com/kamailio/kamailio/commit/99896b1f05830777decaa70384982c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-16T14:29:51+02:00 kex: use snprintf() for rpc memory mod stats - safer to ensure it doesn't overflow the target buffer --- Modified: src/modules/kex/mod_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/99896b1f05830777decaa70384982c1… Patch: https://github.com/kamailio/kamailio/commit/99896b1f05830777decaa70384982c1… --- diff --git a/src/modules/kex/mod_stats.c b/src/modules/kex/mod_stats.c index 5f8f0555cf..4dd5fb1095 100644 --- a/src/modules/kex/mod_stats.c +++ b/src/modules/kex/mod_stats.c @@ -105,7 +105,7 @@ static int rpc_mod_print(rpc_t *rpc, void *ctx, const char *mname, while (iter) { if (strcmp(mname, iter->mname) == 0) { - sprintf(buff, "%s(%ld)", iter->func, iter->line); + snprintf(buff, 128, "%s(%ld)", iter->func, iter->line); if (rpc->struct_add(stats_th, "d", buff, iter->size) < 0) { rpc->fault(ctx, 500, "Internal error adding to struct rpc"); return -1;

1 0

git:master:9cc1c638: kex: new rpc command mod.mem_statsx
by Daniel-Constantin Mierla 17 Apr '19

17 Apr '19

Module: kamailio Branch: master Commit: 9cc1c63888d6d1811819157aa57f12c4df9e08fb URL: https://github.com/kamailio/kamailio/commit/9cc1c63888d6d1811819157aa57f12c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-17T09:56:34+02:00 kex: new rpc command mod.mem_statsx - print also the count of allocated chunks in summary - aliased old rpc mod.stats to mod.mem_stats to reflect better the purpose of printing memory usage stats --- Modified: src/modules/kex/mod_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/9cc1c63888d6d1811819157aa57f12c… Patch: https://github.com/kamailio/kamailio/commit/9cc1c63888d6d1811819157aa57f12c…

1 0

git:master:7e871382: modules: readme files regenerated - pv ... [skip ci]
by Kamailio Dev 16 Apr '19

16 Apr '19

Module: kamailio Branch: master Commit: 7e87138293589189101cef7f9dcb82f54794e5c7 URL: https://github.com/kamailio/kamailio/commit/7e87138293589189101cef7f9dcb82f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-04-16T09:32:36+02:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/7e87138293589189101cef7f9dcb82f… Patch: https://github.com/kamailio/kamailio/commit/7e87138293589189101cef7f9dcb82f…

1 0

git:5.2:26fbc04b: uac: log an error if uac module should use the dialog module and it can't bind the API
by Henning Westerholt 16 Apr '19

16 Apr '19

Module: kamailio Branch: 5.2 Commit: 26fbc04bcf925396ad928583d0d38b99ed296f57 URL: https://github.com/kamailio/kamailio/commit/26fbc04bcf925396ad928583d0d38b9… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-04-16T09:30:22+02:00 uac: log an error if uac module should use the dialog module and it can't bind the API (cherry picked from commit e2de33b01efdd2c9799a1d5cf9d0e7d127a36416) --- Modified: src/modules/uac/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/26fbc04bcf925396ad928583d0d38b9… Patch: https://github.com/kamailio/kamailio/commit/26fbc04bcf925396ad928583d0d38b9… --- diff --git a/src/modules/uac/uac.c b/src/modules/uac/uac.c index d74c1cf47f..8528027f7e 100644 --- a/src/modules/uac/uac.c +++ b/src/modules/uac/uac.c @@ -295,14 +295,17 @@ static int mod_init(void) /* we need the append_fromtag on in RR */ memset(&dlg_api, 0, sizeof(struct dlg_binds)); - if (uac_restore_dlg==0 || load_dlg_api(&dlg_api)!=0) { + if (uac_restore_dlg==0) { if (!uac_rrb.append_fromtag) { LM_ERR("'append_fromtag' RR param is not enabled!" " - required by AUTO restore mode\n"); goto error; } - if (uac_restore_dlg!=0) - LM_DBG("failed to find dialog API - is dialog module loaded?\n"); + } else { + if (load_dlg_api(&dlg_api)!=0) { + LM_ERR("failed to find dialog API - is dialog module loaded?\n"); + goto error; + } } /* get all requests doing loose route */

1 0

git:5.2:a829305a: uac: bug fix for uac module uac_replace* functions, register callbacks after start
by Henning Westerholt 16 Apr '19

16 Apr '19

Module: kamailio Branch: 5.2 Commit: a829305aa207ddcda3936a0ffab082cb93359efc URL: https://github.com/kamailio/kamailio/commit/a829305aa207ddcda3936a0ffab082c… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-04-16T09:30:27+02:00 uac: bug fix for uac module uac_replace* functions, register callbacks after start - bug fix for uac module uac_replace* functions, register callbacks after restart - only applies to the dialog tracking mode of the module - the uac module was not using the available dialog callbacks for a proxy (re-)start - because of this the uac module was not able to properly re-write in-dialog messages like BYEs after a proxy restart - As we don't have access to the uac_flag at the dialog on load callback, we just install a callback for both from and to rewriting cases. If only one of the functions is used in the cfg hen the uac module will obviously not find database variables for the other case, and will log an error. This is of course also a bit inefficient, but as it only applies to this (re-)start case it does not matter. (cherry picked from commit aa7dee1ab874aaac807c2166f38ec9da0fa0ccf6) --- Modified: src/modules/uac/replace.c Modified: src/modules/uac/replace.h Modified: src/modules/uac/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/a829305aa207ddcda3936a0ffab082c… Patch: https://github.com/kamailio/kamailio/commit/a829305aa207ddcda3936a0ffab082c…

1 0

git:5.1:35e98c53: uac: bug fix for uac module uac_replace* functions, register callbacks after start
by Henning Westerholt 16 Apr '19

16 Apr '19

Module: kamailio Branch: 5.1 Commit: 35e98c53e708c5acd23476adb54855d405a08f25 URL: https://github.com/kamailio/kamailio/commit/35e98c53e708c5acd23476adb54855d… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-04-16T09:30:38+02:00 uac: bug fix for uac module uac_replace* functions, register callbacks after start - bug fix for uac module uac_replace* functions, register callbacks after restart - only applies to the dialog tracking mode of the module - the uac module was not using the available dialog callbacks for a proxy (re-)start - because of this the uac module was not able to properly re-write in-dialog messages like BYEs after a proxy restart - As we don't have access to the uac_flag at the dialog on load callback, we just install a callback for both from and to rewriting cases. If only one of the functions is used in the cfg hen the uac module will obviously not find database variables for the other case, and will log an error. This is of course also a bit inefficient, but as it only applies to this (re-)start case it does not matter. (cherry picked from commit aa7dee1ab874aaac807c2166f38ec9da0fa0ccf6) --- Modified: src/modules/uac/replace.c Modified: src/modules/uac/replace.h Modified: src/modules/uac/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/35e98c53e708c5acd23476adb54855d… Patch: https://github.com/kamailio/kamailio/commit/35e98c53e708c5acd23476adb54855d…

1 0

git:5.1:194dd20c: uac: log an error if uac module should use the dialog module and it can't bind the API
by Henning Westerholt 16 Apr '19

16 Apr '19

Module: kamailio Branch: 5.1 Commit: 194dd20c78a71c65d6692df4553792e9039e5dcd URL: https://github.com/kamailio/kamailio/commit/194dd20c78a71c65d6692df4553792e… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-04-16T09:30:32+02:00 uac: log an error if uac module should use the dialog module and it can't bind the API (cherry picked from commit e2de33b01efdd2c9799a1d5cf9d0e7d127a36416) --- Modified: src/modules/uac/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/194dd20c78a71c65d6692df4553792e… Patch: https://github.com/kamailio/kamailio/commit/194dd20c78a71c65d6692df4553792e… --- diff --git a/src/modules/uac/uac.c b/src/modules/uac/uac.c index 844b6025ff..05b7f2144d 100644 --- a/src/modules/uac/uac.c +++ b/src/modules/uac/uac.c @@ -286,14 +286,17 @@ static int mod_init(void) /* we need the append_fromtag on in RR */ memset(&dlg_api, 0, sizeof(struct dlg_binds)); - if (uac_restore_dlg==0 || load_dlg_api(&dlg_api)!=0) { + if (uac_restore_dlg==0) { if (!uac_rrb.append_fromtag) { LM_ERR("'append_fromtag' RR param is not enabled!" " - required by AUTO restore mode\n"); goto error; } - if (uac_restore_dlg!=0) - LM_DBG("failed to find dialog API - is dialog module loaded?\n"); + } else { + if (load_dlg_api(&dlg_api)!=0) { + LM_ERR("failed to find dialog API - is dialog module loaded?\n"); + goto error; + } } /* get all requests doing loose route */

1 0

git:master:a690d0a4: pv: docs for xavp_set_child_ival() and xavp_set_child_sval()
by Daniel-Constantin Mierla 16 Apr '19

16 Apr '19

Module: kamailio Branch: master Commit: a690d0a44f62acb8c5b02c017f11c510747f9c13 URL: https://github.com/kamailio/kamailio/commit/a690d0a44f62acb8c5b02c017f11c51… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-16T09:16:08+02:00 pv: docs for xavp_set_child_ival() and xavp_set_child_sval() --- Modified: src/modules/pv/doc/pv_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a690d0a44f62acb8c5b02c017f11c51… Patch: https://github.com/kamailio/kamailio/commit/a690d0a44f62acb8c5b02c017f11c51… --- diff --git a/src/modules/pv/doc/pv_admin.xml b/src/modules/pv/doc/pv_admin.xml index f5faa0ab11..98aded0063 100644 --- a/src/modules/pv/doc/pv_admin.xml +++ b/src/modules/pv/doc/pv_admin.xml @@ -323,6 +323,58 @@ $xavp(x[0]=>c) = "d"; $xavp(x[0]=>a) = "b"; xavp_params_implode("x", "$var(out)"); # results in: $var(out) is "a=b;c=d;e=f;" +... + </programlisting> + </example> + </section> + <section id="pv.f.xavp_set_child_ival"> + <title> + <function moreinfo="none">xavp_set_child_ival(rname, cname, ival)</function> + </title> + <para> + Set the value of $xavp(rname=>cname) to integer value ival. + </para> + <para> + The first parameter has to be the name of XAVP in the root list. + The second parameter name of child XAVP. The third parameter + can be an integer number or a variable holding an integer. + </para> + <para> + Function can be used from ANY ROUTE. + </para> + <example> + <title><function>xavp_set_child_ival</function> usage</title> + <programlisting format="linespecific"> +... +$var(n) = 10; +xavp_set_child_ival("x", "y", "$var(n)"); +# results in: $xavp(x=>y) is 10 +... + </programlisting> + </example> + </section> + <section id="pv.f.xavp_set_child_sval"> + <title> + <function moreinfo="none">xavp_set_child_sval(rname, cname, sval)</function> + </title> + <para> + Set the value of $xavp(rname=>cname) to string value sval. + </para> + <para> + The first parameter has to be the name of XAVP in the root list. + The second parameter name of child XAVP. The third parameter + can be a static or dynamic (with variables) string. + </para> + <para> + Function can be used from ANY ROUTE. + </para> + <example> + <title><function>xavp_set_child_sval</function> usage</title> + <programlisting format="linespecific"> +... +$var(n) = 10; +xavp_set_child_sval("x", "y", "Count: $var(n)"); +# results in: $xavp(x=>y) is "Count: 10" ... </programlisting> </example>

1 0

git:master:db9bf755: pv: exported functions to set the value for first xavp with child
by Daniel-Constantin Mierla 16 Apr '19

16 Apr '19

Module: kamailio Branch: master Commit: db9bf755b8557979934a42a678ded08509e25635 URL: https://github.com/kamailio/kamailio/commit/db9bf755b8557979934a42a678ded08… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-16T09:04:17+02:00 pv: exported functions to set the value for first xavp with child - xavp_set_child_ival(rname, cname, ival) - xavp_set_child_sval(rname, cname, sval) - exported to native config and kemi framework --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/db9bf755b8557979934a42a678ded08… Patch: https://github.com/kamailio/kamailio/commit/db9bf755b8557979934a42a678ded08…

1 0

git:master:77e356f8: core: mod fix - added fixup_free_igp_all() helper function
by Daniel-Constantin Mierla 16 Apr '19

16 Apr '19

Module: kamailio Branch: master Commit: 77e356f8b5e865df6804315fb5943404d3aa8175 URL: https://github.com/kamailio/kamailio/commit/77e356f8b5e865df6804315fb594340… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-16T08:59:48+02:00 core: mod fix - added fixup_free_igp_all() helper function --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/77e356f8b5e865df6804315fb594340… Patch: https://github.com/kamailio/kamailio/commit/77e356f8b5e865df6804315fb594340… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index f90237b915..27cdac471c 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -617,6 +617,14 @@ int fixup_igp_all(void** param, int param_no) return fixup_igp_null(param, 1); } +/** + * + */ +int fixup_free_igp_all(void** param, int param_no) +{ + return fixup_free_igp_null(param, 1); +} + /** * */ @@ -707,4 +715,4 @@ int fixup_free_none_spve(void** param, int param_no) if(param_no==2) return fixup_free_spve_null(param, 1); return 0; -} \ No newline at end of file +} diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index b3ab9b91ae..f040fc1b3c 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -140,6 +140,7 @@ int fixup_free_spve_str(void** param, int param_no); int fixup_spve_all(void** param, int param_no); int fixup_free_spve_all(void** param, int param_no); int fixup_igp_all(void** param, int param_no); +int fixup_free_igp_all(void** param, int param_no); int fixup_spve_igp(void** param, int param_no); int fixup_free_spve_igp(void** param, int param_no);

1 0

git:master:f60f116f: core: xavp - added functions to set first xavp with first child to int or str
by Daniel-Constantin Mierla 16 Apr '19

16 Apr '19

Module: kamailio Branch: master Commit: f60f116ff54e7199f392bace3d3571d5abc2663a URL: https://github.com/kamailio/kamailio/commit/f60f116ff54e7199f392bace3d3571d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-16T09:00:37+02:00 core: xavp - added functions to set first xavp with first child to int or str - similar to $xavp(x=>y) = v; - if that xavp doesn not exist, or $xavp(x[0]=>y[0]) = v; - if that xavp exists --- Modified: src/core/xavp.c Modified: src/core/xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/f60f116ff54e7199f392bace3d3571d… Patch: https://github.com/kamailio/kamailio/commit/f60f116ff54e7199f392bace3d3571d… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index 2fd5aaec49..1e25862650 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -896,6 +896,77 @@ sr_xavp_t* xavp_get_child_with_sval(str *rname, str *cname) return vavp; } +/** + * Set the value of the first xavp rname with first child xavp cname + * - replace if it exits; add if it doesn't exist + * - config operations: + * $xavp(rxname=>cname) = xval; + * or: + * $xavp(rxname[0]=>cname[0]) = xval; + */ +int xavp_set_child_xval(str *rname, str *cname, sr_xval_t *xval) +{ + sr_xavp_t *ravp=NULL; + sr_xavp_t *cavp=NULL; + + ravp = xavp_get(rname, NULL); + if(ravp) { + if(ravp->val.type != SR_XTYPE_XAVP) { + /* first root xavp does not have xavp list value - remove it */ + xavp_rm(ravp, NULL); + /* add a new xavp in the root list with a child */ + if(xavp_add_xavp_value(rname, cname, xval, NULL)==NULL) { + return -1; + } + } else { + /* first root xavp has an xavp list value */ + cavp = xavp_get(cname, ravp->val.v.xavp); + if(cavp) { + /* child xavp with same name - remove it */ + /* todo: update in place for int or if allocated size fits */ + xavp_rm(cavp, &ravp->val.v.xavp); + } + if(xavp_add_value(cname, xval, &ravp->val.v.xavp)==NULL) { + return -1; + } + } + } else { + /* no xavp with rname in root list found */ + if(xavp_add_xavp_value(rname, cname, xval, NULL)==NULL) { + return -1; + } + } + + return 0; +} + +/** + * + */ +int xavp_set_child_ival(str *rname, str *cname, int ival) +{ + sr_xval_t xval; + + memset(&xval, 0, sizeof(sr_xval_t)); + xval.type = SR_XTYPE_INT; + xval.v.i = ival; + + return xavp_set_child_xval(rname, cname, &xval); +} + +/** + * + */ +int xavp_set_child_sval(str *rname, str *cname, str *sval) +{ + sr_xval_t xval; + + memset(&xval, 0, sizeof(sr_xval_t)); + xval.type = SR_XTYPE_STR; + xval.v.s = *sval; + + return xavp_set_child_xval(rname, cname, &xval); +} /** * serialize the values in subfields of an xavp in name=value; format diff --git a/src/core/xavp.h b/src/core/xavp.h index 83f4f09b15..c97123e190 100644 --- a/src/core/xavp.h +++ b/src/core/xavp.h @@ -108,6 +108,8 @@ sr_xavp_t* xavp_get_child_with_ival(str *rname, str *cname); sr_xavp_t* xavp_get_child_with_sval(str *rname, str *cname); int xavp_serialize_fields(str *rname, char *obuf, int olen); +int xavp_set_child_ival(str *rname, str *cname, int ival); +int xavp_set_child_sval(str *rname, str *cname, str *sval); #endif #endif

1 0

git:master:f847fcd7: tls: fix shell syntax for preloaded .so usage
by Richard Fuchs 15 Apr '19

15 Apr '19

Module: kamailio Branch: master Commit: f847fcd720ccc62744c5cbea6c7db9f94b25a14a URL: https://github.com/kamailio/kamailio/commit/f847fcd720ccc62744c5cbea6c7db9f… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2019-04-15T07:26:40-04:00 tls: fix shell syntax for preloaded .so usage --- Modified: src/modules/tls/utils/openssl_mutex_shared/README.md --- Diff: https://github.com/kamailio/kamailio/commit/f847fcd720ccc62744c5cbea6c7db9f… Patch: https://github.com/kamailio/kamailio/commit/f847fcd720ccc62744c5cbea6c7db9f… --- diff --git a/src/modules/tls/utils/openssl_mutex_shared/README.md b/src/modules/tls/utils/openssl_mutex_shared/README.md index e446d66f72..26f5de84b4 100644 --- a/src/modules/tls/utils/openssl_mutex_shared/README.md +++ b/src/modules/tls/utils/openssl_mutex_shared/README.md @@ -47,7 +47,7 @@ Kamailio. Example, when Kamailio was installed from sources: ``` -LD_PRELOAD=/usr/local/lib64/kamailio/openssl_mutex_shared/openssl_mutex_shared.so; \ +LD_PRELOAD=/usr/local/lib64/kamailio/openssl_mutex_shared/openssl_mutex_shared.so \ /usr/local/sbin/kamailio -f /usr/local/etc/kamailio/kamailio.cfg ```

1 0

[kamailio/kamailio] Preloaded library for openssl v1.1 process shared locking (#1927)
by Daniel-Constantin Mierla 15 Apr '19

15 Apr '19

#### 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Preloaded library to make libssl 1.1 use pthread locks with process shared option. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1927 -- Commit Summary -- * tls: add preloaded library to force process-shared locks * tls: added a readme for openssl_mutex_shared * tls: docs - short note about libssl 1.1.x and openssl_mutex_shared -- File Changes -- M src/modules/tls/Makefile (2) M src/modules/tls/doc/tls.xml (5) A src/modules/tls/utils/openssl_mutex_shared/Makefile (26) A src/modules/tls/utils/openssl_mutex_shared/README.md (53) A src/modules/tls/utils/openssl_mutex_shared/openssl_mutex_shared.c (46) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1927.patch https://github.com/kamailio/kamailio/pull/1927.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/1927

2 2

git:master:770c3972: modules: readme files regenerated - registrar ... [skip ci]
by Kamailio Dev 15 Apr '19

15 Apr '19

Module: kamailio Branch: master Commit: 770c39726dc36e4f278cd662e538c85015e5440c URL: https://github.com/kamailio/kamailio/commit/770c39726dc36e4f278cd662e538c85… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-04-15T11:31:48+02:00 modules: readme files regenerated - registrar ... [skip ci] --- Modified: src/modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/770c39726dc36e4f278cd662e538c85… Patch: https://github.com/kamailio/kamailio/commit/770c39726dc36e4f278cd662e538c85…

1 0

git:master:01834fb2: registrar: docs for lookup_filter_mode parameter
by Daniel-Constantin Mierla 15 Apr '19

15 Apr '19

Module: kamailio Branch: master Commit: 01834fb2ddfb993a8680eabd42e0715309abf0ba URL: https://github.com/kamailio/kamailio/commit/01834fb2ddfb993a8680eabd42e0715… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-15T11:24:31+02:00 registrar: docs for lookup_filter_mode parameter --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/01834fb2ddfb993a8680eabd42e0715… Patch: https://github.com/kamailio/kamailio/commit/01834fb2ddfb993a8680eabd42e0715… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index a3c974203a..4ce4a6b995 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -999,6 +999,44 @@ end </programlisting> </example> </section> + <section id="registrar.p.lookup_filter_mode"> + <title><varname>lookup_filter_mode</varname> (int)</title> + <para> + Control what filters should be applied to lookup(...) operations. + It can be a combination (sum) of the next values: + </para> + <itemizedlist> + <listitem> + <para> + <emphasis>1</emphasis> - apply the branch flags filter - return + only contact records with branch flags matching at least one set + inside xavp specified by xavp_cfg parameter with inner name + rlf_bflags - e.g., $xavp(reg=>rlf_bflags). + </para> + </listitem> + </itemizedlist> + <para> + <emphasis> + Default value is NULL (disabled). + </emphasis> + </para> + <example> + <title>Set <varname>xavp_cfg</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("registrar", "xavp_cfg", "reg") +modparam("registrar", "lookup_filter_mode", 1) +... +request_route { + ... + $xavp(reg=>rlf_bflags) = 8; + if(lookup("location")) { ... } + ... +} +... + </programlisting> + </example> + </section> </section>

1 0

git:master:97f7d248: registrar: new parameter lookup_filter_mode
by Daniel-Constantin Mierla 15 Apr '19

15 Apr '19

Module: kamailio Branch: master Commit: 97f7d248f7ce1456c1b86e07c0389d376d547520 URL: https://github.com/kamailio/kamailio/commit/97f7d248f7ce1456c1b86e07c0389d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-15T11:22:45+02:00 registrar: new parameter lookup_filter_mode - control what filters should be applied for lookup(...) operations - filter values are specified via filed of xavp_cfg - implemented filter for branch flags matching --- Modified: src/modules/registrar/lookup.c Modified: src/modules/registrar/registrar.c --- Diff: https://github.com/kamailio/kamailio/commit/97f7d248f7ce1456c1b86e07c0389d3… Patch: https://github.com/kamailio/kamailio/commit/97f7d248f7ce1456c1b86e07c0389d3… --- diff --git a/src/modules/registrar/lookup.c b/src/modules/registrar/lookup.c index f012d690ab..89a0b7f600 100644 --- a/src/modules/registrar/lookup.c +++ b/src/modules/registrar/lookup.c @@ -45,6 +45,54 @@ #include "lookup.h" #include "config.h" + +extern int reg_lookup_filter_mode; + +typedef struct reg_lookup_filter { + uint32_t factive; + uint32_t bflags; +} reg_lookup_filter_t; + +static reg_lookup_filter_t _reg_lookup_filter; + +static void reg_lookup_filter_init(void) +{ + str filter_bflags = str_init("rlf_bflags"); + sr_xavp_t *vavp = NULL; + + if(reg_lookup_filter_mode==0 || reg_xavp_cfg.s==NULL) { + return; + } + memset(&_reg_lookup_filter, 0, sizeof(reg_lookup_filter_t)); + + if((reg_lookup_filter_mode & 1) + && (vavp = xavp_get_child_with_ival(&reg_xavp_cfg, + &filter_bflags)) != NULL) { + if(vavp->val.v.i != 0) { + _reg_lookup_filter.bflags = (uint32_t)vavp->val.v.i; + _reg_lookup_filter.factive = 1; + } + } + return; +} + +static int reg_lookup_filter_match(ucontact_t* ptr) +{ + if(reg_lookup_filter_mode==0 || reg_xavp_cfg.s==NULL) { + return 1; + } + if(_reg_lookup_filter.factive==0) { + return 1; + } + if(_reg_lookup_filter.bflags!=0) { + if((_reg_lookup_filter.bflags & ptr->cflags)==0) { + return 0; + } + } + return 1; + +} + static int has_to_tag(struct sip_msg* msg) { if (parse_to_header(msg) < 0) return 0; @@ -223,6 +271,7 @@ int lookup_helper(struct sip_msg* _m, udomain_t* _d, str* _uri, int _mode) } get_act_time(); + reg_lookup_filter_init(); if(puri.gr.s==NULL || puri.gr_val.len>0) { @@ -251,10 +300,12 @@ int lookup_helper(struct sip_msg* _m, udomain_t* _d, str* _uri, int _mode) break; } } else { - /* no-gruu - found by address */ - LM_DBG("contact for [%.*s] found by address\n", - aor.len, ZSW(aor.s)); - break; + if(reg_lookup_filter_match(ptr)) { + /* no-gruu - found by address */ + LM_DBG("contact for [%.*s] found by address\n", + aor.len, ZSW(aor.s)); + break; + } } } else { LM_DBG("contact for [%.*s] cannot handle the SIP method\n", @@ -417,7 +468,8 @@ int lookup_helper(struct sip_msg* _m, udomain_t* _d, str* _uri, int _mode) if (!cfg_get(registrar, registrar_cfg, append_branches)) goto done; for( ; ptr ; ptr = ptr->next ) { - if (VALID_CONTACT(ptr, act_time) && allowed_method(_m, ptr)) { + if (VALID_CONTACT(ptr, act_time) && allowed_method(_m, ptr) + && reg_lookup_filter_match(ptr)) { path_dst.len = 0; if(ptr->path.s && ptr->path.len) { path_str = ptr->path; diff --git a/src/modules/registrar/registrar.c b/src/modules/registrar/registrar.c index 5ea2a5f99c..4a9d6f5332 100644 --- a/src/modules/registrar/registrar.c +++ b/src/modules/registrar/registrar.c @@ -135,6 +135,8 @@ str sock_hdr_name = {0,0}; int reg_expire_event_rt = -1; /* default disabled */ str reg_event_callback = STR_NULL; +int reg_lookup_filter_mode = 0; + sr_kemi_eng_t *keng = NULL; #define RCV_NAME "received" @@ -239,6 +241,7 @@ static param_export_t params[] = { {"flow_timer", INT_PARAM, &reg_flow_timer }, {"contact_max_size", INT_PARAM, &contact_max_size }, {"event_callback", PARAM_STR, &reg_event_callback }, + {"lookup_filter_mode", INT_PARAM, &reg_lookup_filter_mode }, {0, 0, 0} };

1 0

git:master:96421ea0: registrar: detailed example for xavp_cfg parameter
by Daniel-Constantin Mierla 15 Apr '19

15 Apr '19

Module: kamailio Branch: master Commit: 96421ea051ff799943ae1c7b66251f97211aa125 URL: https://github.com/kamailio/kamailio/commit/96421ea051ff799943ae1c7b66251f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-15T11:09:26+02:00 registrar: detailed example for xavp_cfg parameter --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/96421ea051ff799943ae1c7b66251f9… Patch: https://github.com/kamailio/kamailio/commit/96421ea051ff799943ae1c7b66251f9… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index 7c4226ad3c..a3c974203a 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -730,6 +730,13 @@ modparam("registrar", "reg_callid_avp", "$avp(s:avp)") <programlisting format="linespecific"> ... modparam("registrar", "xavp_cfg", "reg") +... +request_route { + ... + $xavp(reg=>max_contacts) = 4; + save("location"); + ... +} ... </programlisting> </example>

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev