sr-dev November 2011

sr-dev@lists.kamailio.org

31 participants
340 discussions

git:master: modules/app_lua, modules_k/siputils, modules_k/uac: Added siputils.is_uri_user_e164 and uac.replace_from to app_lua

by Peter Dunkley

Module: sip-router Branch: master Commit: fcbe9878c6f09adc000edaffb0f292b555eb6b48 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fcbe987… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Sun Nov 20 22:05:14 2011 +0000 modules/app_lua, modules_k/siputils, modules_k/uac: Added siputils.is_uri_user_e164 and uac.replace_from to app_lua --- modules/app_lua/app_lua_exp.c | 118 +++++++++++++++++++++++++++++++++++++++++ modules_k/siputils/checks.c | 22 +++++--- modules_k/siputils/checks.h | 3 +- modules_k/siputils/siputils.c | 4 +- modules_k/siputils/siputils.h | 2 + modules_k/uac/api.h | 25 +++++++++ modules_k/uac/uac.c | 16 +++++- 7 files changed, 180 insertions(+), 10 deletions(-) diff --git a/modules/app_lua/app_lua_exp.c b/modules/app_lua/app_lua_exp.c index 93db02b..3b15fb7 100644 --- a/modules/app_lua/app_lua_exp.c +++ b/modules/app_lua/app_lua_exp.c @@ -50,6 +50,7 @@ #include "../../modules_k/rls/api.h" #include "../../modules_k/alias_db/api.h" #include "../../modules_k/msilo/api.h" +#include "../../modules_k/uac/api.h" #include "app_lua_api.h" @@ -72,6 +73,7 @@ #define SR_LUA_EXP_MOD_RLS (1<<16) #define SR_LUA_EXP_MOD_ALIAS_DB (1<<17) #define SR_LUA_EXP_MOD_MSILO (1<<18) +#define SR_LUA_EXP_MOD_UAC (1<<19) /** * @@ -175,6 +177,11 @@ static alias_db_api_t _lua_alias_dbb; static msilo_api_t _lua_msilob; /** + * uac + */ +static uac_api_t _lua_uacb; + +/** * */ static int lua_sr_sl_send_reply (lua_State *L) @@ -1837,8 +1844,48 @@ static int lua_sr_siputils_has_totag(lua_State *L) /** * */ +static int lua_sr_siputils_is_uri_user_e164(lua_State *L) +{ + int ret; + sr_lua_env_t *env_L; + str param[1]; + + env_L = sr_lua_env_get(); + + if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_SIPUTILS)) + { + LM_WARN("weird: siputils 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); + } + + if(lua_gettop(L)!=1) + { + LM_ERR("incorrect number of arguments\n"); + return app_lua_return_error(L); + } + + param[0].s = (char *) lua_tostring(L, -1); + param[0].len = strlen(param[0].s); + + ret = _lua_siputilsb.is_uri_user_e164(env_L->msg, &param[0]); + if (ret < 0) + return app_lua_return_false(L); + + return app_lua_return_true(L); +} + +/** + * + */ static const luaL_reg _sr_siputils_Map [] = { {"has_totag", lua_sr_siputils_has_totag}, + {"is_uri_user_e164", lua_sr_siputils_is_uri_user_e164}, {NULL, NULL} }; @@ -2063,6 +2110,62 @@ static const luaL_reg _sr_msilo_Map [] = { /** * */ +static int lua_sr_uac_replace_from(lua_State *L) +{ + int ret; + sr_lua_env_t *env_L; + str param[2]; + + env_L = sr_lua_env_get(); + + if (!(_sr_lua_exp_reg_mods & SR_LUA_EXP_MOD_UAC)) + { + LM_WARN("weird:uac 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); + } + + if (lua_gettop(L) == 1) + { + param[0].s = ""; + param[0].len = 0; + param[1].s = (char *) lua_tostring(L, -1); + param[1].len = strlen(param[1].s); + + } + else if (lua_gettop(L) == 2) + { + param[0].s = (char *) lua_tostring(L, -2); + param[0].len = strlen(param[0].s); + param[1].s = (char *) lua_tostring(L, -1); + param[1].len = strlen(param[1].s); + } + else + { + LM_ERR("incorrect number of arguments\n"); + return app_lua_return_error(L); + } + + ret = _lua_uacb.replace_from(env_L->msg, &param[0], &param[1]); + return app_lua_return_int(L, ret); +} + +/** + * + */ +static const luaL_reg _sr_uac_Map [] = { + {"replace_from",lua_sr_uac_replace_from}, + {NULL, NULL} +}; + +/** + * + */ int lua_sr_exp_init_mod(void) { if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_SL) @@ -2261,6 +2364,16 @@ int lua_sr_exp_init_mod(void) } LM_DBG("loaded msilo api\n"); } + if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_UAC) + { + /* bind the UAC API */ + if (load_uac_api(&_lua_uacb) < 0) + { + LM_ERR("cannot bind to UAC API\n"); + return -1; + } + LM_DBG("loaded uac api\n"); + } return 0; } @@ -2331,6 +2444,9 @@ int lua_sr_exp_register_mod(char *mname) } else if(len==5 && strcmp(mname, "msilo")==0) { _sr_lua_exp_reg_mods |= SR_LUA_EXP_MOD_MSILO; return 0; + } else if(len==3 && strcmp(mname, "uac")==0) { + _sr_lua_exp_reg_mods |= SR_LUA_EXP_MOD_UAC; + return 0; } return -1; @@ -2379,5 +2495,7 @@ void lua_sr_exp_openlibs(lua_State *L) luaL_openlib(L, "sr.alias_db", _sr_alias_db_Map, 0); if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_MSILO) luaL_openlib(L, "sr.msilo", _sr_msilo_Map, 0); + if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_UAC) + luaL_openlib(L, "sr.uac", _sr_uac_Map, 0); } diff --git a/modules_k/siputils/checks.c b/modules_k/siputils/checks.c index 6ccac04..52db0ae 100644 --- a/modules_k/siputils/checks.c +++ b/modules_k/siputils/checks.c @@ -467,11 +467,10 @@ int is_e164(struct sip_msg* _m, char* _sp, char* _s2) /* * Check if user part of URI in pseudo variable is an e164 number */ -int is_uri_user_e164(struct sip_msg* _m, char* _sp, char* _s2) +int w_is_uri_user_e164(struct sip_msg* _m, char* _sp, char* _s2) { pv_spec_t *sp; pv_value_t pv_val; - struct sip_uri puri; sp = (pv_spec_t *)_sp; @@ -481,11 +480,7 @@ int is_uri_user_e164(struct sip_msg* _m, char* _sp, char* _s2) LM_DBG("missing uri\n"); return -1; } - if (parse_uri(pv_val.rs.s, pv_val.rs.len, &puri) < 0) { - LM_ERR("parsing URI failed\n"); - return -1; - } - return e164_check(&(puri.user)); + return is_uri_user_e164(_m, &pv_val.rs); } else { LM_ERR("pseudo variable value is not string\n"); return -1; @@ -496,6 +491,19 @@ int is_uri_user_e164(struct sip_msg* _m, char* _sp, char* _s2) } } + +int is_uri_user_e164(struct sip_msg *msg, str *uri) +{ + struct sip_uri puri; + + if (parse_uri(uri->s, uri->len, &puri) < 0) { + LM_ERR("parsing URI failed\n"); + return -1; + } + + return e164_check(&(puri.user)); +} + /* * Set userpart of URI */ diff --git a/modules_k/siputils/checks.h b/modules_k/siputils/checks.h index 706e54b..07a71a2 100644 --- a/modules_k/siputils/checks.h +++ b/modules_k/siputils/checks.h @@ -84,7 +84,8 @@ int tel2sip(struct sip_msg* _msg, char* _uri, char* _hostpart, char* _res); /* * Check if user part of URI in pseudo variable is an e164 number */ -int is_uri_user_e164(struct sip_msg* _m, char* _sp, char* _s2); +int w_is_uri_user_e164(struct sip_msg* _m, char* _sp, char* _s2); +int is_uri_user_e164(struct sip_msg* msg, str *uri); /* * Check if pseudo variable argument value is an e164 number diff --git a/modules_k/siputils/siputils.c b/modules_k/siputils/siputils.c index 9970f45..b5c9806 100644 --- a/modules_k/siputils/siputils.c +++ b/modules_k/siputils/siputils.c @@ -132,7 +132,7 @@ static cmd_export_t cmds[]={ REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE}, {"is_e164", (cmd_function)is_e164, 1, fixup_pvar_null, fixup_free_pvar_null, REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, - {"is_uri_user_e164", (cmd_function)is_uri_user_e164, 1, fixup_pvar_null, + {"is_uri_user_e164", (cmd_function)w_is_uri_user_e164, 1, fixup_pvar_null, fixup_free_pvar_null, REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, {"encode_contact", (cmd_function)encode_contact, 2, 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, @@ -263,6 +263,8 @@ int bind_siputils(siputils_api_t* api) } get_rpid_avp( &api->rpid_avp, &api->rpid_avp_type ); + api->has_totag = has_totag; + api->is_uri_user_e164 = is_uri_user_e164; return 0; } diff --git a/modules_k/siputils/siputils.h b/modules_k/siputils/siputils.h index b640a25..a4fc655 100644 --- a/modules_k/siputils/siputils.h +++ b/modules_k/siputils/siputils.h @@ -25,12 +25,14 @@ #define _SIPUTILS_H_ typedef int (*siputils_has_totag_t)(struct sip_msg*, char*, char*); +typedef int (*siputils_is_uri_user_e164_t)(struct sip_msg*, str*); /*! Siputils module API */ typedef struct siputils_api { int_str rpid_avp; /*!< Name of AVP containing Remote-Party-ID */ int rpid_avp_type; /*!< type of the RPID AVP */ siputils_has_totag_t has_totag; + siputils_is_uri_user_e164_t is_uri_user_e164; } siputils_api_t; typedef int (*bind_siputils_t)(siputils_api_t* api); diff --git a/modules_k/uac/api.h b/modules_k/uac/api.h new file mode 100644 index 0000000..64c4b37 --- /dev/null +++ b/modules_k/uac/api.h @@ -0,0 +1,25 @@ +#ifndef UAC_API_H_ +#define UAC_API_H_ +#include "../../sr_module.h" + + +typedef int (*uac_replace_from_t)(struct sip_msg *, str *, str *); + +typedef struct uac_binds { + uac_replace_from_t replace_from; +} uac_api_t; + +typedef int (*bind_uac_f)(uac_api_t*); + +int bind_uac(uac_api_t*); + +inline static int load_uac_api(uac_api_t *uacb){ + bind_uac_f bind_uac_exports; + if(!(bind_uac_exports=(bind_uac_f)find_export("bind_uac",1,0))){ + LM_ERR("Failed to import bind_iuax\n"); + return -1; + } + return bind_uac_exports(uacb); +} + +#endif /* UAC_API_H_ */ diff --git a/modules_k/uac/uac.c b/modules_k/uac/uac.c index 95abd10..5f6112a 100644 --- a/modules_k/uac/uac.c +++ b/modules_k/uac/uac.c @@ -57,6 +57,7 @@ #include "auth.h" #include "uac_send.h" #include "uac_reg.h" +#include "api.h" MODULE_VERSION @@ -115,7 +116,8 @@ static cmd_export_t cmds[]={ fixup_free_pvar_pvar, ANY_ROUTE }, {"uac_reg_request_to", (cmd_function)w_uac_reg_request_to, 2, fixup_pvar_uint, fixup_free_pvar_uint, REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE }, - + {"bind_uac", (cmd_function)bind_uac, 1, 0, 0, + 0}, {0,0,0,0,0,0} }; @@ -496,3 +498,15 @@ static int w_uac_reg_request_to(struct sip_msg* msg, char* src, char* mode_s) return uac_reg_request_to(msg, &val.rs, mode); } + +int bind_uac(struct uac_binds *uacb) +{ + if (uacb == NULL) + { + LM_WARN("bind_uac: Cannot load uac API into a NULL pointer\n"); + return -1; + } + + uacb->replace_from = replace_from; + return 0; +}

