sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:master: app_lua: several tm functions added to Lua api

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 8ea8966228a0d15ee4ddd7ab3087d4c11a0680d0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8ea8966… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Nov 17 13:33:17 2010 +0100 app_lua: several tm functions added to Lua api --- modules/app_lua/app_lua_exp.c | 213 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 210 insertions(+), 3 deletions(-) diff --git a/modules/app_lua/app_lua_exp.c b/modules/app_lua/app_lua_exp.c index 9bf9fea..ae86ab2 100644 --- a/modules/app_lua/app_lua_exp.c +++ b/modules/app_lua/app_lua_exp.c @@ -28,6 +28,7 @@ #include "../../sr_module.h" #include "../../dprint.h" +#include "../../route.h" #include "../../ut.h" #include "../../modules/sl/sl.h" @@ -93,7 +94,8 @@ static sl_api_t _lua_slb; /** * tm */ -static tm_api_t _lua_tmb; +static tm_api_t _lua_tmb; +static tm_xapi_t _lua_xtmb; /** * @@ -112,6 +114,11 @@ static int lua_sr_sl_send_reply (lua_State *L) LM_WARN("weird: sl function executed but module not registered\n"); return app_lua_return_error(L); } + if(env_L->msg==NULL) + { + LM_WARN("invalid parameters from Lua env\n"); + return app_lua_return_error(L); + } code = lua_tointeger(L, -2); @@ -143,6 +150,11 @@ static int lua_sr_sl_get_reply_totag (lua_State *L) LM_WARN("weird: sl function executed but module not registered\n"); return app_lua_return_false(L); } + if(env_L->msg==NULL) + { + LM_WARN("invalid parameters from Lua env\n"); + return app_lua_return_error(L); + } ret = _lua_slb.get_reply_totag(env_L->msg, &txt); if(ret<0) { @@ -179,6 +191,11 @@ static int lua_sr_tm_t_reply(lua_State *L) LM_WARN("weird: tm function executed but module not registered\n"); return app_lua_return_error(L); } + if(env_L->msg==NULL) + { + LM_WARN("invalid parameters from Lua env\n"); + return app_lua_return_error(L); + } code = lua_tointeger(L, -2); @@ -209,17 +226,200 @@ static int lua_sr_tm_t_relay(lua_State *L) LM_WARN("weird: tm function executed but module not registered\n"); return app_lua_return_error(L); } + if(env_L->msg==NULL) + { + LM_WARN("invalid parameters from Lua env\n"); + return app_lua_return_error(L); + } ret = _lua_tmb.t_relay(env_L->msg, NULL, NULL); return app_lua_return_int(L, ret); } +/** + * + */ +static int lua_sr_tm_t_on_failure(lua_State *L) +{ + char *name; + int i; + sr_lua_env_t *env_L; + + env_L = sr_lua_env_get(); + + if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_TM)) + { + LM_WARN("weird: tm function executed but module not registered\n"); + return app_lua_return_error(L); + } + + if(env_L->msg==NULL) + { + LM_WARN("invalid parameters from Lua env\n"); + return app_lua_return_error(L); + } + + name = (char*)lua_tostring(L, -1); + if(name==NULL) + { + LM_WARN("invalid parameters from Lua\n"); + return app_lua_return_error(L); + } + + i = route_get(&failure_rt, name); + if(failure_rt.rlist[i]==0) + { + LM_WARN("no actions in failure_route[%s]\n", name); + return app_lua_return_error(L); + } + + _lua_xtmb.t_on_failure((unsigned int)i); + return app_lua_return_int(L, 1); +} + +/** + * + */ +static int lua_sr_tm_t_on_branch(lua_State *L) +{ + char *name; + int i; + sr_lua_env_t *env_L; + + env_L = sr_lua_env_get(); + + if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_TM)) + { + LM_WARN("weird: tm function executed but module not registered\n"); + return app_lua_return_error(L); + } + + if(env_L->msg==NULL) + { + LM_WARN("invalid parameters from Lua env\n"); + return app_lua_return_error(L); + } + + name = (char*)lua_tostring(L, -1); + if(name==NULL) + { + LM_WARN("invalid parameters from Lua\n"); + return app_lua_return_error(L); + } + + i = route_get(&branch_rt, name); + if(branch_rt.rlist[i]==0) + { + LM_WARN("no actions in branch_route[%s]\n", name); + return app_lua_return_error(L); + } + + _lua_xtmb.t_on_branch((unsigned int)i); + return app_lua_return_int(L, 1); +} + +/** + * + */ +static int lua_sr_tm_t_on_reply(lua_State *L) +{ + char *name; + int i; + sr_lua_env_t *env_L; + + env_L = sr_lua_env_get(); + + if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_TM)) + { + LM_WARN("weird: tm function executed but module not registered\n"); + return app_lua_return_error(L); + } + + if(env_L->msg==NULL) + { + LM_WARN("invalid parameters from Lua env\n"); + return app_lua_return_error(L); + } + + name = (char*)lua_tostring(L, -1); + if(name==NULL) + { + LM_WARN("invalid parameters from Lua\n"); + return app_lua_return_error(L); + } + + i = route_get(&onreply_rt, name); + if(onreply_rt.rlist[i]==0) + { + LM_WARN("no actions in onreply_route[%s]\n", name); + return app_lua_return_error(L); + } + + _lua_xtmb.t_on_reply((unsigned int)i); + return app_lua_return_int(L, 1); +} + +/** + * + */ +static int lua_sr_tm_t_check_trans(lua_State *L) +{ + int ret; + sr_lua_env_t *env_L; + + env_L = sr_lua_env_get(); + + if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_TM)) + { + LM_WARN("weird: tm function executed but module not registered\n"); + return app_lua_return_error(L); + } + if(env_L->msg==NULL) + { + LM_WARN("invalid parameters from Lua env\n"); + return app_lua_return_error(L); + } + + ret = _lua_xtmb.t_check_trans(env_L->msg); + return app_lua_return_int(L, ret); +} + +/** + * + */ +static int lua_sr_tm_t_is_canceled(lua_State *L) +{ + int ret; + sr_lua_env_t *env_L; + + env_L = sr_lua_env_get(); + + if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_TM)) + { + LM_WARN("weird: tm function executed but module not registered\n"); + return app_lua_return_error(L); + } + if(env_L->msg==NULL) + { + LM_WARN("invalid parameters from Lua env\n"); + return app_lua_return_error(L); + } + + ret = _lua_xtmb.t_is_canceled(env_L->msg); + return app_lua_return_int(L, ret); +} + /** * */ static const luaL_reg _sr_tm_Map [] = { - {"t_reply", lua_sr_tm_t_reply}, - {"t_relay", lua_sr_tm_t_relay}, + {"t_reply", lua_sr_tm_t_reply}, + {"t_relay", lua_sr_tm_t_relay}, + {"t_on_failure", lua_sr_tm_t_on_failure}, + {"t_on_branch", lua_sr_tm_t_on_branch}, + {"t_on_reply", lua_sr_tm_t_on_reply}, + {"t_check_trans", lua_sr_tm_t_check_trans}, + {"t_is_canceled", lua_sr_tm_t_is_canceled}, {NULL, NULL} }; @@ -892,6 +1092,13 @@ int lua_sr_exp_init_mod(void) return -1; } LM_DBG("loaded tm api\n"); + /* bind the TM XAPI */ + if (tm_load_xapi(&_lua_xtmb) < 0) + { + LM_ERR("cannot bind to TM XAPI\n"); + return -1; + } + LM_DBG("loaded tm xapi\n"); } if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_SQLOPS) {

