sr-dev May 2018

sr-dev@lists.kamailio.org

22 participants
214 discussions

git:5.1:649e3766: tls: Fixed build tls module on Alpine dist

by Henning Westerholt

Module: kamailio Branch: 5.1 Commit: 649e3766f4159a366a1befe49f132637239e7e9a URL: https://github.com/kamailio/kamailio/commit/649e3766f4159a366a1befe49f13263… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-05-22T21:31:18+02:00 tls: Fixed build tls module on Alpine dist (cherry picked from commit 9bdc1eba76f03cd009d7f04906f13bdb6579f511) --- Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/649e3766f4159a366a1befe49f13263… Patch: https://github.com/kamailio/kamailio/commit/649e3766f4159a366a1befe49f13263… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 030e3d2d79..ef27d08f7f 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -857,7 +857,7 @@ void destroy_tls_h(void) tls_destroy_cfg(); tls_destroy_locks(); tls_ct_wq_destroy(); -#if OPENSSL_VERSION_NUMBER >= 0x010100000L +#if OPENSSL_VERSION_NUMBER >= 0x010100000L && !defined(LIBRESSL_VERSION_NUMBER) /* explicit execution of libssl cleanup to avoid being executed again * by atexit(), when shm is gone */ LM_DBG("executing openssl v1.1+ cleanup\n");

6 years, 6 months

