X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fndp.c;h=e006c85261af4180147fb6b79b1d37a95f7a8e99;hp=02c2dbd89164b96c2c352df3d3300bf1bffc9695;hb=56c6a4a72a0e086074f69d2ee5cc46079d179dac;hpb=5d599d81ff97e1275935fd5c1b6a5991f245cb61

diff --git a/src/ndp.c b/src/ndp.c
index 02c2dbd..e006c85 100644
--- a/src/ndp.c
+++ b/src/ndp.c
@@ -167,6 +167,7 @@ int setup_ndp_interface(struct interface *iface, bool enable)
 			memcpy(entry, iface->static_ndp, iface->static_ndp_len);
 
 			for (entry = strtok_r(entry, " ", &saveptr); entry; entry = strtok_r(NULL, " ", &saveptr)) {
+				char *sep;
 				struct ndp_neighbor *n = malloc(sizeof(*n));
 				if (!n) {
 					syslog(LOG_ERR, "Malloc failed for static NDP-prefix %s", entry);
@@ -176,12 +177,20 @@ int setup_ndp_interface(struct interface *iface, bool enable)
 				n->iface = iface;
 				n->timeout = 0;
 
-				char ipbuf[INET6_ADDRSTRLEN];
-				if (sscanf(entry, "%45s/%hhu", ipbuf, &n->len) < 2
-						|| n->len > 128 || inet_pton(AF_INET6, ipbuf, &n->addr) != 1) {
+				sep = strchr(entry, '/');
+				if (!sep) {
+					free(n);
 					syslog(LOG_ERR, "Invalid static NDP-prefix %s", entry);
 					return -1;
 				}
+				
+				*sep = 0;
+				n->len = atoi(sep + 1);
+				if (inet_pton(AF_INET6, entry, &n->addr) != 1 || n->len > 128) {
+					free(n);
+					syslog(LOG_ERR, "Invalid static NDP-prefix %s/%s", entry, sep + 1);
+					return -1;
+				}
 
 				list_add(&n->head, &neighbors);
 			}
@@ -364,41 +373,12 @@ static void free_neighbor(struct ndp_neighbor *n)
 	--neighbor_count;
 }
 
-
-static bool match_neighbor(struct ndp_neighbor *n, struct in6_addr *addr)
-{
-	if (n->len <= 32)
-		return ntohl(n->addr.s6_addr32[0]) >> (32 - n->len) ==
-				ntohl(addr->s6_addr32[0]) >> (32 - n->len);
-
-	if (n->addr.s6_addr32[0] != addr->s6_addr32[0])
-		return false;
-
-	if (n->len <= 64)
-		return ntohl(n->addr.s6_addr32[1]) >> (64 - n->len) ==
-				ntohl(addr->s6_addr32[1]) >> (64 - n->len);
-
-	if (n->addr.s6_addr32[1] != addr->s6_addr32[1])
-		return false;
-
-	if (n->len <= 96)
-		return ntohl(n->addr.s6_addr32[2]) >> (96 - n->len) ==
-				ntohl(addr->s6_addr32[2]) >> (96 - n->len);
-
-	if (n->addr.s6_addr32[2] != addr->s6_addr32[2])
-		return false;
-
-	return ntohl(n->addr.s6_addr32[3]) >> (128 - n->len) ==
-			ntohl(addr->s6_addr32[3]) >> (128 - n->len);
-}
-
-
 static struct ndp_neighbor* find_neighbor(struct in6_addr *addr, bool strict)
 {
 	time_t now = time(NULL);
 	struct ndp_neighbor *n, *e;
 	list_for_each_entry_safe(n, e, &neighbors, head) {
-		if ((!strict && match_neighbor(n, addr)) ||
+		if ((!strict && !odhcpd_bmemcmp(&n->addr, addr, n->len)) ||
 				(n->len == 128 && IN6_ARE_ADDR_EQUAL(&n->addr, addr)))
 			return n;