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_skinny.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_skinny.c')
| -rw-r--r-- | channels/chan_skinny.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index 1237c7869..35da7bf8a 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -4357,10 +4357,12 @@ static char *_skinny_show_lines(int fd, int *total, struct mansession *s, const l->label); if (verbose) { AST_LIST_TRAVERSE(&l->sub, sub, list) { + RAII_VAR(struct ast_channel *, bridged, ast_channel_bridge_peer(sub->owner), ao2_cleanup); + ast_cli(fd, " %s> %s to %s\n", (sub == l->activesub?"Active ":"Inactive"), ast_channel_name(sub->owner), - (ast_bridged_channel(sub->owner)?ast_channel_name(ast_bridged_channel(sub->owner)):"") + bridged ? ast_channel_name(bridged) : "" ); } } @@ -7170,6 +7172,8 @@ static int handle_soft_key_event_message(struct skinny_req *req, struct skinnyse } if ((sub && sub->owner) && (ast_channel_state(sub->owner) == AST_STATE_UP)) { + RAII_VAR(struct ast_channel *, bridged, NULL, ast_channel_cleanup); + c = sub->owner; ast_channel_lock(c); bridge_channel = ast_channel_get_bridge_channel(c); |