dialog: add active_only parameter to load_dialog_ctx

The new parameter makes the function to return only active dialogs -
dialogs that are in state <= 4

Author: razvancrainea

modules/dialog/dialog.c

@@ -149,7 +149,7 @@ static int w_get_dlg_vals(struct sip_msg *msg, pv_spec_t *v_name,
 		pv_spec_t *v_val, str *callid);
 static int w_tsl_dlg_flag(struct sip_msg *msg, void *_idx, int *_val);
 static int w_set_dlg_shtag(struct sip_msg *msg, str *shtag);
-static int load_dlg_ctx(struct sip_msg *msg, str *callid, void* lmode);
+static int load_dlg_ctx(struct sip_msg *msg, str *callid, void* lmode, int *active);
 static int unload_dlg_ctx(struct sip_msg *msg);
 
 static int fixup_route(void** param);
@@ -263,7 +263,8 @@ static const cmd_export_t cmds[]={
 		REQUEST_ROUTE},
 	{"load_dialog_ctx",(cmd_function)load_dlg_ctx, {
 		{CMD_PARAM_STR,0,0},
-		{CMD_PARAM_STR|CMD_PARAM_OPT,fixup_lmode,0}, {0,0,0}},
+		{CMD_PARAM_STR|CMD_PARAM_OPT,fixup_lmode,0},
+		{CMD_PARAM_INT|CMD_PARAM_OPT,0,0}, {0,0,0}},
 		ALL_ROUTES},
 	{"unload_dialog_ctx",(cmd_function)unload_dlg_ctx,
 		{{0,0,0}}, ALL_ROUTES},
@@ -2409,10 +2410,11 @@ static int fixup_leg(void **param)
 }
 
 
-static int load_dlg_ctx(struct sip_msg *msg, str *callid, void *lmode)
+static int load_dlg_ctx(struct sip_msg *msg, str *callid, void *lmode, int *active)
 {
 	struct dlg_cell *dlg = NULL;
 	int mode;
+	int active_only = (active?*active:0);
 
 	if (lmode)
 		mode = (int)(long)lmode;
@@ -2427,12 +2429,12 @@ static int load_dlg_ctx(struct sip_msg *msg, str *callid, void *lmode)
 	switch (mode) {
 		case DLG_CTX_LOAD_BY_CALLID:
 			/* callid */
-			dlg = get_dlg_by_callid( callid, 0 );
+			dlg = get_dlg_by_callid( callid, active_only );
 			break;
 
 		case DLG_CTX_LOAD_BY_DID:
 			/* did */
-			dlg = get_dlg_by_did( callid, 0);
+			dlg = get_dlg_by_did( callid, active_only );
 			break;
 	}
 

modules/dialog/doc/dialog_admin.xml

@@ -1882,7 +1882,7 @@ if ( get_dialogs_by_profile("caller",$fU,$avp(dlg_jsons),$avp(dlg_no)) ) {
 
 	<section id="func_load_dialog_ctx" xreflabel="load_dialog_ctx()">
 		<title>
-		<function moreinfo="none">load_dialog_ctx( dialog [, id_type])</function>
+		<function moreinfo="none">load_dialog_ctx( dialog [, id_type] [, active_only])</function>
 		</title>
 		<para>
 		The function loads and switches to the context of the given dialog.
@@ -1910,6 +1910,13 @@ if ( get_dialogs_by_profile("caller",$fU,$avp(dlg_jsons),$avp(dlg_no)) ) {
 			will be assumed.
 			</para>
 		</listitem>
+		<listitem>
+			<para><emphasis>id_type (integer,optional)</emphasis> - if
+			set to something different than <emphasis>0</emphasis>,
+			it only considers active dialogs - dialogs that are not
+			deleted.
+			</para>
+		</listitem>
 		</itemizedlist>
 		<para>
 		This function can be used from any type of route.