[asterisk-commits] file: trunk r403174 - in /trunk: ./ res/res_pjsip/pjsip_configuration.c

[SVN commits to the Asterisk project]

Author: file
Date: Wed Nov 27 09:31:43 2013
New Revision: 403174

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=403174
Log:
res_pjsip: Update handling of some options to work with new option names.

Some options (such as call_group and pickup_group) share the same configuration
handler and decide what logic to use based on the name of the option. These
handlers were not updated to check for the new option names and were treating
the options as invalid.

This change simply updates the handlers with the proper names of the options.

(closes issue ASTERISK-22922)
Reported by: Anthony Messina
........

Merged revisions 403173 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/res/res_pjsip/pjsip_configuration.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Wed Nov 27 09:31:43 2013
@@ -1,1 +1,1 @@
-/branches/12:1-398558,398560-398577,398579-399305,399307-401390,401392-402993,403016,403022,403069,403082,403094,403117,403119,403131,403134,403160
+/branches/12:1-398558,398560-398577,398579-399305,399307-401390,401392-402993,403016,403022,403069,403082,403094,403117,403119,403131,403134,403160,403173

Modified: trunk/res/res_pjsip/pjsip_configuration.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip/pjsip_configuration.c?view=diff&rev=403174&r1=403173&r2=403174
==============================================================================
--- trunk/res/res_pjsip/pjsip_configuration.c (original)
+++ trunk/res/res_pjsip/pjsip_configuration.c Wed Nov 27 09:31:43 2013
@@ -666,11 +666,11 @@
 {
 	struct ast_sip_endpoint *endpoint = obj;
 
-	if (!strncmp(var->name, "callgroup", 9)) {
+	if (!strncmp(var->name, "call_group", 10)) {
 		if (!(endpoint->pickup.callgroup = ast_get_group(var->value))) {
 			return -1;
 		}
-	} else if (!strncmp(var->name, "pickupgroup", 11)) {
+	} else if (!strncmp(var->name, "pickup_group", 12)) {
 		if (!(endpoint->pickup.pickupgroup = ast_get_group(var->value))) {
 			return -1;
 		}
@@ -710,12 +710,12 @@
 {
 	struct ast_sip_endpoint *endpoint = obj;
 
-	if (!strncmp(var->name, "namedcallgroup", 14)) {
+	if (!strncmp(var->name, "named_call_group", 16)) {
 		if (!(endpoint->pickup.named_callgroups =
 		      ast_get_namedgroups(var->value))) {
 			return -1;
 		}
-	} else if (!strncmp(var->name, "namedpickupgroup", 16)) {
+	} else if (!strncmp(var->name, "named_pickup_group", 18)) {
 		if (!(endpoint->pickup.named_pickupgroups =
 		      ast_get_namedgroups(var->value))) {
 			return -1;