[asterisk-commits] mmichelson: trunk r157306 - in /trunk: ./ apps/ channels/ include/asterisk/ m...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Nov 18 12:31:09 CST 2008
Author: mmichelson
Date: Tue Nov 18 12:31:08 2008
New Revision: 157306
URL: http://svn.digium.com/view/asterisk?view=rev&rev=157306
Log:
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.
........
Modified:
trunk/ (props changed)
trunk/apps/app_dial.c
trunk/apps/app_followme.c
trunk/channels/chan_local.c
trunk/include/asterisk/channel.h
trunk/main/features.c
Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Modified: trunk/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_dial.c?view=diff&rev=157306&r1=157305&r2=157306
==============================================================================
--- trunk/apps/app_dial.c (original)
+++ trunk/apps/app_dial.c Tue Nov 18 12:31:08 2008
@@ -1490,6 +1490,10 @@
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 @@
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);
Modified: trunk/apps/app_followme.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_followme.c?view=diff&rev=157306&r1=157305&r2=157306
==============================================================================
--- trunk/apps/app_followme.c (original)
+++ trunk/apps/app_followme.c Tue Nov 18 12:31:08 2008
@@ -992,6 +992,11 @@
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)
{
struct fm_args targs;
@@ -1116,6 +1121,7 @@
ast_set_flag(&(config.features_caller), AST_FEATURE_AUTOMON);
config.end_bridge_callback = end_bridge_callback;
config.end_bridge_callback_data = chan;
+ config.end_bridge_callback_data_fixup = end_bridge_callback_data_fixup;
ast_moh_stop(caller);
/* Be sure no generators are left on it */
Modified: trunk/channels/chan_local.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_local.c?view=diff&rev=157306&r1=157305&r2=157306
==============================================================================
--- trunk/channels/chan_local.c (original)
+++ trunk/channels/chan_local.c Tue Nov 18 12:31:08 2008
@@ -287,7 +287,7 @@
if (!ast_check_hangup(p->chan->_bridge)) {
if (!ast_channel_trylock(p->owner)) {
if (!ast_check_hangup(p->owner)) {
- 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
* 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
@@ -296,6 +296,12 @@
tmp = p->owner->monitor;
p->owner->monitor = p->chan->_bridge->monitor;
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_set_flag(p, LOCAL_ALREADY_MASQED);
Modified: trunk/include/asterisk/channel.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/channel.h?view=diff&rev=157306&r1=157305&r2=157306
==============================================================================
--- trunk/include/asterisk/channel.h (original)
+++ trunk/include/asterisk/channel.h Tue Nov 18 12:31:08 2008
@@ -586,6 +586,10 @@
unsigned int flags;
void (* end_bridge_callback)(void *); /*!< A callback that is called after a bridge attempt */
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;
Modified: trunk/main/features.c
URL: http://svn.digium.com/view/asterisk/trunk/main/features.c?view=diff&rev=157306&r1=157305&r2=157306
==============================================================================
--- trunk/main/features.c (original)
+++ trunk/main/features.c Tue Nov 18 12:31:08 2008
@@ -1424,6 +1424,10 @@
tobj->peer = xferchan;
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, ""))
ast_log(LOG_WARNING, "Failed to play transfer sound!\n");
ast_bridge_call_thread_launch(tobj);
@@ -1520,6 +1524,10 @@
tobj->chan = newchan;
tobj->peer = xferchan;
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, ""))
ast_log(LOG_WARNING, "Failed to play transfer sound!\n");
More information about the asterisk-commits
mailing list