sr-dev November 2017

sr-dev@lists.kamailio.org

26 participants
481 discussions

git:master:f4c6365f: app_python: updated the ctl tool to generate the exports

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f4c6365f2678e5c30d4a1fc287206b82a7eee459 URL: https://github.com/kamailio/kamailio/commit/f4c6365f2678e5c30d4a1fc287206b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-24T19:04:13+01:00 app_python: updated the ctl tool to generate the exports --- Modified: src/modules/app_python/apy_kemi_export.c Modified: src/modules/app_python/utils/app_python_ctl --- Diff: https://github.com/kamailio/kamailio/commit/f4c6365f2678e5c30d4a1fc287206b8… Patch: https://github.com/kamailio/kamailio/commit/f4c6365f2678e5c30d4a1fc287206b8… --- diff --git a/src/modules/app_python/apy_kemi_export.c b/src/modules/app_python/apy_kemi_export.c index 07cc901abd..fab078b68e 100644 --- a/src/modules/app_python/apy_kemi_export.c +++ b/src/modules/app_python/apy_kemi_export.c @@ -9279,6 +9279,9 @@ PyCFunction sr_apy_kemi_export_associate(sr_kemi_t *ket) _sr_apy_kemi_export_list[i].ket = ket; return _sr_apy_kemi_export_list[i].pfunc; } + if(_sr_apy_kemi_export_list[i].ket==ket) { + return _sr_apy_kemi_export_list[i].pfunc; + } } LM_ERR("no more indexing slots\n"); return NULL; diff --git a/src/modules/app_python/utils/app_python_ctl b/src/modules/app_python/utils/app_python_ctl index 273d5ca2c4..7fff1c7f2d 100755 --- a/src/modules/app_python/utils/app_python_ctl +++ b/src/modules/app_python/utils/app_python_ctl @@ -34,7 +34,7 @@ cat > ../apy_kemi_export.h <<EOF #define __APY_KEMI_FLIB_H__ #include <Python.h> -#include "../../kemi.h" +#include "../../core/kemi.h" #define SR_APY_KEMI_EXPORT_SIZE ${KEMI_MAX_SIZE} @@ -83,7 +83,7 @@ cat > ../apy_kemi_export.c <<EOF #include <Python.h> -#include "../../dprint.h" +#include "../../core/dprint.h" #include "apy_kemi.h" #include "apy_kemi_export.h" @@ -138,6 +138,9 @@ PyCFunction sr_apy_kemi_export_associate(sr_kemi_t *ket) _sr_apy_kemi_export_list[i].ket = ket; return _sr_apy_kemi_export_list[i].pfunc; } + if(_sr_apy_kemi_export_list[i].ket==ket) { + return _sr_apy_kemi_export_list[i].pfunc; + } } LM_ERR("no more indexing slots\n"); return NULL;

7 years

git:master:ac8cc0a3: app_lua: updated the utils/app_lua_ctl

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ac8cc0a3735325ec79a4a634eea6bcdcea4affe7 URL: https://github.com/kamailio/kamailio/commit/ac8cc0a3735325ec79a4a634eea6bcd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-24T19:00:34+01:00 app_lua: updated the utils/app_lua_ctl --- Modified: src/modules/app_lua/utils/app_lua_ctl --- Diff: https://github.com/kamailio/kamailio/commit/ac8cc0a3735325ec79a4a634eea6bcd… Patch: https://github.com/kamailio/kamailio/commit/ac8cc0a3735325ec79a4a634eea6bcd… --- diff --git a/src/modules/app_lua/utils/app_lua_ctl b/src/modules/app_lua/utils/app_lua_ctl index 6a85943dda..e4ef9aca8c 100755 --- a/src/modules/app_lua/utils/app_lua_ctl +++ b/src/modules/app_lua/utils/app_lua_ctl @@ -142,6 +142,9 @@ lua_CFunction sr_kemi_lua_export_associate(sr_kemi_t *ket) _sr_kemi_lua_export_list[i].ket = ket; return _sr_kemi_lua_export_list[i].pfunc; } + if(_sr_kemi_lua_export_list[i].ket==ket) { + return _sr_kemi_lua_export_list[i].pfunc; + } } LM_ERR("no more indexing slots\n"); return NULL;

7 years

git:master:6c7bc039: drouting: removed unused variable

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6c7bc0390fc1d9972ca9fc330c25dd9b29f2476a URL: https://github.com/kamailio/kamailio/commit/6c7bc0390fc1d9972ca9fc330c25dd9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-24T18:48:09+01:00 drouting: removed unused variable --- Modified: src/modules/drouting/drouting.c --- Diff: https://github.com/kamailio/kamailio/commit/6c7bc0390fc1d9972ca9fc330c25dd9… Patch: https://github.com/kamailio/kamailio/commit/6c7bc0390fc1d9972ca9fc330c25dd9… --- diff --git a/src/modules/drouting/drouting.c b/src/modules/drouting/drouting.c index 148c991a25..234e3ea1b9 100644 --- a/src/modules/drouting/drouting.c +++ b/src/modules/drouting/drouting.c @@ -729,7 +729,6 @@ static int do_routing(struct sip_msg *msg, int grp_id) struct sip_uri uri; str *ruri; int_str val; - struct usr_avp *avp; #define DR_MAX_GWLIST 32 static int active_gwlist[DR_MAX_GWLIST]; static int local_gwlist[DR_MAX_GWLIST]; @@ -1209,4 +1208,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_drouting_exports); return 0; -} \ No newline at end of file +}

