sr-dev August 2018

sr-dev@lists.kamailio.org

22 participants
281 discussions

git:master:1d33a04b: sipjson: added module version define
by Daniel-Constantin Mierla 29 Aug '18

29 Aug '18

Module: kamailio Branch: master Commit: 1d33a04b551394f50b4e27ff48a366c563b72dce URL: https://github.com/kamailio/kamailio/commit/1d33a04b551394f50b4e27ff48a366c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-29T11:47:04+02:00 sipjson: added module version define --- Modified: src/modules/sipjson/sipjson_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1d33a04b551394f50b4e27ff48a366c… Patch: https://github.com/kamailio/kamailio/commit/1d33a04b551394f50b4e27ff48a366c… --- diff --git a/src/modules/sipjson/sipjson_mod.c b/src/modules/sipjson/sipjson_mod.c index 1c210223a6..f1dad02dfc 100644 --- a/src/modules/sipjson/sipjson_mod.c +++ b/src/modules/sipjson/sipjson_mod.c @@ -33,6 +33,10 @@ #include "../../lib/srutils/srjson.h" + +MODULE_VERSION + + static int sj_serialize_data(sip_msg_t* msg, srjson_doc_t *jdoc, str* smode); static int w_sj_serialize(sip_msg_t* msg, char* mode, char* vout);

1 0

git:master:d1ccbc11: sipjson: exported sj_serialize(...) to kemi framework
by Daniel-Constantin Mierla 29 Aug '18

29 Aug '18

Module: kamailio Branch: master Commit: d1ccbc11aeaab5fbd2c169458e95d09a48fbeed7 URL: https://github.com/kamailio/kamailio/commit/d1ccbc11aeaab5fbd2c169458e95d09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-29T11:21:56+02:00 sipjson: exported sj_serialize(...) to kemi framework --- Modified: src/modules/sipjson/sipjson_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d1ccbc11aeaab5fbd2c169458e95d09… Patch: https://github.com/kamailio/kamailio/commit/d1ccbc11aeaab5fbd2c169458e95d09… --- diff --git a/src/modules/sipjson/sipjson_mod.c b/src/modules/sipjson/sipjson_mod.c index 7c0069e105..1c210223a6 100644 --- a/src/modules/sipjson/sipjson_mod.c +++ b/src/modules/sipjson/sipjson_mod.c @@ -346,4 +346,27 @@ static int sj_serialize_data(sip_msg_t* msg, srjson_doc_t *jdoc, str* smode) error: return -1; +} + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_sipjson_exports[] = { + { str_init("sipjson"), str_init("sj_serialize"), + SR_KEMIP_INT, ki_sj_serialize, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ + +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_sipjson_exports); + return 0; } \ No newline at end of file

1 0

git:master:779115c9: Makefile.groups: added sipjson module to group extra
by Daniel-Constantin Mierla 28 Aug '18

28 Aug '18

Module: kamailio Branch: master Commit: 779115c943ccecfe767836f7324d704b1bc633c5 URL: https://github.com/kamailio/kamailio/commit/779115c943ccecfe767836f7324d704… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-28T17:31:22+02:00 Makefile.groups: added sipjson module to group extra --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/779115c943ccecfe767836f7324d704… Patch: https://github.com/kamailio/kamailio/commit/779115c943ccecfe767836f7324d704… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 0c5386365f..04a5ae730f 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -18,10 +18,11 @@ mod_list_basic=async auth benchmark blst cfg_rpc cfgutils corex counters \ auth_xkeys smsops tsilo cfgt statsc topos sipdump # - extra used modules, with no extra dependency -mod_list_extra=avp auth_diameter call_control call_obj dmq domainpolicy msrp carrierroute \ - pdb qos sca seas sms sst timer tmrec uac_redirect xhttp \ - xhttp_rpc xprint jsonrpcs nosip dmq_usrloc statsd rtjson \ - log_custom keepalive ss7ops app_sqlang acc_diameter evrexec +mod_list_extra=avp auth_diameter call_control call_obj dmq domainpolicy msrp \ + carrierroute pdb qos sca seas sms sst timer tmrec uac_redirect \ + xhttp xhttp_rpc xprint jsonrpcs nosip dmq_usrloc statsd rtjson \ + log_custom keepalive ss7ops app_sqlang acc_diameter evrexec \ + sipjson # - common modules depending on database mod_list_db=acc alias_db auth_db avpops cfg_db db_text db_flatstore \

