sr-dev May 2018

sr-dev@lists.kamailio.org

22 participants
215 discussions

git:master:abf6039d: app_python3: added KSR.pv.getw(...)
by Daniel-Constantin Mierla 18 May '18

18 May '18

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,

1 0

git:master:e8b434f1: app_python: added KSR.pv.getw() to kemi expors
by Daniel-Constantin Mierla 18 May '18

18 May '18

Module: kamailio Branch: master Commit: e8b434f13f56b2f34d5b30bf728c4685c488e63c URL: https://github.com/kamailio/kamailio/commit/e8b434f13f56b2f34d5b30bf728c468… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-18T09:03:04+02:00 app_python: added KSR.pv.getw() to kemi expors - wrapper function for returning the value --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/e8b434f13f56b2f34d5b30bf728c468… Patch: https://github.com/kamailio/kamailio/commit/e8b434f13f56b2f34d5b30bf728c468… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index b7cca69bdf..6ea72e3d1c 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -657,6 +657,18 @@ static sr_kemi_t _sr_apy_kemi_test[] = { { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; +/** + * + */ +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(); + } +} + /** * */ @@ -674,11 +686,7 @@ static PyObject *sr_apy_kemi_f_pv_get_mode(PyObject *self, PyObject *args, if(env_P==NULL) { LM_ERR("invalid Python environment attributes\n"); - if(rmode) { - return sr_apy_kemi_return_str(NULL, "<<null>>", 8); - } else { - return sr_apy_kemi_return_none(); - } + return sr_apy_kemi_return_none_mode(rmode); } if(env_P->msg==NULL) { lmsg = faked_msg_next(); @@ -688,20 +696,12 @@ static PyObject *sr_apy_kemi_f_pv_get_mode(PyObject *self, PyObject *args, if(!PyArg_ParseTuple(args, "s:pv.get", &pvn.s)) { LM_ERR("unable to retrieve str param\n"); - if(rmode) { - return sr_apy_kemi_return_str(NULL, "<<null>>", 8); - } else { - 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"); - if(rmode) { - return sr_apy_kemi_return_str(NULL, "<<null>>", 8); - } else { - return sr_apy_kemi_return_none(); - } + return sr_apy_kemi_return_none_mode(rmode); } pvn.len = strlen(pvn.s); @@ -709,37 +709,21 @@ static PyObject *sr_apy_kemi_f_pv_get_mode(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); - if(rmode) { - return sr_apy_kemi_return_str(NULL, "<<null>>", 8); - } else { - 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); - if(rmode) { - return sr_apy_kemi_return_str(NULL, "<<null>>", 8); - } else { - 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); - if(rmode) { - return sr_apy_kemi_return_str(NULL, "<<null>>", 8); - } else { - return sr_apy_kemi_return_none(); - } + return sr_apy_kemi_return_none_mode(rmode); } if(val.flags&PV_VAL_NULL) { - if(rmode) { - return sr_apy_kemi_return_str(NULL, "<<null>>", 8); - } else { - 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); @@ -758,7 +742,7 @@ static PyObject *sr_apy_kemi_f_pv_get(PyObject *self, PyObject *args) /** * */ -static PyObject *sr_apy_kemi_f_pv_get_w(PyObject *self, PyObject *args) +static PyObject *sr_apy_kemi_f_pv_getw(PyObject *self, PyObject *args) { return sr_apy_kemi_f_pv_get_mode(self, args, 1); } @@ -994,6 +978,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,

1 0

git:master:115fa38f: app_python: added KSR.pv.getw(...)
by Daniel-Constantin Mierla 18 May '18

18 May '18