13 years

git:master: modules_k/pua, modules_k/rls: Several debug, PostgreSQL, and DB only fixes to PUA and RLS

by Peter Dunkley

Module: sip-router Branch: master Commit: e5edc71fa4e2e53a135e206d9b07acdfe3694c02 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e5edc71… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Sun Nov 20 21:55:28 2011 +0000 modules_k/pua, modules_k/rls: Several debug, PostgreSQL, and DB only fixes to PUA and RLS - A number of small tweaks and fixes --- modules_k/pua/pua.c | 5 ++- modules_k/pua/pua_db.c | 120 ++++++++++++----------------------------------- modules_k/rls/rls_db.c | 1 + 3 files changed, 36 insertions(+), 90 deletions(-) diff --git a/modules_k/pua/pua.c b/modules_k/pua/pua.c index eea341a..123a3ff 100644 --- a/modules_k/pua/pua.c +++ b/modules_k/pua/pua.c @@ -1044,7 +1044,10 @@ static void db_update(unsigned int ticks,void *param) if((p->watcher_uri)) q_vals[watcher_col].val.str_val = *(p->watcher_uri); else - memset(& q_vals[watcher_col].val.str_val ,0, sizeof(str)); + { + q_vals[watcher_col].val.str_val.s = ""; + q_vals[watcher_col].val.str_val.len = 0; + } if(p->tuple_id.s == NULL) { diff --git a/modules_k/pua/pua_db.c b/modules_k/pua/pua_db.c index 407eca7..f8e5e79 100644 --- a/modules_k/pua/pua_db.c +++ b/modules_k/pua/pua_db.c @@ -65,51 +65,6 @@ static int puadb_debug=0; /******************************************************************************/ -void pua_trace( char *func_name, char *text, ua_pres_t *pres ) -{ - str *w=pres->watcher_uri; - - if (!puadb_debug) return; - - /*LM_ERR( "%s %s pres_uri=%.*s watcher_uri=%.*s\n", */ - LM_ERR( "%s %s pres_uri=%.*s pres_id=%.*s flag=%d event=%d watcher_uri=%.*s\n", - func_name, text, pres->pres_uri->len, pres->pres_uri->s, - pres->id.len, pres->id.s, pres->flag, pres->event, - w?w->len:0, w?w->s:"" ); -} - -/******************************************************************************/ - -void pua_trace_int( char *func_name, char *text, int val, ua_pres_t *pres ) -{ - str *w=pres->watcher_uri; - - if (!puadb_debug) return; - - /*LM_ERR( "%s %s %d pres_uri=%.*s watcher_uri=%.*s\n", */ - LM_ERR( "%s %s %d pres_uri=%.*s pres_id=%.*s flag=%d event=%d watcher_uri=%.*s\n", - func_name, text, val, pres->pres_uri->len, pres->pres_uri->s, - pres->id.len, pres->id.s, pres->flag, pres->event, - w?w->len:0, w?w->s:"" ); -} - -/******************************************************************************/ - -void pua_trace_string( char *func_name, char *text, const char *val, ua_pres_t *pres ) -{ - str *w=pres->watcher_uri; - - if (!puadb_debug) return; - - /*LM_ERR( "%s %s %s pres_uri=%.*s watcher_uri=%.*s\n", */ - LM_ERR( "%s %s %s pres_uri=%.*s pres_id=%.*s flag=%d event=%d watcher_uri=%.*s\n", - func_name, text, "val", pres->pres_uri->len, pres->pres_uri->s, - pres->id.len, pres->id.s, pres->flag, pres->event, - w?w->len:0, w?w->s:"" ); -} - -/******************************************************************************/ - void free_results_puadb( db1_res_t *res ) { @@ -420,7 +375,7 @@ int matches_in_puadb(ua_pres_t *pres) nr_rows = RES_ROW_N(res); pua_dbf.free_result(pua_db, res); - pua_trace_int( "matches_in_puadb", "DONE rval=", nr_rows, pres ); + LM_DBG("Found %d rows\n", nr_rows); return(nr_rows); } @@ -539,14 +494,14 @@ ua_pres_t* search_puadb(ua_pres_t *pres, ua_pres_t *result, db1_res_t **dbres) if (nr_rows == 0) { /* no match */ - pua_trace( "search_puadb", "NO MATCH", pres ); + LM_DBG("No rows found\n"); pua_dbf.free_result(pua_db, res); return(NULL); } if (nr_rows != 1) { - pua_trace_int( "search_puadb", "TOO MANY MATCHES=", nr_rows, pres ); + LM_ERR("Too many rows found (%d)\n", nr_rows); pua_dbf.free_result(pua_db, res); return(NULL); } @@ -561,8 +516,6 @@ ua_pres_t* search_puadb(ua_pres_t *pres, ua_pres_t *result, db1_res_t **dbres) /*pua_dbf.free_result(pua_db, res);*/ *dbres = res; - pua_trace( "search_puadb", "DONE", pres ); - return(result); } @@ -665,14 +618,14 @@ ua_pres_t* get_dialog_puadb(ua_pres_t *pres, ua_pres_t *result, db1_res_t **dbre if (nr_rows == 0) { /* no match */ - pua_trace( "get_dialog_puadb", "NO MATCH", pres ); + LM_DBG("No rows found\n"); pua_dbf.free_result(pua_db, res); return(NULL); } if (nr_rows != 1) { - pua_trace_int( "get_dialog_puadb", "TOO MANY RESULTS=", nr_rows, pres ); + LM_ERR("Too many rows found (%d)\n", nr_rows); return(NULL); } @@ -686,7 +639,6 @@ ua_pres_t* get_dialog_puadb(ua_pres_t *pres, ua_pres_t *result, db1_res_t **dbre /*pua_dbf.free_result(pua_db, res);*/ *dbres = res; - pua_trace( "get_dialog_puadb", "DONE", pres ); return(result); } @@ -783,18 +735,16 @@ int is_dialog_puadb(ua_pres_t *pres) if (nr_rows == 0) { /* no match */ - pua_trace( "is_dialog_puadb", "NO MATCH", pres ); + LM_ERR("No rows found.\n"); return(-1); } if (nr_rows != 1) { - pua_trace_int( "is_dialog_puadb", "TOO MANY RESULTS=", nr_rows, pres ); + LM_ERR("Too many rows found (%d)\n", nr_rows); return(-1); } - - pua_trace( "is_dialog_puadb", "MATCH", pres ); return(0); } @@ -895,15 +845,15 @@ int get_record_id_puadb(ua_pres_t *pres, str **rec_id ) if (nr_rows == 0) { - /* no match */ - pua_trace( "get_record_id_puadb", "NO MATCH", pres ); + /* no match */ + LM_DBG("No rows found.\n"); pua_dbf.free_result(pua_db, res); return(0); } if (nr_rows != 1) { - pua_trace_int( "get_record_id_puadb", "TOO MANY MATCHES=", nr_rows, pres ); + LM_ERR("Too many rows found (%d)\n", nr_rows); pua_dbf.free_result(pua_db, res); return(-1); } @@ -940,7 +890,7 @@ int get_record_id_puadb(ua_pres_t *pres, str **rec_id ) *rec_id= id; pua_dbf.free_result(pua_db, res); - pua_trace_string( "get_record_id_puadb", "FOUND id=", VAL_STRING(values+1), pres ); + LM_DBG("Found id=%.*s\n", id->len, id->s); return(0); } @@ -1022,11 +972,11 @@ int delete_temporary_dialog_puadb(ua_pres_t *pres ) if ( rval < 0 ) { - pua_trace( "delete_temporary_dialog_puad", "NOT FOUND", pres ); + LM_DBG("No temporary dialog found and deleted\n"); } else { - pua_trace( "delete_temporary_dialog_puad", "DONE", pres ); + LM_DBG("Temporary dialog found and deleted\n"); } return(rval); @@ -1133,11 +1083,11 @@ int delete_puadb(ua_pres_t *pres ) if ( rval < 0 ) { - pua_trace( "delete_puad", "NOT FOUND", pres ); + LM_DBG("No dialog found and deleted\n"); } else { - pua_trace( "delete_puad", "DONE", pres ); + LM_DBG("Dialog found and deleted\n"); } return(rval); @@ -1228,11 +1178,10 @@ int update_contact_puadb(ua_pres_t *pres, str *contact) if(pua_dbf.update(pua_db, q_cols, q_ops, q_vals, db_cols,db_vals,n_query_cols,n_update_cols) < 0) { - pua_trace( "update_contact_puad", "FAILED", pres ); + LM_ERR("DB update failed\n"); return(-1); } - pua_trace( "update_contact_puad", "DONE", pres ); return(0); } @@ -1274,10 +1223,6 @@ int update_version_puadb(ua_pres_t *pres, int version ) q_ops[watcher_col] = OP_EQ; n_query_cols++; } - else - { - LM_ERR( "update_version_puadb has NULL watcher_uri\n" ); - } q_cols[callid_col= n_query_cols] = &str_call_id_col; q_vals[callid_col].type = DB1_STR; @@ -1307,6 +1252,7 @@ int update_version_puadb(ua_pres_t *pres, int version ) /* we overwrite contact even if not changed */ db_cols[n_update_cols] = &str_version_col; db_vals[n_update_cols].type = DB1_INT; + db_vals[n_update_cols].nul = 0; db_vals[n_update_cols].val.int_val = version; n_update_cols++; @@ -1321,11 +1267,10 @@ int update_version_puadb(ua_pres_t *pres, int version ) db_cols,db_vals,n_query_cols,n_update_cols) < 0) { - pua_trace( "update_version_puad", "FAILED", pres ); + LM_ERR("DB update failed\n"); return(-1); } - pua_trace( "update_version_puad", "DONE", pres ); return(0); } @@ -1475,13 +1420,8 @@ void update_puadb(ua_pres_t* pres, time_t desired_expires, if(pua_dbf.update(pua_db, q_cols, q_ops, q_vals, db_cols,db_vals,n_query_cols,n_update_cols) < 0) { - pua_trace( "update_puad", "FAILED", pres ); + LM_ERR("DB update failed\n"); } - else - { - pua_trace( "update_puad", "DONE", pres ); - } - } /******************************************************************************/ @@ -1561,16 +1501,23 @@ void insert_puadb(ua_pres_t* pres) n_cols++; /* subscribe */ + db_cols[n_cols] = &str_watcher_uri_col; + db_vals[n_cols].type = DB1_STR; + db_vals[n_cols].nul = 0; + if (pres->watcher_uri) { - db_cols[n_cols] = &str_watcher_uri_col; - db_vals[n_cols].type = DB1_STR; - db_vals[n_cols].nul = 0; db_vals[n_cols].val.str_val.s = pres->watcher_uri->s; db_vals[n_cols].val.str_val.len = pres->watcher_uri->len; - n_cols++; + } + else + { + db_vals[n_cols].val.str_val.s = ""; + db_vals[n_cols].val.str_val.len = 0; } + n_cols++; + db_cols[n_cols] = &str_call_id_col; db_vals[n_cols].type = DB1_STR; db_vals[n_cols].nul = 0; @@ -1653,13 +1600,8 @@ void insert_puadb(ua_pres_t* pres) if(pua_dbf.insert(pua_db, db_cols, db_vals, n_cols) < 0) { - pua_trace( "insert_puad", "FAILED", pres ); + LM_ERR("DB insert failed\n"); } - else - { - pua_trace( "insert_puad", "DONE", pres ); - } - } /******************************************************************************/ diff --git a/modules_k/rls/rls_db.c b/modules_k/rls/rls_db.c index 8adca7b..1d63d17 100644 --- a/modules_k/rls/rls_db.c +++ b/modules_k/rls/rls_db.c @@ -675,6 +675,7 @@ int update_subs_rlsdb( subs_t *subs ) if ( r_remote_cseq >= subs->remote_cseq) { LM_DBG("stored cseq= %d\n", r_remote_cseq); + rls2_dbf.free_result(rls2_db, result); return(401); /*stale cseq code */ }