1 0

git:master:120aad0f: sipjson: new module to serialize sip message attributes into a json doc
by Daniel-Constantin Mierla 28 Aug '18

28 Aug '18

Module: kamailio Branch: master Commit: 120aad0fb98b437b5e7cfd06fabb8f02c6dc90cc URL: https://github.com/kamailio/kamailio/commit/120aad0fb98b437b5e7cfd06fabb8f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-28T17:28:42+02:00 sipjson: new module to serialize sip message attributes into a json doc --- Added: src/modules/sipjson/Makefile Added: src/modules/sipjson/README Added: src/modules/sipjson/doc/Makefile Added: src/modules/sipjson/doc/sipjson.xml Added: src/modules/sipjson/doc/sipjson_admin.xml Added: src/modules/sipjson/sipjson_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/120aad0fb98b437b5e7cfd06fabb8f0… Patch: https://github.com/kamailio/kamailio/commit/120aad0fb98b437b5e7cfd06fabb8f0…

1 0

git:master:d014e2c7: app_python3: implemented KSR.pv.getvs(...) an KSR.pv.getvn(...)
by Daniel-Constantin Mierla 28 Aug '18

28 Aug '18

Module: kamailio Branch: master Commit: d014e2c726001268133a4b1bddaff77495a7be1d URL: https://github.com/kamailio/kamailio/commit/d014e2c726001268133a4b1bddaff77… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-28T09:56:28+02:00 app_python3: implemented KSR.pv.getvs(...) an KSR.pv.getvn(...) --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/d014e2c726001268133a4b1bddaff77… Patch: https://github.com/kamailio/kamailio/commit/d014e2c726001268133a4b1bddaff77… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 69666e2d5e..9f78e53089 100755 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -828,6 +828,106 @@ static PyObject *sr_apy_kemi_f_pv_gete(PyObject *self, PyObject *args) return sr_apy_kemi_f_pv_get_mode(self, args, "s:pv.gete", 2); } +/** + * + */ +static PyObject *sr_apy_kemi_pv_push_valx(int rmode, int xival, str *xsval) +{ + if(rmode==1) { + return sr_kemi_apy_return_int(NULL, xival); + } else { + return sr_apy_kemi_return_str(NULL, xsval->s, xsval->len); + } +} + +/** + * + */ +static PyObject *sr_apy_kemi_f_pv_get_valx(PyObject *self, PyObject *args, + int rmode) +{ + str pvn; + pv_spec_t *pvs; + pv_value_t val; + int pl; + sr_apy_env_t *env_P; + sip_msg_t *lmsg = NULL; + int xival = 0; + str xsval = str_init(""); + + env_P = sr_apy_env_get(); + + if(env_P==NULL) { + LM_ERR("invalid Python environment attributes\n"); + return sr_apy_kemi_return_none_mode(rmode); + } + if(env_P->msg==NULL) { + lmsg = faked_msg_next(); + } else { + lmsg = env_P->msg; + } + + memset(&val, 0, sizeof(pv_value_t)); + if(rmode==1) { + if(!PyArg_ParseTuple(args, "si:pv.getvn", &pvn.s, &xival)) { + LM_ERR("unable to retrieve str-int params\n"); + return sr_apy_kemi_return_none_mode(rmode); + } + } else { + if(!PyArg_ParseTuple(args, "ss:pv.getvs", &pvn.s, &xival)) { + LM_ERR("unable to retrieve str-int params\n"); + return sr_apy_kemi_return_none_mode(rmode); + } + } + + if(pvn.s==NULL || lmsg==NULL) { + LM_ERR("invalid context attributes\n"); + return sr_apy_kemi_pv_push_valx(rmode, xival, &xsval); + } + val.flags |= PV_TYPE_INT|PV_VAL_INT; + pvn.len = strlen(pvn.s); + + LM_DBG("pv set: %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 sr_apy_kemi_pv_push_valx(rmode, xival, &xsval); + } + pvs = pv_cache_get(&pvn); + if(pvs==NULL) { + LM_ERR("cannot get pv spec for [%s]\n", pvn.s); + return sr_apy_kemi_pv_push_valx(rmode, xival, &xsval); + } + 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_pv_push_valx(rmode, xival, &xsval); + } + if(val.flags&PV_VAL_NULL) { + return sr_apy_kemi_pv_push_valx(rmode, xival, &xsval); + } + if(val.flags&PV_TYPE_INT) { + return sr_kemi_apy_return_int(NULL, val.ri); + } + return sr_apy_kemi_return_str(NULL, val.rs.s, val.rs.len); +} + +/** + * + */ +static PyObject *sr_apy_kemi_f_pv_getvs(PyObject *self, PyObject *args) +{ + return sr_apy_kemi_f_pv_get_valx(self, args, 0); +} + +/** + * + */ +static PyObject *sr_apy_kemi_f_pv_getvn(PyObject *self, PyObject *args) +{ + return sr_apy_kemi_f_pv_get_valx(self, args, 1); +} + /** * */ @@ -1063,6 +1163,10 @@ static PyMethodDef _sr_apy_kemi_pv_Methods[] = { NAME " - pv get value or <<null>>"}, {"gete", sr_apy_kemi_f_pv_gete, METH_VARARGS, NAME " - pv get value or <<null>>"}, + {"getvs", sr_apy_kemi_f_pv_getvs, METH_VARARGS, + NAME " - pv get value of pv or str val param"}, + {"getvn", sr_apy_kemi_f_pv_getvn, METH_VARARGS, + NAME " - pv get value of pv or int val param"}, {"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

[kamailio/kamailio] smsops: Add support for concatenated SMS in decode_3gpp_sms() (#1617)
by Tsvetomir Dimitrov 27 Aug '18

27 Aug '18

#### 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) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Support for concatenated SMS messages in smsops module. The current implementation doesn't handle correctly concatenated SMSes. The patch adds support for them in the smsops module, including dumping a concatenated message to the log and new PVs with SMS message parameters. There are also small fixes in the indentation - spaces are replaces with tabs, as this seeems to be the preferred approach in the file. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1617 -- Commit Summary -- * smsops: Add support for concatenated SMS in decode_3gpp_sms() -- File Changes -- M src/modules/smsops/smsops_impl.c (472) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1617.patch https://github.com/kamailio/kamailio/pull/1617.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/1617

3 4

git:master:453190fb: app_python: implemented KSR.pv.getvs(...) and KSR.pv.getvn(...)
by Daniel-Constantin Mierla 27 Aug '18

27 Aug '18

Module: kamailio Branch: master Commit: 453190fb28c5e4f3190d54c59a4845cbf3e7cd75 URL: https://github.com/kamailio/kamailio/commit/453190fb28c5e4f3190d54c59a4845c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-27T12:39:16+02:00 app_python: implemented KSR.pv.getvs(...) and KSR.pv.getvn(...) --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/453190fb28c5e4f3190d54c59a4845c… Patch: https://github.com/kamailio/kamailio/commit/453190fb28c5e4f3190d54c59a4845c… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index 13764664df..1de3b3b3fe 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -805,6 +805,106 @@ static PyObject *sr_apy_kemi_f_pv_gete(PyObject *self, PyObject *args) return sr_apy_kemi_f_pv_get_mode(self, args, "s:pv.gete", 2); } +/** + * + */ +static PyObject *sr_apy_kemi_pv_push_valx(int rmode, int xival, str *xsval) +{ + if(rmode==1) { + return sr_kemi_apy_return_int(NULL, xival); + } else { + return sr_apy_kemi_return_str(NULL, xsval->s, xsval->len); + } +} + +/** + * + */ +static PyObject *sr_apy_kemi_f_pv_get_valx(PyObject *self, PyObject *args, + int rmode) +{ + str pvn; + pv_spec_t *pvs; + pv_value_t val; + int pl; + sr_apy_env_t *env_P; + sip_msg_t *lmsg = NULL; + int xival = 0; + str xsval = str_init(""); + + env_P = sr_apy_env_get(); + + if(env_P==NULL) { + LM_ERR("invalid Python environment attributes\n"); + return sr_apy_kemi_return_none_mode(rmode); + } + if(env_P->msg==NULL) { + lmsg = faked_msg_next(); + } else { + lmsg = env_P->msg; + } + + memset(&val, 0, sizeof(pv_value_t)); + if(rmode==1) { + if(!PyArg_ParseTuple(args, "si:pv.getvn", &pvn.s, &xival)) { + LM_ERR("unable to retrieve str-int params\n"); + return sr_apy_kemi_return_none_mode(rmode); + } + } else { + if(!PyArg_ParseTuple(args, "ss:pv.getvs", &pvn.s, &xival)) { + LM_ERR("unable to retrieve str-int params\n"); + return sr_apy_kemi_return_none_mode(rmode); + } + } + + if(pvn.s==NULL || lmsg==NULL) { + LM_ERR("invalid context attributes\n"); + return sr_apy_kemi_pv_push_valx(rmode, xival, &xsval); + } + val.flags |= PV_TYPE_INT|PV_VAL_INT; + pvn.len = strlen(pvn.s); + + LM_DBG("pv set: %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 sr_apy_kemi_pv_push_valx(rmode, xival, &xsval); + } + pvs = pv_cache_get(&pvn); + if(pvs==NULL) { + LM_ERR("cannot get pv spec for [%s]\n", pvn.s); + return sr_apy_kemi_pv_push_valx(rmode, xival, &xsval); + } + 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_pv_push_valx(rmode, xival, &xsval); + } + if(val.flags&PV_VAL_NULL) { + return sr_apy_kemi_pv_push_valx(rmode, xival, &xsval); + } + if(val.flags&PV_TYPE_INT) { + return sr_kemi_apy_return_int(NULL, val.ri); + } + return sr_apy_kemi_return_str(NULL, val.rs.s, val.rs.len); +} + +/** + * + */ +static PyObject *sr_apy_kemi_f_pv_getvs(PyObject *self, PyObject *args) +{ + return sr_apy_kemi_f_pv_get_valx(self, args, 0); +} + +/** + * + */ +static PyObject *sr_apy_kemi_f_pv_getvn(PyObject *self, PyObject *args) +{ + return sr_apy_kemi_f_pv_get_valx(self, args, 1); +} + /** * */ @@ -1038,6 +1138,10 @@ static PyMethodDef _sr_apy_kemi_pv_Methods[] = { NAME " - pv get value"}, {"getw", sr_apy_kemi_f_pv_getw, METH_VARARGS, NAME " - pv get value or <<null>>"}, + {"getvs", sr_apy_kemi_f_pv_getvs, METH_VARARGS, + NAME " - pv get value of pv or str val param"}, + {"getvn", sr_apy_kemi_f_pv_getvn, METH_VARARGS, + NAME " - pv get value of pv or int val param"}, {"gete", sr_apy_kemi_f_pv_gete, METH_VARARGS, NAME " - pv get value or empty string"}, {"seti", sr_apy_kemi_f_pv_seti, METH_VARARGS,

1 0

git:master:b7047205: app_lua: rmode 1 corresponds to int returned value
by Daniel-Constantin Mierla 27 Aug '18

27 Aug '18

Module: kamailio Branch: master Commit: b7047205287a0fde12b3568bd0cd0425eeb68fcd URL: https://github.com/kamailio/kamailio/commit/b7047205287a0fde12b3568bd0cd042… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-27T12:38:35+02:00 app_lua: rmode 1 corresponds to int returned value --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/b7047205287a0fde12b3568bd0cd042… Patch: https://github.com/kamailio/kamailio/commit/b7047205287a0fde12b3568bd0cd042… --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index 165f43bf06..24ae3fb63e 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -906,9 +906,9 @@ static int lua_sr_pv_push_val_null (lua_State *L, int rmode) static int lua_sr_pv_push_valx (lua_State *L, int rmode, int vi, str *vs) { if(rmode==1) { - lua_pushlstring(L, vs->s, vs->len); - } else { lua_pushinteger(L, vi); + } else { + lua_pushlstring(L, vs->s, vs->len); } return 1; }

1 0

git:master:c1701cf3: app_python: give scan format to PyArg_ParseTuple() via param
by Daniel-Constantin Mierla 27 Aug '18

27 Aug '18

Module: kamailio Branch: master Commit: c1701cf3e57adbf8448c414bfb8ba10426a69104 URL: https://github.com/kamailio/kamailio/commit/c1701cf3e57adbf8448c414bfb8ba10… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-27T12:18:47+02:00 app_python: give scan format to PyArg_ParseTuple() via param --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/c1701cf3e57adbf8448c414bfb8ba10… Patch: https://github.com/kamailio/kamailio/commit/c1701cf3e57adbf8448c414bfb8ba10… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index b40c042777..13764664df 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -723,7 +723,7 @@ PyObject *sr_apy_kemi_return_none_mode(int rmode) * */ static PyObject *sr_apy_kemi_f_pv_get_mode(PyObject *self, PyObject *args, - int rmode) + char *pfmt, int rmode) { str pvn; pv_spec_t *pvs; @@ -744,7 +744,7 @@ static PyObject *sr_apy_kemi_f_pv_get_mode(PyObject *self, PyObject *args, lmsg = env_P->msg; } - if(!PyArg_ParseTuple(args, "s:pv.get", &pvn.s)) { + if(!PyArg_ParseTuple(args, pfmt, &pvn.s)) { LM_ERR("unable to retrieve str param\n"); return sr_apy_kemi_return_none_mode(rmode); } @@ -786,7 +786,7 @@ static PyObject *sr_apy_kemi_f_pv_get_mode(PyObject *self, PyObject *args, */ static PyObject *sr_apy_kemi_f_pv_get(PyObject *self, PyObject *args) { - return sr_apy_kemi_f_pv_get_mode(self, args, 0); + return sr_apy_kemi_f_pv_get_mode(self, args, "s:pv.get", 0); } /** @@ -794,7 +794,7 @@ static PyObject *sr_apy_kemi_f_pv_get(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); + return sr_apy_kemi_f_pv_get_mode(self, args, "s:pv.getw", 1); } /** @@ -802,7 +802,7 @@ static PyObject *sr_apy_kemi_f_pv_getw(PyObject *self, PyObject *args) */ static PyObject *sr_apy_kemi_f_pv_gete(PyObject *self, PyObject *args) { - return sr_apy_kemi_f_pv_get_mode(self, args, 2); + return sr_apy_kemi_f_pv_get_mode(self, args, "s:pv.gete", 2); } /**

1 0

git:master:22749d33: app_python3: give scan format to PyArg_ParseTuple() via param
by Daniel-Constantin Mierla 27 Aug '18

27 Aug '18

Module: kamailio Branch: master Commit: 22749d33e7d93422a69233a6fb0e60f2f2267c88 URL: https://github.com/kamailio/kamailio/commit/22749d33e7d93422a69233a6fb0e60f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-27T12:16:58+02:00 app_python3: give scan format to PyArg_ParseTuple() via param --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/22749d33e7d93422a69233a6fb0e60f… Patch: https://github.com/kamailio/kamailio/commit/22749d33e7d93422a69233a6fb0e60f… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index cc7dfa6ccf..69666e2d5e 100755 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -746,7 +746,7 @@ PyObject *sr_apy_kemi_return_none_mode(int rmode) * */ static PyObject *sr_apy_kemi_f_pv_get_mode(PyObject *self, PyObject *args, - int rmode) + char *pfmt, int rmode) { str pvn; pv_spec_t *pvs; @@ -767,7 +767,7 @@ static PyObject *sr_apy_kemi_f_pv_get_mode(PyObject *self, PyObject *args, lmsg = env_P->msg; } - if(!PyArg_ParseTuple(args, "s:pv.get", &pvn.s)) { + if(!PyArg_ParseTuple(args, pfmt, &pvn.s)) { LM_ERR("unable to retrieve str param\n"); return sr_apy_kemi_return_none_mode(rmode); } @@ -809,7 +809,7 @@ static PyObject *sr_apy_kemi_f_pv_get_mode(PyObject *self, PyObject *args, */ static PyObject *sr_apy_kemi_f_pv_get(PyObject *self, PyObject *args) { - return sr_apy_kemi_f_pv_get_mode(self, args, 0); + return sr_apy_kemi_f_pv_get_mode(self, args, "s:pv.get", 0); } /** @@ -817,7 +817,7 @@ static PyObject *sr_apy_kemi_f_pv_get(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); + return sr_apy_kemi_f_pv_get_mode(self, args, "s:pv.getw", 1); } /** @@ -825,7 +825,7 @@ static PyObject *sr_apy_kemi_f_pv_getw(PyObject *self, PyObject *args) */ static PyObject *sr_apy_kemi_f_pv_gete(PyObject *self, PyObject *args) { - return sr_apy_kemi_f_pv_get_mode(self, args, 2); + return sr_apy_kemi_f_pv_get_mode(self, args, "s:pv.gete", 2); } /**

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2018