diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-05 18:18:27 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-05 18:18:27 +0000 |
| commit | 78d18e52a495a2b1f964a2dceeb7fcc705a79d73 (patch) | |
| tree | cc242551fdaa17b1537490b8ec0621d2c3fa2c66 /include/asterisk/channel.h | |
| parent | 62297fe334460eaa96bc7a2a2c39d9714c77c868 (diff) | |
Merge phase 1 support for the new bridging architecture.
This commit brings in the bridging core, bridging technologies,
and the ConfBridge application.
For usage information on the ConfBridge application please see
the output of "core show application ConfBridge" from the CLI.
For API documentation please see the doxygen page describing the
architecture and the documentation for each API call.
Review: http://reviewboard.digium.com/r/93/
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@180369 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk/channel.h')
| -rw-r--r-- | include/asterisk/channel.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 39b302fc8..2d0643a0f 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -496,7 +496,13 @@ struct ast_channel { unsigned short transfercapability; /*!< ISDN Transfer Capbility - AST_FLAG_DIGITAL is not enough */ - char unused_old_dtmfq[AST_MAX_EXTENSION]; /*!< (deprecated, use readq instead) Any/all queued DTMF characters */ + union { + char unused_old_dtmfq[AST_MAX_EXTENSION]; /*!< (deprecated, use readq instead) Any/all queued DTMF characters */ + struct { + struct ast_bridge *bridge; /*!< Bridge this channel is participating in */ + }; + }; + char context[AST_MAX_CONTEXT]; /*!< Dialplan: Current extension context */ char exten[AST_MAX_EXTENSION]; /*!< Dialplan: Current extension number */ char macrocontext[AST_MAX_CONTEXT]; /*!< Macro: Current non-macro context. See app_macro.c */ |