[Freeswitch-svn] [commit] r11557 - in freeswitch/trunk/src/mod/applications: mod_commands mod_dptools

[FreeSWITCH SVN]

Author: anthm
Date: Thu Jan 29 15:52:20 2009
New Revision: 11557

Log:
add all modifier to break

Modified:
   freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c
   freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c

Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c	Thu Jan 29 15:52:20 2009
@@ -1954,11 +1954,7 @@
 	}
 
 	channel = switch_core_session_get_channel(psession);
-	if (switch_channel_test_flag(channel, CF_BROADCAST)) {
-		switch_channel_stop_broadcast(channel);
-	} else {
-		switch_channel_set_flag(channel, CF_BREAK);
-	}
+
 	switch_core_session_rwunlock(psession);
 
 	return SWITCH_STATUS_SUCCESS;

Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c	Thu Jan 29 15:52:20 2009
@@ -385,7 +385,19 @@
 
 SWITCH_STANDARD_APP(break_function)
 {
-	switch_channel_set_flag(switch_core_session_get_channel(session), CF_BREAK);
+	switch_channel_t *channel;
+
+	channel = switch_core_session_get_channel(session);
+
+	if (data && strcasecmp(data, "all")) {
+		switch_core_session_flush_private_events(session);
+	}
+
+	if (switch_channel_test_flag(channel, CF_BROADCAST)) {
+		switch_channel_stop_broadcast(channel);
+	} else {
+		switch_channel_set_flag(channel, CF_BREAK);
+	}
 }
 
 SWITCH_STANDARD_APP(queue_dtmf_function)