Module: kamailio Branch: master Commit: 115fa38f427b1bc3730add9078c44219b25960cb URL: https://github.com/kamailio/kamailio/commit/115fa38f427b1bc3730add9078c4421… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-18T08:48:37+02:00 app_python: added KSR.pv.getw(...) --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/115fa38f427b1bc3730add9078c4421… Patch: https://github.com/kamailio/kamailio/commit/115fa38f427b1bc3730add9078c4421… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index e9759d43d6..b7cca69bdf 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -660,7 +660,8 @@ static sr_kemi_t _sr_apy_kemi_test[] = { /** * */ -static PyObject *sr_apy_kemi_f_pv_get(PyObject *self, PyObject *args) +static PyObject *sr_apy_kemi_f_pv_get_mode(PyObject *self, PyObject *args, + int rmode) { str pvn; pv_spec_t *pvs; @@ -673,7 +674,11 @@ 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(); + if(rmode) { + return sr_apy_kemi_return_str(NULL, "<<null>>", 8); + } else { + return sr_apy_kemi_return_none(); + } } if(env_P->msg==NULL) { lmsg = faked_msg_next(); @@ -683,12 +688,20 @@ 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(); + if(rmode) { + return sr_apy_kemi_return_str(NULL, "<<null>>", 8); + } else { + return sr_apy_kemi_return_none(); + } } if(pvn.s==NULL || lmsg==NULL) { LM_ERR("invalid context attributes\n"); - return sr_apy_kemi_return_none(); + if(rmode) { + return sr_apy_kemi_return_str(NULL, "<<null>>", 8); + } else { + return sr_apy_kemi_return_none(); + } } pvn.len = strlen(pvn.s); @@ -696,21 +709,37 @@ 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(); + if(rmode) { + return sr_apy_kemi_return_str(NULL, "<<null>>", 8); + } else { + return sr_apy_kemi_return_none(); + } } 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(); + if(rmode) { + return sr_apy_kemi_return_str(NULL, "<<null>>", 8); + } else { + return sr_apy_kemi_return_none(); + } } 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(); + if(rmode) { + return sr_apy_kemi_return_str(NULL, "<<null>>", 8); + } else { + return sr_apy_kemi_return_none(); + } } if(val.flags&PV_VAL_NULL) { - return sr_apy_kemi_return_none(); + if(rmode) { + return sr_apy_kemi_return_str(NULL, "<<null>>", 8); + } else { + return sr_apy_kemi_return_none(); + } } if(val.flags&PV_TYPE_INT) { return sr_kemi_apy_return_int(NULL, val.ri); @@ -718,6 +747,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_get_w(PyObject *self, PyObject *args) +{ + return sr_apy_kemi_f_pv_get_mode(self, args, 1); +} + /** * */

1 0

Whats is wrong in this call
by Sergey Safarov 15 May '18

15 May '18

Hello I have a call with not passed ACK by Kamailio. http://prntscr.com/jhtobo Same behaviour i looked before when SIP endpoint contact string is wrong In this call look as contact string correct is correct (packets 7 and 8) and i not understand why ACK (packet 9) not passed to callee. Could you help me understand this. PCAP file is create using homer tracer and TCP transport packets is stored as UDP. Sergey

3 3

git:master:5b1355aa: db2_ldap: fix compilation warning
by Victor Seva 15 May '18

15 May '18

Module: kamailio Branch: master Commit: 5b1355aa3d9404a5165b0afbfdac384fe9cf785a URL: https://github.com/kamailio/kamailio/commit/5b1355aa3d9404a5165b0afbfdac384… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-05-15T22:11:52+02:00 db2_ldap: fix compilation warning > ld_fld.c:831:19: warning: unused function 'db_double2ldap_str' [-Wunused-function] > static inline int db_double2ldap_str(struct sbuf* buf, db_fld_t* fld) > ^ > 1 warning generated. --- Modified: src/modules/db2_ldap/ld_fld.c --- Diff: https://github.com/kamailio/kamailio/commit/5b1355aa3d9404a5165b0afbfdac384… Patch: https://github.com/kamailio/kamailio/commit/5b1355aa3d9404a5165b0afbfdac384… --- diff --git a/src/modules/db2_ldap/ld_fld.c b/src/modules/db2_ldap/ld_fld.c index 564762b64a..867c873e8f 100644 --- a/src/modules/db2_ldap/ld_fld.c +++ b/src/modules/db2_ldap/ld_fld.c @@ -828,7 +828,7 @@ static inline int db_float2ldap_str(struct sbuf* buf, db_fld_t* fld) } -static inline int db_double2ldap_str(struct sbuf* buf, db_fld_t* fld) +/*static inline int db_double2ldap_str(struct sbuf* buf, db_fld_t* fld) { char tmp[16]; int len; @@ -839,7 +839,7 @@ static inline int db_double2ldap_str(struct sbuf* buf, db_fld_t* fld) return -1; } return sb_add(buf, tmp, len); -} +}*/ static inline int ld_db2ldap(struct sbuf* buf, db_fld_t* fld) { struct ld_fld* lfld;

1 0

git:master:5a5475f3: ims_usrloc_pcscf: fix compilation warning
by Victor Seva 15 May '18

15 May '18

Module: kamailio Branch: master Commit: 5a5475f372591b1be5c3dc7851ea509149131509 URL: https://github.com/kamailio/kamailio/commit/5a5475f372591b1be5c3dc7851ea509… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-05-15T20:25:00+02:00 ims_usrloc_pcscf: fix compilation warning > pcontact.c:122:5: warning: enumeration value 'SECURITY_NONE' not handled in switch [-Wswitch] > switch (_p->type) > ^~~~~~ --- Modified: src/modules/ims_usrloc_pcscf/pcontact.c --- Diff: https://github.com/kamailio/kamailio/commit/5a5475f372591b1be5c3dc7851ea509… Patch: https://github.com/kamailio/kamailio/commit/5a5475f372591b1be5c3dc7851ea509… --- diff --git a/src/modules/ims_usrloc_pcscf/pcontact.c b/src/modules/ims_usrloc_pcscf/pcontact.c index ff666f8103..60d6b28132 100644 --- a/src/modules/ims_usrloc_pcscf/pcontact.c +++ b/src/modules/ims_usrloc_pcscf/pcontact.c @@ -138,7 +138,8 @@ void free_security(security_t* _p) shm_free(_p->data.tls); break; - //default: Nothing to deallocate + default: // Nothing to deallocate + break; } shm_free(_p);

1 0

git:master:dbae2561: db_perlvdb: fix compilation warning
by Victor Seva 15 May '18

15 May '18

Module: kamailio Branch: master Commit: dbae2561720c97200d8e58e1e6c408a943e3c07b URL: https://github.com/kamailio/kamailio/commit/dbae2561720c97200d8e58e1e6c408a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-05-15T20:18:02+02:00 db_perlvdb: fix compilation warning > db_perlvdb.c: In function 'db_perlvdb_bind_api': > db_perlvdb.c:98:24: warning: assignment from incompatible pointer type [-Wincompatible-pointer-types] > dbb->replace = perlvdb_db_replace; > ^ --- Modified: src/modules/db_perlvdb/perlvdbfunc.c Modified: src/modules/db_perlvdb/perlvdbfunc.h --- Diff: https://github.com/kamailio/kamailio/commit/dbae2561720c97200d8e58e1e6c408a… Patch: https://github.com/kamailio/kamailio/commit/dbae2561720c97200d8e58e1e6c408a… --- diff --git a/src/modules/db_perlvdb/perlvdbfunc.c b/src/modules/db_perlvdb/perlvdbfunc.c index c6d6513616..e27d83c254 100644 --- a/src/modules/db_perlvdb/perlvdbfunc.c +++ b/src/modules/db_perlvdb/perlvdbfunc.c @@ -202,7 +202,8 @@ int perlvdb_db_insert(const db1_con_t* h, const db_key_t* k, const db_val_t* v, /* * Just like insert, but replace the row if it exists */ -int perlvdb_db_replace(const db1_con_t* h, const db_key_t* k, const db_val_t* v, const int n) { +int perlvdb_db_replace(const db1_con_t* h, const db_key_t* k, const db_val_t* v, + const int n, const int un, const int m) { return perlvdb_db_insertreplace(h, k, v, n, PERL_VDB_REPLACEMETHOD); } diff --git a/src/modules/db_perlvdb/perlvdbfunc.h b/src/modules/db_perlvdb/perlvdbfunc.h index 33f392b755..0db42a28ee 100644 --- a/src/modules/db_perlvdb/perlvdbfunc.h +++ b/src/modules/db_perlvdb/perlvdbfunc.h @@ -48,7 +48,8 @@ void perlvdb_db_close(db1_con_t* h); int perlvdb_use_table(db1_con_t* h, const str* t); int perlvdb_db_insert(const db1_con_t* h, const db_key_t* k, const db_val_t* v, const int n); -int perlvdb_db_replace(const db1_con_t* h, const db_key_t* k, const db_val_t* v, const int n); +int perlvdb_db_replace(const db1_con_t* h, const db_key_t* k, const db_val_t* v, + const int n, const int un, const int m); int perlvdb_db_delete(const db1_con_t* h, const db_key_t* k, const db_op_t* o, const db_val_t* v, const int n); int perlvdb_db_update(const db1_con_t* h, const db_key_t* k, const db_op_t* o,

1 0

git:master:c3e36a1e: app_lua: kemi - exported KSR.pv.getw("$...")
by Daniel-Constantin Mierla 15 May '18

15 May '18

Module: kamailio Branch: master Commit: c3e36a1eb2ff70f94b83a42de3e901f4ba142813 URL: https://github.com/kamailio/kamailio/commit/c3e36a1eb2ff70f94b83a42de3e901f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-15T07:54:24+02:00 app_lua: kemi - exported KSR.pv.getw("$...") - get the value of the pseudo-variable if it is not $null and the string "<<null>>" if it is $null - useful to use in building log messages without testing if the variable is set, otherwise lua throws error while trying to concatenate null value --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/c3e36a1eb2ff70f94b83a42de3e901f… Patch: https://github.com/kamailio/kamailio/commit/c3e36a1eb2ff70f94b83a42de3e901f… --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index f6155dc741..6edba5d7a7 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -884,7 +884,7 @@ static const luaL_Reg _sr_hdr_Map [] = { /** * */ -static int lua_sr_pv_get (lua_State *L) +static int lua_sr_pv_get_val (lua_State *L, int rmode) { str pvn; pv_spec_t *pvs; @@ -895,35 +895,56 @@ static int lua_sr_pv_get (lua_State *L) env_L = sr_lua_env_get(); pvn.s = (char*)lua_tostring(L, -1); - if(pvn.s==NULL || env_L->msg==NULL) - return 0; + if(pvn.s==NULL || env_L->msg==NULL) { + if(rmode) { + lua_pushlstring(L, "<<null>>", 8); + return 1; + } else { + return 0; + } + } pvn.len = strlen(pvn.s); LM_DBG("pv get: %s\n", pvn.s); pl = pv_locate_name(&pvn); - if(pl != pvn.len) - { + if(pl != pvn.len) { LM_ERR("invalid pv [%s] (%d/%d)\n", pvn.s, pl, pvn.len); - return 0; + if(rmode) { + lua_pushlstring(L, "<<null>>", 8); + return 1; + } else { + return 0; + } } pvs = pv_cache_get(&pvn); - if(pvs==NULL) - { + if(pvs==NULL) { LM_ERR("cannot get pv spec for [%s]\n", pvn.s); - return 0; + if(rmode) { + lua_pushlstring(L, "<<null>>", 8); + return 1; + } else { + return 0; + } } memset(&val, 0, sizeof(pv_value_t)); - if(pv_get_spec_value(env_L->msg, pvs, &val) != 0) - { + if(pv_get_spec_value(env_L->msg, pvs, &val) != 0) { LM_ERR("unable to get pv value for [%s]\n", pvn.s); - return 0; + if(rmode) { + lua_pushlstring(L, "<<null>>", 8); + return 1; + } else { + return 0; + } } - if(val.flags&PV_VAL_NULL) - { - return 0; + if(val.flags&PV_VAL_NULL) { + if(rmode) { + lua_pushlstring(L, "<<null>>", 8); + return 1; + } else { + return 0; + } } - if(val.flags&PV_TYPE_INT) - { + if(val.flags&PV_TYPE_INT) { lua_pushinteger(L, val.ri); return 1; } @@ -931,6 +952,22 @@ static int lua_sr_pv_get (lua_State *L) return 1; } +/** + * + */ +static int lua_sr_pv_get (lua_State *L) +{ + return lua_sr_pv_get_val(L, 0); +} + +/** + * + */ +static int lua_sr_pv_getw (lua_State *L) +{ + return lua_sr_pv_get_val(L, 1); +} + /** * */ @@ -1137,6 +1174,7 @@ static int lua_sr_pv_is_null (lua_State *L) */ static const luaL_Reg _sr_pv_Map [] = { {"get", lua_sr_pv_get}, + {"getw", lua_sr_pv_getw}, {"seti", lua_sr_pv_seti}, {"sets", lua_sr_pv_sets}, {"unset", lua_sr_pv_unset},

