diff options
| author | Mark Michelson <mmichelson@digium.com> | 2008-10-01 22:23:50 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2008-10-01 22:23:50 +0000 |
| commit | 7eae109418777f15f5a3ddfaa6542d594d1874ad (patch) | |
| tree | 3080465f267f809ea9b7bfe35a9686b76d05e22a | |
| parent | e6799e1c99ae7fe7865541cd89766483d49de3e0 (diff) | |
Okay, this should really do it now. While I did manage
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
| -rw-r--r-- | main/features.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/main/features.c b/main/features.c index 2ff178e5a..a8333728e 100644 --- a/main/features.c +++ b/main/features.c @@ -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); |