sr-dev August 2010

sr-dev@lists.kamailio.org

26 participants
346 discussions

git:master: added missing database files for dbtext and berkley

by Marius Ovidiu Bucur

Module: sip-router Branch: master Commit: 5dacff0515a4ce347fd77d8049bab426d527a8ff URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5dacff0… Author: Marius Bucur <marius(a)dsl-core.(none)> Committer: Marius Bucur <marius(a)dsl-core.(none)> Date: Thu Aug 5 10:48:23 2010 +0200 added missing database files for dbtext and berkley --- utils/kamctl/db_berkeley/kamailio/matrix | 10 ++++++++++ utils/kamctl/dbtext/kamailio/matrix | 1 + 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/utils/kamctl/db_berkeley/kamailio/matrix b/utils/kamctl/db_berkeley/kamailio/matrix new file mode 100644 index 0000000..a2e07b3 --- /dev/null +++ b/utils/kamctl/db_berkeley/kamailio/matrix @@ -0,0 +1,10 @@ +METADATA_COLUMNS +first(int) second(int) res(int) +METADATA_KEY + +METADATA_READONLY +0 +METADATA_LOGFLAGS +0 +METADATA_DEFAULTS +NIL|NIL|NIL diff --git a/utils/kamctl/dbtext/kamailio/matrix b/utils/kamctl/dbtext/kamailio/matrix new file mode 100644 index 0000000..5f86e10 --- /dev/null +++ b/utils/kamctl/dbtext/kamailio/matrix @@ -0,0 +1 @@ +first(int) second(int) res(int)

13 years, 9 months

git:kamailio_3.0: modules:carrierroute Better handling of fclose

by Marius Zbihlei

