kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 00:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a crash in the end_bridge_callback of app_dial and

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/branches/1.4@157305 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2008-11-18 18:25:55 +00:00
parent 9bfbfb5496
commit 3429c9de5e
5 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/app_dial.c
View File

@@ -857,6 +857,10 @@ static void end_bridge_callback (void *data)
ast_channel_unlock(chan); 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_flags *peerflags, int *continue_exec) static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags *peerflags, int *continue_exec)
{ {
int res = -1; int res = -1;
@@ -1795,6 +1799,7 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
config.start_sound = start_sound; config.start_sound = start_sound;
config.end_bridge_callback = end_bridge_callback; config.end_bridge_callback = end_bridge_callback;
config.end_bridge_callback_data = chan; config.end_bridge_callback_data = chan;
config.end_bridge_callback_data_fixup = end_bridge_callback_data_fixup;
if (moh) { if (moh) {
moh = 0; moh = 0;
ast_moh_stop(chan); ast_moh_stop(chan);

6
apps/app_followme.c
View File

@@ -935,6 +935,11 @@ static void end_bridge_callback (void *data)
ast_channel_unlock(chan); 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 app_exec(struct ast_channel *chan, void *data) static int app_exec(struct ast_channel *chan, void *data)
{ {
struct fm_args targs; struct fm_args targs;
@@ -1057,6 +1062,7 @@ static int app_exec(struct ast_channel *chan, void *data)
config.end_bridge_callback = end_bridge_callback; config.end_bridge_callback = end_bridge_callback;
config.end_bridge_callback_data = chan; config.end_bridge_callback_data = chan;
config.end_bridge_callback_data_fixup = end_bridge_callback_data_fixup;
ast_moh_stop(caller); ast_moh_stop(caller);
/* Be sure no generators are left on it */ /* Be sure no generators are left on it */

8
channels/chan_local.c
View File

@@ -254,7 +254,7 @@ static void check_bridge(struct local_pvt *p, int isoutbound)
if (!p->chan->_bridge->_softhangup) { if (!p->chan->_bridge->_softhangup) {
if (!ast_mutex_trylock(&p->owner->lock)) { if (!ast_mutex_trylock(&p->owner->lock)) {
if (!p->owner->_softhangup) { if (!p->owner->_softhangup) {
if(p->owner->monitor && !p->chan->_bridge->monitor) { if (p->owner->monitor && !p->chan->_bridge->monitor) {
/* If a local channel is being monitored, we don't want a masquerade /* If a local channel is being monitored, we don't want a masquerade
* to cause the monitor to go away. Since the masquerade swaps the monitors, * to cause the monitor to go away. Since the masquerade swaps the monitors,
* pre-swapping the monitors before the masquerade will ensure that the monitor * pre-swapping the monitors before the masquerade will ensure that the monitor
@@ -264,6 +264,12 @@ static void check_bridge(struct local_pvt *p, int isoutbound)
p->owner->monitor = p->chan->_bridge->monitor; p->owner->monitor = p->chan->_bridge->monitor;
p->chan->_bridge->monitor = tmp; p->chan->_bridge->monitor = tmp;
} }
if (p->chan->audiohooks) {
struct ast_audiohook_list *audiohooks_swapper;
audiohooks_swapper = p->chan->audiohooks;
p->chan->audiohooks = p->owner->audiohooks;
p->owner->audiohooks = audiohooks_swapper;
}
ast_channel_masquerade(p->owner, p->chan->_bridge); ast_channel_masquerade(p->owner, p->chan->_bridge);
ast_set_flag(p, LOCAL_ALREADY_MASQED); ast_set_flag(p, LOCAL_ALREADY_MASQED);
} }

4
include/asterisk/channel.h
View File

@@ -542,6 +542,10 @@ struct ast_bridge_config {
unsigned int flags; unsigned int flags;
void (* end_bridge_callback)(void *); /*!< A callback that is called after a bridge attempt */ void (* end_bridge_callback)(void *); /*!< A callback that is called after a bridge attempt */
void *end_bridge_callback_data; /*!< Data passed to the callback */ void *end_bridge_callback_data; /*!< Data passed to the callback */
/*! If the end_bridge_callback_data refers to a channel which no longer is going to
* exist when the end_bridge_callback is called, then it needs to be fixed up properly
*/
void (*end_bridge_callback_data_fixup)(struct ast_bridge_config *bconfig, struct ast_channel *originator, struct ast_channel *terminator);
}; };
struct chanmon; struct chanmon;

4
res/res_features.c
View File

@@ -982,6 +982,10 @@ static int builtin_atxfer(struct ast_channel *chan, struct ast_channel *peer, st
tobj->peer = xferchan; tobj->peer = xferchan;
tobj->bconfig = *config; tobj->bconfig = *config;
if (tobj->bconfig.end_bridge_callback_data_fixup) {
tobj->bconfig.end_bridge_callback_data_fixup(&tobj->bconfig, tobj->peer, tobj->chan);
}
if (ast_stream_and_wait(newchan, xfersound, newchan->language, "")) if (ast_stream_and_wait(newchan, xfersound, newchan->language, ""))
ast_log(LOG_WARNING, "Failed to play transfer sound!\n"); ast_log(LOG_WARNING, "Failed to play transfer sound!\n");
ast_bridge_call_thread_launch(tobj); ast_bridge_call_thread_launch(tobj);