sr-dev November 2010

sr-dev@lists.kamailio.org

17 participants
108 discussions

git:master: modules_k/siputils: added set_uri_user(uri, user) function.

by Juha Heinanen

Module: sip-router Branch: master Commit: dbfd450d4e27c12793daa8225b348aa496a02d5b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dbfd450… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue Nov 23 14:22:52 2010 +0200 modules_k/siputils: added set_uri_user(uri, user) function. --- modules_k/siputils/README | 40 ++++++++++++ modules_k/siputils/checks.c | 93 ++++++++++++++++++++++++++++- modules_k/siputils/checks.h | 5 ++ modules_k/siputils/doc/siputils.xml | 9 +++ modules_k/siputils/doc/siputils_admin.xml | 47 +++++++++++++++ modules_k/siputils/siputils.c | 40 ++++++++++++ 6 files changed, 233 insertions(+), 1 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=dbf…

13 years, 5 months

MySQL - driver error on query: Commands out of sync; you can't run this command now

by Johny Kadarisman Kwan

Hello, I installed and run Kamailio, it run pretty stabil for a while with a few phone registered, but recently encountered a mysql error, once a while, kamailio report following error: /usr/local/sbin/kamailio[11693]: INFO: <script>: route[AUTH] /usr/local/sbin/kamailio[11693]: ERROR: db_mysql [km_dbase.c:117]: driver error on query: Commands out of sync; you can't run this command now /usr/local/sbin/kamailio[11693]: ERROR: <core> [db_query.c:101]: error while submitting query /usr/local/sbin/kamailio[11693]: ERROR: auth_db [authorize.c:102]: failed to query database the freq of these error getting increase once we introduce more clients. Try to google about this type of error, but found a mix suggestion without clear answer/suggestion. Any pointer/suggestion on how to troubleshoot? Thanks in advance for you help. ======== i'm running : Server: kamailio (3.0.3 (i386/linux)) a22dc9 Mysql: 5.0.77 CentOS 5.5

13 years, 5 months

uri userpart replacement

by Juha Heinanen

looks like there is currently no function that could be used to replace parts of uri (such as userpart) with a new value. it can be done by copying the uri temporarily to request uri or by a ugly regular expression. should i write utility function(s) for replacing userpart and perhaps also hostpart or are there better, more generic suggestions? -- juha

13 years, 5 months

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router

by Jan Janak

Module: sip-router Branch: master Commit: 1b209e395c1816aa126592c005f4fb61d9828dfd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1b209e3… Author: Jan Janak <jan(a)ryngle.com> Committer: Jan Janak <jan(a)ryngle.com> Date: Wed Nov 17 18:27:35 2010 -0500 Merge branch 'master' of ssh://git.sip-router.org/sip-router * 'master' of ssh://git.sip-router.org/sip-router: (31 commits) app_lua: several tm functions added to Lua api tm: added export structure for extra API app_lua: added several core functions to sr package app_lua: helper function to return error code app_lua: fixed name of module in modparam examples app_lua: added registrar API to Lua registrar(k): exported inter-module API usrloc(k): db modes defines moved in usrloc.h usrloc(k)API function get_udomain() usrloc(k): preload parameter exported usrloc(k): new parameter 'preload' sqlops: added LF to end of debug message app_lua: sr.maxfwd mentioned as available submodule maxfwd(k): added inter-module API structure auth_db(k): added new file api.h app_lua: typo in register parameter app_lua: added functions from auth_db api auth_db(k): close db handle only for second param fixup app_lua: note about submodule sr.auth app_lua: exported functions from AUTH API to Lua ... ---

13 years, 5 months

git:master: db_mysql: Fixes crash in libmysqlclient after connection reset.

by Jan Janak

Module: sip-router Branch: master Commit: 0e564bcd3616f9dc981bb768003545674c79c2a7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0e564bc… Author: Jan Janak <jan(a)ryngle.com> Committer: Jan Janak <jan(a)ryngle.com> Date: Wed Nov 17 18:26:32 2010 -0500 db_mysql: Fixes crash in libmysqlclient after connection reset. Sometimes SIP-Router would crash in libmysqlclient after a connection to the server has been reset. This is caused by mysql_stmt_prepare which will reset the connection data structure if a connection has been reset. Subsequent calls to other mysql functions (mysql_stmt_execute) crash unless the connection has been re-connected. This is documented as mysql bug #33384. A workaround is to reset and reconnect the connection explicitly immediately after mysql_stmt_prepare has failed with CR_SERVER_GONE_ERROR. This change implements exactly that. First of all, this patch fixes a minor bug in updating the variable that keeps track of number of connection resets for each database connection and pre-pared statement. The variable needs to be incremented each time a connection is closed. Previously it was incremented only if a connection was successfully reconnected. If the reconnect attempt failed than the variable was not incremented. The function that uploads commands to the server relies on the variable to detect connection resets and may not have worked properly under some circumstances (if a connection fails to reconnect). Function upload_cmd has been modified to close the connection explicitly if mysql_stmt_prepare fails with CR_SERVER_GONE_ERROR. This ensures that subsequent calls to mysql_stmt_exec are forced to reconnect and re-upload commands to the server. This is needed to prevent the library from crashing. exec_cmd_safe now checks if a connection has been disconnected and if so it tries to reconnect it before executing a prepared statement. This is used to recover from failing mysql_stmt_prepare. --- modules/db_mysql/my_cmd.c | 258 +++++++++++++++++++++++++-------------------- modules/db_mysql/my_con.c | 18 ++-- modules/db_mysql/my_con.h | 10 +- 3 files changed, 158 insertions(+), 128 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=0e5…

13 years, 5 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

13 years, 5 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} };

13 years, 5 months

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) {

13 years, 5 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

13 years, 5 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

13 years, 5 months

← Newer
1
...
5
6
7
8
9
10
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2010