Okay, this should really do it now. While I did manage
authorMark Michelson <mmichelson@digium.com>
Wed, 1 Oct 2008 22:23:50 +0000 (22:23 +0000)
committerMark Michelson <mmichelson@digium.com>
Wed, 1 Oct 2008 22:23:50 +0000 (22:23 +0000)
to fix blind transfers with my last commit here, I also
caused an unwanted side-effect. That is, only the first
priority of the 'h' extension would be executed when
a blind transfer occurred instead of all priorities.

Essentially, my last commit corrected the return value
of ast_bridge_call. However, the implementation still
was not 100% correct. Now it is.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@145606 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/features.c

index 2ff178e..a833372 100644 (file)
@@ -2379,14 +2379,15 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
                ast_copy_string(chan->exten, "h", sizeof(chan->exten));
                chan->priority = 1;
                ast_channel_unlock(chan);
-               while ((res = ast_spawn_extension(chan, chan->context, chan->exten, chan->priority, chan->cid.cid_num, &found, 1))) {
+               while ((res = ast_spawn_extension(chan, chan->context, chan->exten, chan->priority, chan->cid.cid_num, &found, 1)) == 0) {
                        chan->priority++;
                }
-               if (found && res) 
-               {
+               if (found && res) {
                        /* Something bad happened, or a hangup has been requested. */
                        ast_debug(1, "Spawn extension (%s,%s,%d) exited non-zero on '%s'\n", chan->context, chan->exten, chan->priority, chan->name);
                        ast_verb(2, "Spawn extension (%s, %s, %d) exited non-zero on '%s'\n", chan->context, chan->exten, chan->priority, chan->name);
+               } else if (!found && res) {
+                       res = 0;
                }
                /* swap it back */
                ast_channel_lock(chan);