[asterisk-commits] mmichelson: branch mmichelson/sip_endpoint_reorg r395506 - in /team/mmichelso...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Fri Jul 26 10:46:51 2013
New Revision: 395506

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=395506
Log:
Group pickup options together.


Modified:
    team/mmichelson/sip_endpoint_reorg/channels/chan_gulp.c
    team/mmichelson/sip_endpoint_reorg/include/asterisk/res_sip.h
    team/mmichelson/sip_endpoint_reorg/res/res_sip/sip_configuration.c

Modified: team/mmichelson/sip_endpoint_reorg/channels/chan_gulp.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/sip_endpoint_reorg/channels/chan_gulp.c?view=diff&rev=395506&r1=395505&r2=395506
==============================================================================
--- team/mmichelson/sip_endpoint_reorg/channels/chan_gulp.c (original)
+++ team/mmichelson/sip_endpoint_reorg/channels/chan_gulp.c Fri Jul 26 10:46:51 2013
@@ -609,11 +609,11 @@
 	ast_channel_exten_set(chan, S_OR(exten, "s"));
 	ast_channel_priority_set(chan, 1);
 
-	ast_channel_callgroup_set(chan, session->endpoint->callgroup);
-	ast_channel_pickupgroup_set(chan, session->endpoint->pickupgroup);
-
-	ast_channel_named_callgroups_set(chan, session->endpoint->named_callgroups);
-	ast_channel_named_pickupgroups_set(chan, session->endpoint->named_pickupgroups);
+	ast_channel_callgroup_set(chan, session->endpoint->pickup.callgroup);
+	ast_channel_pickupgroup_set(chan, session->endpoint->pickup.pickupgroup);
+
+	ast_channel_named_callgroups_set(chan, session->endpoint->pickup.named_callgroups);
+	ast_channel_named_pickupgroups_set(chan, session->endpoint->pickup.named_pickupgroups);
 
 	if (!ast_strlen_zero(session->endpoint->language)) {
 		ast_channel_language_set(chan, session->endpoint->language);

Modified: team/mmichelson/sip_endpoint_reorg/include/asterisk/res_sip.h
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/sip_endpoint_reorg/include/asterisk/res_sip.h?view=diff&rev=395506&r1=395505&r2=395506
==============================================================================
--- team/mmichelson/sip_endpoint_reorg/include/asterisk/res_sip.h (original)
+++ team/mmichelson/sip_endpoint_reorg/include/asterisk/res_sip.h Fri Jul 26 10:46:51 2013
@@ -437,6 +437,16 @@
 		/*! When performing connected line update, which method should be used */
 		enum ast_sip_session_refresh_method refresh_method;
 	} id;
+	struct {
+		/*! Call group */
+		ast_group_t callgroup;
+		/*! Pickup group */
+		ast_group_t pickupgroup;
+		/*! Named call group */
+		struct ast_namedgroups *named_callgroups;
+		/*! Named pickup group */
+		struct ast_namedgroups *named_pickupgroups;
+	} pickup;
 	/*! Domain to which this endpoint belongs */
 	struct ast_sip_domain *domain;
 	/*! Address of record for incoming registrations */
@@ -459,14 +469,6 @@
 	unsigned int one_touch_recording;
 	/*! Boolean indicating if ringing should be sent as inband progress */
 	unsigned int inband_progress;
-	/*! Call group */
-	ast_group_t callgroup;
-	/*! Pickup group */
-	ast_group_t pickupgroup;
-	/*! Named call group */
-	struct ast_namedgroups *named_callgroups;
-	/*! Named pickup group */
-	struct ast_namedgroups *named_pickupgroups;
 	/*! Pointer to the persistent Asterisk endpoint */
 	struct ast_endpoint *persistent;
 	/*! The number of channels at which busy device state is returned */

Modified: team/mmichelson/sip_endpoint_reorg/res/res_sip/sip_configuration.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/sip_endpoint_reorg/res/res_sip/sip_configuration.c?view=diff&rev=395506&r1=395505&r2=395506
==============================================================================
--- team/mmichelson/sip_endpoint_reorg/res/res_sip/sip_configuration.c (original)
+++ team/mmichelson/sip_endpoint_reorg/res/res_sip/sip_configuration.c Fri Jul 26 10:46:51 2013
@@ -483,11 +483,11 @@
 	struct ast_sip_endpoint *endpoint = obj;
 
 	if (!strncmp(var->name, "callgroup", 9)) {
-		if (!(endpoint->callgroup = ast_get_group(var->value))) {
+		if (!(endpoint->pickup.callgroup = ast_get_group(var->value))) {
 			return -1;
 		}
 	} else if (!strncmp(var->name, "pickupgroup", 11)) {
-		if (!(endpoint->pickupgroup = ast_get_group(var->value))) {
+		if (!(endpoint->pickup.pickupgroup = ast_get_group(var->value))) {
 			return -1;
 		}
 	} else {
@@ -503,12 +503,12 @@
 	struct ast_sip_endpoint *endpoint = obj;
 
 	if (!strncmp(var->name, "namedcallgroup", 14)) {
-		if (!(endpoint->named_callgroups =
+		if (!(endpoint->pickup.named_callgroups =
 		      ast_get_namedgroups(var->value))) {
 			return -1;
 		}
 	} else if (!strncmp(var->name, "namedpickupgroup", 16)) {
-		if (!(endpoint->named_pickupgroups =
+		if (!(endpoint->pickup.named_pickupgroups =
 		      ast_get_namedgroups(var->value))) {
 			return -1;
 		}
@@ -770,8 +770,8 @@
 	destroy_auths(endpoint->sip_inbound_auths, endpoint->num_inbound_auths);
 	destroy_auths(endpoint->sip_outbound_auths, endpoint->num_outbound_auths);
 	ast_party_id_free(&endpoint->id.self);
-	endpoint->named_callgroups = ast_unref_namedgroups(endpoint->named_callgroups);
-	endpoint->named_pickupgroups = ast_unref_namedgroups(endpoint->named_pickupgroups);
+	endpoint->pickup.named_callgroups = ast_unref_namedgroups(endpoint->pickup.named_callgroups);
+	endpoint->pickup.named_pickupgroups = ast_unref_namedgroups(endpoint->pickup.named_pickupgroups);
 	ao2_cleanup(endpoint->persistent);
 }