[svn-commits] rmudgett: branch group/issue8824 r182796 - in /team/group/issue8824: ./ funcs/

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Tue Mar 17 17:36:55 2009
New Revision: 182796

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=182796
Log:
Merged revisions 182762 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r182762 | russell | 2009-03-17 16:28:04 -0500 (Tue, 17 Mar 2009) | 4 lines
  
  Add support for the "name" option in the CHANNEL() function.
  
  Review: http://reviewboard.digium.com/r/199/
........

Modified:
    team/group/issue8824/   (props changed)
    team/group/issue8824/CHANGES
    team/group/issue8824/funcs/func_channel.c

Propchange: team/group/issue8824/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Mar 17 17:36:55 2009
@@ -1,1 +1,1 @@
-/trunk:1-182740
+/trunk:1-182795

Modified: team/group/issue8824/CHANGES
URL: http://svn.digium.com/svn-view/asterisk/team/group/issue8824/CHANGES?view=diff&rev=182796&r1=182795&r2=182796
==============================================================================
--- team/group/issue8824/CHANGES (original)
+++ team/group/issue8824/CHANGES Tue Mar 17 17:36:55 2009
@@ -11,11 +11,15 @@
 --- 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 for COLP feature -----------------------------------

Modified: team/group/issue8824/funcs/func_channel.c
URL: http://svn.digium.com/svn-view/asterisk/team/group/issue8824/funcs/func_channel.c?view=diff&rev=182796&r1=182795&r2=182796
==============================================================================
--- team/group/issue8824/funcs/func_channel.c (original)
+++ team/group/issue8824/funcs/func_channel.c Tue Mar 17 17:36:55 2009
@@ -82,6 +82,9 @@
 					</enum>
 					<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>
@@ -249,7 +252,9 @@
 		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);