From 5fae364cfdbe50130dc18486079f16f692d4237e Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthony.minessale@gmail.com>
Date: Wed, 12 Mar 2008 00:30:52 +0000
Subject: [PATCH] update

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7871 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
 src/mod/applications/mod_dptools/mod_dptools.c | 10 +++++++++-
 src/switch_ivr.c                               |  3 ++-
 src/switch_ivr_async.c                         |  6 +++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/mod/applications/mod_dptools/mod_dptools.c b/src/mod/applications/mod_dptools/mod_dptools.c
index da1fe6fc38..393866a679 100644
--- a/src/mod/applications/mod_dptools/mod_dptools.c
+++ b/src/mod/applications/mod_dptools/mod_dptools.c
@@ -205,10 +205,15 @@ SWITCH_STANDARD_APP(transfer_function)
 	int argc;
 	char *argv[4] = { 0 };
 	char *mydata;
+	int bleg = 0, both = 0;
 
+	
 	if (!switch_strlen_zero(data) && (mydata = switch_core_session_strdup(session, data))) {
 		if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) >= 1) {
-			if (!strcasecmp(argv[0], "-bleg")) {
+			bleg = !strcasecmp(argv[0], "-bleg");
+			both = !strcasecmp(argv[0], "-both");
+
+			if (bleg || both) {
 				const char *uuid;
 				switch_channel_t *channel = switch_core_session_get_channel(session);																		
 				if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE))) {
@@ -218,6 +223,9 @@ SWITCH_STANDARD_APP(transfer_function)
 						switch_core_session_rwunlock(b_session);
 					}
 				}
+				if (both) {
+					switch_ivr_session_transfer(session, argv[1], argv[2], argv[3]);
+				}
 			} else {
 				switch_ivr_session_transfer(session, argv[0], argv[1], argv[2]);
 			}
diff --git a/src/switch_ivr.c b/src/switch_ivr.c
index 3d00d23fca..0f76abffa5 100644
--- a/src/switch_ivr.c
+++ b/src/switch_ivr.c
@@ -314,8 +314,9 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_parse_event(switch_core_session_t *se
 							if (!(stream = switch_channel_get_variable_partner(channel, SWITCH_HOLD_MUSIC_VARIABLE))) {
 								stream = switch_channel_get_variable(channel, SWITCH_HOLD_MUSIC_VARIABLE);
 							}
+
 							if (stream) {
-								switch_ivr_broadcast(b_uuid, hold_bleg, SMF_ECHO_ALEG | SMF_LOOP);
+								switch_ivr_broadcast(b_uuid, stream, SMF_ECHO_ALEG | SMF_LOOP);
 							} else {
 								b_uuid = NULL;
 							}
diff --git a/src/switch_ivr_async.c b/src/switch_ivr_async.c
index 8c4eaad9ce..4a46f2ed70 100644
--- a/src/switch_ivr_async.c
+++ b/src/switch_ivr_async.c
@@ -1842,7 +1842,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_broadcast(const char *uuid, const cha
 			if ((flags & SMF_HOLD_BLEG)) {
 				switch_event_add_header(event, SWITCH_STACK_BOTTOM, "hold-bleg", "%s", "true");
 			}
-				
+
 			switch_core_session_queue_private_event(other_session, &event);
 		}
 			
@@ -1861,6 +1861,10 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_broadcast(const char *uuid, const cha
 			if ((flags & SMF_LOOP)) {
 				switch_event_add_header(event, SWITCH_STACK_BOTTOM, "loops", "%d", -1);
 			}
+			if ((flags & SMF_HOLD_BLEG)) {
+				switch_event_add_header(event, SWITCH_STACK_BOTTOM, "hold-bleg", "%s", "true");
+			}
+
 			switch_core_session_queue_private_event(session, &event);
 		}
 		master = session;