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 /funcs/func_channel.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 'funcs/func_channel.c')
| -rw-r--r-- | funcs/func_channel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/funcs/func_channel.c b/funcs/func_channel.c index 3f2ef5cb6..ccdbb6e7d 100644 --- a/funcs/func_channel.c +++ b/funcs/func_channel.c @@ -495,10 +495,10 @@ static int func_channel_read(struct ast_channel *chan, const char *function, } ast_channel_unlock(chan); } else if (!strcasecmp(data, "peer")) { - struct ast_channel *p; + RAII_VAR(struct ast_channel *, p, NULL, ast_channel_cleanup); ast_channel_lock(chan); - p = ast_bridged_channel(chan); + p = ast_channel_bridge_peer(chan); if (p || ast_channel_tech(chan)) /* dummy channel? if so, we hid the peer name in the language */ ast_copy_string(buf, (p ? ast_channel_name(p) : ""), len); else { |