diff options
author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-18 18:31:08 +0000 |
---|---|---|
committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-18 18:31:08 +0000 |
commit | 135ce4759840347f4965be0cf9684fb4d965e2da (patch) | |
tree | 9d7c49be024ce0c889bfbb0d0299794cb862daec /apps/app_dial.c | |
parent | fe4ad3a4a2cd255ecbd3dc8cf3e425e5ed5d9c72 (diff) |
Merged revisions 157305 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r157305 | mmichelson | 2008-11-18 12:25:55 -0600 (Tue, 18 Nov 2008) | 12 lines
Fix a crash in the end_bridge_callback of app_dial and
app_followme which would occur at the end of an attended
transfer. The error occurred because we initially stored
a pointer to an ast_channel which then was hung up due
to a masquerade.
This commit adds a "fixup" callback to the bridge_config
structure to allow for end_bridge_callback_data to be
changed in the case that a new channel pointer is needed
for the end_bridge_callback.
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@157306 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_dial.c')
-rw-r--r-- | apps/app_dial.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index e2e50f90e..38d2bbd28 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -1490,6 +1490,10 @@ static void end_bridge_callback(void *data) ast_channel_unlock(chan); } +static void end_bridge_callback_data_fixup(struct ast_bridge_config *bconfig, struct ast_channel *originator, struct ast_channel *terminator) { + bconfig->end_bridge_callback_data = originator; +} + static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags64 *peerflags, int *continue_exec) { int res = -1; /* default: error */ @@ -2170,7 +2174,8 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags config.end_bridge_callback = end_bridge_callback; config.end_bridge_callback_data = chan; - + config.end_bridge_callback_data_fixup = end_bridge_callback_data_fixup; + if (moh) { moh = 0; ast_moh_stop(chan); |