add -bleg and -both flags to the transfer api command so you can transfer both sides...

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5770 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/applications/mod_commands/mod_commands.c b/src/mod/applications/mod_commands/mod_commands.c
index 9a2aa9c769d17ea04691ff861dfc4ea3ee5002ad..1baaf97ba095abef339b2887e574f673be1f00ad 100644 (file)
--- a/src/mod/applications/mod_commands/mod_commands.c
+++ b/src/mod/applications/mod_commands/mod_commands.c
@@ -218,11 +218,11 @@ SWITCH_STANDARD_API(kill_function)
        return SWITCH_STATUS_SUCCESS;
 }
 
-#define TRANSFER_SYNTAX "<uuid> <dest-exten> [<dialplan>] [<context>]"
+#define TRANSFER_SYNTAX "<uuid> [-bleg|-both] <dest-exten> [<dialplan>] [<context>]"
 SWITCH_STANDARD_API(transfer_function)
 {
-       switch_core_session_t *tsession = NULL;
-       char *mycmd = NULL, *argv[4] = { 0 };
+       switch_core_session_t *tsession = NULL, *other_session = NULL;
+       char *mycmd = NULL, *argv[5] = { 0 };
        int argc = 0;
 
        if (session) {
@@ -236,9 +236,38 @@ SWITCH_STANDARD_API(transfer_function)
                        char *dest = argv[1];
                        char *dp = argv[2];
                        char *context = argv[3];
+                       char *arg = NULL;
 
                        if ((tsession = switch_core_session_locate(uuid))) {
 
+                               if (*dest == '-') {
+                                       arg = dest;
+                                       dest = argv[2];
+                                       dp = argv[3];
+                                       context = argv[4];
+                               }
+
+                               if (arg) {
+                                       switch_channel_t *channel = switch_core_session_get_channel(tsession);
+                                       arg++;
+                                       if (!strcasecmp(arg, "bleg")) {
+                                               char *uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE);
+                                               if (uuid && (other_session = switch_core_session_locate(uuid))) {
+                                                       switch_core_session_t *tmp = tsession;
+                                                       tsession = other_session;
+                                                       other_session = NULL;
+                                                       switch_core_session_rwunlock(tmp);
+                                               }
+                                       } else if (!strcasecmp(arg, "both")) {
+                                               char *uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE);
+                                               switch_core_session_t *other_session;
+                                               if (uuid && (other_session = switch_core_session_locate(uuid))) {
+                                                       switch_ivr_session_transfer(other_session, dest, dp, context);
+                                                       switch_core_session_rwunlock(other_session);
+                                               }
+                                       }
+                               }
+                               
                                if (switch_ivr_session_transfer(tsession, dest, dp, context) == SWITCH_STATUS_SUCCESS) {
                                        stream->write_function(stream, "OK\n");
                                } else {
@@ -246,7 +275,7 @@ SWITCH_STANDARD_API(transfer_function)
                                }
 
                                switch_core_session_rwunlock(tsession);
-
+                               
                        } else {
                                stream->write_function(stream, "No Such Channel!\n");
                        }

diff --git a/src/switch_ivr.c b/src/switch_ivr.c
index 6e171f2b85385c6c3422d8e664debdb3a9dceb29..263f8936194a64d6ca3316681057edd040eb8652 100644 (file)
--- a/src/switch_ivr.c
+++ b/src/switch_ivr.c
@@ -895,6 +895,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_session_transfer(switch_core_session_
                }
                
                if (uuid && (other_session = switch_core_session_locate(uuid))) {
+                       other_channel = switch_core_session_get_channel(other_session);
+                       assert(other_channel != NULL);
                        switch_channel_set_variable(other_channel, SWITCH_SIGNAL_BOND_VARIABLE, NULL);
                        switch_core_session_rwunlock(other_session);
                }