13 years

git:master: modules_k/rr: Added new (C-API) function to add Record-Route based on advertised address

by Peter Dunkley

Module: sip-router Branch: master Commit: 5bdef817bdc2e3fcf4e68bf25bf1a97683f2269f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5bdef81… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Sun Nov 20 22:09:57 2011 +0000 modules_k/rr: Added new (C-API) function to add Record-Route based on advertised address - You can already do something similar with record_route_preset, but that function has some disadvantages. Double record-routing doesn't work and you can't subsequently add parameters to the Record-Route header. This new function doesn't have these disadvantages. - Currently this is not exported to the configuration file. This may be worth doing in the future. - Feature added by Hugh Waite @ Crocodile RCS --- modules_k/rr/README | 88 +++++++++++++++----- modules_k/rr/api.c | 1 + modules_k/rr/api.h | 1 + modules_k/rr/doc/rr_devel.xml | 62 ++++++++++++++ modules_k/rr/record.c | 182 +++++++++++++++++++++++++++++++++++++++++ modules_k/rr/record.h | 16 ++++ 6 files changed, 328 insertions(+), 22 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=5bd…

13 years

git:master: lib/binrpc, modules/mi_rpc: Added MI command to run RPC commands

by Peter Dunkley

Module: sip-router Branch: master Commit: 566347e893ac9c71942e2a5fe1d72e6426c58f0f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=566347e… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Sun Nov 20 21:48:43 2011 +0000 lib/binrpc, modules/mi_rpc: Added MI command to run RPC commands - Useful for things like running RPC commands from the Siremis MI command page - Feature added by Andrew Miller @ Crocodile RCS --- lib/binrpc/binrpc_api.c | 6 +- lib/binrpc/binrpc_api.h | 2 +- modules/mi_rpc/Makefile | 1 + modules/mi_rpc/README | 52 ++++++++++- modules/mi_rpc/doc/mi_rpc_admin.xml | 39 +++++++-- modules/mi_rpc/mi_rpc_mod.c | 170 ++++++++++++++++++++++++++++++++++- 6 files changed, 252 insertions(+), 18 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=566…