7 years

git:master:d98a005a: app_lua: detect if a kemi function was already added in the exports list

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d98a005ac57b957231f8bda26c711bf7c7260049 URL: https://github.com/kamailio/kamailio/commit/d98a005ac57b957231f8bda26c711bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-24T18:42:07+01:00 app_lua: detect if a kemi function was already added in the exports list --- Modified: src/modules/app_lua/app_lua_kemi_export.c --- Diff: https://github.com/kamailio/kamailio/commit/d98a005ac57b957231f8bda26c711bf… Patch: https://github.com/kamailio/kamailio/commit/d98a005ac57b957231f8bda26c711bf… --- diff --git a/src/modules/app_lua/app_lua_kemi_export.c b/src/modules/app_lua/app_lua_kemi_export.c index 0fe6c0d9cb..29aa0e3d2b 100644 --- a/src/modules/app_lua/app_lua_kemi_export.c +++ b/src/modules/app_lua/app_lua_kemi_export.c @@ -9281,6 +9281,9 @@ lua_CFunction sr_kemi_lua_export_associate(sr_kemi_t *ket) _sr_kemi_lua_export_list[i].ket = ket; return _sr_kemi_lua_export_list[i].pfunc; } + if(_sr_kemi_lua_export_list[i].ket==ket) { + return _sr_kemi_lua_export_list[i].pfunc; + } } LM_ERR("no more indexing slots\n"); return NULL;

7 years

git:master:b34a31a6: modules: readme files regenerated - cnxcc ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: b34a31a66442ca6ec566676fcfb7210acbb83201 URL: https://github.com/kamailio/kamailio/commit/b34a31a66442ca6ec566676fcfb7210… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-11-24T15:16:53+01:00 modules: readme files regenerated - cnxcc ... [skip ci] --- Modified: src/modules/cnxcc/README --- Diff: https://github.com/kamailio/kamailio/commit/b34a31a66442ca6ec566676fcfb7210… Patch: https://github.com/kamailio/kamailio/commit/b34a31a66442ca6ec566676fcfb7210…

7 years

git:master:b24cae28: cnxcc: docs - added parameters to functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b24cae28dcb8ba3289e0320a1e406e4667371258 URL: https://github.com/kamailio/kamailio/commit/b24cae28dcb8ba3289e0320a1e406e4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-24T15:15:19+01:00 cnxcc: docs - added parameters to functions --- Modified: src/modules/cnxcc/doc/cnxcc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b24cae28dcb8ba3289e0320a1e406e4… Patch: https://github.com/kamailio/kamailio/commit/b24cae28dcb8ba3289e0320a1e406e4…

7 years

git:master:41953f19: cnxcc: use fixup function helper for core to get string and int params

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 41953f192185989b5ba3ee7154202b6c390fe84c URL: https://github.com/kamailio/kamailio/commit/41953f192185989b5ba3ee7154202b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-24T14:48:38+01:00 cnxcc: use fixup function helper for core to get string and int params --- Modified: src/modules/cnxcc/cnxcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/41953f192185989b5ba3ee7154202b6… Patch: https://github.com/kamailio/kamailio/commit/41953f192185989b5ba3ee7154202b6…

7 years

git:master:3205c597: core: mod_fix - typedefed struct to pvs_fixup_t

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3205c5970652bba56e2e3904a565491503fb6206 URL: https://github.com/kamailio/kamailio/commit/3205c5970652bba56e2e3904a565491… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-24T14:44:12+01:00 core: mod_fix - typedefed struct to pvs_fixup_t --- Modified: src/core/mod_fix.c --- Diff: https://github.com/kamailio/kamailio/commit/3205c5970652bba56e2e3904a565491… Patch: https://github.com/kamailio/kamailio/commit/3205c5970652bba56e2e3904a565491… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index 3e8562add6..b07adcfc26 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -259,14 +259,14 @@ FIXUP_F1T(pvar_null, 1, 1, FPARAM_PVS) FIXUP_F1T(pvar_pvar, 1, 2, FPARAM_PVS) */ -struct pvs_fixup { +typedef struct pvs_fixup { pv_spec_t pvs; /* parsed pv spec */ void* orig; /* original pointer */ -}; +} pvs_fixup_t; int fixup_pvar_all(void** param, int param_no) { - struct pvs_fixup* pvs_f; + pvs_fixup_t* pvs_f; str name; pvs_f = 0; @@ -296,14 +296,14 @@ int fixup_pvar_all(void** param, int param_no) int fixup_free_pvar_all(void** param, int param_no) { - struct pvs_fixup* pvs_f; + pvs_fixup_t* pvs_f; if (*param) { pvs_f = *param; *param = pvs_f->orig; /* free only the contents (don't attempt to free &pvs_f->pvs)*/ pv_spec_destroy(&pvs_f->pvs); - /* free the whole pvs_fixup */ + /* free the whole pvs_fixup_t */ pkg_free(pvs_f); } return 0;

7 years