Merge "BuildSystem: Really do not pass unknown-warning options to the compiler."
[asterisk/asterisk.git] / funcs / func_channel.c
index bd6eaae..e290fa0 100644 (file)
  *
  * \author Kevin P. Fleming <kpfleming@digium.com>
  * \author Ben Winslow
- * 
+ *
  * \ingroup functions
  */
 
-#include "asterisk.h"
+/*** MODULEINFO
+       <support_level>core</support_level>
+ ***/
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+#include "asterisk.h"
 
 #include <regex.h>
+#include <ctype.h>
 
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
+#include "asterisk/bridge.h"
 #include "asterisk/pbx.h"
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
 #include "asterisk/indications.h"
 #include "asterisk/stringfields.h"
+#include "asterisk/global_datastores.h"
+#include "asterisk/bridge_basic.h"
+#include "asterisk/bridge_after.h"
+#include "asterisk/max_forwards.h"
 
 /*** DOCUMENTATION
        <function name="CHANNELS" language="en_US">
@@ -54,6 +62,18 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                        will be space-delimited.</para>
                </description>
        </function>
+       <function name="MASTER_CHANNEL" language="en_US">
+               <synopsis>
+                       Gets or sets variables on the master channel
+               </synopsis>
+               <description>
+                       <para>Allows access to the oldest channel associated with the current
+                       channel if it still exists.  If the channel is the master channel or
+                       the master channel no longer exists then access local channel variables
+                       instead.  In other words, the master channel is the channel identified by
+                       the channel's linkedid.</para>
+               </description>
+       </function>
        <function name="CHANNEL" language="en_US">
                <synopsis>
                        Gets/sets various pieces of information about the channel.
@@ -62,6 +82,20 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                        <parameter name="item" required="true">
                                <para>Standard items (provided by all channel technologies) are:</para>
                                <enumlist>
+                                       <enum name="amaflags">
+                                               <para>R/W the Automatic Message Accounting (AMA) flags on the channel.
+                                               When read from a channel, the integer value will always be returned.
+                                               When written to a channel, both the string format or integer value
+                                               is accepted.</para>
+                                               <enumlist>
+                                                       <enum name="1"><para><literal>OMIT</literal></para></enum>
+                                                       <enum name="2"><para><literal>BILLING</literal></para></enum>
+                                                       <enum name="3"><para><literal>DOCUMENTATION</literal></para></enum>
+                                               </enumlist>
+                                       </enum>
+                                       <enum name="accountcode">
+                                               <para>R/W the channel's account code.</para>
+                                       </enum>
                                        <enum name="audioreadformat">
                                                <para>R/O format currently being read.</para>
                                        </enum>
@@ -71,12 +105,62 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                                        <enum name="audiowriteformat">
                                                <para>R/O format currently being written.</para>
                                        </enum>
+                                       <enum name="dtmf_features">
+                                               <para>R/W The channel's DTMF bridge features.
+                                               May include one or more of 'T' 'K' 'H' 'W' and 'X' in a similar manner to options
+                                               in the <literal>Dial</literal> application. When setting it, the features string
+                                               must be all upper case.</para>
+                                       </enum>
                                        <enum name="callgroup">
-                                               <para>R/W call groups for call pickup.</para>
+                                               <para>R/W numeric call pickup groups that this channel is a member.</para>
+                                       </enum>
+                                       <enum name="pickupgroup">
+                                               <para>R/W numeric call pickup groups this channel can pickup.</para>
+                                       </enum>
+                                       <enum name="namedcallgroup">
+                                               <para>R/W named call pickup groups that this channel is a member.</para>
+                                       </enum>
+                                       <enum name="namedpickupgroup">
+                                               <para>R/W named call pickup groups this channel can pickup.</para>
                                        </enum>
                                        <enum name="channeltype">
                                                <para>R/O technology used for channel.</para>
                                        </enum>
+                                       <enum name="checkhangup">
+                                               <para>R/O Whether the channel is hanging up (1/0)</para>
+                                       </enum>
+                                       <enum name="after_bridge_goto">
+                                               <para>R/W the parseable goto string indicating where the channel is
+                                               expected to return to in the PBX after exiting the next bridge it joins
+                                               on the condition that it doesn't hang up. The parseable goto string uses
+                                               the same syntax as the <literal>Goto</literal> application.</para>
+                                       </enum>
+                                       <enum name="hangup_handler_pop">
+                                               <para>W/O Replace the most recently added hangup handler
+                                               with a new hangup handler on the channel if supplied.  The
+                                               assigned string is passed to the Gosub application when
+                                               the channel is hung up.  Any optionally omitted context
+                                               and exten are supplied by the channel pushing the handler
+                                               before it is pushed.</para>
+                                       </enum>
+                                       <enum name="hangup_handler_push">
+                                               <para>W/O Push a hangup handler onto the channel hangup
+                                               handler stack.  The assigned string is passed to the
+                                               Gosub application when the channel is hung up.  Any
+                                               optionally omitted context and exten are supplied by the
+                                               channel pushing the handler before it is pushed.</para>
+                                       </enum>
+                                       <enum name="hangup_handler_wipe">
+                                               <para>W/O Wipe the entire hangup handler stack and replace
+                                               with a new hangup handler on the channel if supplied.  The
+                                               assigned string is passed to the Gosub application when
+                                               the channel is hung up.  Any optionally omitted context
+                                               and exten are supplied by the channel pushing the handler
+                                               before it is pushed.</para>
+                                       </enum>
+                                       <enum name="onhold">
+                                               <para>R/O Whether or not the channel is onhold. (1/0)</para>
+                                       </enum>
                                        <enum name="language">
                                                <para>R/W language for sounds played.</para>
                                        </enum>
@@ -92,12 +176,29 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                                        <enum name="rxgain">
                                                <para>R/W set rxgain level on channel drivers that support it.</para>
                                        </enum>
+                                       <enum name="secure_bridge_signaling">
+                                               <para>Whether or not channels bridged to this channel require secure signaling (1/0)</para>
+                                       </enum>
+                                       <enum name="secure_bridge_media">
+                                               <para>Whether or not channels bridged to this channel require secure media (1/0)</para>
+                                       </enum>
                                        <enum name="state">
-                                               <para>R/O state for channel</para>
+                                               <para>R/O state of the channel</para>
                                        </enum>
                                        <enum name="tonezone">
                                                <para>R/W zone for indications played</para>
                                        </enum>
+                                       <enum name="transfercapability">
+                                               <para>R/W ISDN Transfer Capability, one of:</para>
+                                               <enumlist>
+                                                       <enum name="SPEECH" />
+                                                       <enum name="DIGITAL" />
+                                                       <enum name="RESTRICTED_DIGITAL" />
+                                                       <enum name="3K1AUDIO" />
+                                                       <enum name="DIGITAL_W_TONES" />
+                                                       <enum name="VIDEO" />
+                                               </enumlist>
+                                       </enum>
                                        <enum name="txgain">
                                                <para>R/W set txgain level on channel drivers that support it.</para>
                                        </enum>
@@ -108,97 +209,65 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                                                <para>R/W whether or not context tracing is enabled, only available
                                                <emphasis>if CHANNEL_TRACE is defined</emphasis>.</para>
                                        </enum>
-                               </enumlist>
-                               <para><emphasis>chan_sip</emphasis> provides the following additional options:</para>
-                               <enumlist>
-                                       <enum name="peerip">
-                                               <para>R/O Get the IP address of the peer.</para>
-                                       </enum>
-                                       <enum name="recvip">
-                                               <para>R/O Get the source IP address of the peer.</para>
-                                       </enum>
-                                       <enum name="from">
-                                               <para>R/O Get the URI from the From: header.</para>
-                                       </enum>
-                                       <enum name="uri">
-                                               <para>R/O Get the URI from the Contact: header.</para>
-                                       </enum>
-                                       <enum name="useragent">
-                                               <para>R/O Get the useragent.</para>
-                                       </enum>
-                                       <enum name="peername">
-                                               <para>R/O Get the name of the peer.</para>
-                                       </enum>
-                                       <enum name="t38passthrough">
-                                               <para>R/O <literal>1</literal> if T38 is offered or enabled in this channel,
-                                               otherwise <literal>0</literal></para>
-                                       </enum>
-                                       <enum name="rtpqos">
-                                               <para>R/O Get QOS information about the RTP stream</para>
-                                               <para>    This option takes two additional arguments:</para>
-                                               <para>    Argument 1:</para>
-                                               <para>     <literal>audio</literal>             Get data about the audio stream</para>
-                                               <para>     <literal>video</literal>             Get data about the video stream</para>
-                                               <para>     <literal>text</literal>              Get data about the text stream</para>
-                                               <para>    Argument 2:</para>
-                                               <para>     <literal>local_ssrc</literal>        Local SSRC (stream ID)</para>
-                                               <para>     <literal>local_lostpackets</literal> Local lost packets</para>
-                                               <para>     <literal>local_jitter</literal>      Local calculated jitter</para>
-                                               <para>     <literal>local_maxjitter</literal>   Local calculated jitter (maximum)</para>
-                                               <para>     <literal>local_minjitter</literal>   Local calculated jitter (minimum)</para>
-                                               <para>     <literal>local_normdevjitter</literal>Local calculated jitter (normal deviation)</para>
-                                               <para>     <literal>local_stdevjitter</literal> Local calculated jitter (standard deviation)</para>
-                                               <para>     <literal>local_count</literal>       Number of received packets</para>
-                                               <para>     <literal>remote_ssrc</literal>       Remote SSRC (stream ID)</para>
-                                               <para>     <literal>remote_lostpackets</literal>Remote lost packets</para>
-                                               <para>     <literal>remote_jitter</literal>     Remote reported jitter</para>
-                                               <para>     <literal>remote_maxjitter</literal>  Remote calculated jitter (maximum)</para>
-                                               <para>     <literal>remote_minjitter</literal>  Remote calculated jitter (minimum)</para>
-                                               <para>     <literal>remote_normdevjitter</literal>Remote calculated jitter (normal deviation)</para>
-                                               <para>     <literal>remote_stdevjitter</literal>Remote calculated jitter (standard deviation)</para>
-                                               <para>     <literal>remote_count</literal>      Number of transmitted packets</para>
-                                               <para>     <literal>remote_ssrc</literal>       Remote SSRC (stream ID)</para>
-                                               <para>     <literal>remote_lostpackets</literal>Remote lost packets</para>
-                                               <para>     <literal>remote_jitter</literal>     Remote reported jitter</para>
-                                               <para>     <literal>remote_maxjitter</literal>  Remote calculated jitter (maximum)</para>
-                                               <para>     <literal>remote_minjitter</literal>  Remote calculated jitter (minimum)</para>
-                                               <para>     <literal>remote_normdevjitter</literal>Remote calculated jitter (normal deviation)</para>
-                                               <para>     <literal>remote_stdevjitter</literal>Remote calculated jitter (standard deviation)</para>
-                                               <para>     <literal>remote_count</literal>      Number of transmitted packets</para>
-                                               <para>     <literal>rtt</literal>               Round trip time</para>
-                                               <para>     <literal>maxrtt</literal>            Round trip time (maximum)</para>
-                                               <para>     <literal>minrtt</literal>            Round trip time (minimum)</para>
-                                               <para>     <literal>normdevrtt</literal>        Round trip time (normal deviation)</para>
-                                               <para>     <literal>stdevrtt</literal>          Round trip time (standard deviation)</para>
-                                               <para>     <literal>all</literal>               All statistics (in a form suited to logging,
-                                               but not for parsing)</para>
-                                       </enum>
-                                       <enum name="rtpdest">
-                                               <para>R/O Get remote RTP destination information.</para>
-                                               <para>   This option takes one additional argument:</para>
-                                               <para>    Argument 1:</para>
-                                               <para>     <literal>audio</literal>             Get audio destination</para>
-                                               <para>     <literal>video</literal>             Get video destination</para>
+                                       <enum name="hangupsource">
+                                               <para>R/W returns the channel responsible for hangup.</para>
                                        </enum>
-                               </enumlist>
-                               <para><emphasis>chan_iax2</emphasis> provides the following additional options:</para>
-                               <enumlist>
-                                       <enum name="osptoken">
-                                               <para>R/W Get or set the OSP token information for a call.</para>
+                                       <enum name="appname">
+                                               <para>R/O returns the internal application name.</para>
+                                       </enum>
+                                       <enum name="appdata">
+                                               <para>R/O returns the application data if available.</para>
+                                       </enum>
+                                       <enum name="exten">
+                                               <para>R/O returns the extension for an outbound channel.</para>
+                                       </enum>
+                                       <enum name="context">
+                                               <para>R/O returns the context for an outbound channel.</para>
                                        </enum>
-                                       <enum name="peerip">
-                                               <para>R/O Get the peer's ip address.</para>
+                                       <enum name="channame">
+                                               <para>R/O returns the channel name for an outbound channel.</para>
                                        </enum>
-                                       <enum name="peername">
-                                               <para>R/O Get the peer's username.</para>
+                                       <enum name="uniqueid">
+                                               <para>R/O returns the channel uniqueid.</para>
+                                       </enum>
+                                       <enum name="linkedid">
+                                               <para>R/O returns the linkedid if available, otherwise returns the uniqueid.</para>
+                                       </enum>
+                                       <enum name="max_forwards">
+                                               <para>R/W The maximum number of forwards allowed.</para>
+                                       </enum>
+                                       <enum name="callid">
+                                               <para>R/O Call identifier log tag associated with the channel
+                                               e.g., <literal>[C-00000000]</literal>.</para>
                                        </enum>
                                </enumlist>
+                               <xi:include xpointer="xpointer(/docs/info[@name='CHANNEL'])" />
                        </parameter>
                </syntax>
                <description>
                        <para>Gets/sets various pieces of information about the channel, additional <replaceable>item</replaceable> may
                        be available from the channel driver; see its documentation for details. Any <replaceable>item</replaceable>
                        requested that is not available on the current channel will return an empty string.</para>
+                       <example title="Standard CHANNEL item examples">
+                               ; Push a hangup handler subroutine existing at dialplan
+                               ; location default,s,1 onto the current channel
+                               same => n,Set(CHANNEL(hangup_handler_push)=default,s,1)
+
+                               ; Set the current tonezone to Germany (de)
+                               same => n,Set(CHANNEL(tonezone)=de)
+
+                               ; Set the allowed maximum number of forwarding attempts
+                               same => n,Set(CHANNEL(max_forwards)=10)
+
+                               ; If this channel is ejected from its next bridge, and if
+                               ; the channel is not hung up, begin executing dialplan at
+                               ; location default,after-bridge,1
+                               same => n,Set(CHANNEL(after_bridge_goto)=default,after-bridge,1)
+
+                               ; Log the current state of the channel
+                               same => n,Log(NOTICE, This channel is: ${CHANNEL(state)})
+                       </example>
+                       <xi:include xpointer="xpointer(/docs/info[@name='CHANNEL_EXAMPLES'])" />
                </description>
        </function>
  ***/