13 years

git:master: modules_k/msilo: Fixed a bad memcpy used for the storage of extra headers in MSilo

by Peter Dunkley

Module: sip-router Branch: master Commit: a5c30f50d0db9b57954bd74643c6b130f10e233c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a5c30f5… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Sun Nov 20 21:43:58 2011 +0000 modules_k/msilo: Fixed a bad memcpy used for the storage of extra headers in MSilo - Problem found and fixed by Hugh Waite @ Crocodile RCS --- modules_k/msilo/msilo.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules_k/msilo/msilo.c b/modules_k/msilo/msilo.c index 5be2f70..cb23b2b 100644 --- a/modules_k/msilo/msilo.c +++ b/modules_k/msilo/msilo.c @@ -1066,7 +1066,7 @@ static int m_dump(struct sip_msg* msg, str* owner_s) } tmp_extra_hdrs.len = extra_hdrs_str.len+str_vals[4].len; - if ((tmp_extra_hdrs.s = pkg_malloc(tmp_extra_hdrs.len+1)) == NULL) + if ((tmp_extra_hdrs.s = pkg_malloc(tmp_extra_hdrs.len)) == NULL) { LM_ERR("Out of pkg memory"); if (msilo_dbf.free_result(db_con, db_res) < 0) @@ -1074,8 +1074,8 @@ static int m_dump(struct sip_msg* msg, str* owner_s) msg_list_set_flag(ml, mid, MS_MSG_ERRO); goto error; } - snprintf(tmp_extra_hdrs.s, tmp_extra_hdrs.len, "%.*s%.*s", extra_hdrs_str.len, extra_hdrs_str.s, - str_vals[4].len, str_vals[4].s); + memcpy(tmp_extra_hdrs.s, extra_hdrs_str.s, extra_hdrs_str.len); + memcpy(tmp_extra_hdrs.s+extra_hdrs_str.len, str_vals[4].s, str_vals[4].len); hdr_str.len = 1024; if(m_build_headers(&hdr_str, str_vals[3] /*ctype*/,

13 years

git:master: modules_k/presence_xml: Fixed segmentation fault in pres_check_activities()

by Peter Dunkley

Module: sip-router Branch: master Commit: f042a01c0af018bbfa3a53d132cb66c10f89a69a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f042a01… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Sun Nov 20 21:42:14 2011 +0000 modules_k/presence_xml: Fixed segmentation fault in pres_check_activities() --- modules_k/presence_xml/pres_check.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules_k/presence_xml/pres_check.c b/modules_k/presence_xml/pres_check.c index a43ad4b..eecb1c4 100644 --- a/modules_k/presence_xml/pres_check.c +++ b/modules_k/presence_xml/pres_check.c @@ -167,7 +167,9 @@ int presxml_check_activities(struct sip_msg *msg, str presentity_uri, str activi { retval = -2; } + break; } + if (activitiesNode->children == NULL) { LM_DBG("activities node has no children\n"); @@ -175,6 +177,7 @@ int presxml_check_activities(struct sip_msg *msg, str presentity_uri, str activi { retval = -2; } + break; } if ((activityNode = xmlNodeGetNodeByName(activitiesNode, nodeName, NULL)) != NULL)

13 years

git:master: modules_k/dispatcher: Added outbound_proxy modparam for use with dispatcher pings

by Peter Dunkley

Module: sip-router Branch: master Commit: a201a33815edc968d48b9307282e9a5507664ee6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a201a33… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Sun Nov 20 21:04:52 2011 +0000 modules_k/dispatcher: Added outbound_proxy modparam for use with dispatcher pings - When set the dispatcher pings are routed through an outbound proxy. - This modparam has no effect on real traffic. --- modules_k/dispatcher/README | 281 +++++++++++++------------ modules_k/dispatcher/dispatch.c | 2 +- modules_k/dispatcher/dispatch.h | 1 + modules_k/dispatcher/dispatcher.c | 4 + modules_k/dispatcher/doc/dispatcher_admin.xml | 19 ++ 5 files changed, 173 insertions(+), 134 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=a20…

13 years

[tracker] Comment added: Double Free -- Crash/Coredump and possible security vulnerability

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#173 - Double Free -- Crash/Coredump and possible security vulnerability User who did this - Timo Reimann (tr) ---------- Brandon, I took a closer look at the information you gave: The problem seems to be related to reference counting (again). I can see that the reference counter is decremented one time too often after the BYE message is received. In your scenario, things look like this: Nov 17 09:40:04 kamailio /usr/local/sbin/kamailio[21598]: INFO: dialog [dlg_handlers.c:1132]: BYE successfully processed Nov 17 09:40:04 kamailio /usr/local/sbin/kamailio[21598]: INFO: dialog [dlg_hash.c:597]: unref dlg 0x7f12fbd186c8 with 2 -> 2 Nov 17 09:40:04 kamailio /usr/local/sbin/kamailio[21598]: INFO: dialog [dlg_hash.c:579]: ref dlg 0x7f12fbd186c8 with 1 -> 3 Nov 17 09:40:04 kamailio /usr/local/sbin/kamailio[21598]: INFO: dialog [dlg_hash.c:597]: unref dlg 0x7f12fbd186c8 with 2 -> 1 In a reference call I did on my machine, you can see that the last unref operation is one less: 0(43729) NOTICE: dialog [dlg_handlers.c:1132]: BYE successfully processed 0(43729) NOTICE: dialog [dlg_hash.c:597]: unref dlg 0x101bb2080 with 2 -> 2 0(43729) NOTICE: dialog [dlg_hash.c:579]: ref dlg 0x101bb2080 with 1 -> 3 0(43729) NOTICE: dialog [dlg_hash.c:597]: unref dlg 0x101bb2080 with 1 -> 2 This leads to the situation where the dialog is erroneously removed prematurely. When the "canonical" dialog termination occurs later, removal is conducted for a second time, leading to a double free. So the question is: What is happening in your scenario? Are you using any dialog module-related functions or touch the dialog in any way within the configuration script during processing of the BYE request? If so, which one(s)? Also, could you please post your dialog modparams? I assume you're using a latest build of 3.2 (that is, not the official release but a recent compiled build from the 3.2 branch). Is that correct? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=173#comment368 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

13 years

[tracker] Comment added: Double Free -- Crash/Coredump and possible security vulnerability

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#173 - Double Free -- Crash/Coredump and possible security vulnerability User who did this - Brandon Armstead (CRYY2010) ---------- version: kamailio 3.1.5 (x86_64/linux) 2bb8bb-dirty flags: STATS: Off, USE_IPV6, USE_TCP, USE_TLS, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, DBG_QM_MALLOC, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, PKG_SIZE 16MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 2bb8bb -dirty compiled on 18:55:59 Nov 19 2011 with gcc 4.3.2 **** This crash was produced on the above build **** Also the syslog output I provided is with LM_DBG -> LM_INFO (LM_INFO SYSLOG) Let me know if I can provide any additional information, thanks! ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=173#comment367 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

13 years

[tracker] Comment added: Double Free -- Crash/Coredump and possible security vulnerability

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#173 - Double Free -- Crash/Coredump and possible security vulnerability User who did this - Brandon Armstead (CRYY2010) ---------- **** SEPARATE CRASH **** (full backtrace) #0 0x00007f1eb16fbed5 in raise () from /lib/libc.so.6 #1 0x00007f1eb16fd3f3 in abort () from /lib/libc.so.6 #2 0x0000000000528739 in qm_free (qm=0x7f1e9a864000, p=0x7f1e9c2b28a0, file=0x7f1eaf8c26bb "dialog: dlg_hash.c", func=0x7f1eaf8c3022 "destroy_dlg", line=215) at mem/q_malloc.c:447 #3 0x00007f1eaf8aa224 in destroy_dlg (dlg=0x7f1e9cae87f8) at dlg_hash.c:215 #4 0x00007f1eaf8ac69b in unref_dlg (dlg=0x7f1e9cae87f8, cnt=518) at dlg_hash.c:584 #5 0x00007f1eaf8b1a94 in profile_cleanup (msg=<value optimized out>, flags=<value optimized out>, param=0x6) at dlg_profile.c:317 #6 0x00000000004bca91 in exec_post_script_cb (msg=0xaa93c8, type=<value optimized out>) at script_cb.c:195 #7 0x0000000000495a4d in receive_msg ( buf=0x8a4300 "ACK sip:URI@IP:5060;user=phone;transport=udp SIP/2.0\r\nRecord-Route: <sip:PROXY:5078;lr=on;ftag=7a0b74aea87281deo0>\r\nVia: SIP/2.0/UDP PROXY:5078;branch=z9hG4bK-4ab37cdb"..., len=<value optimized out>, rcv_info=0x7fffba04e9a0) at receive.c:221 #8 0x000000000051ca91 in udp_rcv_loop () at udp_server.c:532 #9 0x0000000000464bf5 in main_loop () at main.c:1560 #10 0x0000000000468063 in main (argc=<value optimized out>, argv=0x7fffba04ec68) at main.c:2410 #0 0x00007f1eb16fbed5 in raise () from /lib/libc.so.6 No symbol table info available. #1 0x00007f1eb16fd3f3 in abort () from /lib/libc.so.6 No symbol table info available. #2 0x0000000000528739 in qm_free (qm=0x7f1e9a864000, p=0x7f1e9c2b28a0, file=0x7f1eaf8c26bb "dialog: dlg_hash.c", func=0x7f1eaf8c3022 "destroy_dlg", line=215) at mem/q_malloc.c:447 f = <value optimized out> size = <value optimized out> #3 0x00007f1eaf8aa224 in destroy_dlg (dlg=0x7f1e9cae87f8) at dlg_hash.c:215 ret = <value optimized out> __FUNCTION__ = "destroy_dlg" #4 0x00007f1eaf8ac69b in unref_dlg (dlg=0x7f1e9cae87f8, cnt=518) at dlg_hash.c:584 d_entry = <value optimized out> #5 0x00007f1eaf8b1a94 in profile_cleanup (msg=<value optimized out>, flags=<value optimized out>, param=0x6) at dlg_profile.c:317 No locals. #6 0x00000000004bca91 in exec_post_script_cb (msg=0xaa93c8, type=<value optimized out>) at script_cb.c:195 cb = (struct script_cb *) 0xe0e410 flags = 2147483649 #7 0x0000000000495a4d in receive_msg ( buf=0x8a4300 "ACK sip:URI@IP:5060;user=phone;transport=udp SIP/2.0\r\nRecord-Route: <sip:PROXY:5078;lr=on;ftag=7a0b74aea87281deo0>\r\nVia: SIP/2.0/UDP PROXY:5078;branch=z9hG4bK-4ab37cdb"..., len=<value optimized out>, rcv_info=0x7fffba04e9a0) at receive.c:221 msg = (struct sip_msg *) 0xaa93c8 ctx = {rec_lev = 6, run_flags = 0, last_retcode = 0, jmp_env = {{__jmpbuf = {9420032, 5082739, 140736314272479, 0, 139769802477104, 139769812373504, 6, 4294967295}, __mask_was_saved = 9420904, __saved_mask = {__val = {8357392, 140736314272168, 14652072, 4294967245, 139769812371096, 0, 139769810264522, 1, 0, 139771120713727, 4250091, 139769802477104, 14728624, 14652064, 139769810288658, 16}}}}} ret = <value optimized out> inb = { s = 0x8a4300 "ACK sip:URI@IP:5060;user=phone;transport=udp SIP/2.0\r\nRecord-Route: <sip:PROXY:5078;lr=on;ftag=7a0b74aea87281deo0>\r\nVia: SIP/2.0/UDP PROXY:5078;branch=z9hG4bK-4ab37cdb"..., len = 729} __FUNCTION__ = "receive_msg" #8 0x000000000051ca91 in udp_rcv_loop () at udp_server.c:532 len = 729 from = (union sockaddr_union *) 0xdf92a0 fromlen = 16 ri = {src_ip = {af = 2, len = 4, u = {addrl = {2083402568, 6}, addr32 = {2083402568, 0, 6, 0}, addr16 = {13128, 31790, 0, 0, 6, 0, 0, 0}, addr = "H3.|\000\000\000\000\006\000\000\000\000\000\000"}}, dst_ip = {af = 2, len = 4, u = {addrl = {162653251, 0}, addr32 = {162653251, 0, 0, 0}, addr16 = {58435, 2481, 0, 0, 0, 0, 0, 0}, addr = "Cä±\t", '\0' <repeats 11 times>}}, src_port = 5078, dst_port = 5060, proto_reserved1 = 0, proto_reserved2 = 0, src_su = {s = {sa_family = 2, sa_data = "\023ÖH3.|\000\000\000\000\000\000\000"}, sin = {sin_family = 2, sin_port = 54803, sin_addr = {s_addr = 2083402568}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 2, sin6_port = 54803, sin6_flowinfo = 2083402568, sin6_addr = {in6_u = {u6_addr8 = '\0' <repeats 15 times>, u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}}, bind_address = 0xe0bdb0, proto = 1 '\001'} buf = "ACK sip:URI@IP:5060;user=phone;transport=udp SIP/2.0\r\nRecord-Route: <sip:PROXY:5078;lr=on;ftag=7a0b74aea87281deo0>\r\nVia: SIP/2.0/UDP PROXY:5078;branch=z9hG4bK-4ab37cdb"... __FUNCTION__ = "udp_rcv_loop" #9 0x0000000000464bf5 in main_loop () at main.c:1560 i = 5 pid = <value optimized out> si = (struct socket_info *) 0xe0bdb0 si_desc = "udp receiver child=5 sock=67.228.177.9:5060\000\000\000\000\000°·à\000\000\000\000\000\001\000\000\000\036\177", '\0' <repeats 18 times>, "t\000\000\000\000\000\000\000\030\225\211\232\001\000\000\000\001\000\000\000\000\000\000\000\003", '\0' <repeats 22 times> #10 0x0000000000468063 in main (argc=<value optimized out>, argv=0x7fffba04ec68) at main.c:2410 cfg_stream = (FILE *) 0x1a00010 c = <value optimized out> r = <value optimized out> tmp = 0x7fffba050e5f "" Quit ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=173#comment366 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

13 years

← Newer
1
...
15
16
17
18
19
20
21
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2011