[kamailio/kamailio] tls: Fixed build tls module on Alpine dist (#1537)

by sergey-safarov

`OPENSSL_cleanup` is not exist on Alpine dist ([`tls_init.c:864`](https://github.com/kamailio/kamailio/blob/master/src/modules/tls/tls_init.c#L864)) Later wanted cherry-pick to 5.1 branch You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1537 -- Commit Summary -- * tls: Fixed build tls module on Alpine dist -- File Changes -- M src/modules/tls/tls_init.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1537.patch https://github.com/kamailio/kamailio/pull/1537.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/1537

6 years, 6 months

git:master:9bdc1eba: tls: Fixed build tls module on Alpine dist

by Henning Westerholt

Module: kamailio Branch: master Commit: 9bdc1eba76f03cd009d7f04906f13bdb6579f511 URL: https://github.com/kamailio/kamailio/commit/9bdc1eba76f03cd009d7f04906f13bd… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2018-05-22T20:56:42+02:00 tls: Fixed build tls module on Alpine dist --- Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/9bdc1eba76f03cd009d7f04906f13bd… Patch: https://github.com/kamailio/kamailio/commit/9bdc1eba76f03cd009d7f04906f13bd… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 030e3d2d79..ef27d08f7f 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -857,7 +857,7 @@ void destroy_tls_h(void) tls_destroy_cfg(); tls_destroy_locks(); tls_ct_wq_destroy(); -#if OPENSSL_VERSION_NUMBER >= 0x010100000L +#if OPENSSL_VERSION_NUMBER >= 0x010100000L && !defined(LIBRESSL_VERSION_NUMBER) /* explicit execution of libssl cleanup to avoid being executed again * by atexit(), when shm is gone */ LM_DBG("executing openssl v1.1+ cleanup\n");

6 years, 6 months

git:master:5a0086fb: topoh: more verbose debug messages when decoding r-uri

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5a0086fb5d54cf0411180a8426ea49ad440f147a URL: https://github.com/kamailio/kamailio/commit/5a0086fb5d54cf0411180a8426ea49a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-22T20:21:02+02:00 topoh: more verbose debug messages when decoding r-uri --- Modified: src/modules/topoh/th_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/5a0086fb5d54cf0411180a8426ea49a… Patch: https://github.com/kamailio/kamailio/commit/5a0086fb5d54cf0411180a8426ea49a… --- diff --git a/src/modules/topoh/th_msg.c b/src/modules/topoh/th_msg.c index 0b9db7289d..8f46382c8e 100644 --- a/src/modules/topoh/th_msg.c +++ b/src/modules/topoh/th_msg.c @@ -749,14 +749,19 @@ int th_unmask_ruri(sip_msg_t *msg) } if(th_get_uri_param_value(&REQ_LINE(msg).uri, &th_uparam_name, &eval)<0 - || eval.len<=0) + || eval.len<=0) { + LM_DBG("no uri param [%.*s] in [%.*s]\n", + th_uparam_name.len, th_uparam_name.s, + REQ_LINE(msg).uri.len,REQ_LINE(msg).uri.s); return -1; + } out.s = th_mask_decode(eval.s, eval.len, &th_uparam_prefix, 0, &out.len); if(out.s==NULL) { - LM_ERR("cannot decode r-uri\n"); + LM_ERR("cannot decode r-uri [%.*s]\n", + REQ_LINE(msg).uri.len,REQ_LINE(msg).uri.s); return -1; }

6 years, 6 months

git:master:420fa5e5: core: cfg.lex - removed redundant token defining max_branches

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 420fa5e581af5668cdecd0c97b555f4d673105f7 URL: https://github.com/kamailio/kamailio/commit/420fa5e581af5668cdecd0c97b555f4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-22T13:46:58+02:00 core: cfg.lex - removed redundant token defining max_branches --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/420fa5e581af5668cdecd0c97b555f4… Patch: https://github.com/kamailio/kamailio/commit/420fa5e581af5668cdecd0c97b555f4… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 033f87e3df..9801dd3436 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -453,7 +453,7 @@ REPLY_ROUTE_CALLBACK "reply_route_callback" EVENT_ROUTE_CALLBACK "event_route_callback" MAX_RECURSIVE_LEVEL "max_recursive_level" -MAX_BRANCHES_PARAM "max_branches"|"max_branches" +MAX_BRANCHES_PARAM "max_branches" LATENCY_CFG_LOG latency_cfg_log LATENCY_LOG latency_log

6 years, 6 months

Set arbitrary destination port for outgoing request/reply

by Tsvetomir Dimitrov

Hello, Is it possible to modify the destination UDP port number for outgoing SIP request/response? I am working on a sec-agree extension implementation for Kamailio and after negotiating the IPSec tunnel parameters I need to redirect the messages to the new port number. I checked the code and looks like the destination port is determined mainly by the VIA headers, which doesn't work for me. Is it possible to achieve this without messing up with the core? Best regards, Tsvetomir

6 years, 6 months

git:master:3647cc1a: app_jsdt: implemented kemi KSR.pv.getw(...)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3647cc1a9b2e85e71657ba3dd3bba21c6bdc5ff5 URL: https://github.com/kamailio/kamailio/commit/3647cc1a9b2e85e71657ba3dd3bba21… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-20T21:17:47+02:00 app_jsdt: implemented kemi KSR.pv.getw(...) --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/3647cc1a9b2e85e71657ba3dd3bba21… Patch: https://github.com/kamailio/kamailio/commit/3647cc1a9b2e85e71657ba3dd3bba21… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index 8f4f3de18c..ef86d51165 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -155,11 +155,23 @@ int sr_kemi_jsdt_return_int(duk_context *J, sr_kemi_t *ket, int rc) return app_jsdt_return_false(J); } +/** + * + */ +static int jsdt_sr_return_none(duk_context *J, int rmode) +{ + if(rmode) { + duk_push_lstring(J, "<<null>>", 8); + return 1; + } else { + return 0; + } +} /** * */ -static int jsdt_sr_pv_get(duk_context *J) +static int jsdt_sr_pv_get_mode(duk_context *J, int rmode) { str pvn; pv_spec_t *pvs; @@ -171,28 +183,32 @@ static int jsdt_sr_pv_get(duk_context *J) pvn.s = (char*)duk_to_string(J, 0); if(pvn.s==NULL || env_J->msg==NULL) - return 0; + return jsdt_sr_return_none(J, rmode); pvn.len = strlen(pvn.s); LM_DBG("pv get: %s\n", pvn.s); pl = pv_locate_name(&pvn); if(pl != pvn.len) { LM_ERR("invalid pv [%s] (%d/%d)\n", pvn.s, pl, pvn.len); - return 0; + return jsdt_sr_return_none(J, rmode); } pvs = pv_cache_get(&pvn); if(pvs==NULL) { LM_ERR("cannot get pv spec for [%s]\n", pvn.s); - return 0; + return jsdt_sr_return_none(J, rmode); } memset(&val, 0, sizeof(pv_value_t)); if(pv_get_spec_value(env_J->msg, pvs, &val) != 0) { LM_ERR("unable to get pv value for [%s]\n", pvn.s); - return 0; + return jsdt_sr_return_none(J, rmode); } if(val.flags&PV_VAL_NULL) { - duk_push_string(J, NULL); - return 1; + if(rmode) { + jsdt_sr_return_none(J, rmode); + } else { + duk_push_string(J, NULL); + return 1; + } } if(val.flags&PV_TYPE_INT) { duk_push_int(J, val.ri); @@ -202,6 +218,22 @@ static int jsdt_sr_pv_get(duk_context *J) return 1; } +/** + * + */ +static int jsdt_sr_pv_get(duk_context *J) +{ + return jsdt_sr_pv_get_mode(J, 0); +} + +/** + * + */ +static int jsdt_sr_pv_getw(duk_context *J) +{ + return jsdt_sr_pv_get_mode(J, 1); +} + /** * */

6 years, 6 months

git:master:cb97be77: app_sqlang: added KSR.pv.getw(...)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cb97be77664625a4fb454bdd6d5c84c8a2c7adb3 URL: https://github.com/kamailio/kamailio/commit/cb97be77664625a4fb454bdd6d5c84c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-19T19:33:56+02:00 app_sqlang: added KSR.pv.getw(...) --- Modified: src/modules/app_sqlang/app_sqlang_api.c --- Diff: https://github.com/kamailio/kamailio/commit/cb97be77664625a4fb454bdd6d5c84c… Patch: https://github.com/kamailio/kamailio/commit/cb97be77664625a4fb454bdd6d5c84c… --- diff --git a/src/modules/app_sqlang/app_sqlang_api.c b/src/modules/app_sqlang/app_sqlang_api.c index 624e13908f..77d98ddc3d 100644 --- a/src/modules/app_sqlang/app_sqlang_api.c +++ b/src/modules/app_sqlang/app_sqlang_api.c @@ -275,7 +275,20 @@ static int sqlang_gettype(HSQUIRRELVM J, int idx) /** * */ -static SQInteger sqlang_sr_pv_get(HSQUIRRELVM J) +static SQInteger sqlang_sr_get_str_null(HSQUIRRELVM J, int rmode) +{ + if(rmode) { + sqlang_pushlstring(J, "<<null>>", 8); + return 1; + } else { + return 0; + } +} + +/** + * + */ +static SQInteger sqlang_sr_pv_get_mode(HSQUIRRELVM J, int rmode) { str pvn; pv_spec_t *pvs; @@ -287,24 +300,24 @@ static SQInteger sqlang_sr_pv_get(HSQUIRRELVM J) pvn.s = (char*)sqlang_to_string(J, 0); if(pvn.s==NULL || env_J->msg==NULL) - return 0; + return sqlang_sr_get_str_null(J, rmode); pvn.len = strlen(pvn.s); LM_DBG("pv get: %s\n", pvn.s); pl = pv_locate_name(&pvn); if(pl != pvn.len) { LM_ERR("invalid pv [%s] (%d/%d)\n", pvn.s, pl, pvn.len); - return 0; + return sqlang_sr_get_str_null(J, rmode); } pvs = pv_cache_get(&pvn); if(pvs==NULL) { LM_ERR("cannot get pv spec for [%s]\n", pvn.s); - return 0; + return sqlang_sr_get_str_null(J, rmode); } memset(&val, 0, sizeof(pv_value_t)); if(pv_get_spec_value(env_J->msg, pvs, &val) != 0) { LM_ERR("unable to get pv value for [%s]\n", pvn.s); - return 0; + return sqlang_sr_get_str_null(J, rmode); } if(val.flags&PV_VAL_NULL) { sqlang_pushstring(J, NULL); @@ -318,6 +331,22 @@ static SQInteger sqlang_sr_pv_get(HSQUIRRELVM J) return 1; } +/** + * + */ +static SQInteger sqlang_sr_pv_get(HSQUIRRELVM J) +{ + return sqlang_sr_pv_get_mode(J, 0); +} + +/** + * + */ +static SQInteger sqlang_sr_pv_getw(HSQUIRRELVM J) +{ + return sqlang_sr_pv_get_mode(J, 1); +} + /** * */ @@ -508,6 +537,7 @@ static SQInteger sqlang_sr_pv_is_null (HSQUIRRELVM J) const SQRegFunction _sr_kemi_pv_J_Map[] = { { "get", sqlang_sr_pv_get, 2 /* 1 args */, NULL }, + { "getw", sqlang_sr_pv_getw, 2 /* 1 args */, NULL }, { "seti", sqlang_sr_pv_seti, 3 /* 2 args */, NULL }, { "sets", sqlang_sr_pv_sets, 4 /* 2 args */, NULL }, { "unset", sqlang_sr_pv_unset, 2 /* 1 args */, NULL },

6 years, 6 months

[kamailio/kamailio] db_mongodb has a problem with projection (#1479)

by kelchy

### Description on upgrade to 5.1.2, db_mongodb broke ### Troubleshooting i create a [PR](https://github.com/kamailio/kamailio/pull/1477) to print out any mongo query error then i saw the debug messages below #### Reproduction install 5.1.2, use mongo as db for sip_trace module #### Debugging Data ``` DEBUG: db_mongodb [mongodb_connection.c:55]: db_mongodb_new_connection(): connection open to: mongodb://user:pass@mongo1.abc.com:17017/collection DEBUG: db_mongodb [mongodb_dbase.c:904]: db_mongodb_query(): query to collection [version] DEBUG: db_mongodb [mongodb_dbase.c:938]: db_mongodb_query(): query filter: { "table_name" : "sip_trace" } DEBUG: db_mongodb [mongodb_dbase.c:966]: db_mongodb_query(): columns filter: { "projection" : { "table_version" : 1 } } DEBUG: db_mongodb [mongodb_dbase.c:782]: db_mongodb_store_result(): An error occurred: Unsupported projection option: projection: { table_version: 1 } ERROR: <core> [db.c:450]: db_check_table_version(): invalid version 0 for table sip_trace found, expected 4 (check table structure and table "version") ERROR: siptrace [siptrace.c:435]: child_init(): error during table version check ERROR: <core> [core/sr_module.c:942]: init_mod_child(): error while initializing module siptrace (/usr/lib64/kamailio/modules/siptrace.so) (idx: 39 rank: -2 desc: [Http Async Worker]) ``` #### Log Messages #### SIP Traffic ### Possible Solutions change the way mongo builds the query ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.2 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, 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 on 06:43:15 Mar 9 2018 with gcc 4.8.2 ``` * **Operating System**:  ``` Ubuntu 14.04.1 LTS \n \l Linux hostname 3.13.0-53-generic #89-Ubuntu SMP Wed May 20 10:34:39 UTC 2015 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/1479

6 years, 6 months

git:master:abf6039d: app_python3: added KSR.pv.getw(...)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: abf6039da53ba373c5e389e162d5b21a431fb3ee URL: https://github.com/kamailio/kamailio/commit/abf6039da53ba373c5e389e162d5b21… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-18T09:05:04+02:00 app_python3: added KSR.pv.getw(...) --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/abf6039da53ba373c5e389e162d5b21… Patch: https://github.com/kamailio/kamailio/commit/abf6039da53ba373c5e389e162d5b21… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index ce6bc68733..cacd9067f4 100644 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -662,7 +662,20 @@ static sr_kemi_t _sr_apy_kemi_test[] = { /** * */ -static PyObject *sr_apy_kemi_f_pv_get(PyObject *self, PyObject *args) +PyObject *sr_apy_kemi_return_none_mode(int rmode) +{ + if(rmode) { + return sr_apy_kemi_return_str(NULL, "<<null>>", 8); + } else { + return sr_apy_kemi_return_none(); + } +} + +/** + * + */ +static PyObject *sr_apy_kemi_f_pv_get_mode(PyObject *self, PyObject *args, + int rmode) { str pvn; pv_spec_t *pvs; @@ -675,7 +688,7 @@ static PyObject *sr_apy_kemi_f_pv_get(PyObject *self, PyObject *args) if(env_P==NULL) { LM_ERR("invalid Python environment attributes\n"); - return sr_apy_kemi_return_none(); + return sr_apy_kemi_return_none_mode(rmode); } if(env_P->msg==NULL) { lmsg = faked_msg_next(); @@ -685,12 +698,12 @@ static PyObject *sr_apy_kemi_f_pv_get(PyObject *self, PyObject *args) if(!PyArg_ParseTuple(args, "s:pv.get", &pvn.s)) { LM_ERR("unable to retrieve str param\n"); - return sr_apy_kemi_return_none(); + return sr_apy_kemi_return_none_mode(rmode); } if(pvn.s==NULL || lmsg==NULL) { LM_ERR("invalid context attributes\n"); - return sr_apy_kemi_return_none(); + return sr_apy_kemi_return_none_mode(rmode); } pvn.len = strlen(pvn.s); @@ -698,21 +711,21 @@ static PyObject *sr_apy_kemi_f_pv_get(PyObject *self, PyObject *args) pl = pv_locate_name(&pvn); if(pl != pvn.len) { LM_ERR("invalid pv [%s] (%d/%d)\n", pvn.s, pl, pvn.len); - return sr_apy_kemi_return_none(); + return sr_apy_kemi_return_none_mode(rmode); } pvs = pv_cache_get(&pvn); if(pvs==NULL) { LM_ERR("cannot get pv spec for [%s]\n", pvn.s); - return sr_apy_kemi_return_none(); + return sr_apy_kemi_return_none_mode(rmode); } memset(&val, 0, sizeof(pv_value_t)); if(pv_get_spec_value(lmsg, pvs, &val) != 0) { LM_ERR("unable to get pv value for [%s]\n", pvn.s); - return sr_apy_kemi_return_none(); + return sr_apy_kemi_return_none_mode(rmode); } if(val.flags&PV_VAL_NULL) { - return sr_apy_kemi_return_none(); + return sr_apy_kemi_return_none_mode(rmode); } if(val.flags&PV_TYPE_INT) { return sr_kemi_apy_return_int(NULL, val.ri); @@ -720,6 +733,22 @@ static PyObject *sr_apy_kemi_f_pv_get(PyObject *self, PyObject *args) return sr_apy_kemi_return_str(NULL, val.rs.s, val.rs.len); } +/** + * + */ +static PyObject *sr_apy_kemi_f_pv_get(PyObject *self, PyObject *args) +{ + return sr_apy_kemi_f_pv_get_mode(self, args, 0); +} + +/** + * + */ +static PyObject *sr_apy_kemi_f_pv_getw(PyObject *self, PyObject *args) +{ + return sr_apy_kemi_f_pv_get_mode(self, args, 1); +} + /** * */ @@ -951,6 +980,8 @@ static PyObject *sr_apy_kemi_f_pv_is_null(PyObject *self, PyObject *args) static PyMethodDef _sr_apy_kemi_pv_Methods[] = { {"get", sr_apy_kemi_f_pv_get, METH_VARARGS, NAME " - pv get value"}, + {"getw", sr_apy_kemi_f_pv_getw, METH_VARARGS, + NAME " - pv get value or <<null>>"}, {"seti", sr_apy_kemi_f_pv_seti, METH_VARARGS, NAME " - pv set int value"}, {"sets", sr_apy_kemi_f_pv_sets, METH_VARARGS,

6 years, 6 months

← Newer
1
...
12
13
14
15
16
17
18
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2018