summaryrefslogtreecommitdiff
path: root/include/asterisk/channel.h
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2006-06-01 20:53:17 +0000
committerKevin P. Fleming <kpfleming@digium.com>2006-06-01 20:53:17 +0000
commitdfd5fc5605bf4732dc433582fc50e414be3d5c7c (patch)
tree6a27d506f9a8a99099ac2b41d09b21222a834bb1 /include/asterisk/channel.h
parent0760b8244d35fdb63a7b34f126ff221cf6eff70c (diff)
Merged revisions 31520 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r31520 | kpfleming | 2006-06-01 15:27:50 -0500 (Thu, 01 Jun 2006) | 2 lines handle Zap transfers behind chan_agent properly so the agent doesn't get stuck waiting for the call to hang up ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@31522 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/channel.h')
-rw-r--r--include/asterisk/channel.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 9d38dff5b..a36949932 100644
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -311,8 +311,9 @@ struct ast_channel {
/*! Current active data generator */
struct ast_generator *generator;
- /*! Who are we bridged to, if we're bridged Do not access directly,
- use ast_bridged_channel(chan) */
+ /*! Who are we bridged to, if we're bridged. Who is proxying for us,
+ if we are proxied (i.e. chan_agent).
+ Do not access directly, use ast_bridged_channel(chan) */
struct ast_channel *_bridge;
/*! Channel that will masquerade as us */
struct ast_channel *masq;