diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-17 21:16:53 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-17 21:16:53 +0000 |
| commit | b969191c13883a899a457d0944716d32fdc700b4 (patch) | |
| tree | b5a3cf78d6411d9280e1e6d8941d4532981a9565 /channels/chan_local.c | |
| parent | 1981bc555ffd3c4776ba61e23a7ee485d8608829 (diff) | |
Merged revisions 176592,176642 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r176592 | tilghman | 2009-02-17 12:49:20 -0600 (Tue, 17 Feb 2009) | 4 lines
Add assertions in the quest to track down a refcount leak.
(closes issue #14485)
Reported by: davevg
........
r176642 | tilghman | 2009-02-17 15:14:18 -0600 (Tue, 17 Feb 2009) | 8 lines
Prior to masquerade, move the group definitions to the channel performing the
masq, so that the group count lingers past the bridge.
(closes issue #14275)
Reported by: kowalma
Patches:
20090216__bug14275.diff.txt uploaded by Corydon76 (license 14)
Tested by: kowalma
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@176644 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_local.c')
| -rw-r--r-- | channels/chan_local.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/channels/chan_local.c b/channels/chan_local.c index 754f49b8c..a9a27ff8c 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -106,8 +106,8 @@ struct local_pvt { char exten[AST_MAX_EXTENSION]; /* Extension to call */ int reqformat; /* Requested format */ struct ast_jb_conf jb_conf; /*!< jitterbuffer configuration for this local channel */ - struct ast_channel *owner; /* Master Channel */ - struct ast_channel *chan; /* Outbound channel */ + struct ast_channel *owner; /* Master Channel - Bridging happens here */ + struct ast_channel *chan; /* Outbound channel - PBX is run here */ struct ast_module_user *u_owner; /*! reference to keep the module loaded while in use */ struct ast_module_user *u_chan; /*! reference to keep the module loaded while in use */ AST_LIST_ENTRY(local_pvt) list; /* Next entity */ @@ -303,6 +303,7 @@ static void check_bridge(struct local_pvt *p, int isoutbound) p->chan->audiohooks = p->owner->audiohooks; p->owner->audiohooks = audiohooks_swapper; } + ast_app_group_update(p->chan, p->owner); ast_channel_masquerade(p->owner, p->chan->_bridge); ast_set_flag(p, LOCAL_ALREADY_MASQED); } |