[Asterisk-cvs] asterisk acl.c,1.12,1.13

[markster at lists.digium.com]

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

Modified Files:
	acl.c 
Log Message:
Allow /x for subnetmask identification (e.g. 192.168.0.0/16)


Index: acl.c
===================================================================
RCS file: /usr/cvsroot/asterisk/acl.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- acl.c	10 Jan 2004 21:31:40 -0000	1.12
+++ acl.c	10 Jan 2004 21:43:17 -0000	1.13
@@ -72,6 +72,8 @@
 	char tmp[256] = "";
 	struct ast_ha *prev = NULL;
 	struct ast_ha *ret;
+	int x,z;
+	unsigned int y;
 	ret = path;
 	while(path) {
 		prev = path;
@@ -86,13 +88,22 @@
 			*nm = '\0';
 			nm++;
 		}
-		if (!inet_aton(tmp, &ha->netaddr)) {
-			ast_log(LOG_WARNING, "%s not a valid IP\n", tmp);
+		if (!strchr(nm, '.')) {
+			if ((sscanf(nm, "%i", &x) == 1) && (x >= 0) && (x <= 32)) {
+				y = 0;
+				for (z=0;z<x;z++) {
+					y >>= 1;
+					y |= 0x8000000;
+				}
+				ha->netmask.s_addr = htonl(y);
+			}
+		} else if (!inet_aton(nm, &ha->netmask)) {
+			ast_log(LOG_WARNING, "%s not a valid netmask\n", nm);
 			free(ha);
 			return path;
 		}
-		if (!inet_aton(nm, &ha->netmask)) {
-			ast_log(LOG_WARNING, "%s not a valid netmask\n", nm);
+		if (!inet_aton(tmp, &ha->netaddr)) {
+			ast_log(LOG_WARNING, "%s not a valid IP\n", tmp);
 			free(ha);
 			return path;
 		}