X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=proto.c;h=bd3b09ae7d2748f665ea1138d20e29edd0aab4ae;hb=e8f450ba2e67716cf3ed70060a309b80aa24cf00;hp=d8f16b33e2e45c9f5003e5c9670920edf0157e3b;hpb=bbfa8c18c8ae086b6fd941e950c466f25c134c17;p=project%2Fnetifd.git

diff --git a/proto.c b/proto.c
index d8f16b3..bd3b09a 100644
--- a/proto.c
+++ b/proto.c
@@ -2,12 +2,93 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#include <arpa/inet.h>
+#include <netinet/in.h>
+
 #include "netifd.h"
 #include "interface.h"
+#include "interface-ip.h"
 #include "proto.h"
 
 static struct avl_tree handlers;
 
+unsigned int
+parse_netmask_string(const char *str, bool v6)
+{
+	struct in_addr addr;
+	unsigned int ret;
+	char *err = NULL;
+
+	if (!strchr(str, '.')) {
+		ret = strtoul(str, &err, 0);
+		if (err && *err)
+			goto error;
+
+		return ret;
+	}
+
+	if (v6)
+		goto error;
+
+	if (inet_aton(str, &addr) != 1)
+		goto error;
+
+	return 32 - fls(~(ntohl(addr.s_addr)));
+
+error:
+	return ~0;
+}
+
+static bool
+split_netmask(char *str, unsigned int *netmask, bool v6)
+{
+	char *delim = strchr(str, '/');
+
+	if (delim) {
+		*(delim++) = 0;
+
+		*netmask = parse_netmask_string(delim, v6);
+	}
+	return true;
+}
+
+static int
+parse_ip_and_netmask(int af, const char *str, void *addr, unsigned int *netmask)
+{
+	char *astr = alloca(strlen(str) + 1);
+
+	strcpy(astr, str);
+	if (!split_netmask(astr, netmask, af == AF_INET6))
+		return 0;
+
+	if (af == AF_INET6) {
+		if (*netmask > 128)
+			return 0;
+	} else {
+		if (*netmask > 32)
+			return 0;
+	}
+
+	return inet_pton(af, astr, addr);
+}
+
+struct device_addr *
+proto_parse_ip_addr_string(const char *str, bool v6, int mask)
+{
+	struct device_addr *addr;
+	int af = v6 ? AF_INET6 : AF_INET;
+
+	addr = calloc(1, sizeof(*addr));
+	addr->flags = v6 ? DEVADDR_INET6 : DEVADDR_INET4;
+	addr->mask = mask;
+	if (!parse_ip_and_netmask(af, str, &addr->addr, &addr->mask)) {
+		free(addr);
+		return NULL;
+	}
+	return addr;
+}
+
+
 void add_proto_handler(struct proto_handler *p)
 {
 	if (!handlers.comp)
@@ -112,7 +193,7 @@ int
 interface_proto_event(struct interface_proto_state *proto,
 		      enum interface_proto_cmd cmd, bool force)
 {
-	enum interface_event ev;
+	enum interface_proto_event ev;
 	int ret;
 
 	ret = proto->cb(proto, cmd, force);
@@ -121,10 +202,10 @@ interface_proto_event(struct interface_proto_state *proto,
 
 	switch(cmd) {
 	case PROTO_CMD_SETUP:
-		ev = IFEV_UP;
+		ev = IFPEV_UP;
 		break;
 	case PROTO_CMD_TEARDOWN:
-		ev = IFEV_DOWN;
+		ev = IFPEV_DOWN;
 		break;
 	default:
 		return -EINVAL;