Add support for the "name" option in the CHANNEL() function.

Review: http://reviewboard.digium.com/r/199/

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@182762 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/CHANGES b/CHANGES
index 25cb357..404248b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -12,12 +12,16 @@
 --- Functionality changes from Asterisk 1.6.2 to Asterisk 1.6.3  -------------
 ------------------------------------------------------------------------------
 
- *Applications
+Applications
 ------------
  * Added progress option to the app_dial D() option.  When progress DTMF is
    present, those values are sent immediatly upon receiving a PROGRESS message
    regardless if the call has been answered or not.
 
+Functions
+---------
+ * The CHANNEL() function now supports the "name" option.
+
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 1.6.1 to Asterisk 1.6.2  -------------
 ------------------------------------------------------------------------------

diff --git a/funcs/func_channel.c b/funcs/func_channel.c
index ff8eeb2..5cf2621 100644 (file)
--- a/funcs/func_channel.c
+++ b/funcs/func_channel.c
@@ -83,6 +83,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                                        <enum name="musicclass">
                                                <para>R/W class (from musiconhold.conf) for hold music.</para>
                                        </enum>
+                                       <enum name="name">
+                                               <para>The name of the channel</para>
+                                       </enum>
                                        <enum name="parkinglot">
                                                <para>R/W parkinglot for parking.</para>
                                        </enum>
@@ -249,7 +252,9 @@ static int func_channel_read(struct ast_channel *chan, const char *function,
                locked_copy_string(chan, buf, chan->language, len);
        else if (!strcasecmp(data, "musicclass"))
                locked_copy_string(chan, buf, chan->musicclass, len);
-       else if (!strcasecmp(data, "parkinglot"))
+       else if (!strcasecmp(data, "name")) {
+               locked_copy_string(chan, buf, chan->name, len);
+       } else if (!strcasecmp(data, "parkinglot"))
                locked_copy_string(chan, buf, chan->parkinglot, len);
        else if (!strcasecmp(data, "state"))
                locked_copy_string(chan, buf, ast_state2str(chan->_state), len);