diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-07-26 21:34:23 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-07-26 21:34:23 +0000 |
| commit | c017d5e6a34fa7e8dc7ba089b5db2338f117c81b (patch) | |
| tree | d111b5985f3985ab02a462d4b48467b537163b70 /apps/app_bridgewait.c | |
| parent | 50aba6be3654e348960a3bda2312f7a913f5c160 (diff) | |
Remove the unsafe bridge parameter from ast_bridge_hook_callback's.
Most hook callbacks did not need the bridge parameter. The pointer value
could become invalid if the channel is moved to another bridge while it is
executing.
* Fixed some issues in feature_attended_transfer() as a result.
* Reduce the bridge inhibit count in
attended_transfer_properties_shutdown() after it has restored the bridge
channel hooks.
* Removed basic bridge requirement on feature_blind_transfer(). It does
not require the basic bridge like feature_attended_transfer().
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395574 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_bridgewait.c')
| -rw-r--r-- | apps/app_bridgewait.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_bridgewait.c b/apps/app_bridgewait.c index bdfd87e62..5697a79d0 100644 --- a/apps/app_bridgewait.c +++ b/apps/app_bridgewait.c @@ -201,7 +201,7 @@ AST_APP_OPTIONS(bridgewait_opts, { AST_APP_OPTION_ARG('S', MUXFLAG_TIMEOUT, OPT_ARG_TIMEOUT), }); -static int bridgewait_timeout_callback(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel, void *hook_pvt) +static int bridgewait_timeout_callback(struct ast_bridge_channel *bridge_channel, void *hook_pvt) { ast_verb(3, "Channel %s timed out.\n", ast_channel_name(bridge_channel->chan)); ast_bridge_channel_leave_bridge(bridge_channel, BRIDGE_CHANNEL_STATE_END); |