Module: sip-router Branch: kamailio_3.0 Commit: b5ef768bcabf905d455ca26225c55f858cbe4c48 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b5ef768… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Thu Aug 5 11:31:02 2010 +0300 modules:carrierroute Better handling of fclose --- modules/carrierroute/cr_config.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/carrierroute/cr_config.c b/modules/carrierroute/cr_config.c index 1f0775a..51a81d9 100644 --- a/modules/carrierroute/cr_config.c +++ b/modules/carrierroute/cr_config.c @@ -168,7 +168,8 @@ static int backup_config(void) { if (fclose(from)==EOF) { LM_ERR("Error closing source file.\n"); - goto errclose; + fclose(to); + goto errout; } if (fclose(to)==EOF) {

13 years, 9 months

git:kamailio_3.0: modules/carrierroute: Prevent resource leak in case of error

by Marius Zbihlei

Module: sip-router Branch: kamailio_3.0 Commit: 821a4322a0902b827add7913705f72d5e50176b5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=821a432… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Thu Aug 5 11:02:14 2010 +0300 modules/carrierroute: Prevent resource leak in case of error the 2 FILE* opened in file mode where not properly closed on all code paths --- modules/carrierroute/cr_config.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/carrierroute/cr_config.c b/modules/carrierroute/cr_config.c index 87969fa..1f0775a 100644 --- a/modules/carrierroute/cr_config.c +++ b/modules/carrierroute/cr_config.c @@ -157,18 +157,18 @@ static int backup_config(void) { ch = fgetc(from); if (ferror(from)) { LM_ERR("Error reading source file.\n"); - goto errout; + goto errclose; } if (!feof(from)) fputc(ch, to); if (ferror(to)) { LM_ERR("Error writing destination file.\n"); - goto errout; + goto errclose; } } if (fclose(from)==EOF) { LM_ERR("Error closing source file.\n"); - goto errout; + goto errclose; } if (fclose(to)==EOF) { @@ -178,6 +178,10 @@ static int backup_config(void) { LM_NOTICE("backup written to %s\n", backup_file); pkg_free(backup_file); return 0; +errclose: + /* close the files so that resource leak is prevented ; ignore errors*/ + fclose(from); + fclose(to); errout: pkg_free(backup_file); return -1;

13 years, 9 months

git:master: modules/carrierroute Fixed resource leak in case of error

by Marius Zbihlei

Module: sip-router Branch: master Commit: 2c034db7a3dc22886ad9b848d0c105a26f72e256 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2c034db… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Thu Aug 5 11:08:17 2010 +0300 modules/carrierroute Fixed resource leak in case of error 2 FILE* where leaked(fclose was not called) in file mode on the error paths. --- modules/carrierroute/cr_config.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/carrierroute/cr_config.c b/modules/carrierroute/cr_config.c index 8b37fe6..92f96a9 100644 --- a/modules/carrierroute/cr_config.c +++ b/modules/carrierroute/cr_config.c @@ -157,17 +157,18 @@ static int backup_config(void) { ch = fgetc(from); if (ferror(from)) { LM_ERR("Error reading source file.\n"); - goto errout; + goto errclose; } if (!feof(from)) fputc(ch, to); if (ferror(to)) { LM_ERR("Error writing destination file.\n"); - goto errout; + goto errclose; } } if (fclose(from)==EOF) { LM_ERR("Error closing source file.\n"); + fclose(to); goto errout; } @@ -178,6 +179,10 @@ static int backup_config(void) { LM_NOTICE("backup written to %s\n", backup_file); pkg_free(backup_file); return 0; +errclose: + /* close the files so that resource leak is prevented ; ignore errors*/ + fclose(from); + fclose(to); errout: pkg_free(backup_file); return -1;

13 years, 9 months

git:master: add new module "matrix" for array lookups

by Marius Ovidiu Bucur

Module: sip-router Branch: master Commit: 1fb1997b632b33b4f9195bb3b68111ca6a87d84b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1fb1997… Author: Marius Bucur <marius(a)dsl-core.(none)> Committer: Marius Bucur <marius(a)dsl-core.(none)> Date: Wed Aug 4 18:35:31 2010 +0200 add new module "matrix" for array lookups --- lib/srdb1/schema/kamailio-matrix.xml | 13 + lib/srdb1/schema/matrix.xml | 45 ++ modules/matrix/Makefile | 13 + modules/matrix/README | 313 +++++++++++ modules/matrix/db_matrix.c | 112 ++++ modules/matrix/db_matrix.h | 85 +++ modules/matrix/doc/Makefile | 4 + modules/matrix/doc/matrix.html | 874 +++++++++++++++++++++++++++++ modules/matrix/doc/matrix.txt | 313 +++++++++++ modules/matrix/doc/matrix.xml | 42 ++ modules/matrix/doc/matrix_admin.xml | 240 ++++++++ modules/matrix/doc/matrix_db.xml | 79 +++ modules/matrix/matrix.c | 621 ++++++++++++++++++++ utils/kamctl/db_berkeley/kamailio/version | 20 +- utils/kamctl/dbtext/kamailio/version | 10 +- utils/kamctl/mysql/matrix-create.sql | 9 + utils/kamctl/oracle/matrix-create.sql | 17 + utils/kamctl/postgres/matrix-create.sql | 9 + 18 files changed, 2813 insertions(+), 6 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=1fb…

13 years, 9 months

git:andrei/rve_f_params: core: fix "unsigned" bug in sint2str*()

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/rve_f_params Commit: 3ea6da788168d95a28ea5ec86fc137a3338df104 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3ea6da7… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 4 16:22:11 2010 +0200 core: fix "unsigned" bug in sint2str*() Due to a typo, the sint2str*() functions did not include the sign most of the times. --- ut.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ut.h b/ut.h index 18dc46e..1e4b2b4 100644 --- a/ut.h +++ b/ut.h @@ -365,7 +365,7 @@ static inline char* sint2strbuf(long l, char* r, int r_size, int* len) l = -l; } p = int2strbuf((unsigned long)l, r, r_size, &p_len); - if(sign && *len<(r_size-1)) { + if(sign && p_len<(r_size-1)) { *(--p) = '-'; p_len++;; }

13 years, 9 months

git:andrei/rve_f_params: core: fix auto-deref. for vars in fparam fixups

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/rve_f_params Commit: 356571397bc86b1d85c588f1a3bfda6b136fbac7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3565713… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 4 15:51:46 2010 +0200 core: fix auto-deref. for vars in fparam fixups When an expression was fixed-up at runtime by the core and the module had fparam-type fixup, the fparam fixup re-evaluated the result, e.g.: $bar=test; $foo="$bar"; f($foo) => "test" instead of "$bar". Now all the RVE-enabled fparam fixups will avoid this case. --- action.c | 2 +- route_struct.h | 3 +- sr_module.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++------- 3 files changed, 52 insertions(+), 10 deletions(-) diff --git a/action.c b/action.c index e8a80e5..9c643fb 100644 --- a/action.c +++ b/action.c @@ -168,7 +168,7 @@ struct onsend_info* p_onsend=0; /* onsend route send info */ MODF_RVE_PARAM_FREE(src, dst); \ goto error; \ } \ - (dst)[i+2].type = STRING_ST; \ + (dst)[i+2].type = STRING_RVE_ST; \ (dst)[i+2].u.string = s.s; \ (dst)[i+2].u.str.len = s.len; \ rval_destroy(rv); \ diff --git a/route_struct.h b/route_struct.h index 9c7b40b..178ac77 100644 --- a/route_struct.h +++ b/route_struct.h @@ -127,7 +127,8 @@ enum _operand_subtype{ LVAL_ST, RVE_ST, RETCODE_ST, CASE_ST, BLOCK_ST, JUMPTABLE_ST, CONDTABLE_ST, MATCH_CONDTABLE_ST, - FPARAM_DYN_ST /* temporary only */ + STRING_RVE_ST /* RVE converted to a string (fparam hack) */, + FPARAM_DYN_ST /* temporary only (fparam hack) */ }; typedef enum _expr_l_type expr_l_type; diff --git a/sr_module.c b/sr_module.c index 5089f5f..b729102 100644 --- a/sr_module.c +++ b/sr_module.c @@ -935,6 +935,30 @@ int fixup_get_param_count(void **cur_param, int cur_param_no) } + +/** get a pointer to a parameter internal type. + * @param param + * @return pointer to the parameter internal type. + */ +action_param_type* fixup_get_param_ptype(void** param) +{ + action_u_t* a; + a = (void*)((char*)param - (char*)&(((action_u_t*)(0))->u.string)); + return &a->type; +} + + +/** get a parameter internal type. + * @see fixup_get_param_ptype(). + * @return paramter internal type. + */ +action_param_type fixup_get_param_type(void** param) +{ + return *fixup_get_param_ptype(param); +} + + + /* fixes flag params (resolves possible named flags) * use PARAM_USE_FUNC|PARAM_STRING as a param. type and create * a wrapper function that does just: @@ -1216,6 +1240,13 @@ int fix_param_types(int types, void** param) int ret; int t; + if (fixup_get_param_type(param) == STRING_RVE_ST && + (types & (FPARAM_INT|FPARAM_STR|FPARAM_STRING))) { + /* if called with a RVE already converted to string => + don't try AVP, PVAR or SELECT (to avoid double + deref., e.g.: $foo="$bar"; f($foo) ) */ + types &= ~ (FPARAM_AVP|FPARAM_PVS|FPARAM_SELECT|FPARAM_PVE); + } for (t=types & ~(types-1); types; types&=(types-1), t=types & ~(types-1)){ if ((ret=fix_param(t, param))<=0) return ret; } @@ -1236,10 +1267,15 @@ int fix_param_types(int types, void** param) int fixup_var_str_12(void** param, int param_no) { int ret; - if ((sr_cfg_compat!=SR_COMPAT_SER) && - ((ret = fix_param(FPARAM_PVS, param)) <= 0)) return ret; - if ((ret = fix_param(FPARAM_AVP, param)) <= 0) return ret; - if ((ret = fix_param(FPARAM_SELECT, param)) <= 0) return ret; + if (fixup_get_param_type(param) != STRING_RVE_ST) { + /* if called with a RVE already converted to string => + don't try AVP, PVAR or SELECT (to avoid double + deref., e.g.: $foo="$bar"; f($foo) ) */ + if ((sr_cfg_compat!=SR_COMPAT_SER) && + ((ret = fix_param(FPARAM_PVS, param)) <= 0)) return ret; + if ((ret = fix_param(FPARAM_AVP, param)) <= 0) return ret; + if ((ret = fix_param(FPARAM_SELECT, param)) <= 0) return ret; + } if ((ret = fix_param(FPARAM_STR, param)) <= 0) return ret; ERR("Error while fixing parameter, AVP, SELECT, and str conversions" " failed\n"); @@ -1273,10 +1309,15 @@ int fixup_var_str_2(void** param, int param_no) int fixup_var_int_12(void** param, int param_no) { int ret; - if ((sr_cfg_compat!=SR_COMPAT_SER) && - ((ret = fix_param(FPARAM_PVS, param)) <= 0)) return ret; - if ((ret = fix_param(FPARAM_AVP, param)) <= 0) return ret; - if ((ret = fix_param(FPARAM_SELECT, param)) <= 0) return ret; + if (fixup_get_param_type(param) != STRING_RVE_ST) { + /* if called with a RVE already converted to string => + don't try AVP, PVAR or SELECT (to avoid double + deref., e.g.: $foo="$bar"; f($foo) ) */ + if ((sr_cfg_compat!=SR_COMPAT_SER) && + ((ret = fix_param(FPARAM_PVS, param)) <= 0)) return ret; + if ((ret = fix_param(FPARAM_AVP, param)) <= 0) return ret; + if ((ret = fix_param(FPARAM_SELECT, param)) <= 0) return ret; + } if ((ret = fix_param(FPARAM_INT, param)) <= 0) return ret; ERR("Error while fixing parameter, AVP, SELECT, and int conversions" " failed\n");

13 years, 9 months

git:andrei/rve_f_params: perl(k): use sr31_cmd_export_t

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/rve_f_params Commit: b4d119dd49338527d0f27d60939269c06b6543ce URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b4d119d… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 4 15:50:30 2010 +0200 perl(k): use sr31_cmd_export_t Use the new cmd export interface when calling other modules functions. --- modules_k/perl/openserxs.xs | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules_k/perl/openserxs.xs b/modules_k/perl/openserxs.xs index 998b219..86aa9c6 100644 --- a/modules_k/perl/openserxs.xs +++ b/modules_k/perl/openserxs.xs @@ -215,7 +215,7 @@ int moduleFunc(struct sip_msg *m, char *func, char *param1, char *param2, int *retval) { - union cmd_export_u* exp_func_struct; + sr31_cmd_export_t* exp_func_struct; struct action *act; unsigned mod_ver; char *argv[2]; @@ -275,7 +275,7 @@ int moduleFunc(struct sip_msg *m, char *func, } - if (exp_func_struct->v1.fixup) { + if (exp_func_struct->fixup) { if (!unsafemodfnc) { LM_ERR("Module function '%s' is unsafe. Call is refused.\n", func); if (argv[0]) pkg_free(argv[0]); @@ -285,7 +285,7 @@ int moduleFunc(struct sip_msg *m, char *func, } if (argc>=2) { - *retval = exp_func_struct->v1.fixup(&(act->val[2].u.data), 2); + *retval = exp_func_struct->fixup(&(act->val[2].u.data), 2); if (*retval < 0) { LM_ERR("Error in fixup (2)\n"); return -1; @@ -293,7 +293,7 @@ int moduleFunc(struct sip_msg *m, char *func, act->val[2].type = MODFIXUP_ST; } if (argc>=1) { - *retval = exp_func_struct->v1.fixup(&(act->val[1].u.data), 1); + *retval = exp_func_struct->fixup(&(act->val[1].u.data), 1); if (*retval < 0) { LM_ERR("Error in fixup (1)\n"); return -1; @@ -301,7 +301,7 @@ int moduleFunc(struct sip_msg *m, char *func, act->val[1].type = MODFIXUP_ST; } if (argc==0) { - *retval = exp_func_struct->v1.fixup(0, 0); + *retval = exp_func_struct->fixup(0, 0); if (*retval < 0) { LM_ERR("Error in fixup (0)\n"); return -1;

13 years, 9 months

git:andrei/rve_f_params: app_python: use sr31_cmd_export_t

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/rve_f_params Commit: 5ffba901df81196ab4999a97fbe6008269545cb5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5ffba90… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 4 15:49:14 2010 +0200 app_python: use sr31_cmd_export_t Use the new command export interface when trying to call other modules functions. --- modules/app_python/python_msgobj.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/app_python/python_msgobj.c b/modules/app_python/python_msgobj.c index 830cfdb..debaa8b 100644 --- a/modules/app_python/python_msgobj.c +++ b/modules/app_python/python_msgobj.c @@ -190,7 +190,7 @@ msg_call_function(msgobject *self, PyObject *args) { int i, rval; char *fname, *arg1, *arg2; - union cmd_export_u* fexport; + sr31_cmd_export_t* fexport; struct action *act; struct run_act_ctx ra_ctx; unsigned mod_ver; @@ -233,9 +233,9 @@ msg_call_function(msgobject *self, PyObject *args) return Py_None; } - if (fexport->v1.fixup != NULL) { + if (fexport->fixup != NULL) { if (i >= 3) { - rval = fexport->v1.fixup(&(act->val[2].u.data), 2); + rval = fexport->fixup(&(act->val[2].u.data), 2); if (rval < 0) { PyErr_SetString(PyExc_RuntimeError, "Error in fixup (2)"); Py_INCREF(Py_None); @@ -244,7 +244,7 @@ msg_call_function(msgobject *self, PyObject *args) act->val[2].type = MODFIXUP_ST; } if (i >= 2) { - rval = fexport->v1.fixup(&(act->val[1].u.data), 1); + rval = fexport->fixup(&(act->val[1].u.data), 1); if (rval < 0) { PyErr_SetString(PyExc_RuntimeError, "Error in fixup (1)"); Py_INCREF(Py_None); @@ -253,7 +253,7 @@ msg_call_function(msgobject *self, PyObject *args) act->val[1].type = MODFIXUP_ST; } if (i == 1) { - rval = fexport->v1.fixup(0, 0); + rval = fexport->fixup(0, 0); if (rval < 0) { PyErr_SetString(PyExc_RuntimeError, "Error in fixup (0)"); Py_INCREF(Py_None);

13 years, 9 months

git:andrei/rve_f_params: core: internal module interface changes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/rve_f_params Commit: dee21fffc8c610a14dec348d286108dbd377b9a0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dee21ff… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 4 15:38:58 2010 +0200 core: internal module interface changes Use a new internal representation for the module interface, that combines the ser & kamailio module interfaces plus some extra internal stuff. This allows using extra flags (e.g. the new internal fixup_flags) and also simplifies all the functions dealing with the module interface or cmd_exports (since now there is a single internal interface there's no need to check its version and access it differently depending on it). The ser or kamailio module interfaces are converted to the new sr31 mod interface when the modules are loaded (register_module()). --- action.c | 24 ++-- cfg.y | 24 ++-- modparam.c | 8 +- route.c | 17 +-- sr_module.c | 459 +++++++++++++++++++++++++++-------------------------------- sr_module.h | 70 ++++++++- 6 files changed, 305 insertions(+), 297 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=dee…

13 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2010