1 0

[kamailio/kamailio] kazoo: wrong BLF when used application/dialog-info+xml (#1489)
by sergey-safarov 10 May '18

10 May '18

### Description Yealink phones is subscribes using `application/dialog-info+xml`. In this case for many phones false reported `early` state. ### Troubleshooting #### Reproduction Not knows. Some phones is displayes properly, some is not. #### Debugging Data none #### Log Messages not yet done #### SIP Traffic In provided pcap. is subscribed two clients `yealink` phone and `x-lite` softphone. Created call to extension 201 (sip login). For `x-lite` status is changed properly for `yealink` is not. Filters `udp.port==13322` caller leg `udp.port==1025` callee legs `udp.srcport==5060&&udp.dstport==5060` yealink phone `udp.port==15502` xlite [blf-test.pcap.gz](https://github.com/kamailio/kamailio/files/1849284/blf-te… packet 14 - kamailio reports 201 extension is Available to xlite packet 25 - kamailio reports 201 is early to yealink (unexpected) packet 108 - created call to 201 extension packer 109 - ringing to caller packet 118 - kamailio send ringing to caller packet 119 - INVITE send to callee packet 124 - callee send Trying packet 127 - kamailio reports 201 is ringing to yalink packet 129 - kamailio reports 201 is busy to xlite packet 145 - kamailio send session progress to caller packet 146 - callee send ringing packet 154 - caller send cancel packet 156 - kamailio send early to yealink (unexpected) packet 156 - kamailio send Available to x-lite ### Possible Solutions not known ### Additional Information Kamailio installed from kazoo team repo ``` [root@kamailio01 ~]# kamailio -V version: kamailio 5.0.3 (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 on 11:07:05 Sep 23 2017 with gcc 4.8.5 [root@kamailio01 ~]# ``` * **Operating System**:  ``` [root@kamailio01 ~]# uname -a Linux kamailio01.cloudpbx.ai.co.uk 3.10.0-514.6.1.el7.x86_64 #1 SMP Wed Jan 18 13:06:36 UTC 2017 x86_64 x86_64 x86_64 GNU/Linux [root@kamailio01 ~]# cat /etc/redhat-release CentOS Linux release 7.3.1611 (Core) [root@kamailio01 ~]# ``` -- 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/1489

2 9

[kamailio/kamailio] app_lua: htable event_callback failed (#1519)
by Surendra Tiwari 09 May '18

09 May '18

### Description event_callback for app_lua is not working ### Troubleshooting #### Reproduction # ----- app_lua params ---- 1. load the htable and app_lua with following parameters modparam("app_lua", "reload", 1) modparam("app_lua", "load", "/usr/local/etc/kamailio/route.lua") modparam("htable", "event_callback", "ksr_htable_event") -- event callback function implemented in Lua function ksr_htable_event(evname) KSR.info("===== htable module triggered event: " .. evname .. "\n"); return 1; end #### Debugging Data May 3 12:15:19 ip-172-31-4-160 kamailio[9797]: ERROR: app_lua [app_lua_api.c:652]: app_lua_run_ex(): lua loading state not initialized (call: ksr_htable_event) ``` (paste your debugging data here) ``` #### Log Messages ``` May 3 12:15:19 ip-172-31-4-160 kamailio[9797]: ERROR: app_lua [app_lua_api.c:652]: app_lua_run_ex(): lua loading state not initialized (call: ksr_htable_event) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` root@ip-172-31-4-160:/usr/local/etc/kamailio# kamailio -v version: kamailio 5.1.3 (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 15:16:50 Apr 24 2018 with gcc 4.8.4 ``` * **Operating System**:  ``` root@ip-172-31-4-160:/usr/local/etc/kamailio# uname -a Linux ip-172-31-4-160 3.13.0-143-generic #192-Ubuntu SMP Tue Feb 27 10:45:36 UTC 2018 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/1519

2 12

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2018