sr-dev February 2012

sr-dev@lists.kamailio.org

24 participants
116 discussions

git:master: dialog: execut event routes on start and end of dialog

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: a46f2ee6ca5710737f208369c9178f2681301d25 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a46f2ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Feb 16 10:49:06 2012 +0100 dialog: execut event routes on start and end of dialog - event_route[dialog:start] - when 200ok for INVITE is processed - event_route[dialog:end] - when BYE is processed or dialog timed out --- modules_k/dialog/dialog.c | 4 +++ modules_k/dialog/dlg_handlers.c | 48 +++++++++++++++++++++++++++++++++++++++ modules_k/dialog/dlg_hash.h | 3 ++ 3 files changed, 55 insertions(+), 0 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index d48773f..0ce7464 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -106,6 +106,8 @@ str dlg_extra_hdrs = {NULL,0}; static int db_fetch_rows = 200; int initial_cbs_inscript = 1; +int dlg_event_rt[DLG_EVENTRT_MAX]; + str dlg_bridge_controller = {"sip:controller@kamailio.org", 27}; str ruri_pvar_param = {"$ru", 3}; @@ -410,6 +412,8 @@ static int mod_init(void) { unsigned int n; + dlg_event_rt[DLG_EVENTRT_START] = route_lookup(&event_rt, "dialog:start"); + dlg_event_rt[DLG_EVENTRT_END] = route_lookup(&event_rt, "dialog:end"); #ifdef STATISTICS /* register statistics */ diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index 5a3717b..f000a1e 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -84,6 +84,7 @@ static int shutdown_done = 0; /*!< 1 when destroy_dlg_handlers was called extern int detect_spirals; extern int initial_cbs_inscript; extern int dlg_send_bye; +extern int dlg_event_rt[DLG_EVENTRT_MAX]; int spiral_detected = -1; extern struct rr_binds d_rrb; /*!< binding to record-routing module */ @@ -106,6 +107,8 @@ static unsigned int CURR_DLG_ID = 0xffffffff; /*!< current dialog id */ /*! separator inside the record-route paramter */ #define DLG_SEPARATOR '.' +void dlg_run_event_route(dlg_cell_t *dlg, sip_msg_t *msg, int ostate, int nstate); + int dlg_set_tm_callbacks(tm_cell_t *t, sip_msg_t *req, dlg_cell_t *dlg, int mode); @@ -441,6 +444,7 @@ static void dlg_onreply(struct cell* t, int type, struct tmcb_params *param) event = DLG_EVENT_RPL3xx; next_state_dlg( dlg, event, &old_state, &new_state, &unref); + dlg_run_event_route(dlg, (rpl==FAKED_REPLY)?NULL:rpl, old_state, new_state); if (new_state==DLG_STATE_EARLY) { run_dlg_callbacks(DLGCB_EARLY, dlg, req, rpl, DLG_DIR_UPSTREAM, 0); @@ -1120,6 +1124,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) } next_state_dlg( dlg, event, &old_state, &new_state, &unref); + dlg_run_event_route(dlg, req, old_state, new_state); CURR_DLG_ID = req->id; CURR_DLG_LIFETIME = (unsigned int)(time(0))-dlg->start_ts; @@ -1274,6 +1279,7 @@ void dlg_ontimeout(struct dlg_tl *tl) } next_state_dlg( dlg, DLG_EVENT_REQBYE, &old_state, &new_state, &unref); + dlg_run_event_route(dlg, NULL, old_state, new_state); if (new_state==DLG_STATE_DELETED && old_state!=DLG_STATE_DELETED) { LM_WARN("timeout for dlg with CallID '%.*s' and tags '%.*s' '%.*s'\n", @@ -1354,3 +1360,45 @@ int pv_get_dlg_status(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) return 0; } + +/*! + * \brief Execute event routes based on new state + * + */ +void dlg_run_event_route(dlg_cell_t *dlg, sip_msg_t *msg, int ostate, int nstate) +{ + sip_msg_t *fmsg; + int rt; + + if(dlg==NULL) + return; + if(ostate==nstate) + return; + + rt = -1; + if(nstate==DLG_STATE_CONFIRMED_NA) { + rt = dlg_event_rt[DLG_EVENTRT_START]; + } else if(nstate==DLG_STATE_DELETED) { + if(ostate==DLG_STATE_CONFIRMED || DLG_STATE_CONFIRMED_NA) + rt = dlg_event_rt[DLG_EVENTRT_END]; + } + + if(rt==-1 || event_rt.rlist[rt]==NULL) + + if(msg==NULL) + fmsg = faked_msg_next(); + else + fmsg = msg; + + if (exec_pre_script_cb(fmsg, REQUEST_CB_TYPE)>0) + { + dlg_ref(dlg, 1); + dlg_set_ctx_iuid(dlg); + LM_DBG("executing event_route %d on state %d\n", rt, nstate); + set_route_type(REQUEST_ROUTE); + run_top_route(event_rt.rlist[rt], fmsg, 0); + dlg_reset_ctx_iuid(); + exec_post_script_cb(fmsg, REQUEST_CB_TYPE); + dlg_unref(dlg, 1); + } +} diff --git a/modules_k/dialog/dlg_hash.h b/modules_k/dialog/dlg_hash.h index 06fbd75..dae6e02 100644 --- a/modules_k/dialog/dlg_hash.h +++ b/modules_k/dialog/dlg_hash.h @@ -88,6 +88,9 @@ #define DLG_DIR_DOWNSTREAM 1 /*!< dialog has downstream direction */ #define DLG_DIR_UPSTREAM 2 /*!< dialog has upstream direction */ +#define DLG_EVENTRT_START 0 +#define DLG_EVENTRT_END 1 +#define DLG_EVENTRT_MAX 2 /*! internal unique ide per dialog */ typedef struct dlg_iuid {

12 years, 2 months

git:master: dialog: lookup dialog by (entry, label) if available for $dlg()

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: b49134a38c9aacd5416b219c377df7c03776fd1d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b49134a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Feb 15 23:44:42 2012 +0100 dialog: lookup dialog by (entry, label) if available for $dlg() - useful for timeout route where there is no SIP message passing through for the dialog --- modules_k/dialog/dlg_var.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modules_k/dialog/dlg_var.c b/modules_k/dialog/dlg_var.c index 31afc10..d7645b8 100644 --- a/modules_k/dialog/dlg_var.c +++ b/modules_k/dialog/dlg_var.c @@ -520,8 +520,14 @@ int pv_get_dlg(struct sip_msg *msg, pv_param_t *param, if(param==NULL) return -1; - /* Retrieve the dialog for current message */ - dlg=dlg_get_msg_dialog( msg); + if(_dlg_ctx.iuid.h_id==0) + { + /* Retrieve the dialog for current message */ + dlg=dlg_get_msg_dialog(msg); + } else { + /* Retrieve the dialog for current context */ + dlg=dlg_get_by_iuid(&_dlg_ctx.iuid); + } if(dlg == NULL) return pv_get_null(msg, param, res);

12 years, 2 months

git:master: dialog: documented send_bye parameter

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: b38a0047adeadbb770d31dadbf79feff72b875b7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b38a004… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Feb 15 22:59:19 2012 +0100 dialog: documented send_bye parameter --- modules_k/dialog/README | 270 +++++++++++++++++--------------- modules_k/dialog/doc/dialog_admin.xml | 26 +++- 2 files changed, 167 insertions(+), 129 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=b38…

12 years, 2 months

git:master: dialog(k): new parameter send_bye

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 84d38ce708a0c19344ddca8eec9241207494db37 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=84d38ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Feb 15 22:52:05 2012 +0100 dialog(k): new parameter send_bye - will mark all dialogs for sending bye on timeout, alternative to $dlg_ctx(...) which can still be used on a per-dialog basis --- modules_k/dialog/dialog.c | 2 ++ modules_k/dialog/dlg_handlers.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index 25afaa5..d48773f 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -116,6 +116,7 @@ int dlg_enable_stats = 1; int active_dlgs_cnt = 0; int early_dlgs_cnt = 0; int detect_spirals = 1; +int dlg_send_bye = 0; stat_var *active_dlgs = 0; stat_var *processed_dlgs = 0; stat_var *expired_dlgs = 0; @@ -243,6 +244,7 @@ static param_export_t mod_params[]={ { "bridge_controller", STR_PARAM, &dlg_bridge_controller.s }, { "ruri_pvar", STR_PARAM, &ruri_pvar_param.s }, { "initial_cbs_inscript", INT_PARAM, &initial_cbs_inscript }, + { "send_bye", INT_PARAM, &dlg_send_bye }, { 0,0,0 } }; diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index 2a06e34..5a3717b 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -83,6 +83,7 @@ static int seq_match_mode; /*!< dlg_match mode */ static int shutdown_done = 0; /*!< 1 when destroy_dlg_handlers was called */ extern int detect_spirals; extern int initial_cbs_inscript; +extern int dlg_send_bye; int spiral_detected = -1; extern struct rr_binds d_rrb; /*!< binding to record-routing module */ @@ -819,7 +820,7 @@ int dlg_new_dialog(struct sip_msg *req, struct cell *t, const int run_initial_cb dlg_set_toroute(dlg, &s); dlg->sflags |= _dlg_ctx.flags; - if (_dlg_ctx.to_bye!=0) + if (dlg_send_bye!=0 || _dlg_ctx.to_bye!=0) dlg->dflags |= DLG_FLAG_TOBYE; if (run_initial_cbs) run_create_callbacks( dlg, req);

12 years, 2 months

git:master: pkg/gentoo: Added ebuild v3.2.2

by Claudio Furrer

Module: sip-router Branch: master Commit: 6c0fe978f479f633599bfe6e6c06ade171581b3b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6c0fe97… Author: Claudio Furrer <elcaio(a)gmail.com> Committer: Claudio Furrer <elcaio(a)gmail.com> Date: Wed Feb 15 15:21:47 2012 -0300 pkg/gentoo: Added ebuild v3.2.2 --- pkg/ser/gentoo/ChangeLog | 17 ++- pkg/ser/gentoo/Manifest | 8 +- pkg/ser/gentoo/files/ser.confd | 2 +- pkg/ser/gentoo/files/ser.initd | 2 +- pkg/ser/gentoo/sip-router-3.2.2.ebuild | 251 ++++++++++++++++++++++++++++++++ 5 files changed, 270 insertions(+), 10 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=6c0…

12 years, 2 months

git:master: modules_k/rls FIX call child_init also for main process

by Anca Vamanu

Module: sip-router Branch: master Commit: 5cb9b9bddb265376ef31f69e45cf1633ab465827 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5cb9b9b… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Wed Feb 15 13:59:19 2012 +0200 modules_k/rls FIX call child_init also for main process - call child_init also for main process, it has to be able to do the flush to DB at shutdown - updated to the last changes in the presence interface --- modules_k/rls/rls.c | 38 +++++++++++++++++++------------------- modules_k/rls/rls_db.c | 4 ++-- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/modules_k/rls/rls.c b/modules_k/rls/rls.c index d623ade..7b827cb 100644 --- a/modules_k/rls/rls.c +++ b/modules_k/rls/rls.c @@ -115,7 +115,7 @@ extern subs_t* rls_search_shtable(shtable_t htable,str callid,str to_tag, extern int rls_delete_shtable(shtable_t htable,unsigned int hash_code,str to_tag); extern int rls_update_shtable(shtable_t htable,unsigned int hash_code, subs_t* subs, int type); -extern void rls_update_db_subs(db1_con_t *db,db_func_t dbf, shtable_t hash_table, +extern void rls_update_db_subs_timer(db1_con_t *db,db_func_t dbf, shtable_t hash_table, int htable_size, int no_lock, handle_expired_func_t handle_expired_func); new_shtable_t pres_new_shtable; @@ -125,7 +125,7 @@ update_shtable_t pres_update_shtable; delete_shtable_t pres_delete_shtable; destroy_shtable_t pres_destroy_shtable; mem_copy_subs_t pres_copy_subs; -update_db_subs_t pres_update_db_subs; +update_db_subs_t pres_update_db_subs_timer; extract_sdialog_info_t pres_extract_sdialog_info; int rls_events= EVENT_PRESENCE; int to_presence_code = 1; @@ -358,23 +358,23 @@ static int mod_init(void) if (dbmode == RLS_DB_ONLY) { - pres_new_shtable = rls_new_shtable; - pres_destroy_shtable= rls_destroy_shtable; - pres_insert_shtable = rls_insert_shtable; - pres_delete_shtable = rls_delete_shtable; - pres_update_shtable = rls_update_shtable; - pres_search_shtable = rls_search_shtable; - pres_update_db_subs = rls_update_db_subs; + pres_new_shtable = rls_new_shtable; + pres_destroy_shtable = rls_destroy_shtable; + pres_insert_shtable = rls_insert_shtable; + pres_delete_shtable = rls_delete_shtable; + pres_update_shtable = rls_update_shtable; + pres_search_shtable = rls_search_shtable; + pres_update_db_subs_timer = rls_update_db_subs_timer; } else { - pres_new_shtable = pres.new_shtable; - pres_destroy_shtable= pres.destroy_shtable; - pres_insert_shtable = pres.insert_shtable; - pres_delete_shtable = pres.delete_shtable; - pres_update_shtable = pres.update_shtable; - pres_search_shtable = pres.search_shtable; - pres_update_db_subs = pres.update_db_subs; + pres_new_shtable = pres.new_shtable; + pres_destroy_shtable = pres.destroy_shtable; + pres_insert_shtable = pres.insert_shtable; + pres_delete_shtable = pres.delete_shtable; + pres_update_shtable = pres.update_shtable; + pres_search_shtable = pres.search_shtable; + pres_update_db_subs_timer = pres.update_db_subs_timer; } pres_copy_subs = pres.mem_copy_subs; @@ -635,8 +635,8 @@ static int mod_init(void) */ static int child_init(int rank) { - if (rank==PROC_INIT || rank==PROC_MAIN || rank==PROC_TCP_MAIN) - return 0; /* do nothing for the main process */ + if (rank==PROC_INIT || rank==PROC_TCP_MAIN) + return 0; /* don't call child_init for main process more than once */ LM_DBG("child [%d] pid [%d]\n", rank, getpid()); @@ -771,7 +771,7 @@ void rlsubs_table_update(unsigned int ticks,void *param) LM_ERR("sql use table failed\n"); return; } - pres_update_db_subs(rls_db, rls_dbf, rls_table, hash_size, + pres_update_db_subs_timer(rls_db, rls_dbf, rls_table, hash_size, no_lock, handle_expired_record); } diff --git a/modules_k/rls/rls_db.c b/modules_k/rls/rls_db.c index ad2b686..ee357d7 100644 --- a/modules_k/rls/rls_db.c +++ b/modules_k/rls/rls_db.c @@ -103,10 +103,10 @@ int rls_update_shtable(shtable_t htable,unsigned int hash_code, /******************************************************************************/ -void rls_update_db_subs(db1_con_t *db,db_func_t dbf, shtable_t hash_table, +void rls_update_db_subs_timer(db1_con_t *db,db_func_t dbf, shtable_t hash_table, int htable_size, int no_lock, handle_expired_func_t handle_expired_func) { - LM_ERR( "rls_update_db_subs shouldn't be called in RLS_DB_ONLY mode\n" ); + LM_ERR( "rls_update_db_subs_timer shouldn't be called in RLS_DB_ONLY mode\n" ); } /******************************************************************************/

12 years, 2 months

git:master: modules_k/presence_xml If force_active set, db_url not compulsory

by Anca Vamanu

Module: sip-router Branch: master Commit: 0b6cb25b30ae563986830e46d4fd889c10084272 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0b6cb25… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Wed Feb 15 13:56:49 2012 +0200 modules_k/presence_xml If force_active set, db_url not compulsory --- modules_k/presence_xml/presence_xml.c | 165 ++++++++++++++++----------------- 1 files changed, 82 insertions(+), 83 deletions(-) diff --git a/modules_k/presence_xml/presence_xml.c b/modules_k/presence_xml/presence_xml.c index 5b9f9c0..cebd2d0 100644 --- a/modules_k/presence_xml/presence_xml.c +++ b/modules_k/presence_xml/presence_xml.c @@ -174,30 +174,7 @@ static int mod_init(void) LM_DBG("db_url=%s/%d/%p\n",ZSW(db_url.s),db_url.len, db_url.s); xcap_table.len = xcap_table.s ? strlen(xcap_table.s) : 0; - /* binding to mysql module */ - if (db_bind_mod(&db_url, &pxml_dbf)) - { - LM_ERR("Database module not found\n"); - return -1; - } - - if (!DB_CAPABILITY(pxml_dbf, DB_CAP_ALL)) { - LM_ERR("Database module does not implement all functions" - " needed by the module\n"); - return -1; - } - pxml_db = pxml_dbf.init(&db_url); - if (!pxml_db) - { - LM_ERR("while connecting to database\n"); - return -1; - } - - if(db_check_table_version(&pxml_dbf, pxml_db, &xcap_table, S_TABLE_VERSION) < 0) { - LM_ERR("error during table version check.\n"); - return -1; - } /* bind the SL API */ if (sl_load_api(&slb)!=0) { LM_ERR("cannot bind to SL API\n"); @@ -233,36 +210,63 @@ static int mod_init(void) return -1; } - if(force_active== 0 && !integrated_xcap_server ) + if(force_active== 0) { - xcap_api_t xcap_api; - bind_xcap_t bind_xcap; - - /* bind xcap */ - bind_xcap= (bind_xcap_t)find_export("bind_xcap", 1, 0); - if (!bind_xcap) + /* binding to mysql module */ + if (db_bind_mod(&db_url, &pxml_dbf)) { - LM_ERR("Can't bind xcap_client\n"); + LM_ERR("Database module not found\n"); return -1; } - - if (bind_xcap(&xcap_api) < 0) - { - LM_ERR("Can't bind xcap_api\n"); + + if (!DB_CAPABILITY(pxml_dbf, DB_CAP_ALL)) { + LM_ERR("Database module does not implement all functions" + " needed by the module\n"); return -1; } - xcap_GetNewDoc= xcap_api.getNewDoc; - if(xcap_GetNewDoc== NULL) + + pxml_db = pxml_dbf.init(&db_url); + if (!pxml_db) { - LM_ERR("can't import get_elem from xcap_client module\n"); + LM_ERR("while connecting to database\n"); return -1; } - - if(xcap_api.register_xcb(PRES_RULES, xcap_doc_updated)< 0) - { - LM_ERR("registering xcap callback function\n"); + + if(db_check_table_version(&pxml_dbf, pxml_db, &xcap_table, S_TABLE_VERSION) < 0) { + LM_ERR("error during table version check.\n"); return -1; } + if(!integrated_xcap_server ) + { + xcap_api_t xcap_api; + bind_xcap_t bind_xcap; + + /* bind xcap */ + bind_xcap= (bind_xcap_t)find_export("bind_xcap", 1, 0); + if (!bind_xcap) + { + LM_ERR("Can't bind xcap_client\n"); + return -1; + } + + if (bind_xcap(&xcap_api) < 0) + { + LM_ERR("Can't bind xcap_api\n"); + return -1; + } + xcap_GetNewDoc= xcap_api.getNewDoc; + if(xcap_GetNewDoc== NULL) + { + LM_ERR("can't import get_elem from xcap_client module\n"); + return -1; + } + + if(xcap_api.register_xcb(PRES_RULES, xcap_doc_updated)< 0) + { + LM_ERR("registering xcap callback function\n"); + return -1; + } + } } if(shm_copy_xcap_list()< 0) @@ -279,34 +283,31 @@ static int mod_init(void) } static int mi_child_init(void) -{ +{ if(passive_mode==1) return 0; - - if (pxml_dbf.init==0) - { - LM_CRIT("database not bound\n"); - return -1; - } - if(pxml_db) - return 0; - pxml_db = pxml_dbf.init(&db_url); - if (pxml_db== NULL) - { - LM_ERR("while connecting database\n"); - return -1; - } - - if (pxml_dbf.use_table(pxml_db, &xcap_table) < 0) + + if(force_active== 0) { - LM_ERR("in use_table SQL operation\n"); - return -1; + if(pxml_db) + return 0; + pxml_db = pxml_dbf.init(&db_url); + if (pxml_db== NULL) + { + LM_ERR("while connecting database\n"); + return -1; + } + if (pxml_dbf.use_table(pxml_db, &xcap_table) < 0) + { + LM_ERR("in use_table SQL operation\n"); + return -1; + } } - + LM_DBG("Database connection opened successfully\n"); return 0; -} +} static int child_init(int rank) { @@ -314,36 +315,34 @@ static int child_init(int rank) if(passive_mode==1) return 0; - + if (rank==PROC_INIT || rank==PROC_MAIN || rank==PROC_TCP_MAIN) return 0; /* do nothing for the main process */ - if (pxml_dbf.init==0) + if(force_active== 0) { - LM_CRIT("database not bound\n"); - return -1; - } - if(pxml_db) - return 0; - pxml_db = pxml_dbf.init(&db_url); - if (pxml_db== NULL) - { - LM_ERR("child %d: ERROR while connecting database\n",rank); - return -1; - } - if (pxml_dbf.use_table(pxml_db, &xcap_table) < 0) - { - LM_ERR("child %d: ERROR in use_table\n", rank); - return -1; + if(pxml_db) + return 0; + pxml_db = pxml_dbf.init(&db_url); + if (pxml_db== NULL) + { + LM_ERR("while connecting database\n"); + return -1; + } + if (pxml_dbf.use_table(pxml_db, &xcap_table) < 0) + { + LM_ERR("in use_table SQL operation\n"); + return -1; + } } - + LM_DBG("child %d: Database connection opened successfully\n",rank); return 0; -} +} static void destroy(void) -{ +{ LM_DBG("start\n"); if(pxml_db && pxml_dbf.close) pxml_dbf.close(pxml_db);

12 years, 2 months

London Meetup in March, at UC Expo

by Daniel-Constantin Mierla

Hello, it is very likely I will be in London and visit UC Expo show (http://www.ucexpo.co.uk/) at least the first day. Therefore I am thinking of organizing a Kamailio/SIP/VoIP social networking event (perhaps a dinner or pub meeting), on the evening of the 5th or 6th of March. Are people from community interested in joining such event? If yes, write me your preferred date -- based on feedback in the next days, it will be decided whether it is going to happen and when. Also, if many people would be interested in a project developments and updates session (like the one did in 2010: http://www.kamailio.org/w/present-and-future-of-sip-routing-2010-london/), I can try to get a location for 2-3 hours on the 5th of March for such meetup. Let me know as well your interest in such event. Cheers, Daniel -- Daniel-Constantin Mierla -- http://www.asipto.com http://linkedin.com/in/miconda -- http://twitter.com/miconda

12 years, 2 months

FreeBSD 9.0 amd64 Kamailio Compile Error

by Serhat AKCA

Hello I am using FreeBSD 9.0 amd64 bit. I downloaded kamailio and compiled over 10 times. It does not compile. Always it gives "/bin/ld: -ldl" error. How can i overcome this problem ? Serhat AKCA email : serhat_akca(a)hotmail.com Mobile : +90 532 616 49 92

12 years, 2 months

git:master: modules_k/pua: Clean-up and re-arrangement of send_subscribe.c

by Peter Dunkley

Module: sip-router Branch: master Commit: c666c738398bacb5f18c98a2f6e15279abfbb3ff URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c666c73… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Feb 10 16:42:17 2012 +0000 modules_k/pua: Clean-up and re-arrangement of send_subscribe.c - Bit of a tidy-up - Also fixed some cases where "temporary dialogs" could be left in hash-table or DB if a SUBSCRIBE timed-out or received an error response. - Other minor issues (found during presence/rls performance/load-testing) fixed too --- modules_k/pua/send_subscribe.c | 212 ++++++++++++++++++++++++++++------------ 1 files changed, 149 insertions(+), 63 deletions(-) diff --git a/modules_k/pua/send_subscribe.c b/modules_k/pua/send_subscribe.c index 31ebfac..15a1a02 100644 --- a/modules_k/pua/send_subscribe.c +++ b/modules_k/pua/send_subscribe.c @@ -225,6 +225,50 @@ static int pua_free_tm_dlg(dlg_t *td) return 0; } +static void find_and_delete_dialog(ua_pres_t *dialog, int hash_code) +{ + ua_pres_t *presentity; + ua_pres_t dbpres; + str pres_uri={0,0}, watcher_uri={0,0}, extra_headers={0,0}; + db1_res_t *res=NULL; + + memset(&dbpres, 0, sizeof(dbpres)); + dbpres.pres_uri = &pres_uri; + dbpres.watcher_uri = &watcher_uri; + dbpres.extra_headers = &extra_headers; + + if (dbmode==PUA_DB_ONLY) + { + presentity = get_dialog_puadb(dialog, &dbpres, &res); + } + else + { + lock_get(&HashT->p_records[hash_code].lock); + presentity= get_dialog(dialog, hash_code); + if (presentity == NULL) + presentity = get_temporary_dialog(dialog, hash_code); + } + + if(presentity== NULL) + { + LM_ERR("no record found\n"); + if (dbmode!=PUA_DB_ONLY) + lock_release(&HashT->p_records[hash_code].lock); + return; + } + + if (dbmode==PUA_DB_ONLY) + { + delete_puadb(presentity); + free_results_puadb(res); + } + else + { + delete_htable(presentity, hash_code); + lock_release(&HashT->p_records[hash_code].lock); + } +} + void subs_cback_func(struct cell *t, int cb_type, struct tmcb_params *ps) { struct sip_msg* msg= NULL; @@ -271,41 +315,44 @@ void subs_cback_func(struct cell *t, int cb_type, struct tmcb_params *ps) if(msg== FAKED_REPLY) { - /* delete record from hash_table and call registered functions */ + struct hdr_field *callid = NULL, *from = NULL; + struct to_body FROM = {0}; - if(hentity->call_id.s== NULL) /* if a new requets failed-> do nothing*/ + callid = (struct hdr_field *) pkg_malloc(sizeof(struct hdr_field)); + if (callid == NULL) { - LM_DBG("initial Subscribe request failed\n"); - goto done; + LM_ERR("Out of memory\n"); + goto faked_error; } + memset(callid, 0, sizeof(struct hdr_field)); + get_hdr_field(t->callid.s, t->callid.s + t->callid.len, callid); + hentity->call_id = callid->body; - if (dbmode==PUA_DB_ONLY) + from = (struct hdr_field *) pkg_malloc(sizeof(struct hdr_field)); + if (from == NULL) { - presentity = get_dialog_puadb(hentity, &dbpres, &res); - } - else - { - lock_get(&HashT->p_records[hash_code].lock); - presentity= get_dialog(hentity, hash_code); + LM_ERR("Out of memory\n"); + goto faked_error; } - - if(presentity== NULL) + memset(from, 0, sizeof(struct hdr_field)); + get_hdr_field(t->from.s, t->from.s + t->from.len, from); + parse_to(from->body.s, from->body.s + from->body.len + 1, &FROM); + if(FROM.uri.len <= 0) { - LM_ERR("no record found\n"); - if (dbmode!=PUA_DB_ONLY) - lock_release(&HashT->p_records[hash_code].lock); - goto done; - } - - if (dbmode==PUA_DB_ONLY) - { - delete_puadb(presentity); - } - else - { - delete_htable(presentity, hash_code); - lock_release(&HashT->p_records[hash_code].lock); + LM_ERR("'From' header NOT parsed\n"); + goto faked_error; } + + hentity->call_id = callid->body; + hentity->from_tag = (&FROM)->tag_value; + hentity->to_tag.s = NULL; + hentity->to_tag.len = 0; + + find_and_delete_dialog(hentity, hash_code); +faked_error: + if (callid) pkg_free(callid); + free_to_params(&FROM); + if (from) pkg_free(from); goto done; } @@ -320,17 +367,12 @@ void subs_cback_func(struct cell *t, int cb_type, struct tmcb_params *ps) if(hentity->call_id.s== NULL) { initial_request = 1; - if(ps->code>= 300) - { - LM_DBG("initial Subscribe request failed\n"); - goto done; - } if( msg->callid==NULL || msg->callid->body.s==NULL) { LM_ERR("cannot parse callid header\n"); goto done; - } + } if (!msg->from || !msg->from->body.s) { @@ -368,7 +410,7 @@ void subs_cback_func(struct cell *t, int cb_type, struct tmcb_params *ps) msg->to->body.len + 1, &TO); if(TO.uri.len <= 0) { - LM_DBG("'To' header NOT parsed\n"); + LM_ERR("'To' header NOT parsed\n"); goto done; } pto = &TO; @@ -381,6 +423,12 @@ void subs_cback_func(struct cell *t, int cb_type, struct tmcb_params *ps) hentity->call_id= msg->callid->body; hentity->to_tag= pto->tag_value; hentity->from_tag= pfrom->tag_value; + + if(ps->code >= 300) + { + find_and_delete_dialog(hentity, hash_code); + goto done; + } } /* extract the other necesary information for inserting a new record */ @@ -403,6 +451,8 @@ void subs_cback_func(struct cell *t, int cb_type, struct tmcb_params *ps) { lock_get(&HashT->p_records[hash_code].lock); presentity= get_dialog(hentity, hash_code); + if (presentity == NULL) + presentity = get_temporary_dialog(hentity, hash_code); } if(ps->code >= 300 ) @@ -424,6 +474,7 @@ void subs_cback_func(struct cell *t, int cb_type, struct tmcb_params *ps) lock_release(&HashT->p_records[hash_code].lock); } + /* Redirect if the response 3XX */ memset(&subs, 0, sizeof(subs_info_t)); subs.pres_uri= hentity->pres_uri; subs.watcher_uri= hentity->watcher_uri; @@ -439,7 +490,7 @@ void subs_cback_func(struct cell *t, int cb_type, struct tmcb_params *ps) subs.expires= 0; else subs.expires= hentity->desired_expires- (int)time(NULL)+ 3; - + subs.flag= INSERT_TYPE; subs.source_flag= flag; subs.event= hentity->event; @@ -456,7 +507,7 @@ void subs_cback_func(struct cell *t, int cb_type, struct tmcb_params *ps) } else { - LM_DBG("No dialog found\n"); + LM_ERR("No dialog found\n"); if (dbmode!=PUA_DB_ONLY) lock_release(&HashT->p_records[hash_code].lock); } @@ -489,53 +540,63 @@ void subs_cback_func(struct cell *t, int cb_type, struct tmcb_params *ps) } contact = ((contact_body_t* )msg->contact->parsed)->contacts->uri; - if(presentity) - { - if(lexpire== 0 ) + if(initial_request == 0) + { + if(presentity) { - LM_DBG("lexpire= 0 Delete from hash table"); + if(lexpire== 0 ) + { + LM_DBG("lexpire= 0 Delete from hash table"); + if (dbmode==PUA_DB_ONLY) + { + delete_puadb(presentity); + } + else + { + delete_htable(presentity, hash_code); + lock_release(&HashT->p_records[hash_code].lock); + } + goto done; + } + LM_DBG("*** Update expires\n"); if (dbmode==PUA_DB_ONLY) { - delete_puadb(presentity); + update_puadb( presentity, hentity->desired_expires, lexpire, NULL, &contact ); } else { - delete_htable(presentity, hash_code); + update_htable(presentity, hentity->desired_expires, lexpire, NULL, + hash_code, &contact); lock_release(&HashT->p_records[hash_code].lock); } goto done; } - LM_DBG("*** Update expires\n"); + + LM_ERR("Not initial request and no record found\n"); + if (dbmode!=PUA_DB_ONLY) + lock_release(&HashT->p_records[hash_code].lock); + goto error; + } + + /* if a new dialog -> insert */ + if(lexpire== 0) + { + LM_WARN("expires= 0: no not insert\n"); if (dbmode==PUA_DB_ONLY) { - update_puadb( presentity, hentity->desired_expires, lexpire, NULL, &contact ); + delete_puadb(presentity); } else { - update_htable(presentity, hentity->desired_expires, lexpire, NULL, - hash_code, &contact); + delete_htable(presentity, hash_code); lock_release(&HashT->p_records[hash_code].lock); } goto done; } - if(initial_request == 0) - { - LM_ERR("Not initial request and no record found\n"); - if (dbmode!=PUA_DB_ONLY) - lock_release(&HashT->p_records[hash_code].lock); - goto error; - } if (dbmode!=PUA_DB_ONLY) lock_release(&HashT->p_records[hash_code].lock); - /* if a new dialog -> insert */ - if(lexpire== 0) - { - LM_DBG("expires= 0: no not insert\n"); - goto done; - } - if( msg->cseq==NULL || msg->cseq->body.s==NULL) { LM_ERR("cannot parse cseq header\n"); @@ -546,7 +607,7 @@ void subs_cback_func(struct cell *t, int cb_type, struct tmcb_params *ps) { LM_ERR("while converting str to int\n"); goto done; - } + } /*process record route and add it to a string*/ if (msg->record_route!=NULL) @@ -979,8 +1040,14 @@ int send_subscribe(subs_info_t* subs) { int size; insert: + if (dbmode!=PUA_DB_ONLY) - lock_release(&HashT->p_records[hash_code].lock); + lock_release(&HashT->p_records[hash_code].lock); + + if (subs->expires == 0) + /* Don't create a new dialog when expires == 0 */ + goto done; + if(subs->flag & UPDATE_TYPE) { /* @@ -1148,12 +1215,31 @@ insert: if (subs->internal_update_flag == INTERNAL_UPDATE_TRUE) { LM_INFO("attempting to re-SUBSCRIBE on internal (rls_update_subs()) update - skipping\n"); + if (dbmode != PUA_DB_ONLY) + lock_release(&HashT->p_records[hash_code].lock); goto done; } if (presentity->to_tag.len == 0) { - LM_WARN("attempting to re-SUBSCRIBE to temporary (non-established) dialog - skipping\n"); + if (subs->expires > 0) + { + LM_WARN("attempting to re-SUBSCRIBE to temporary (non-established) dialog - skipping\n"); + LM_WARN(" is %.*s in %.*s's contact list more than once?\n", + presentity->pres_uri->len, presentity->pres_uri->s, + presentity->watcher_uri->len, presentity->watcher_uri->s); + } + else + { + LM_WARN("attempting to un-SUBSCRIBE to temporary (non-established) dialog - skipping and deleting dialog\n"); + if (dbmode==PUA_DB_ONLY) + delete_puadb(presentity); + else + delete_htable(presentity, hash_code); + } + + if (dbmode != PUA_DB_ONLY) + lock_release(&HashT->p_records[hash_code].lock); goto done; }

12 years, 2 months

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2012