diff options
| author | Mark Michelson <mmichelson@digium.com> | 2013-08-02 14:05:07 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2013-08-02 14:05:07 +0000 |
| commit | f8622e7c5cbdda91a5efad230a9e3af593378c7c (patch) | |
| tree | ac2c4b5f2256fb55c84fb8915d82298d23c0e188 /channels/chan_dahdi.c | |
| parent | 57a8148ccd704f02f33c65d902b199f4205e5480 (diff) | |
Get rid of ast_bridged_channel() and the bridged_channel field on ast_channels.
This commit is smaller than the initial review placed on review board. This is because
a change to allow for channel drivers to access parking functionality externally was
committed and invalidated quite a few of the changes initially made.
(closes issue ASTERISK-22039)
reported by Matt Jordan
Review: https://reviewboard.asterisk.org/r/2717
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396103 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_dahdi.c')
| -rw-r--r-- | channels/chan_dahdi.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 15726e110..8ce700c2f 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -1742,7 +1742,7 @@ static void my_get_and_handle_alarms(void *pvt) static void *my_get_sigpvt_bridged_channel(struct ast_channel *chan) { - struct ast_channel *bridged = ast_bridged_channel(chan); + RAII_VAR(struct ast_channel *, bridged, ast_channel_bridge_peer(chan), ast_channel_cleanup); if (bridged && ast_channel_tech(bridged) == &dahdi_tech) { struct dahdi_pvt *p = ast_channel_tech_pvt(bridged); @@ -9737,12 +9737,15 @@ static void *analog_ss_thread(void *data) struct ast_channel *nbridge = p->subs[SUB_THREEWAY].owner; struct dahdi_pvt *pbridge = NULL; + RAII_VAR(struct ast_channel *, bridged, nbridge ? ast_channel_bridge_peer(nbridge) : NULL, ast_channel_cleanup); + /* set up the private struct of the bridged one, if any */ - if (nbridge && ast_bridged_channel(nbridge)) - pbridge = ast_channel_tech_pvt(ast_bridged_channel(nbridge)); + if (nbridge && bridged) { + pbridge = ast_channel_tech_pvt(bridged); + } if (nbridge && pbridge && (ast_channel_tech(nbridge) == &dahdi_tech) && - (ast_channel_tech(ast_bridged_channel(nbridge)) == &dahdi_tech) && + (ast_channel_tech(bridged) == &dahdi_tech) && ISTRUNK(pbridge)) { int func = DAHDI_FLASH; /* Clear out the dial buffer */ |