@@ -212,11 +281,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #define locked_string_field_set(chan, field, source) \
        do { \
                ast_channel_lock(chan); \
-               ast_string_field_set(chan, field, source); \
+               ast_channel_##field##_set(chan, source); \
                ast_channel_unlock(chan); \
        } while (0)
 
-char *transfercapability_table[0x20] = {
+static const char * const transfercapability_table[0x20] = {
        "SPEECH", "UNK", "UNK", "UNK", "UNK", "UNK", "UNK", "UNK",
        "DIGITAL", "RESTRICTED_DIGITAL", "UNK", "UNK", "UNK", "UNK", "UNK", "UNK",
        "3K1AUDIO", "DIGITAL_W_TONES", "UNK", "UNK", "UNK", "UNK", "UNK", "UNK",
@@ -226,47 +295,179 @@ static int func_channel_read(struct ast_channel *chan, const char *function,
                             char *data, char *buf, size_t len)
 {
        int ret = 0;
+       struct ast_format_cap *tmpcap;
 
-       if (!strcasecmp(data, "audionativeformat"))
-               /* use the _multiple version when chan->nativeformats holds multiple formats */
-               /* ast_getformatname_multiple(buf, len, chan->nativeformats & AST_FORMAT_AUDIO_MASK); */
-               ast_copy_string(buf, ast_getformatname(chan->nativeformats & AST_FORMAT_AUDIO_MASK), len);
-       else if (!strcasecmp(data, "videonativeformat"))
-               /* use the _multiple version when chan->nativeformats holds multiple formats */
-               /* ast_getformatname_multiple(buf, len, chan->nativeformats & AST_FORMAT_VIDEO_MASK); */
-               ast_copy_string(buf, ast_getformatname(chan->nativeformats & AST_FORMAT_VIDEO_MASK), len);
-       else if (!strcasecmp(data, "audioreadformat"))
-               ast_copy_string(buf, ast_getformatname(chan->readformat), len);
-       else if (!strcasecmp(data, "audiowriteformat"))
-               ast_copy_string(buf, ast_getformatname(chan->writeformat), len);
-#ifdef CHANNEL_TRACE
-       else if (!strcasecmp(data, "trace")) {
-               ast_channel_lock(chan);
-               ast_copy_string(buf, ast_channel_trace_is_enabled(chan) ? "1" : "0", len);
-               ast_channel_unlock(chan);
+       if (!chan) {
+               ast_log(LOG_WARNING, "No channel was provided to %s function.\n", function);
+               return -1;
        }
+
+       if (!strcasecmp(data, "audionativeformat")) {
+               tmpcap = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT);
+               if (tmpcap) {
+                       struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
+
+                       ast_channel_lock(chan);
+                       ast_format_cap_append_from_cap(tmpcap, ast_channel_nativeformats(chan), AST_MEDIA_TYPE_AUDIO);
+                       ast_channel_unlock(chan);
+                       ast_copy_string(buf, ast_format_cap_get_names(tmpcap, &codec_buf), len);
+                       ao2_ref(tmpcap, -1);
+               }
+       } else if (!strcasecmp(data, "videonativeformat")) {
+               tmpcap = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT);
+               if (tmpcap) {
+                       struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
+
+                       ast_channel_lock(chan);
+                       ast_format_cap_append_from_cap(tmpcap, ast_channel_nativeformats(chan), AST_MEDIA_TYPE_VIDEO);
+                       ast_channel_unlock(chan);
+                       ast_copy_string(buf, ast_format_cap_get_names(tmpcap, &codec_buf), len);
+                       ao2_ref(tmpcap, -1);
+               }
+       } else if (!strcasecmp(data, "audioreadformat")) {
+               locked_copy_string(chan, buf, ast_format_get_name(ast_channel_readformat(chan)), len);
+       } else if (!strcasecmp(data, "audiowriteformat")) {
+               locked_copy_string(chan, buf, ast_format_get_name(ast_channel_writeformat(chan)), len);
+#ifdef CHANNEL_TRACE
+       } else if (!strcasecmp(data, "trace")) {
+               locked_copy_string(chan, buf, ast_channel_trace_is_enabled(chan) ? "1" : "0", len);
 #endif
-       else if (!strcasecmp(data, "tonezone") && chan->zone)
-               locked_copy_string(chan, buf, chan->zone->country, len);
-       else if (!strcasecmp(data, "language"))
-               locked_copy_string(chan, buf, chan->language, len);
+       } else if (!strcasecmp(data, "tonezone") && ast_channel_zone(chan)) {
+               locked_copy_string(chan, buf, ast_channel_zone(chan)->country, len);
+       } else if (!strcasecmp(data, "dtmf_features")) {
+               if (ast_bridge_features_ds_get_string(chan, buf, len)) {
+                       buf[0] = '\0';
+               }
+       } else if (!strcasecmp(data, "language"))
+               locked_copy_string(chan, buf, ast_channel_language(chan), len);
        else if (!strcasecmp(data, "musicclass"))
-               locked_copy_string(chan, buf, chan->musicclass, len);
+               locked_copy_string(chan, buf, ast_channel_musicclass(chan), len);
        else if (!strcasecmp(data, "name")) {
-               locked_copy_string(chan, buf, chan->name, len);
+               locked_copy_string(chan, buf, ast_channel_name(chan), len);
        } else if (!strcasecmp(data, "parkinglot"))
-               locked_copy_string(chan, buf, chan->parkinglot, len);
+               locked_copy_string(chan, buf, ast_channel_parkinglot(chan), len);
        else if (!strcasecmp(data, "state"))
-               locked_copy_string(chan, buf, ast_state2str(chan->_state), len);
-       else if (!strcasecmp(data, "channeltype"))
-               locked_copy_string(chan, buf, chan->tech->type, len);
-       else if (!strcasecmp(data, "transfercapability"))
-               locked_copy_string(chan, buf, transfercapability_table[chan->transfercapability & 0x1f], len);
-       else if (!strcasecmp(data, "callgroup")) {
+               locked_copy_string(chan, buf, ast_state2str(ast_channel_state(chan)), len);
+       else if (!strcasecmp(data, "onhold")) {
+               locked_copy_string(chan, buf,
+                       ast_channel_hold_state(chan) == AST_CONTROL_HOLD ? "1" : "0", len);
+       } else if (!strcasecmp(data, "channeltype"))
+               locked_copy_string(chan, buf, ast_channel_tech(chan)->type, len);
+       else if (!strcasecmp(data, "accountcode"))
+               locked_copy_string(chan, buf, ast_channel_accountcode(chan), len);
+       else if (!strcasecmp(data, "checkhangup")) {
+               locked_copy_string(chan, buf, ast_check_hangup(chan) ? "1" : "0", len);
+       } else if (!strcasecmp(data, "peeraccount"))
+               locked_copy_string(chan, buf, ast_channel_peeraccount(chan), len);
+       else if (!strcasecmp(data, "hangupsource"))
+               locked_copy_string(chan, buf, ast_channel_hangupsource(chan), len);
+       else if (!strcasecmp(data, "appname") && ast_channel_appl(chan))
+               locked_copy_string(chan, buf, ast_channel_appl(chan), len);
+       else if (!strcasecmp(data, "appdata") && ast_channel_data(chan))
+               locked_copy_string(chan, buf, ast_channel_data(chan), len);
+       else if (!strcasecmp(data, "exten") && ast_channel_data(chan))
+               locked_copy_string(chan, buf, ast_channel_exten(chan), len);
+       else if (!strcasecmp(data, "context") && ast_channel_data(chan))
+               locked_copy_string(chan, buf, ast_channel_context(chan), len);
+       else if (!strcasecmp(data, "userfield") && ast_channel_data(chan))
+               locked_copy_string(chan, buf, ast_channel_userfield(chan), len);
+       else if (!strcasecmp(data, "channame") && ast_channel_data(chan))
+               locked_copy_string(chan, buf, ast_channel_name(chan), len);
+       else if (!strcasecmp(data, "linkedid")) {
+               ast_channel_lock(chan);
+               if (ast_strlen_zero(ast_channel_linkedid(chan))) {
+                       /* fall back on the channel's uniqueid if linkedid is unset */
+                       ast_copy_string(buf, ast_channel_uniqueid(chan), len);
+               }
+               else {
+                       ast_copy_string(buf, ast_channel_linkedid(chan), len);
+               }
+               ast_channel_unlock(chan);
+       } else if (!strcasecmp(data, "peer")) {
+               struct ast_channel *peer;
+
+               peer = ast_channel_bridge_peer(chan);
+               if (peer) {
+                       /* Only real channels could have a bridge peer this way. */
+                       ast_channel_lock(peer);
+                       ast_copy_string(buf, ast_channel_name(peer), len);
+                       ast_channel_unlock(peer);
+                       ast_channel_unref(peer);
+               } else {
+                       buf[0] = '\0';
+                       ast_channel_lock(chan);
+                       if (!ast_channel_tech(chan)) {
+                               const char *pname;
+
+                               /*
+                                * A dummy channel can still pass along bridged peer info
+                                * via the BRIDGEPEER variable.
+                                *
+                                * A horrible kludge, but... how else?
+                                */
+                               pname = pbx_builtin_getvar_helper(chan, "BRIDGEPEER");
+                               if (!ast_strlen_zero(pname)) {
+                                       ast_copy_string(buf, pname, len);
+                               }
+                       }
+                       ast_channel_unlock(chan);
+               }
+       } else if (!strcasecmp(data, "uniqueid")) {
+               locked_copy_string(chan, buf, ast_channel_uniqueid(chan), len);
+       } else if (!strcasecmp(data, "transfercapability")) {
+               locked_copy_string(chan, buf, transfercapability_table[ast_channel_transfercapability(chan) & 0x1f], len);
+       } else if (!strcasecmp(data, "callgroup")) {
                char groupbuf[256];
-               locked_copy_string(chan, buf,  ast_print_group(groupbuf, sizeof(groupbuf), chan->callgroup), len);
-       } else if (!chan->tech->func_channel_read
-                || chan->tech->func_channel_read(chan, function, data, buf, len)) {
+
+               locked_copy_string(chan, buf,  ast_print_group(groupbuf, sizeof(groupbuf), ast_channel_callgroup(chan)), len);
+       } else if (!strcasecmp(data, "pickupgroup")) {
+               char groupbuf[256];
+
+               locked_copy_string(chan, buf,  ast_print_group(groupbuf, sizeof(groupbuf), ast_channel_pickupgroup(chan)), len);
+       } else if (!strcasecmp(data, "namedcallgroup")) {
+               struct ast_str *tmp_str = ast_str_alloca(1024);
+
+               locked_copy_string(chan, buf,  ast_print_namedgroups(&tmp_str, ast_channel_named_callgroups(chan)), len);
+       } else if (!strcasecmp(data, "namedpickupgroup")) {
+               struct ast_str *tmp_str = ast_str_alloca(1024);
+
+               locked_copy_string(chan, buf,  ast_print_namedgroups(&tmp_str, ast_channel_named_pickupgroups(chan)), len);
+       } else if (!strcasecmp(data, "after_bridge_goto")) {
+               ast_bridge_read_after_goto(chan, buf, len);
+       } else if (!strcasecmp(data, "amaflags")) {
+               ast_channel_lock(chan);
+               snprintf(buf, len, "%u", ast_channel_amaflags(chan));
+               ast_channel_unlock(chan);
+       } else if (!strncasecmp(data, "secure_bridge_", 14)) {
+               struct ast_datastore *ds;
+
+               buf[0] = '\0';
+               ast_channel_lock(chan);
+               if ((ds = ast_channel_datastore_find(chan, &secure_call_info, NULL))) {
+                       struct ast_secure_call_store *encrypt = ds->data;
+
+                       if (!strcasecmp(data, "secure_bridge_signaling")) {
+                               snprintf(buf, len, "%s", encrypt->signaling ? "1" : "");
+                       } else if (!strcasecmp(data, "secure_bridge_media")) {
+                               snprintf(buf, len, "%s", encrypt->media ? "1" : "");
+                       }
+               }
+               ast_channel_unlock(chan);
+       } else if (!strcasecmp(data, "max_forwards")) {
+               ast_channel_lock(chan);
+               snprintf(buf, len, "%d", ast_max_forwards_get(chan));
+               ast_channel_unlock(chan);
+       } else if (!strcasecmp(data, "callid")) {
+               ast_callid callid;
+
+               buf[0] = '\0';
+               ast_channel_lock(chan);
+               callid = ast_channel_callid(chan);
+               if (callid) {
+                       ast_callid_strnprint(buf, len, callid);
+               }
+               ast_channel_unlock(chan);
+       } else if (!ast_channel_tech(chan) || !ast_channel_tech(chan)->func_channel_read || ast_channel_tech(chan)->func_channel_read(chan, function, data, buf, len)) {
                ast_log(LOG_WARNING, "Unknown or unavailable item requested: '%s'\n", data);
                ret = -1;
        }
@@ -274,7 +475,7 @@ static int func_channel_read(struct ast_channel *chan, const char *function,
        return ret;
 }
 
-static int func_channel_write(struct ast_channel *chan, const char *function,
+static int func_channel_write_real(struct ast_channel *chan, const char *function,
                              char *data, const char *value)
 {
        int ret = 0;
@@ -286,16 +487,44 @@ static int func_channel_write(struct ast_channel *chan, const char *function,
                locked_string_field_set(chan, parkinglot, value);
        else if (!strcasecmp(data, "musicclass"))
                locked_string_field_set(chan, musicclass, value);
+       else if (!strcasecmp(data, "accountcode"))
+               locked_string_field_set(chan, accountcode, value);
+       else if (!strcasecmp(data, "userfield"))
+               locked_string_field_set(chan, userfield, value);
+       else if (!strcasecmp(data, "after_bridge_goto")) {
+               if (ast_strlen_zero(value)) {
+                       ast_bridge_discard_after_goto(chan);
+               } else {
+                       ast_bridge_set_after_go_on(chan, ast_channel_context(chan), ast_channel_exten(chan), ast_channel_priority(chan), value);
+               }
+       } else if (!strcasecmp(data, "amaflags")) {
+               int amaflags;
+
+               if (isdigit(*value)) {
+                       if (sscanf(value, "%30d", &amaflags) != 1) {
+                               amaflags = AST_AMA_NONE;
+                       }
+               } else {
+                       amaflags = ast_channel_string2amaflag(value);
+               }
+               ast_channel_lock(chan);
+               ast_channel_amaflags_set(chan, amaflags);
+               ast_channel_unlock(chan);
+       } else if (!strcasecmp(data, "peeraccount"))
+               locked_string_field_set(chan, peeraccount, value);
+       else if (!strcasecmp(data, "hangupsource"))
+               /* XXX - should we be forcing this here? */
+               ast_set_hangupsource(chan, value, 0);
 #ifdef CHANNEL_TRACE
        else if (!strcasecmp(data, "trace")) {
                ast_channel_lock(chan);
-               if (ast_true(value)) 
+               if (ast_true(value))
                        ret = ast_channel_trace_enable(chan);
-               else if (ast_false(value)) 
+               else if (ast_false(value))
                        ret = ast_channel_trace_disable(chan);
                else {
                        ret = -1;
-                       ast_log(LOG_WARNING, "Invalid value for CHANNEL(trace).");
+                       ast_log(LOG_WARNING, "Invalid value for CHANNEL(trace).\n");
                }
                ast_channel_unlock(chan);
        }
@@ -304,34 +533,111 @@ static int func_channel_write(struct ast_channel *chan, const char *function,
                struct ast_tone_zone *new_zone;
                if (!(new_zone = ast_get_indication_zone(value))) {
                        ast_log(LOG_ERROR, "Unknown country code '%s' for tonezone. Check indications.conf for available country codes.\n", value);
-                       ret = -1;       
+                       ret = -1;
                } else {
                        ast_channel_lock(chan);
-                       if (chan->zone) {
-                               chan->zone = ast_tone_zone_unref(chan->zone);
+                       if (ast_channel_zone(chan)) {
+                               ast_channel_zone_set(chan, ast_tone_zone_unref(ast_channel_zone(chan)));
                        }
-                       chan->zone = ast_tone_zone_ref(new_zone);
+                       ast_channel_zone_set(chan, ast_tone_zone_ref(new_zone));
                        ast_channel_unlock(chan);
                        new_zone = ast_tone_zone_unref(new_zone);
                }
-       } else if (!strcasecmp(data, "callgroup"))
-               chan->callgroup = ast_get_group(value);
-       else if (!strcasecmp(data, "txgain")) {
-               sscanf(value, "%hhd", &gainset);
+       } else if (!strcasecmp(data, "dtmf_features")) {
+               ret = ast_bridge_features_ds_set_string(chan, value);
+       } else if (!strcasecmp(data, "callgroup")) {
+               ast_channel_lock(chan);
+               ast_channel_callgroup_set(chan, ast_get_group(value));
+               ast_channel_unlock(chan);
+       } else if (!strcasecmp(data, "pickupgroup")) {
+               ast_channel_lock(chan);
+               ast_channel_pickupgroup_set(chan, ast_get_group(value));
+               ast_channel_unlock(chan);
+       } else if (!strcasecmp(data, "namedcallgroup")) {
+               struct ast_namedgroups *groups = ast_get_namedgroups(value);
+
+               ast_channel_lock(chan);
+               ast_channel_named_callgroups_set(chan, groups);
+               ast_channel_unlock(chan);
+               ast_unref_namedgroups(groups);
+       } else if (!strcasecmp(data, "namedpickupgroup")) {
+               struct ast_namedgroups *groups = ast_get_namedgroups(value);
+
+               ast_channel_lock(chan);
+               ast_channel_named_pickupgroups_set(chan, groups);
+               ast_channel_unlock(chan);
+               ast_unref_namedgroups(groups);
+       } else if (!strcasecmp(data, "txgain")) {
+               sscanf(value, "%4hhd", &gainset);
                ast_channel_setoption(chan, AST_OPTION_TXGAIN, &gainset, sizeof(gainset), 0);
        } else if (!strcasecmp(data, "rxgain")) {
-               sscanf(value, "%hhd", &gainset);
+               sscanf(value, "%4hhd", &gainset);
                ast_channel_setoption(chan, AST_OPTION_RXGAIN, &gainset, sizeof(gainset), 0);
        } else if (!strcasecmp(data, "transfercapability")) {
                unsigned short i;
+
+               ast_channel_lock(chan);
                for (i = 0; i < 0x20; i++) {
                        if (!strcasecmp(transfercapability_table[i], value) && strcmp(value, "UNK")) {
-                               chan->transfercapability = i;
+                               ast_channel_transfercapability_set(chan, i);
                                break;
                        }
                }
-       } else if (!chan->tech->func_channel_write
-                || chan->tech->func_channel_write(chan, function, data, value)) {
+               ast_channel_unlock(chan);
+       } else if (!strcasecmp(data, "hangup_handler_pop")) {
+               /* Pop one hangup handler before pushing the new handler. */
+               ast_pbx_hangup_handler_pop(chan);
+               ast_pbx_hangup_handler_push(chan, value);
+       } else if (!strcasecmp(data, "hangup_handler_push")) {
+               ast_pbx_hangup_handler_push(chan, value);
+       } else if (!strcasecmp(data, "hangup_handler_wipe")) {
+               /* Pop all hangup handlers before pushing the new handler. */
+               while (ast_pbx_hangup_handler_pop(chan)) {
+               }
+               ast_pbx_hangup_handler_push(chan, value);
+       } else if (!strncasecmp(data, "secure_bridge_", 14)) {
+               struct ast_datastore *ds;
+               struct ast_secure_call_store *store;
+
+               if (!chan || !value) {
+                       return -1;
+               }
+
+               ast_channel_lock(chan);
+               if (!(ds = ast_channel_datastore_find(chan, &secure_call_info, NULL))) {
+                       if (!(ds = ast_datastore_alloc(&secure_call_info, NULL))) {
+                               ast_channel_unlock(chan);
+                               return -1;
+                       }
+                       if (!(store = ast_calloc(1, sizeof(*store)))) {
+                               ast_channel_unlock(chan);
+                               ast_free(ds);
+                               return -1;
+                       }
+                       ds->data = store;
+                       ast_channel_datastore_add(chan, ds);
+               } else {
+                       store = ds->data;
+               }
+
+               if (!strcasecmp(data, "secure_bridge_signaling")) {
+                       store->signaling = ast_true(value) ? 1 : 0;
+               } else if (!strcasecmp(data, "secure_bridge_media")) {
+                       store->media = ast_true(value) ? 1 : 0;
+               }
+               ast_channel_unlock(chan);
+       } else if (!strcasecmp(data, "max_forwards")) {
+               int max_forwards;
+               if (sscanf(value, "%d", &max_forwards) != 1) {
+                       ast_log(LOG_WARNING, "Unable to set max forwards to '%s'\n", value);
+                       ret = -1;
+               } else {
+                       ast_channel_lock(chan);
+                       ret = ast_max_forwards_set(chan, max_forwards);
+                       ast_channel_unlock(chan);
+               }
+       } else if (!ast_channel_tech(chan)->func_channel_write
+                || ast_channel_tech(chan)->func_channel_write(chan, function, data, value)) {
                ast_log(LOG_WARNING, "Unknown or unavailable item requested: '%s'\n",
                                data);
                ret = -1;
@@ -340,6 +646,29 @@ static int func_channel_write(struct ast_channel *chan, const char *function,
        return ret;
 }
 
+static int func_channel_write(struct ast_channel *chan, const char *function, char *data, const char *value)
+{
+       int res;
+       ast_chan_write_info_t write_info = {
+               .version = AST_CHAN_WRITE_INFO_T_VERSION,
+               .write_fn = func_channel_write_real,
+               .chan = chan,
+               .function = function,
+               .data = data,
+               .value = value,
+       };
+
+       if (!chan) {
+               ast_log(LOG_WARNING, "No channel was provided to %s function.\n", function);
+               return -1;
+       }
+
+       res = func_channel_write_real(chan, function, data, value);
+       ast_channel_setoption(chan, AST_OPTION_CHANNEL_WRITE, &write_info, sizeof(write_info), 0);
+
+       return res;
+}
+
 static struct ast_custom_function channel_function = {
        .name = "CHANNEL",
        .read = func_channel_read,
@@ -364,7 +693,7 @@ static int func_channels_read(struct ast_channel *chan, const char *function, ch
                }
        }
 
-       if (!(iter = ast_channel_iterator_all_new(0))) {
+       if (!(iter = ast_channel_iterator_all_new())) {
                if (!ast_strlen_zero(data)) {
                        regfree(&re);
                }
@@ -373,14 +702,14 @@ static int func_channels_read(struct ast_channel *chan, const char *function, ch
 
        while ((c = ast_channel_iterator_next(iter))) {
                ast_channel_lock(c);
-               if (ast_strlen_zero(data) || regexec(&re, c->name, 0, NULL, 0) == 0) {
-                       size_t namelen = strlen(c->name);
+               if (ast_strlen_zero(data) || regexec(&re, ast_channel_name(c), 0, NULL, 0) == 0) {
+                       size_t namelen = strlen(ast_channel_name(c));
                        if (buflen + namelen + (ast_strlen_zero(buf) ? 0 : 1) + 1 < maxlen) {
                                if (!ast_strlen_zero(buf)) {
                                        strcat(buf, " ");
                                        buflen++;
                                }
-                               strcat(buf, c->name);
+                               strcat(buf, ast_channel_name(c));
                                buflen += namelen;
                        } else {
                                ast_log(LOG_WARNING, "Number of channels exceeds the available buffer space.  Output will be truncated!\n");
@@ -404,23 +733,69 @@ static struct ast_custom_function channels_function = {
        .read = func_channels_read,
 };
 
+static int func_mchan_read(struct ast_channel *chan, const char *function,
+                            char *data, struct ast_str **buf, ssize_t len)
+{
+       struct ast_channel *mchan;
+       char *template = ast_alloca(4 + strlen(data));
+
+       if (!chan) {
+               ast_log(LOG_WARNING, "No channel was provided to %s function.\n", function);
+               return -1;
+       }
+
+       mchan = ast_channel_get_by_name(ast_channel_linkedid(chan));
+       sprintf(template, "${%s}", data); /* SAFE */
+       ast_str_substitute_variables(buf, len, mchan ? mchan : chan, template);
+       if (mchan) {
+               ast_channel_unref(mchan);
+       }
+       return 0;
+}
+
+static int func_mchan_write(struct ast_channel *chan, const char *function,
+                             char *data, const char *value)
+{
+       struct ast_channel *mchan;
+
+       if (!chan) {
+               ast_log(LOG_WARNING, "No channel was provided to %s function.\n", function);
+               return -1;
+       }
+
+       mchan = ast_channel_get_by_name(ast_channel_linkedid(chan));
+       pbx_builtin_setvar_helper(mchan ? mchan : chan, data, value);
+       if (mchan) {
+               ast_channel_unref(mchan);
+       }
+       return 0;
+}
+
+static struct ast_custom_function mchan_function = {
+       .name = "MASTER_CHANNEL",
+       .read2 = func_mchan_read,
+       .write = func_mchan_write,
+};
+
 static int unload_module(void)
 {
        int res = 0;
-       
+
        res |= ast_custom_function_unregister(&channel_function);
        res |= ast_custom_function_unregister(&channels_function);
-       
+       res |= ast_custom_function_unregister(&mchan_function);
+
        return res;
 }
 
 static int load_module(void)
 {
        int res = 0;
-       
+
        res |= ast_custom_function_register(&channel_function);
        res |= ast_custom_function_register(&channels_function);
-       
+       res |= ast_custom_function_register(&mchan_function);
+
        return res;
 }