X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=proto.c;h=c51637f32dac82697eed3bb00ab6637c0cdf82f5;hp=278fb0c33e736789765d4e1d4c602d66774fe641;hb=6803aef644a5112f331e6de4d37d78718b76a9bf;hpb=0c823ed77d2d4aaca12d4c9504e808e4c715b8e4

diff --git a/proto.c b/proto.c
index 278fb0c..c51637f 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)
@@ -48,14 +129,14 @@ default_proto_attach(const struct proto_handler *h,
 
 	proto = calloc(1, sizeof(*proto));
 	proto->free = default_proto_free;
-	proto->flags = PROTO_FLAG_IMMEDIATE;
-	proto->handler = no_proto_handler;
+	proto->cb = no_proto_handler;
 
 	return proto;
 }
 
 static const struct proto_handler no_proto = {
 	.name = "none",
+	.flags = PROTO_FLAG_IMMEDIATE,
 	.attach = default_proto_attach,
 };
 
@@ -79,14 +160,16 @@ proto_init_interface(struct interface *iface, struct blob_attr *attr)
 	const struct proto_handler *proto = iface->proto_handler;
 	struct interface_proto_state *state = NULL;
 
-	if (proto)
-		state = proto->attach(proto, iface, attr);
+	if (!proto)
+		proto = &no_proto;
 
+	state = proto->attach(proto, iface, attr);
 	if (!state) {
 		state = no_proto.attach(&no_proto, iface, attr);
-		state->handler = invalid_proto_handler;
+		state->cb = invalid_proto_handler;
 	}
 
+	state->handler = proto;
 	interface_set_proto_state(iface, state);
 }
 
@@ -101,8 +184,10 @@ proto_attach_interface(struct interface *iface, const char *proto_name)
 	}
 
 	proto = get_proto_handler(proto_name);
-	if (!proto)
+	if (!proto) {
 		interface_add_error(iface, "proto", "INVALID_PROTO", NULL, 0);
+		proto = &no_proto;
+	}
 
 	iface->proto_handler = proto;
 }
@@ -111,19 +196,19 @@ 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->handler(proto, cmd, force);
-	if (ret || !(proto->flags & PROTO_FLAG_IMMEDIATE))
+	ret = proto->cb(proto, cmd, force);
+	if (ret || !(proto->handler->flags & PROTO_FLAG_IMMEDIATE))
 		goto out;
 
 	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;