[asterisk-commits] irroot: branch irroot/distrotech-customers r318994 - /team/irroot/distrotech-...

[SVN commits to the Asterisk project]

Author: irroot
Date: Sat May 14 11:36:41 2011
New Revision: 318994

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=318994
Log:
Allow setting pickupgroup on channl via CHANNEL()

RB:1118
#19045



Modified:
    team/irroot/distrotech-customers/funcs/func_channel.c

Modified: team/irroot/distrotech-customers/funcs/func_channel.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers/funcs/func_channel.c?view=diff&rev=318994&r1=318993&r2=318994
==============================================================================
--- team/irroot/distrotech-customers/funcs/func_channel.c (original)
+++ team/irroot/distrotech-customers/funcs/func_channel.c Sat May 14 11:36:41 2011
@@ -85,6 +85,9 @@
 					<enum name="callgroup">
 						<para>R/W call groups for call pickup.</para>
 					</enum>
+					<enum name="pickupgroup">
+						<para>R/W call groups for call pickup.</para>
+					</enum>
 					<enum name="channeltype">
 						<para>R/O technology used for channel.</para>
 					</enum>
@@ -369,6 +372,9 @@
 	else if (!strcasecmp(data, "callgroup")) {
 		char groupbuf[256];
 		locked_copy_string(chan, buf,  ast_print_group(groupbuf, sizeof(groupbuf), chan->callgroup), len);
+	} else if (!strcasecmp(data, "pickupgroup")) {
+		char groupbuf[256];
+		locked_copy_string(chan, buf,  ast_print_group(groupbuf, sizeof(groupbuf), chan->pickupgroup), len);
 	} else if (!strcasecmp(data, "amaflags")) {
 		char amabuf[256];
 		snprintf(amabuf,sizeof(amabuf), "%d", chan->amaflags);
@@ -454,9 +460,11 @@
 			ast_channel_unlock(chan);
 			new_zone = ast_tone_zone_unref(new_zone);
 		}
-	} else if (!strcasecmp(data, "callgroup"))
+	} else if (!strcasecmp(data, "callgroup")) {
 		chan->callgroup = ast_get_group(value);
-	else if (!strcasecmp(data, "txgain")) {
+	} else if (!strcasecmp(data, "pickupgroup")) {
+		chan->pickupgroup = ast_get_group(value);
+	} 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")) {