Re: [SR-Users] No cdr after Kamailio 5.0 restart

Hi Lucian, I made a few changes like you and I think it's working. Loads dialogs and generate cdr. It needs more testing. The function cdr_on_load it's copy and paste to avoid touching those params in on_create. A lot of improve is needed. diff --git a/modules/dialog/dialog.c b/modules/dialog/*dialog.c* index ceaf08a..59210e8 100644 --- a/modules/dialog/dialog.c +++ b/modules/dialog/dialog.c @@ -692,7 +692,7 @@ static int mod_init(void) LM_ERR("failed to initialize the DB support\n"); return -1; } - run_load_callbacks(); + //run_load_callbacks(); } destroy_dlg_callbacks( DLGCB_LOADED ); ######## diff --git a/modules/dialog/dlg_db_handler.c b/modules/dialog/ *dlg_db_handler.c* index e27f8b2..22d0f04 100644 --- a/modules/dialog/dlg_db_handler.c +++ b/modules/dialog/dlg_db_handler.c @@ -173,6 +173,7 @@ int init_dlg_db(const str *db_url, int dlg_hash_size , int db_update_period, int LM_ERR("unable to load the dialog data\n"); return -1; } + run_load_callbacks(); } dialog_dbf.close(dialog_db_handle); dialog_db_handle = 0; ######## diff --git a/modules/acc/acc_cdr.c b/modules/acc/*acc_cdr.c* index 73bdd45..81ad640 100644 --- a/modules/acc/acc_cdr.c +++ b/modules/acc/acc_cdr.c @@ -733,11 +733,79 @@ static void cdr_on_destroy( struct dlg_cell* dialog, LM_DBG("dialog '%p' destroyed!\n", dialog); } +/* callback for loading a dialog from db. */ +static void cdr_on_load( struct dlg_cell* dialog, + int type, + struct dlg_cb_params* params) +{ + + LM_ERR("ON LOAD\n"); + if( !dialog) + { + LM_ERR( "invalid dialog\n!"); + return; + } + + if( cdr_enable == 0) + { + return; + } + + if( dlgb.register_dlgcb( dialog, DLGCB_CONFIRMED, cdr_on_start, 0, 0) != 0) + { + LM_ERR("can't register create dialog CONFIRM callback\n"); + return; + } + + if(_acc_cdr_on_failed==1) { + if( dlgb.register_dlgcb( dialog, DLGCB_FAILED, cdr_on_failed, 0, 0) != 0) + { + LM_ERR("can't register create dialog FAILED callback\n"); + return; + } + } + + if( dlgb.register_dlgcb( dialog, DLGCB_TERMINATED, cdr_on_end, 0, 0) != 0) + { + LM_ERR("can't register create dialog TERMINATED callback\n"); + return; + } + + if( dlgb.register_dlgcb( dialog, DLGCB_TERMINATED_CONFIRMED, cdr_on_end_confirmed, 0, 0) != 0) + { + LM_ERR("can't register create dialog TERMINATED CONFIRMED callback\n"); + return; + } + + if( dlgb.register_dlgcb( dialog, DLGCB_EXPIRED, cdr_on_expired, 0, 0) != 0) + { + LM_ERR("can't register create dialog EXPIRED callback\n"); + return; + } + + if( dlgb.register_dlgcb( dialog, DLGCB_DESTROY, cdr_on_destroy, 0, 0) != 0) + { + LM_ERR("can't register create dialog DESTROY callback\n"); + return; + } + + LM_DBG("dialog '%p' created!", dialog); + + if( set_start_time( dialog) != 0) + { + LM_ERR( "failed to set start time"); + return; + } +} + + /* callback for the creation of a dialog. */ static void cdr_on_create( struct dlg_cell* dialog, int type, struct dlg_cb_params* params) { + + LM_ERR("ON CREATE\n"); if( !dialog || !params || !params->req) { LM_ERR( "invalid values\n!"); @@ -852,13 +920,19 @@ int init_cdr_generation( void) LM_ERR("can't load dialog API\n"); return -1; } - - if( dlgb.register_dlgcb( 0, DLGCB_CREATED, cdr_on_create, 0, 0) != 0) + //Loaded from db + if( dlgb.register_dlgcb( 0, DLGCB_LOADED, cdr_on_load, 0, 0) != 0) { LM_ERR("can't register create callback\n"); return -1; } + if( dlgb.register_dlgcb( 0, DLGCB_CREATED, cdr_on_create, 0, 0) != 0) + { + LM_ERR("can't register create callback\n"); + return -1; + } + return 0; } if( cdr_enable == 0) { return; } if( dlgb.register_dlgcb( dialog, DLGCB_CONFIRMED, cdr_on_start, 0, 0) != 0) { LM_ERR("can't register create dialog CONFIRM callback\n"); return; } Diego. 2017-03-20 10:06 GMT-03:00 Kordován Szabolcs <koszab(a)gmail.com>om>: