[Asterisk-cvs] asterisk/channels chan_sip.c,1.583,1.584

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv24549/channels

Modified Files:
	chan_sip.c 
Log Message:
Fix allow/disallow nomenclature (bug #2945, part deux)


Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.583
retrieving revision 1.584
diff -u -d -r1.583 -r1.584
--- chan_sip.c	3 Dec 2004 23:34:45 -0000	1.583
+++ chan_sip.c	3 Dec 2004 23:46:09 -0000	1.584
@@ -8292,9 +8292,9 @@
 					user->amaflags = format;
 				}
 			} else if (!strcasecmp(v->name, "allow")) {
-				ast_parse_allow_deny(&user->prefs, &user->capability, v->value, 1);
+				ast_parse_allow_disallow(&user->prefs, &user->capability, v->value, 1);
 			} else if (!strcasecmp(v->name, "disallow")) {
-				ast_parse_allow_deny(&user->prefs, &user->capability, v->value, 0);
+				ast_parse_allow_disallow(&user->prefs, &user->capability, v->value, 0);
 			} else if (!strcasecmp(v->name, "insecure")) {
 				user->insecure = ast_true(v->value);
 			} else if (!strcasecmp(v->name, "callingpres")) {
@@ -8550,9 +8550,9 @@
 			} else if (!strcasecmp(v->name, "pickupgroup")) {
 				peer->pickupgroup = ast_get_group(v->value);
 			} else if (!strcasecmp(v->name, "allow")) {
-				ast_parse_allow_deny(&peer->prefs, &peer->capability, v->value, 1);
+				ast_parse_allow_disallow(&peer->prefs, &peer->capability, v->value, 1);
 			} else if (!strcasecmp(v->name, "disallow")) {
-				ast_parse_allow_deny(&peer->prefs, &peer->capability, v->value, 0);
+				ast_parse_allow_disallow(&peer->prefs, &peer->capability, v->value, 0);
 			} else if (!strcasecmp(v->name, "insecure")) {
 				if (!strcasecmp(v->value, "very")) {
 					peer->insecure = 2;
@@ -8826,9 +8826,9 @@
 			else
 				memcpy(&externip.sin_addr, hp->h_addr, sizeof(externip.sin_addr));
 		} else if (!strcasecmp(v->name, "allow")) {
-			ast_parse_allow_deny(&prefs, &global_capability, v->value, 1);
+			ast_parse_allow_disallow(&prefs, &global_capability, v->value, 1);
 		} else if (!strcasecmp(v->name, "disallow")) {
-			ast_parse_allow_deny(&prefs, &global_capability, v->value, 0);
+			ast_parse_allow_disallow(&prefs, &global_capability, v->value, 0);
 		} else if (!strcasecmp(v->name, "register")) {
 			sip_register(v->value, v->lineno);
 		} else if (!strcasecmp(v->name, "recordhistory")) {