sr-dev

sr-dev@lists.kamailio.org

44307 discussions

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++;; }

14 years, 6 months

git:andrei/rve_f_params: print(s): fparam fixup example

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/rve_f_params Commit: 4125821e5aef02b9f84b0840c25cd169a2d2954f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4125821… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Jun 4 12:40:09 2010 +0200 print(s): fparam fixup example print2 uses now fixup_var_str_12() and get_str_fparam(). Good for testing and as example. --- modules_s/print/print.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/modules_s/print/print.c b/modules_s/print/print.c index 7c704c5..4965341 100644 --- a/modules_s/print/print.c +++ b/modules_s/print/print.c @@ -65,7 +65,7 @@ static cmd_export_t cmds[]={ {"print", print_f_1, 1, print_fixup_f_1, REQUEST_ROUTE}, {"print", print_f_2, 2, print_fixup_f_2, REQUEST_ROUTE}, {"print1", print_f1, 1, 0, REQUEST_ROUTE}, - {"print2", print_f2, 2, 0, REQUEST_ROUTE}, + {"print2", print_f2, 2, fixup_var_str_12, REQUEST_ROUTE}, {"print3", (cmd_function)print_f3, 3, 0, REQUEST_ROUTE}, {"printv", (cmd_function)print_f_var, VAR_PARAM_NO, 0, REQUEST_ROUTE}, {0, 0, 0, 0, 0} @@ -152,10 +152,16 @@ static int print_f1(struct sip_msg* msg, char* s1, char* not_used) } -/* 2 parameters, no fixup version */ +/* 2 parameters, fparam fixup version */ static int print_f2(struct sip_msg* msg, char* s1, char* s2) { - printf("%s%s\n", s1, s2); + str a, b; + if (get_str_fparam(&a, msg, (fparam_t*)s1) !=0 || + get_str_fparam(&b, msg, (fparam_t*)s2) !=0) { + BUG("get_str_fparam failed\n"); + return -1; + } + printf("%.*s%.*s\n", a.len, a.s, b.len, b.s); return 1; }

14 years, 6 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…

14 years, 6 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);

14 years, 6 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;

14 years, 6 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");

14 years, 6 months

freezing for major release 3.1

by Daniel-Constantin Mierla

Hello, as discussed during our devel meeting, next major release 3.1 is scheduled for this autumn. Therefore the freezing should happen soon. Would be 2 weeks from now enough for everyone to push planned new features to repo? Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com/

14 years, 6 months

[sqlops] What does sql_query return in case of DB error?

by Iñaki Baz Castillo

Hi, sqlops module documentation doesn't say what the function sql_query returns in case of DB failure. I'll do my tests but if somebody knows I would like to know the expected return code. Thanks a lot. -- Iñaki Baz Castillo <ibc(a)aliax.net>

14 years, 6 months

git:kamailio_3.0: modules/tm: Fixed memory leak related to several tm function exports

by Marius Zbihlei

Module: sip-router Branch: kamailio_3.0 Commit: d82acc969092fa8f9ddcb88775c221aceaace4df URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d82acc9… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Mon Aug 2 17:26:20 2010 +0300 modules/tm: Fixed memory leak related to several tm function exports Mk_proxy() call allocates a new proxy_t* structure. The free_proxy() call does not free this structure, it frees only the content. Another pkg_free is necessary in this case. (cherry picked from commit 2ae7c6779188e053aa6d1cbd891c428ccc2b63fa) --- modules/tm/tm.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/modules/tm/tm.c b/modules/tm/tm.c index ca60e80..5ed5a65 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -1160,6 +1160,7 @@ inline static int w_t_forward_nonack_to( struct sip_msg *p_msg , if (proxy) { r = _w_t_forward_nonack(p_msg, proxy, proxy->proto); free_proxy(proxy); + pkg_free(proxy); } return r; } @@ -1390,6 +1391,7 @@ inline static int w_t_relay_to_avp( struct sip_msg *p_msg , if (proxy) { r = _w_t_relay_to(p_msg, proxy, PROTO_NONE); free_proxy(proxy); + pkg_free(proxy); } return r; } @@ -1424,6 +1426,7 @@ inline static int w_t_replicate_uri(struct sip_msg *msg , r = t_replicate(msg, proxy, proxy->proto); free_proxy(proxy); + pkg_free(proxy); return r; } @@ -1481,8 +1484,9 @@ inline static int w_t_replicate_to( struct sip_msg *p_msg , int r = -1; proxy = t_protoaddr2proxy(proto_par, addr_par); if (proxy) { - r = t_replicate(p_msg, proxy, proxy->proto); + r = t_replicate(p_msg, proxy, proxy->proto); free_proxy(proxy); + pkg_free(proxy); } return r; }

14 years, 6 months

INumWare: inum users conference

by Meftah Tayeb

hello folk you're invited to join the inum ware conference this conference is for inum users that frequantly use inum (+883 country code) (http://www.inum.net) you can join it by dialing +883510001288888 from any provider that provide INum termination (see http://www.inum.net) thank you! -- Meftah Tayeb algérie télécom SPA phone: +21321761805 phone (INUM): +883510001289101 mobile : +213660347746 mobile (INUM: +883510001289110 http://www.algerietelecom.dz

14 years, 6 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev