dialog: run loaded callbacks after dialog mod_init()

(cherry picked from commit ea5e7f1)

modules/dialog/dialog.c

@@ -827,11 +827,7 @@ static int mod_init(void)
 		run_load_callbacks();
 	}
 
-	/* if profiles should be kept in cachedb's */
-
-	/* do not destroy callbacks - will need them later for syncing new dialogs
-	destroy_dlg_callbacks( DLGCB_LOADED );
-	*/
+	mark_dlg_loaded_callbacks_run();
 	destroy_cachedb(0);
 
 	return 0;

modules/dialog/dlg_cb.c

@@ -38,6 +38,7 @@
 
 static struct dlg_head_cbl* create_cbs = 0;
 
+static int dlg_load_cbs_run = 0;
 static struct dlg_head_cbl* load_cbs = 0;
 
 static struct dlg_cb_params params = {NULL, DLG_DIR_NONE, NULL, NULL};
@@ -81,6 +82,11 @@ void destroy_dlg_callbacks_list(struct dlg_callback *cb)
 	}
 }
 
+void mark_dlg_loaded_callbacks_run(void)
+{
+	dlg_load_cbs_run = 1;
+}
+
 
 void destroy_dlg_callbacks(unsigned int types)
 {
@@ -151,10 +157,9 @@ int register_dlgcb(struct dlg_cell *dlg, int types, dialog_cb f,
 		create_cbs->first = cb;
 		create_cbs->types |= types;
 	} else if (types==DLGCB_LOADED) {
-		if (load_cbs==POINTER_CLOSED_MARKER) {
+		if (dlg_load_cbs_run) {
 			/* run the callback on the spot */
 			run_load_callback(cb);
-			destroy_dlg_callbacks_list(cb);
 			return 0;
 		}
 		if (load_cbs==0) {

modules/dialog/dlg_cb.h

@@ -86,6 +86,8 @@ void destroy_dlg_callbacks(unsigned int type);
 
 void destroy_dlg_callbacks_list(struct dlg_callback *cb);
 
+void mark_dlg_loaded_callbacks_run(void);
+
 int register_dlgcb( struct dlg_cell* dlg, int types, dialog_cb f, void *param, param_free_cb ff);
 
 void run_create_callbacks(struct dlg_cell *dlg, struct sip_msg *msg);