14 years, 2 months

git:master: app_lua: added several core functions to sr package

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 0026a3b553ab3c8ac539cbfcd8fd99fc6f1cb799 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0026a3b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Nov 17 11:47:03 2010 +0100 app_lua: added several core functions to sr package --- modules/app_lua/app_lua_sr.c | 425 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 420 insertions(+), 5 deletions(-) diff --git a/modules/app_lua/app_lua_sr.c b/modules/app_lua/app_lua_sr.c index 51da16b..7a8575a 100644 --- a/modules/app_lua/app_lua_sr.c +++ b/modules/app_lua/app_lua_sr.c @@ -34,6 +34,10 @@ #include "../../mem/mem.h" #include "../../data_lump.h" #include "../../data_lump_rpl.h" +#include "../../forward.h" +#include "../../flags.h" +#include "../../dset.h" +#include "../../parser/parse_uri.h" #include "../../lib/kcore/cmpapi.h" #include "app_lua_api.h" @@ -274,12 +278,423 @@ error: /** * */ +static int lua_sr_is_myself (lua_State *L) +{ + str uri; + struct sip_uri puri; + int ret; + + uri.s = (char*)lua_tostring(L, -1); + if(uri.s==NULL) + { + LM_ERR("invalid uri parameter\n"); + return app_lua_return_false(L); + } + uri.len = strlen(uri.s); + if(uri.len>4 && (strncmp(uri.s, "sip:", 4)==0 + || strncmp(uri.s, "sips:", 5)==0)) + { + if(parse_uri(uri.s, uri.len, &puri)!=0) + { + LM_ERR("failed to parse uri [%s]\n", uri.s); + return app_lua_return_false(L); + } + ret = check_self(&puri.host, (puri.port.s)?puri.port_no:0, + (puri.transport_val.s)?puri.proto:0); + } else { + ret = check_self(&uri, 0, 0); + } + if(ret==1) + return app_lua_return_true(L); + return app_lua_return_false(L); +} + +/** + * + */ +static int lua_sr_setflag (lua_State *L) +{ + int flag; + sr_lua_env_t *env_L; + + env_L = sr_lua_env_get(); + flag = lua_tointeger(L, -1); + + if(env_L->msg==NULL) + { + LM_WARN("invalid parameters from Lua env\n"); + return app_lua_return_false(L); + } + + if (!flag_in_range(flag)) + { + LM_ERR("invalid flag parameter %d\n", flag); + return app_lua_return_false(L); + } + + setflag(env_L->msg, flag); + return app_lua_return_true(L); +} + +/** + * + */ +static int lua_sr_resetflag (lua_State *L) +{ + int flag; + sr_lua_env_t *env_L; + + env_L = sr_lua_env_get(); + flag = lua_tointeger(L, -1); + + if(env_L->msg==NULL) + { + LM_WARN("invalid parameters from Lua env\n"); + return app_lua_return_false(L); + } + + if (!flag_in_range(flag)) + { + LM_ERR("invalid flag parameter %d\n", flag); + return app_lua_return_false(L); + } + + resetflag(env_L->msg, flag); + return app_lua_return_true(L); +} + +/** + * + */ +static int lua_sr_isflagset (lua_State *L) +{ + int flag; + int ret; + sr_lua_env_t *env_L; + + env_L = sr_lua_env_get(); + flag = lua_tointeger(L, -1); + + if(env_L->msg==NULL) + { + LM_WARN("invalid parameters from Lua env\n"); + return app_lua_return_false(L); + } + + if (!flag_in_range(flag)) + { + LM_ERR("invalid flag parameter %d\n", flag); + return app_lua_return_false(L); + } + + ret = isflagset(env_L->msg, flag); + if(ret>0) + return app_lua_return_true(L); + return app_lua_return_false(L); +} + +/** + * + */ +static int lua_sr_setbflag (lua_State *L) +{ + int flag; + int branch; + sr_lua_env_t *env_L; + + env_L = sr_lua_env_get(); + if(lua_gettop(L)==1) + { + flag = lua_tointeger(L, -1); + branch = 0; + } else if(lua_gettop(L)==2) { + flag = lua_tointeger(L, -2); + branch = lua_tointeger(L, -1); + } else { + LM_WARN("invalid number of parameters from Lua\n"); + return app_lua_return_false(L); + } + + if(env_L->msg==NULL) + { + LM_WARN("invalid parameters from Lua env\n"); + return app_lua_return_false(L); + } + + if (!flag_in_range(flag)) + { + LM_ERR("invalid flag parameter %d\n", flag); + return app_lua_return_false(L); + } + + setbflag(branch, flag); + return app_lua_return_true(L); +} + +/** + * + */ +static int lua_sr_resetbflag (lua_State *L) +{ + int flag; + int branch; + sr_lua_env_t *env_L; + + env_L = sr_lua_env_get(); + if(lua_gettop(L)==1) + { + flag = lua_tointeger(L, -1); + branch = 0; + } else if(lua_gettop(L)==2) { + flag = lua_tointeger(L, -2); + branch = lua_tointeger(L, -1); + } else { + LM_WARN("invalid number of parameters from Lua\n"); + return app_lua_return_false(L); + } + + if(env_L->msg==NULL) + { + LM_WARN("invalid parameters from Lua env\n"); + return app_lua_return_false(L); + } + + if (!flag_in_range(flag)) + { + LM_ERR("invalid flag parameter %d\n", flag); + return app_lua_return_false(L); + } + + resetbflag(branch, flag); + return app_lua_return_true(L); +} + +/** + * + */ +static int lua_sr_isbflagset (lua_State *L) +{ + int flag; + int branch; + int ret; + sr_lua_env_t *env_L; + + env_L = sr_lua_env_get(); + if(lua_gettop(L)==1) + { + flag = lua_tointeger(L, -1); + branch = 0; + } else if(lua_gettop(L)==2) { + flag = lua_tointeger(L, -2); + branch = lua_tointeger(L, -1); + } else { + LM_WARN("invalid number of parameters from Lua\n"); + return app_lua_return_false(L); + } + + if(env_L->msg==NULL) + { + LM_WARN("invalid parameters from Lua env\n"); + return app_lua_return_false(L); + } + + if (!flag_in_range(flag)) + { + LM_ERR("invalid flag parameter %d\n", flag); + return app_lua_return_false(L); + } + + ret = isbflagset(branch, flag); + if(ret>0) + return app_lua_return_true(L); + return app_lua_return_false(L); +} + +/** + * + */ +static int lua_sr_seturi (lua_State *L) +{ + struct action act; + struct run_act_ctx h; + str uri; + sr_lua_env_t *env_L; + + env_L = sr_lua_env_get(); + uri.s = (char*)lua_tostring(L, -1); + if(uri.s==NULL) + { + LM_ERR("invalid uri parameter\n"); + return app_lua_return_false(L); + } + uri.len = strlen(uri.s); + + if(env_L->msg==NULL) + { + LM_WARN("invalid parameters from Lua env\n"); + return app_lua_return_false(L); + } + + memset(&act, 0, sizeof(act)); + act.val[0].type = STRING_ST; + act.val[0].u.string = uri.s; + act.type = SET_URI_T; + init_run_actions_ctx(&h); + if (do_action(&h, &act, env_L->msg)<0) + { + LM_ERR("do action failed\n"); + return app_lua_return_false(L); + } + return app_lua_return_true(L); +} + +/** + * + */ +static int lua_sr_setuser (lua_State *L) +{ + struct action act; + struct run_act_ctx h; + str uri; + sr_lua_env_t *env_L; + + env_L = sr_lua_env_get(); + uri.s = (char*)lua_tostring(L, -1); + if(uri.s==NULL) + { + LM_ERR("invalid uri parameter\n"); + return app_lua_return_false(L); + } + uri.len = strlen(uri.s); + + if(env_L->msg==NULL) + { + LM_WARN("invalid parameters from Lua env\n"); + return app_lua_return_false(L); + } + + memset(&act, 0, sizeof(act)); + act.val[0].type = STRING_ST; + act.val[0].u.string = uri.s; + act.type = SET_USER_T; + init_run_actions_ctx(&h); + if (do_action(&h, &act, env_L->msg)<0) + { + LM_ERR("do action failed\n"); + return app_lua_return_false(L); + } + return app_lua_return_true(L); +} + +/** + * + */ +static int lua_sr_sethost (lua_State *L) +{ + struct action act; + struct run_act_ctx h; + str uri; + sr_lua_env_t *env_L; + + env_L = sr_lua_env_get(); + uri.s = (char*)lua_tostring(L, -1); + if(uri.s==NULL) + { + LM_ERR("invalid uri parameter\n"); + return app_lua_return_false(L); + } + uri.len = strlen(uri.s); + + if(env_L->msg==NULL) + { + LM_WARN("invalid parameters from Lua env\n"); + return app_lua_return_false(L); + } + + memset(&act, 0, sizeof(act)); + act.val[0].type = STRING_ST; + act.val[0].u.string = uri.s; + act.type = SET_HOST_T; + init_run_actions_ctx(&h); + if (do_action(&h, &act, env_L->msg)<0) + { + LM_ERR("do action failed\n"); + return app_lua_return_false(L); + } + return app_lua_return_true(L); +} + +/** + * + */ +static int lua_sr_setdsturi (lua_State *L) +{ + str uri; + sr_lua_env_t *env_L; + + env_L = sr_lua_env_get(); + uri.s = (char*)lua_tostring(L, -1); + if(uri.s==NULL) + { + LM_ERR("invalid uri parameter\n"); + return app_lua_return_false(L); + } + uri.len = strlen(uri.s); + + if(env_L->msg==NULL) + { + LM_WARN("invalid parameters from Lua env\n"); + return app_lua_return_false(L); + } + + if (set_dst_uri(env_L->msg, &uri)<0) + { + LM_ERR("setting dst uri failed\n"); + return app_lua_return_false(L); + } + return app_lua_return_true(L); +} + +/** + * + */ +static int lua_sr_resetdsturi (lua_State *L) +{ + sr_lua_env_t *env_L; + + env_L = sr_lua_env_get(); + if(env_L->msg==NULL) + { + LM_WARN("invalid parameters from Lua env\n"); + return app_lua_return_false(L); + } + + reset_dst_uri(env_L->msg); + return app_lua_return_true(L); +} + + +/** + * + */ static const luaL_reg _sr_core_Map [] = { - {"probe", lua_sr_probe}, - {"dbg", lua_sr_dbg}, - {"err", lua_sr_err}, - {"log", lua_sr_log}, - {"modf", lua_sr_modf}, + {"probe", lua_sr_probe}, + {"dbg", lua_sr_dbg}, + {"err", lua_sr_err}, + {"log", lua_sr_log}, + {"modf", lua_sr_modf}, + {"is_myself", lua_sr_is_myself}, + {"setflag", lua_sr_setflag}, + {"resetflag", lua_sr_resetflag}, + {"isflagset", lua_sr_isflagset}, + {"setbflag", lua_sr_setbflag}, + {"resetbflag", lua_sr_resetbflag}, + {"isbflagset", lua_sr_isbflagset}, + {"seturi", lua_sr_seturi}, + {"setuser", lua_sr_setuser}, + {"sethost", lua_sr_sethost}, + {"setdsturi", lua_sr_setdsturi}, + {"resetdsturi", lua_sr_resetdsturi}, {NULL, NULL} };

14 years, 2 months

git:master: tm: added export structure for extra API

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 618712b6ee69ebc41b963754957303d8b1e0aca2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=618712b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Nov 17 12:53:18 2010 +0100 tm: added export structure for extra API - used for not-so-common inter-module API functions - initial tm API structure got quite big and not all functions are very used --- modules/tm/tm.c | 23 +++++++++++++++++------ modules/tm/tm_load.c | 19 +++++++++++++++++++ modules/tm/tm_load.h | 41 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 6 deletions(-) diff --git a/modules/tm/tm.c b/modules/tm/tm.c index e5ca753..e8ef946 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -292,12 +292,12 @@ static int t_branch_timeout(struct sip_msg* msg, char*, char*); static int t_branch_replied(struct sip_msg* msg, char*, char*); static int t_any_timeout(struct sip_msg* msg, char*, char*); static int t_any_replied(struct sip_msg* msg, char*, char*); -static int t_is_canceled(struct sip_msg* msg, char*, char*); +static int w_t_is_canceled(struct sip_msg* msg, char*, char*); static int t_is_expired(struct sip_msg* msg, char*, char*); static int t_grep_status(struct sip_msg* msg, char*, char*); static int w_t_drop_replies(struct sip_msg* msg, char* foo, char* bar); static int w_t_save_lumps(struct sip_msg* msg, char* foo, char* bar); -static int t_check_trans(struct sip_msg* msg, char* foo, char* bar); +static int w_t_check_trans(struct sip_msg* msg, char* foo, char* bar); /* by default the fr timers avps are not set, so that the avps won't be @@ -448,7 +448,7 @@ static cmd_export_t cmds[]={ REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, {"t_any_replied", t_any_replied, 0, 0, REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, - {"t_is_canceled", t_is_canceled, 0, 0, + {"t_is_canceled", w_t_is_canceled, 0, 0, REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, {"t_is_expired", t_is_expired, 0, 0, REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, @@ -460,7 +460,7 @@ static cmd_export_t cmds[]={ FAILURE_ROUTE}, {"t_save_lumps", w_t_save_lumps, 0, 0, REQUEST_ROUTE}, - {"t_check_trans", t_check_trans, 0, 0, + {"t_check_trans", w_t_check_trans, 0, 0, REQUEST_ROUTE|TM_ONREPLY_ROUTE|BRANCH_ROUTE }, {"t_load_contacts", t_load_contacts, 0, 0, @@ -470,6 +470,7 @@ static cmd_export_t cmds[]={ /* not applicable from the script */ {"load_tm", (cmd_function)load_tm, NO_SCRIPT, 0, 0}, + {"load_xtm", (cmd_function)load_xtm, NO_SCRIPT, 0, 0}, {0,0,0,0,0} }; @@ -1755,7 +1756,7 @@ int t_branch_replied(struct sip_msg* msg, char* foo, char* bar) /* script function, returns: 1 if the transaction was canceled, -1 if not */ -int t_is_canceled(struct sip_msg* msg, char* foo, char* bar) +int t_is_canceled(struct sip_msg* msg) { struct cell *t; int ret; @@ -1773,6 +1774,11 @@ int t_is_canceled(struct sip_msg* msg, char* foo, char* bar) return ret; } +static int w_t_is_canceled(struct sip_msg* msg, char* foo, char* bar) +{ + return t_is_canceled(msg); +} + /* script function, returns: 1 if the transaction lifetime interval has already elapsed, -1 if not */ int t_is_expired(struct sip_msg* msg, char* foo, char* bar) { @@ -1937,7 +1943,7 @@ int w_t_reply_wrp(struct sip_msg *m, unsigned int code, char *txt) * reliable: if the ACK is delayed the proxied transaction might * be already deleted when it reaches the proxy (wait_timeout)) */ -static int t_check_trans(struct sip_msg* msg, char* foo, char* bar) +int t_check_trans(struct sip_msg* msg) { struct cell* t; @@ -1976,6 +1982,11 @@ static int t_check_trans(struct sip_msg* msg, char* foo, char* bar) return -1; } +static int w_t_check_trans(struct sip_msg* msg, char* foo, char* bar) +{ + return t_check_trans(msg); +} + static int hexatoi(str *s, unsigned int* result) { int i, xv, fact; diff --git a/modules/tm/tm_load.c b/modules/tm/tm_load.c index 58fd440..d57fd45 100644 --- a/modules/tm/tm_load.c +++ b/modules/tm/tm_load.c @@ -145,3 +145,22 @@ int load_tm( struct tm_binds *tmb) #endif return 1; } + +int load_xtm(tm_xapi_t *xapi) +{ + if(xapi==NULL) + { + LM_ERR("invalid parameter\n"); + return -1; + } + + memset(xapi, 0, sizeof(tm_xapi_t)); + + xapi->t_on_failure = t_on_negative; + xapi->t_on_branch = t_on_branch; + xapi->t_on_reply = t_on_reply; + xapi->t_check_trans = t_check_trans; + xapi->t_is_canceled = t_is_canceled; + + return 0; +} diff --git a/modules/tm/tm_load.h b/modules/tm/tm_load.h index e4829ac..aad979b 100644 --- a/modules/tm/tm_load.h +++ b/modules/tm/tm_load.h @@ -163,4 +163,45 @@ static inline int tm_load_api(tm_api_t *tmb) return load_tm_api(tmb); } +/** + * eXtra API - not common used in other modules + */ + +typedef void (*t_on_route_f)(unsigned int); +typedef int (*t_no_param_f)(struct sip_msg *); + +int t_check_trans(struct sip_msg* msg); +int t_is_canceled(struct sip_msg* msg); + +typedef struct tm_xbinds { + t_on_route_f t_on_failure; + t_on_route_f t_on_branch; + t_on_route_f t_on_reply; + t_no_param_f t_check_trans; + t_no_param_f t_is_canceled; +} tm_xapi_t; + +typedef int(*load_xtm_f)( tm_xapi_t *xtmb ); +int load_xtm(tm_xapi_t *xtmb); + +static inline int tm_load_xapi(tm_xapi_t *xtmb) +{ + load_xtm_f load_xtm; + + /* import the TM auto-loading function */ + load_xtm = (load_xtm_f)find_export("load_xtm", NO_SCRIPT, 0); + + if (load_tm == NULL) { + LOG(L_WARN, "Cannot import load_xtm function from tm module\n"); + return -1; + } + + /* let the auto-loading function load all extra TM stuff */ + if (load_xtm(xtmb) < 0) { + LOG(L_WARN, "Cannot bind xapi from tm module\n"); + return -1; + } + return 0; +} + #endif

14 years, 2 months

New commits on branch master

by Daniel-Constantin Mierla

URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b457031… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 16 23:08:02 2010 +0100 app_lua: helper function to return error code URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fc57fcf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 16 21:43:28 2010 +0100 app_lua: fixed name of module in modparam examples - added note about submodule sr.registrar URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=36f053f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 16 21:12:44 2010 +0100 app_lua: added registrar API to Lua URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5befde4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 16 20:55:44 2010 +0100 registrar(k): exported inter-module API URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=efe9d9d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 16 20:51:05 2010 +0100 usrloc(k): db modes defines moved in usrloc.h - they are part of API as registrar uses them URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c7e65c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 16 19:51:21 2010 +0100 usrloc(k)API function get_udomain() - get usrloc domain only if it exists, don't create a new one URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eed3781… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 16 19:40:50 2010 +0100 usrloc(k): preload parameter exported URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=16679e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 16 19:37:41 2010 +0100 usrloc(k): new parameter 'preload' - can be used to specify list of location table to be initiated at startup, even they are not used by registrar module functions - good for using the usrloc module from other modules URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0d247e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 16 19:29:29 2010 +0100 sqlops: added LF to end of debug message URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a4de75c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 16 18:55:26 2010 +0100 app_lua: sr.maxfwd mentioned as available submodule URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5d3b2f3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 16 18:37:37 2010 +0100 maxfwd(k): added inter-module API structure URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=63e6879… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 16 18:28:17 2010 +0100 auth_db(k): added new file api.h URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=689ee06… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 16 18:17:43 2010 +0100 app_lua: typo in register parameter - note about submodule sr.auth_db URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8955a1a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 16 18:04:17 2010 +0100 app_lua: added functions from auth_db api URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c70565c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 16 16:43:30 2010 +0100 auth_db(k): close db handle only for second param fixup - digest_authenticate() refurbished to accept clear text values for realm and table URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=542fccb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 16 16:29:49 2010 +0100 app_lua: note about submodule sr.auth URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=579006b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 16 14:18:45 2010 +0100 app_lua: exported functions from AUTH API to Lua URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=85cb987… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 16 14:18:24 2010 +0100 app_lua: added helper function to return int to Lua URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dc15caf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 16 13:48:57 2010 +0100 auth: several functions exported via inter-module API URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5674d65… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 16 13:37:19 2010 +0100 auth: pv_authenticate() made inter-modules API friendly URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e5f14b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 16 13:20:28 2010 +0100 auth: parameters are resolved in wrapper functions - parameters for www/proxy_challenge() are resolved in wrapper functions in order to have auth_challenge() receiving the string or integer values - cleaner approach for the perspective of exporting auth_challenge() to inter-modules API URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9451c9c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 16 12:47:20 2010 +0100 app_lua: doc updated with rr export note URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4a9a0ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 16 12:45:48 2010 +0100 app_lua: exported functions from RR module to Lua URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=81f9b6a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 16 11:44:27 2010 +0100 app_lua: note about subpackage sr.sqlops URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=69c68b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 16 11:41:47 2010 +0100 rr(k): record_route() and loose_route() exported via API URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d4e3b92… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 16 10:55:44 2010 +0100 app_lua: export to Lua the API from sqlops module URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=99b933c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 16 10:55:00 2010 +0100 sqlops: return the reference to DB result value in API URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d421a57… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Nov 15 23:27:07 2010 +0100 app_lua: added note about sr.tm submodule

14 years, 2 months

Regarding SER Listening on Custom Port

by Saurabh Srivastava

Hello SER Team, We have made SER listen on two ports via adding this command (listen=eth0:5060 eth0:5062) in ser.cfg file. Now we are able to get the server listening on two ports as 5060 & 5062 and it is sending 200 OK for the user agents which try to communicate on both the ports. SER is able to register two user agents, one on 5060 and one on 5062. But when we are trying to make a communication between the two registered user agents (i.e. one on 5060 and other on 5062) then no communication is possible (i.e. we cannot make calls and chats). Though when the two user agents are registered on same port (i.e. both UAs on 5060 or both UAs on 5062) then communication is possible between the two clients (i.e. we can make calls and chats). Can you people please guide me through that how can I make the 2 UAs registered to SER on different ports (i.e. one on 5060 and other on 5062) communicate with each other (i.e. they can make calls and chats). I have attached a log as well which shows the same problem. This is a wireshark captured output on the machine which has SER installed. Thanks and Best Regards Saurabh Srivastava

14 years, 2 months

git:master: sqlops: return $null pv if the value in result is null

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 13932b3a17620a4e9ac598ec43ad188aa2626f7e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=13932b3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Nov 15 21:47:51 2010 +0100 sqlops: return $null pv if the value in result is null --- modules_k/sqlops/sql_var.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules_k/sqlops/sql_var.c b/modules_k/sqlops/sql_var.c index cc57e39..2cd4e1b 100644 --- a/modules_k/sqlops/sql_var.c +++ b/modules_k/sqlops/sql_var.c @@ -76,6 +76,8 @@ int pv_get_dbr(struct sip_msg *msg, pv_param_t *param, return pv_get_null(msg, param, res); if(col>=spv->res->ncols) return pv_get_null(msg, param, res); + if(spv->res->vals[row][col].flags&PV_VAL_NULL) + return pv_get_null(msg, param, res); if(spv->res->vals[row][col].flags&PV_VAL_INT) return pv_get_sintval(msg, param, res, spv->res->vals[row][col].value.n);

14 years, 2 months

git:master: sqlops: exported sql functions via module API structure

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 576ed7b991e41b1023213a080fe589badc0c1a6f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=576ed7b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Nov 15 22:16:34 2010 +0100 sqlops: exported sql functions via module API structure - new module parameter sqlres to be able to declare DB results IDs --- modules_k/sqlops/sql_api.c | 202 +++++++++++++++++++++++++++++++++++++++----- modules_k/sqlops/sql_api.h | 59 ++++++++++++- modules_k/sqlops/sqlops.c | 82 +++++++++++++++++- 3 files changed, 316 insertions(+), 27 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=576…

14 years, 2 months

git:master: sqlops: documented new sqlres module parameter

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 26947fe82b8917d41174f0aa45665569bbd7e1dc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=26947fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Nov 15 22:36:40 2010 +0100 sqlops: documented new sqlres module parameter --- modules_k/sqlops/README | 47 +++++++++++++++++++++++---------- modules_k/sqlops/doc/sqlops_admin.xml | 27 +++++++++++++++++- 2 files changed, 58 insertions(+), 16 deletions(-) diff --git a/modules_k/sqlops/README b/modules_k/sqlops/README index a14a40a..902f709 100644 --- a/modules_k/sqlops/README +++ b/modules_k/sqlops/README @@ -11,7 +11,7 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright � 2008 http://www.asipto.com + Copyright © 2008 http://www.asipto.com __________________________________________________________________ Table of Contents @@ -27,6 +27,7 @@ Daniel-Constantin Mierla 3. Exported Parameters 3.1. sqlcon (str) + 3.2. sqlres (str) 4. Exported Functions @@ -40,9 +41,10 @@ Daniel-Constantin Mierla List of Examples 1.1. Set sqlcon parameter - 1.2. sql_query() usage - 1.3. sql_result_free() usage - 1.4. $dbr(result=>key) usage + 1.2. Set sqlres parameter + 1.3. sql_query() usage + 1.4. sql_result_free() usage + 1.5. $dbr(result=>key) usage Chapter 1. Admin Guide @@ -57,6 +59,7 @@ Chapter 1. Admin Guide 3. Exported Parameters 3.1. sqlcon (str) + 3.2. sqlres (str) 4. Exported Functions @@ -81,7 +84,7 @@ Chapter 1. Admin Guide * access via pseudo-variables - the content of the SQL query result is accessible via pseudo-variables. Please note that only integer and string variables are supported at the moment because of the - internal usage of "AVPs" to hold the values. So its not possible + internal usage of “AVPs” to hold the values. So it is not possible for example to return floating point or big integer values this way. * array indexes - fast access to result values via array position: @@ -108,6 +111,7 @@ Chapter 1. Admin Guide 3. Exported Parameters 3.1. sqlcon (str) + 3.2. sqlres (str) 3.1. sqlcon (str) @@ -118,7 +122,7 @@ Chapter 1. Admin Guide This parameter may be set multiple times to get many DB connections in the same configuration file. * connection_name - string specifying the name of a DB connection. - This string is used by the "sql_query()" function to refer to the + This string is used by the “sql_query()” function to refer to the DB connection. * database_url - Standardized database URL used to connect to database. @@ -131,16 +135,31 @@ modparam("sqlops","sqlcon","cb=>mysql://openser:abc@10.10.1.1/testdb") modparam("sqlops","sqlcon","ca=>dbdriver://username:password@dbhost/dbname") ... +3.2. sqlres (str) + + The definition of a DB result ID. The value of the parameter can be any + string. Results IDs are also added at fixup time when sql_query() + parameters are parsed, there is no need to decalare them via module + parameter unless you want to use them from within other modules and be + available in all application processes. + + Default value is NULL. + + Example 1.2. Set sqlres parameter +... +modparam("sqlops", "sqlres", "ra") +... + 4. Exported Functions 4.1. sql_query(connection, query, result) 4.2. sql_result_free(result) -4.1. sql_query(connection, query, result) +4.1. sql_query(connection, query, result) Make a SQL query using 'connection' and store data in 'result'. * connection - the name of the connection to be used for query - (defined via the "sqlcon" parameter). + (defined via the “sqlcon” parameter). * query - SQL query string or pseudo-variables containing SQL query. * result - string name to identify the result. Will be used by $dbr(...) pseudo-variable to access result attributes. @@ -148,7 +167,7 @@ modparam("sqlops","sqlcon","ca=>dbdriver://username:password@dbhost/dbname") This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE. - Example 1.2. sql_query() usage + Example 1.3. sql_query() usage ... modparam("sqlops","sqlcon","ca=>dbdriver://username:password@dbhost/dbname") ... @@ -157,14 +176,14 @@ xlog("number of rows in table domain: $dbr(ra=>rows)\n"); sql_result_free("ra"); ... -4.2. sql_result_free(result) +4.2. sql_result_free(result) Free data in SQL 'result'. This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE. - Example 1.3. sql_result_free() usage + Example 1.4. sql_result_free() usage ... modparam("sqlops","sqlcon","ca=>dbdriver://username:password@dbhost/dbname") ... @@ -182,10 +201,10 @@ sql_result_free("ra"); Access hash table entries. - The "result" must be the name identifying a SQL result (third parameter + The “result” must be the name identifying a SQL result (third parameter of sql_query(...)). - The "key" can be: + The “key” can be: * rows - return the number of rows in query result * cols - return the number of columns in the result. * [row,col] - return the value at position (row,col) in the result @@ -193,7 +212,7 @@ sql_result_free("ra"); integer. * colname[N] - return the name of the N-th column in the result set. - Example 1.4. $dbr(result=>key) usage + Example 1.5. $dbr(result=>key) usage ... modparam("sqlops","sqlcon","ca=>dbdriver://username:password@dbhost/dbname") ... diff --git a/modules_k/sqlops/doc/sqlops_admin.xml b/modules_k/sqlops/doc/sqlops_admin.xml index 0c0a444..997a457 100644 --- a/modules_k/sqlops/doc/sqlops_admin.xml +++ b/modules_k/sqlops/doc/sqlops_admin.xml @@ -43,8 +43,8 @@ of the SQL query result is accessible via pseudo-variables. Please note that only integer and string variables are supported at the moment because of the internal usage of <quote>AVPs</quote> to hold - the values. So its not possible for example to return floating point - or big integer values this way. + the values. So it is not possible for example to return floating + point or big integer values this way. </para> </listitem> <listitem> @@ -143,6 +143,29 @@ modparam("sqlops","sqlcon","ca=>&exampledb;") </programlisting> </example> </section> + <section> + <title><varname>sqlres</varname> (str)</title> + <para> + The definition of a DB result ID. The value of the parameter can be + any string. Results IDs are also added at fixup time when sql_query() + parameters are parsed, there is no need to decalare them via module + parameter unless you want to use them from within other modules and be + available in all application processes. + </para> + <para> + <emphasis> + Default value is NULL. + </emphasis> + </para> + <example> + <title>Set <varname>sqlres</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("sqlops", "sqlres", "ra") +... +</programlisting> + </example> + </section> </section> <section> <title>Exported Functions</title>

14 years, 2 months

git:master: app_lua: exported first TM functions to Lua

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: a0f8762f139ca907a199219e3bab7d656ca2731a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a0f8762… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Nov 15 19:41:20 2010 +0100 app_lua: exported first TM functions to Lua - you can call t_reply() and t_relay() natively in Lua via sr.tm.t_reply(code, reason) and sr.tm.t_relay() --- modules/app_lua/app_lua_exp.c | 113 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 105 insertions(+), 8 deletions(-) diff --git a/modules/app_lua/app_lua_exp.c b/modules/app_lua/app_lua_exp.c index e2cd272..2cc1a91 100644 --- a/modules/app_lua/app_lua_exp.c +++ b/modules/app_lua/app_lua_exp.c @@ -31,10 +31,12 @@ #include "../../ut.h" #include "../../modules/sl/sl.h" +#include "../../modules/tm/tm_load.h" #include "app_lua_api.h" #define SR_LUA_EXP_MOD_SL (1<<0) +#define SR_LUA_EXP_MOD_TM (1<<1) /** * @@ -47,6 +49,11 @@ static unsigned int _sr_lua_exp_reg_mods = 0; static sl_api_t _lua_slb; /** + * tm + */ +static tm_api_t _lua_tmb; + +/** * */ static int lua_sr_sl_send_reply (lua_State *L) @@ -61,26 +68,27 @@ static int lua_sr_sl_send_reply (lua_State *L) if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_SL)) { LM_WARN("weird: sl function executed but module not registered\n"); - return 0; + return app_lua_return_false(L); } code = lua_tointeger(L, -2); - if(code<100 || code>=700) - return 0; + if(code<100 || code>=800) + return app_lua_return_false(L); txt.s = (char*)lua_tostring(L, -1); - if(txt.s!=NULL || env_L->msg==NULL) + if(txt.s!=NULL && env_L->msg!=NULL) { txt.len = strlen(txt.s); ret = _lua_slb.freply(env_L->msg, code, &txt); if(ret<0) { LM_WARN("sl send_reply returned false\n"); - return 0; + return app_lua_return_false(L); } + return app_lua_return_true(L); } - return 0; + return app_lua_return_false(L); } /** @@ -97,13 +105,13 @@ static int lua_sr_sl_get_reply_totag (lua_State *L) if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_SL)) { LM_WARN("weird: sl function executed but module not registered\n"); - return 0; + return app_lua_return_false(L); } ret = _lua_slb.get_reply_totag(env_L->msg, &txt); if(ret<0) { LM_WARN("sl get_reply_totag returned false\n"); - return 0; + return app_lua_return_false(L); } lua_pushlstring(L, txt.s, txt.len); return 1; @@ -121,6 +129,79 @@ static const luaL_reg _sr_sl_Map [] = { /** * */ +static int lua_sr_tm_t_reply(lua_State *L) +{ + char *txt; + int code; + int ret; + sr_lua_env_t *env_L; + + env_L = sr_lua_env_get(); + + if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_TM)) + { + LM_WARN("weird: tm function executed but module not registered\n"); + return app_lua_return_false(L); + } + + code = lua_tointeger(L, -2); + + if(code<100 || code>=800) + return app_lua_return_false(L); + + txt = (char*)lua_tostring(L, -1); + if(txt!=NULL && env_L->msg!=NULL) + { + ret = _lua_tmb.t_reply(env_L->msg, code, txt); + if(ret<0) + { + LM_WARN("tm t_reply returned false\n"); + /* shall push FALSE to Lua ?!? */ + return app_lua_return_false(L); + } + return app_lua_return_true(L); + } + return app_lua_return_false(L); +} + +/** + * + */ +static int lua_sr_tm_t_relay(lua_State *L) +{ + int ret; + sr_lua_env_t *env_L; + + env_L = sr_lua_env_get(); + + if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_TM)) + { + LM_WARN("weird: tm function executed but module not registered\n"); + return app_lua_return_false(L); + } + ret = _lua_tmb.t_relay(env_L->msg, NULL, NULL); + if(ret<0) + { + LM_WARN("tm t_relay returned false\n"); + return app_lua_return_false(L); + } + return app_lua_return_true(L); +} + + +/** + * + */ +static const luaL_reg _sr_tm_Map [] = { + {"t_reply", lua_sr_tm_t_reply}, + {"t_relay", lua_sr_tm_t_relay}, + {NULL, NULL} +}; + + +/** + * + */ int lua_sr_exp_init_mod(void) { if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_SL) @@ -132,6 +213,16 @@ int lua_sr_exp_init_mod(void) } LM_DBG("loaded sl api\n"); } + if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_TM) + { + /* bind the TM API */ + if (tm_load_api(&_lua_tmb) == -1) + { + LM_ERR("cannot bind to TM API\n"); + return -1; + } + LM_DBG("loaded tm api\n"); + } return 0; } @@ -148,7 +239,11 @@ int lua_sr_exp_register_mod(char *mname) { _sr_lua_exp_reg_mods |= SR_LUA_EXP_MOD_SL; return 0; + } else if(len==2 && strcmp(mname, "tm")==0) { + _sr_lua_exp_reg_mods |= SR_LUA_EXP_MOD_TM; + return 0; } + return -1; } @@ -159,6 +254,8 @@ void lua_sr_exp_openlibs(lua_State *L) { if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_SL) luaL_openlib(L, "sr.sl", _sr_sl_Map, 0); + if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_TM) + luaL_openlib(L, "sr.tm", _sr_tm_Map, 0); }

14 years, 2 months

git:master: tm: small wrapper for exporting API

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: bffe87d58679020d26a650fbd0535536a0213096 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bffe87d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Nov 15 19:33:05 2010 +0100 tm: small wrapper for exporting API - tm_load_api() added as wrapper to load_tm_api() to match the common pattern for naming module exporting API functions --- modules/tm/tm_load.h | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/modules/tm/tm_load.h b/modules/tm/tm_load.h index 5436914..e4829ac 100644 --- a/modules/tm/tm_load.h +++ b/modules/tm/tm_load.h @@ -131,10 +131,12 @@ struct tm_binds { #endif }; +typedef struct tm_binds tm_api_t; + extern int tm_init; typedef int(*load_tm_f)( struct tm_binds *tmb ); -int load_tm( struct tm_binds *tmb); +int load_tm(struct tm_binds *tmb); static inline int load_tm_api(struct tm_binds* tmb) @@ -156,4 +158,9 @@ static inline int load_tm_api(struct tm_binds* tmb) return 0; } +static inline int tm_load_api(tm_api_t *tmb) +{ + return load_tm_api(tmb); +} + #endif

14 years, 2 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev