[asterisk-commits] jrose: branch 12 r423417 - /branches/12/res/res_pjsip_endpoint_identifier_ip.c

[SVN commits to the Asterisk project]

Author: jrose
Date: Thu Sep 18 11:44:26 2014
New Revision: 423417

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=423417
Log:
res_pjsip_endpoint_identifier_ip: Fix parsing of match value with CIDR

Also fixes comma separates match lists

ASTERISK-24290 #close
Reported by: Ray Crumrine
Review: https://reviewboard.asterisk.org/r/3995/

Modified:
    branches/12/res/res_pjsip_endpoint_identifier_ip.c

Modified: branches/12/res/res_pjsip_endpoint_identifier_ip.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/res/res_pjsip_endpoint_identifier_ip.c?view=diff&rev=423417&r1=423416&r2=423417
==============================================================================
--- branches/12/res/res_pjsip_endpoint_identifier_ip.c (original)
+++ branches/12/res/res_pjsip_endpoint_identifier_ip.c Thu Sep 18 11:44:26 2014
@@ -157,31 +157,53 @@
 static int ip_identify_match_handler(const struct aco_option *opt, struct ast_variable *var, void *obj)
 {
 	struct ip_identify_match *identify = obj;
-	int num_addrs = 0, error = 0, i;
-	struct ast_sockaddr *addrs;
-
-	num_addrs = ast_sockaddr_resolve(&addrs, var->value, PARSE_PORT_FORBID, AST_AF_UNSPEC);
-	if (!num_addrs) {
-		ast_log(LOG_ERROR, "Address '%s' provided on ip endpoint identifier '%s' did not resolve to any address\n",
-			var->value, ast_sorcery_object_get_id(obj));
-		return -1;
-	}
-
-	for (i = 0; i < num_addrs; ++i) {
-		/* We deny what we actually want to match because there is an implicit permit all rule for ACLs */
-		identify->matches = ast_append_ha("d", ast_sockaddr_stringify_addr(&addrs[i]), identify->matches, &error);
-
-		if (!identify->matches || error) {
-			ast_log(LOG_ERROR, "Failed to add address '%s' to ip endpoint identifier '%s'\n",
-				ast_sockaddr_stringify_addr(&addrs[i]), ast_sorcery_object_get_id(obj));
-			error = -1;
-			break;
+	char *input_string = ast_strdupa(var->value);
+	char *current_string;
+
+	while ((current_string = strsep(&input_string, ","))) {
+		struct ast_sockaddr *addrs;
+		int num_addrs = 0, error = 0, i;
+		char *mask = strrchr(current_string, '/');
+
+		if (mask) {
+			identify->matches = ast_append_ha("d", current_string, identify->matches, &error);
+
+			if (!identify->matches || error) {
+				ast_log(LOG_ERROR, "Failed to add address '%s' to ip endpoint identifier '%s'\n",
+					current_string, ast_sorcery_object_get_id(obj));
+				return -1;
+			}
+
+			continue;
 		}
-	}
-
-	ast_free(addrs);
-
-	return error;
+
+		num_addrs = ast_sockaddr_resolve(&addrs, current_string, PARSE_PORT_FORBID, AST_AF_UNSPEC);
+		if (!num_addrs) {
+			ast_log(LOG_ERROR, "Address '%s' provided on ip endpoint identifier '%s' did not resolve to any address\n",
+				var->value, ast_sorcery_object_get_id(obj));
+			return -1;
+		}
+
+		for (i = 0; i < num_addrs; ++i) {
+			/* We deny what we actually want to match because there is an implicit permit all rule for ACLs */
+			identify->matches = ast_append_ha("d", ast_sockaddr_stringify_addr(&addrs[i]), identify->matches, &error);
+
+			if (!identify->matches || error) {
+				ast_log(LOG_ERROR, "Failed to add address '%s' to ip endpoint identifier '%s'\n",
+					ast_sockaddr_stringify_addr(&addrs[i]), ast_sorcery_object_get_id(obj));
+				error = -1;
+				break;
+			}
+		}
+
+		ast_free(addrs);
+
+		if (error) {
+			return -1;
+		}
+	}
+
+	return 0;
 }