sr-dev April 2010

sr-dev@lists.kamailio.org

27 participants
495 discussions

by Daniel-Constantin Mierla

Hello, few weeks ago I uploaded a new module named app_lua, providing functionality to execute Lua (http://www.lua.org) scripts in your configuration file. Lua is small and fast, therefore fits very well in a sip proxy environment. It has a lot of extensions, so when you cannot do something with existing cfg functions, check this one as well. The readme and the api are available at: http://sip-router.org/wiki/api/lua/devel http://sip-router.org/docbook/sip-router/branch/master/modules/app_lua/app_… The API will be enhanced during this development cycle, your feedback will help a lot in this direction. By now you get access to pseudo-variables, sip headers, logging functions and sl module. For new comers in community, if you are a Perl fan, then you can use the perl module in a similar way. Also, another module was uploaded recently, app_python, allowing to write python extensions. Module and API for Python are not yet documented, but I think this is not a barrier for a true Python fan, actually I hope will be a motivation to contribute the docs :-) Cheers, Daniel -- Daniel-Constantin Mierla SIP Server Professional Solutions * http://www.asipto.com/

14 years, 7 months

git:master: perl: update the index of params in action struct

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: f624074a1680befed9328548864407c396ec196f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f624074… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 20 12:24:29 2010 +0200 perl: update the index of params in action struct - params start from 3rd position of val array --- modules_k/perl/openserxs.xs | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules_k/perl/openserxs.xs b/modules_k/perl/openserxs.xs index 4ee86b6..044f818 100644 --- a/modules_k/perl/openserxs.xs +++ b/modules_k/perl/openserxs.xs @@ -285,20 +285,20 @@ 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->v1.fixup(&(act->val[3].u.data), 2); if (*retval < 0) { LM_ERR("Error in fixup (2)\n"); return -1; } - act->val[2].type = MODFIXUP_ST; + act->val[3].type = MODFIXUP_ST; } if (argc>=1) { - *retval = exp_func_struct->v1.fixup(&(act->val[1].u.data), 1); + *retval = exp_func_struct->v1.fixup(&(act->val[2].u.data), 1); if (*retval < 0) { LM_ERR("Error in fixup (1)\n"); return -1; } - act->val[1].type = MODFIXUP_ST; + act->val[2].type = MODFIXUP_ST; } if (argc==0) { *retval = exp_func_struct->v1.fixup(0, 0); @@ -312,14 +312,14 @@ int moduleFunc(struct sip_msg *m, char *func, init_run_actions_ctx(&ra_ctx); *retval = do_action(&ra_ctx, act, m); - if ((act->val[2].type == MODFIXUP_ST) && (act->val[2].u.data)) { - /* pkg_free(act->elem[2].u.data); */ + if ((act->val[3].type == MODFIXUP_ST) && (act->val[3].u.data)) { + /* pkg_free(act->elem[3].u.data); */ LM_WARN("moduleFunction: A fixup function was called. " "This currently creates a memory leak.\n"); } - if ((act->val[1].type == MODFIXUP_ST) && (act->val[1].u.data)) { - /* pkg_free(act->elem[1].u.data); */ + if ((act->val[2].type == MODFIXUP_ST) && (act->val[2].u.data)) { + /* pkg_free(act->elem[2].u.data); */ LM_WARN("moduleFunction: A fixup function was called. " "This currently creates a memory leak.\n"); }

14 years, 7 months

git:master: app_python: update type for fixed params

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 701fd7fa8fd5f45a6ef667ebc993c5b774acbecf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=701fd7f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 20 12:23:20 2010 +0200 app_python: update type for fixed params - related to previous commit --- modules/app_python/python_msgobj.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/app_python/python_msgobj.c b/modules/app_python/python_msgobj.c index fa5fbe2..898314b 100644 --- a/modules/app_python/python_msgobj.c +++ b/modules/app_python/python_msgobj.c @@ -241,7 +241,7 @@ msg_call_function(msgobject *self, PyObject *args) Py_INCREF(Py_None); return Py_None; } - act->val[2].type = MODFIXUP_ST; + act->val[3].type = MODFIXUP_ST; } if (i >= 2) { rval = fexport->v1.fixup(&(act->val[2].u.data), 1); @@ -250,7 +250,7 @@ msg_call_function(msgobject *self, PyObject *args) Py_INCREF(Py_None); return Py_None; } - act->val[1].type = MODFIXUP_ST; + act->val[2].type = MODFIXUP_ST; } if (i == 1) { rval = fexport->v1.fixup(0, 0);

14 years, 7 months

git:master: app_lua: added sr.modf(func, param1, param2, ...)

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 475a65cbf5b7d2acefd02359f67844fd24870f38 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=475a65c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 20 12:12:54 2010 +0200 app_lua: added sr.modf(func, param1, param2, ...) - new function in Lua sr package to execute functions exported by modules - disabled for functions without free fixup, to avoid memleaks --- modules/app_lua/app_lua_api.c | 1 + modules/app_lua/app_lua_sr.c | 150 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 148 insertions(+), 3 deletions(-) diff --git a/modules/app_lua/app_lua_api.c b/modules/app_lua/app_lua_api.c index 5e35436..1673f5e 100644 --- a/modules/app_lua/app_lua_api.c +++ b/modules/app_lua/app_lua_api.c @@ -423,6 +423,7 @@ void app_lua_dump_stack(lua_State *L) top = lua_gettop(L); + LM_DBG("lua stack top index: %d\n", top); for (i = 1; i <= top; i++) { t = lua_type(L, i); diff --git a/modules/app_lua/app_lua_sr.c b/modules/app_lua/app_lua_sr.c index 0cf935d..0900bd4 100644 --- a/modules/app_lua/app_lua_sr.c +++ b/modules/app_lua/app_lua_sr.c @@ -28,6 +28,8 @@ #include "../../sr_module.h" #include "../../dprint.h" +#include "../../route_struct.h" +#include "../../action.h" #include "../../ut.h" #include "../../mem/mem.h" #include "../../data_lump.h" @@ -100,11 +102,153 @@ static int lua_sr_log (lua_State *L) /** * */ +static int lua_sr_modf (lua_State *L) +{ + int ret; + char *luav[MAX_ACTIONS]; + char *argv[MAX_ACTIONS]; + int argc; + int i; + struct run_act_ctx ra_ctx; + unsigned modver; + struct action *act; + union cmd_export_u* expf; + sr_lua_env_t *env_L; + + ret = 1; + act = NULL; + argc = 0; + memset(luav, 0, MAX_ACTIONS*sizeof(char*)); + memset(argv, 0, MAX_ACTIONS*sizeof(char*)); + env_L = sr_lua_env_get(); + if(env_L->msg==NULL) + goto error; + +#if 0 + app_lua_dump_stack(L); +#endif + argc = lua_gettop(L); + if(argc==0) + { + LM_ERR("name of module function not provided\n"); + goto error; + } + if(argc>=MAX_ACTIONS) + { + LM_ERR("too many parameters\n"); + goto error; + } + /* first is function name, then parameters */ + for(i=1; i<=argc; i++) + { + if (!lua_isstring(L, i)) + { + LM_ERR("invalid parameter type (%d)\n", i); + goto error; + } + luav[i-1] = (char*)lua_tostring(L, i); + } + /* pkg copy only parameters */ + for(i=1; i<MAX_ACTIONS; i++) + { + if(luav[i]!=NULL) + { + argv[i] = (char*)pkg_malloc(strlen(luav[i])+1); + if(argv[i]==NULL) + { + LM_ERR("no more pkg\n"); + goto error; + } + strcpy(argv[i], luav[i]); + } + } + + expf = find_export_record(luav[0], argc-1, 0, &modver); + if (expf==NULL) { + LM_ERR("function '%s' is not available\n", luav[0]); + goto error; + } + /* check fixups */ + if (expf->v1.fixup!=NULL && (modver!=1 || expf->v1.free_fixup==NULL)) { + LM_ERR("function '%s' has fixup - cannot be used\n", luav[0]); + goto error; + } + + act = mk_action(MODULE_T, argc+1 /* number of (type, value) pairs */, + MODEXP_ST, expf, /* function */ + NUMBER_ST, argc-1, /* parameter number */ + STRING_ST, argv[1], /* param. 1 */ + STRING_ST, argv[2], /* param. 2 */ + STRING_ST, argv[3], /* param. 3 */ + STRING_ST, argv[4], /* param. 4 */ + STRING_ST, argv[5], /* param. 5 */ + STRING_ST, argv[6] /* param. 6 */ + ); + + if (act==NULL) { + LM_ERR("action structure could not be created for '%s'\n", luav[0]); + goto error; + } + + /* handle fixups */ + if (expf->v1.fixup) { + if(argc==1) + { /* no parameters */ + if(expf->v1.fixup(0, 0)<0) + { + LM_ERR("Error in fixup (0) for '%s'\n", luav[0]); + goto error; + } + } else { + for(i=1; i<=argc; i++) + { + if(expf->v1.fixup(&(act->val[i+1].u.data), i)<0) + { + LM_ERR("Error in fixup (%d) for '%s'\n", i, luav[0]); + goto error; + } + act->val[i+1].type = MODFIXUP_ST; + } + } + } + init_run_actions_ctx(&ra_ctx); + ret = do_action(&ra_ctx, act, env_L->msg); + + /* free fixups */ + if (expf->v1.fixup) { + for(i=1; i<=argc; i++) + { + if ((act->val[i+1].type == MODFIXUP_ST) && (act->val[i+1].u.data)) + { + expf->v1.free_fixup(&(act->val[i+1].u.data), i); + } + } + } + pkg_free(act); + lua_pushinteger(L, ret); + return 1; + +error: + if(act!=NULL) + pkg_free(act); + for(i=0; i<MAX_ACTIONS; i++) + { + if(argv[i]!=NULL) pkg_free(argv[i]); + argv[i] = 0; + } + lua_pushinteger(L, -1); + return 1; +} + +/** + * + */ static const luaL_reg _sr_core_Map [] = { {"probe", lua_sr_probe}, - {"dbg", lua_sr_dbg}, - {"err", lua_sr_err}, - {"log", lua_sr_log}, + {"dbg", lua_sr_dbg}, + {"err", lua_sr_err}, + {"log", lua_sr_log}, + {"modf", lua_sr_modf}, {NULL, NULL} };

14 years, 7 months

git:master: app_python: fixed the index for params

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: c52150e55e5681120c104db4f8ee5c54a20f1797 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c52150e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 20 12:18:02 2010 +0200 app_python: fixed the index for params - params are stored from 3rd possition - search of the exported function uses (nr_of_python_params - 1), using -2 is wrong and goes negative --- modules/app_python/python_msgobj.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/app_python/python_msgobj.c b/modules/app_python/python_msgobj.c index 0299228..fa5fbe2 100644 --- a/modules/app_python/python_msgobj.c +++ b/modules/app_python/python_msgobj.c @@ -212,7 +212,7 @@ msg_call_function(msgobject *self, PyObject *args) if(!PyArg_ParseTuple(args, "s|ss:call_function", &fname, &arg1, &arg2)) return NULL; - fexport = find_export_record(fname, i - 2, 0, &mod_ver); + fexport = find_export_record(fname, i - 1, 0, &mod_ver); if (fexport == NULL) { PyErr_SetString(PyExc_RuntimeError, "no such function"); Py_INCREF(Py_None); @@ -235,7 +235,7 @@ msg_call_function(msgobject *self, PyObject *args) if (fexport->v1.fixup != NULL) { if (i >= 3) { - rval = fexport->v1.fixup(&(act->val[2].u.data), 2); + rval = fexport->v1.fixup(&(act->val[3].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->v1.fixup(&(act->val[2].u.data), 1); if (rval < 0) { PyErr_SetString(PyExc_RuntimeError, "Error in fixup (1)"); Py_INCREF(Py_None); @@ -265,12 +265,12 @@ msg_call_function(msgobject *self, PyObject *args) init_run_actions_ctx(&ra_ctx); rval = do_action(&ra_ctx, act, self->msg); - if ((act->val[2].type == MODFIXUP_ST) && (act->val[2].u.data)) { - pkg_free(act->val[2].u.data); + if ((act->val[3].type == MODFIXUP_ST) && (act->val[3].u.data)) { + pkg_free(act->val[3].u.data); } - if ((act->val[1].type == MODFIXUP_ST) && (act->val[1].u.data)) { - pkg_free(act->val[1].u.data); + if ((act->val[2].type == MODFIXUP_ST) && (act->val[2].u.data)) { + pkg_free(act->val[2].u.data); } pkg_free(act);

14 years, 7 months

$rs is null in failure route

by jh＠tutpro.com

using master branch, if failure route is entered because fr_timer expires, $rs is null. is this intentional or a bug? -- juha

14 years, 7 months

cfg compat mode

by Daniel-Constantin Mierla

Hello, following the irc devel meeting discussions, I removed most of cfg compat stuff, the only remaining one is avp name parameters for TM. - for K mode expect: '$avp(name)' - for S mode expects: 'name' The tracker item #2 is opened by Jan for it: http://sip-router.org/tracker/index.php?do=details&task_id=2 Now, shall I make it default the format $avp(..)? or keep both modes as: - if starts with pv marker '$', then parse as PV - otherwise parse as avp name string Afterwards nothing will be controlled by cfg compat mode. Cheers, Daniel -- Daniel-Constantin Mierla * http://www.asipto.com/ * http://twitter.com/miconda * http://www.linkedin.com/in/danielconstantinmierla

14 years, 7 months

git:master: tm: print deprecated warning for timer APVs

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: bd56a4728de187a871885f8d645cfaefee292875 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bd56a47… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 19 21:21:01 2010 +0200 tm: print deprecated warning for timer APVs - t_set_fr() is better for setting dynamic timeouts for transactions - print deprecated warning when initalizing AVP parameter names --- modules/tm/t_funcs.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules/tm/t_funcs.c b/modules/tm/t_funcs.c index e19ceab..76bd6d8 100644 --- a/modules/tm/t_funcs.c +++ b/modules/tm/t_funcs.c @@ -406,6 +406,8 @@ int init_avp_params(char *fr_timer_param, char *fr_inv_timer_param, if (fr_timer_param && *fr_timer_param) { fr_timer_str.s = fr_timer_param; fr_timer_str.len = strlen(fr_timer_str.s); + LM_WARN("using AVP for TM fr_timer is deprecated," + " use t_set_fr(...) instead\n"); if(fr_timer_str.s[0]==PV_MARKER) { if (pv_parse_spec(&fr_timer_str, &avp_spec)==0 @@ -434,6 +436,8 @@ int init_avp_params(char *fr_timer_param, char *fr_inv_timer_param, if (fr_inv_timer_param && *fr_inv_timer_param) { fr_inv_timer_str.s = fr_inv_timer_param; fr_inv_timer_str.len = strlen(fr_inv_timer_str.s); + LM_WARN("using AVP for TM fr_inv_timer is deprecated," + " use t_set_fr(...) instead\n"); if(fr_inv_timer_str.s[0]==PV_MARKER) { if (pv_parse_spec(&fr_inv_timer_str, &avp_spec)==0

14 years, 7 months

git:master: tm: timer avps spec type auto-detected

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 6961e3afe035035f657748961498fd2d58adf004 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6961e3a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 19 21:13:36 2010 +0200 tm: timer avps spec type auto-detected - detect if is PV spec format or AVP name format - get rid this way of cfg compat mode --- modules/tm/t_funcs.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/tm/t_funcs.c b/modules/tm/t_funcs.c index 92a68da..e19ceab 100644 --- a/modules/tm/t_funcs.c +++ b/modules/tm/t_funcs.c @@ -407,7 +407,7 @@ int init_avp_params(char *fr_timer_param, char *fr_inv_timer_param, fr_timer_str.s = fr_timer_param; fr_timer_str.len = strlen(fr_timer_str.s); - if(sr_cfg_compat==SR_COMPAT_KAMAILIO) { + if(fr_timer_str.s[0]==PV_MARKER) { if (pv_parse_spec(&fr_timer_str, &avp_spec)==0 || avp_spec.type!=PVT_AVP) { LM_ERR("malformed or non AVP %s AVP definition\n", @@ -435,7 +435,7 @@ int init_avp_params(char *fr_timer_param, char *fr_inv_timer_param, fr_inv_timer_str.s = fr_inv_timer_param; fr_inv_timer_str.len = strlen(fr_inv_timer_str.s); - if(sr_cfg_compat==SR_COMPAT_KAMAILIO) { + if(fr_inv_timer_str.s[0]==PV_MARKER) { if (pv_parse_spec(&fr_inv_timer_str, &avp_spec)==0 || avp_spec.type!=PVT_AVP) { LM_ERR("malformed or non AVP %s AVP definition\n", @@ -463,7 +463,7 @@ int init_avp_params(char *fr_timer_param, char *fr_inv_timer_param, contacts_avp_str.s = contacts_avp_param; contacts_avp_str.len = strlen(contacts_avp_str.s); - if(sr_cfg_compat==SR_COMPAT_KAMAILIO) { + if(contacts_avp_str.s[0]==PV_MARKER) { if ((pv_parse_spec(&contacts_avp_str, &avp_spec) == 0) || (avp_spec.type != PVT_AVP)) { LM_ERR("malformed or non AVP definition <%s>\n",

14 years, 7 months

git:master: pv: $null exported by pv api

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: ba533c995169b0c8767bbe3514eb4c725e70d92b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ba533c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 19 21:07:28 2010 +0200 pv: $null exported by pv api - core pv api can export pvs - $null and $$ are generic and can be used without pv module - pv_parse_avp_name() moved together with pv_get_avp_name() --- modules_k/pv/pv.c | 3 -- modules_k/pv/pv_core.c | 43 ---------------------- modules_k/pv/pv_core.h | 2 - pvapi.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++- pvar.h | 1 + 5 files changed, 91 insertions(+), 49 deletions(-) diff --git a/modules_k/pv/pv.c b/modules_k/pv/pv.c index 2076de0..76e590c 100644 --- a/modules_k/pv/pv.c +++ b/modules_k/pv/pv.c @@ -216,9 +216,6 @@ static pv_export_t mod_pvs[] = { {{"ml", (sizeof("ml")-1)}, /* */ PVT_OTHER, pv_get_msg_len, 0, 0, 0, 0, 0}, - {{"null", (sizeof("null")-1)}, /* */ - PVT_NULL, pv_get_null, 0, - 0, 0, 0, 0}, {{"od", (sizeof("od")-1)}, /* */ PVT_OTHER, pv_get_ouri_attr, 0, 0, 0, pv_init_iname, 2}, diff --git a/modules_k/pv/pv_core.c b/modules_k/pv/pv_core.c index 966bed8..10d378f 100644 --- a/modules_k/pv/pv_core.c +++ b/modules_k/pv/pv_core.c @@ -2081,46 +2081,3 @@ error: return -1; } - -int pv_parse_avp_name(pv_spec_p sp, str *in) -{ - char *p; - char *s; - pv_spec_p nsp = 0; - - if(in==NULL || in->s==NULL || sp==NULL) - return -1; - p = in->s; - if(*p==PV_MARKER) - { - nsp = (pv_spec_p)pkg_malloc(sizeof(pv_spec_t)); - if(nsp==NULL) - { - LM_ERR("no more memory\n"); - return -1; - } - s = pv_parse_spec(in, nsp); - if(s==NULL) - { - LM_ERR("invalid name [%.*s]\n", in->len, in->s); - pv_spec_free(nsp); - return -1; - } - //LM_ERR("dynamic name [%.*s]\n", in->len, in->s); - //pv_print_spec(nsp); - sp->pvp.pvn.type = PV_NAME_PVAR; - sp->pvp.pvn.u.dname = (void*)nsp; - return 0; - } - /*LM_DBG("static name [%.*s]\n", in->len, in->s);*/ - if(km_parse_avp_spec(in, &sp->pvp.pvn.u.isname.type, - &sp->pvp.pvn.u.isname.name)!=0) - { - LM_ERR("bad avp name [%.*s]\n", in->len, in->s); - return -1; - } - sp->pvp.pvn.type = PV_NAME_INTSTR; - return 0; -} - - diff --git a/modules_k/pv/pv_core.h b/modules_k/pv/pv_core.h index 1831071..32b6b37 100644 --- a/modules_k/pv/pv_core.h +++ b/modules_k/pv/pv_core.h @@ -234,7 +234,5 @@ int pv_parse_scriptvar_name(pv_spec_p sp, str *in); int pv_parse_hdr_name(pv_spec_p sp, str *in); -int pv_parse_avp_name(pv_spec_p sp, str *in); - #endif diff --git a/pvapi.c b/pvapi.c index 72024cd..bbd4b87 100644 --- a/pvapi.c +++ b/pvapi.c @@ -316,6 +316,9 @@ int pv_get_null(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) return 0; } +/** + * + */ pv_export_t* pv_lookup_spec_name(str *pvname, pv_spec_p e) { pv_item_t *pvi; @@ -353,6 +356,9 @@ pv_export_t* pv_lookup_spec_name(str *pvname, pv_spec_p e) return NULL; } +/** + * + */ int pv_parse_index(pv_spec_p sp, str *in) { char *p; @@ -409,6 +415,9 @@ int pv_parse_index(pv_spec_p sp, str *in) return 0; } +/** + * + */ int pv_init_iname(pv_spec_p sp, int param) { if(sp==NULL) @@ -418,6 +427,9 @@ int pv_init_iname(pv_spec_p sp, int param) return 0; } +/** + * + */ char* pv_parse_spec2(str *in, pv_spec_p e, int silent) { char *p; @@ -787,6 +799,9 @@ error: return -1; } +/** + * + */ int pv_get_spec_name(struct sip_msg* msg, pv_param_p ip, pv_value_t *name) { if(msg==NULL || ip==NULL || name==NULL) @@ -822,6 +837,55 @@ int pv_get_spec_name(struct sip_msg* msg, pv_param_p ip, pv_value_t *name) return -1; } +/** + * parse AVP name + * @return 0 on success, -1 on error + */ +int pv_parse_avp_name(pv_spec_p sp, str *in) +{ + char *p; + char *s; + pv_spec_p nsp = 0; + + if(in==NULL || in->s==NULL || sp==NULL) + return -1; + p = in->s; + if(*p==PV_MARKER) + { + nsp = (pv_spec_p)pkg_malloc(sizeof(pv_spec_t)); + if(nsp==NULL) + { + LM_ERR("no more memory\n"); + return -1; + } + s = pv_parse_spec(in, nsp); + if(s==NULL) + { + LM_ERR("invalid name [%.*s]\n", in->len, in->s); + pv_spec_free(nsp); + return -1; + } + //LM_ERR("dynamic name [%.*s]\n", in->len, in->s); + //pv_print_spec(nsp); + sp->pvp.pvn.type = PV_NAME_PVAR; + sp->pvp.pvn.u.dname = (void*)nsp; + return 0; + } + /*LM_DBG("static name [%.*s]\n", in->len, in->s);*/ + if(km_parse_avp_spec(in, &sp->pvp.pvn.u.isname.type, + &sp->pvp.pvn.u.isname.name)!=0) + { + LM_ERR("bad avp name [%.*s]\n", in->len, in->s); + return -1; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + return 0; +} + +/** + * fill avp name details (id and type) + * @return 0 on success, -1 on error + */ int pv_get_avp_name(struct sip_msg* msg, pv_param_p ip, int_str *avp_name, unsigned short *name_type) { @@ -867,7 +931,9 @@ int pv_get_avp_name(struct sip_msg* msg, pv_param_p ip, int_str *avp_name, return 0; } - +/** + * + */ int pv_get_spec_index(struct sip_msg* msg, pv_param_p ip, int *idx, int *flags) { pv_value_t tv; @@ -903,6 +969,9 @@ int pv_get_spec_index(struct sip_msg* msg, pv_param_p ip, int *idx, int *flags) return 0; } +/** + * + */ int pv_get_spec_value(struct sip_msg* msg, pv_spec_p sp, pv_value_t *value) { int ret = 0; @@ -925,6 +994,9 @@ int pv_get_spec_value(struct sip_msg* msg, pv_spec_p sp, pv_value_t *value) return ret; } +/** + * + */ int pv_set_spec_value(struct sip_msg* msg, pv_spec_p sp, int op, pv_value_t *value) { @@ -1456,6 +1528,9 @@ int tr_table_free(void) return 0; } +/** + * + */ tr_export_t* tr_lookup_class(str *tclass) { tr_item_t *tri; @@ -1483,6 +1558,18 @@ tr_export_t* tr_lookup_class(str *tclass) } +/******************************************************** + * core PVs, initialization and destroy APIs + ********************************************************/ + +static pv_export_t _core_pvs[] = { + {{"null", (sizeof("null")-1)}, /* */ + PVT_NULL, pv_get_null, 0, + 0, 0, 0, 0}, + + { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } +}; + /** init pv api (optional). * @return 0 on success, -1 on error */ @@ -1490,6 +1577,8 @@ int init_pv_api(void) { pv_init_table(); tr_init_table(); + if(register_pvars_mod("core", _core_pvs)<0) + return -1; return 0; } diff --git a/pvar.h b/pvar.h index 19b9310..58fe38b 100644 --- a/pvar.h +++ b/pvar.h @@ -179,6 +179,7 @@ int pv_spec_dbg(pv_spec_p sp); int pv_get_spec_index(struct sip_msg* msg, pv_param_p ip, int *idx, int *flags); int pv_get_avp_name(struct sip_msg* msg, pv_param_p ip, int_str *avp_name, unsigned short *name_type); +int pv_parse_avp_name(pv_spec_p sp, str *in); int pv_get_spec_name(struct sip_msg* msg, pv_param_p ip, pv_value_t *name); int pv_parse_format(str *in, pv_elem_p *el); int pv_parse_index(pv_spec_p sp, str *in);

14 years, 7 months

← Newer
1
...
35
36
37
38
39
40
41
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2010