X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=proto.c;h=786d6005f9e20d3600223e99050f6888156d16c4;hp=b16600ce749ab06ed2bbce301faddc99049d4d5a;hb=11bd51d22596cf26be9ba486d52ef336b4035cae;hpb=56b7cadaeb51a60afa5666e190906d332840d5a1

diff --git a/proto.c b/proto.c
index b16600c..786d600 100644
--- a/proto.c
+++ b/proto.c
@@ -2,10 +2,81 @@
 #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;
+
+static bool
+split_netmask(char *str, unsigned int *netmask)
+{
+	char *delim, *err = NULL;
+
+	delim = strchr(str, '/');
+	if (delim) {
+		*(delim++) = 0;
+
+		*netmask = strtoul(delim, &err, 10);
+		if (err && *err)
+			return false;
+	}
+	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))
+		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)
+		avl_init(&handlers, avl_strcmp, false, NULL);
+
+	if (p->avl.key)
+		return;
+
+	p->avl.key = p->name;
+	avl_insert(&handlers, &p->avl);
+}
+
 static void
 default_proto_free(struct interface_proto_state *proto)
 {
@@ -13,40 +84,104 @@ default_proto_free(struct interface_proto_state *proto)
 }
 
 static int
-default_proto_handler(struct interface_proto_state *proto,
+invalid_proto_handler(struct interface_proto_state *proto,
 		      enum interface_proto_cmd cmd, bool force)
 {
+	return -1;
+}
+
+static int
+no_proto_handler(struct interface_proto_state *proto,
+		 enum interface_proto_cmd cmd, bool force)
+{
 	return 0;
 }
 
-struct interface_proto_state *get_default_proto(void)
+static struct interface_proto_state *
+default_proto_attach(const struct proto_handler *h,
+		     struct interface *iface, struct blob_attr *attr)
 {
 	struct interface_proto_state *proto;
 
 	proto = calloc(1, sizeof(*proto));
-	proto->handler = default_proto_handler;
 	proto->free = default_proto_free;
-	proto->flags = PROTO_FLAG_IMMEDIATE;
+	proto->cb = no_proto_handler;
 
 	return proto;
 }
 
-int interface_proto_event(struct interface_proto_state *proto,
-			  enum interface_proto_cmd cmd, bool force)
+static const struct proto_handler no_proto = {
+	.name = "none",
+	.flags = PROTO_FLAG_IMMEDIATE,
+	.attach = default_proto_attach,
+};
+
+static const struct proto_handler *
+get_proto_handler(const char *name)
+{
+	struct proto_handler *proto;
+
+	if (!strcmp(name, "none"))
+	    return &no_proto;
+
+	if (!handlers.comp)
+		return NULL;
+
+	return avl_find_element(&handlers, name, proto, avl);
+}
+
+void
+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 (!state) {
+		state = no_proto.attach(&no_proto, iface, attr);
+		state->cb = invalid_proto_handler;
+	}
+
+	state->handler = proto;
+	interface_set_proto_state(iface, state);
+}
+
+void
+proto_attach_interface(struct interface *iface, const char *proto_name)
+{
+	const struct proto_handler *proto = NULL;
+
+	if (!proto_name) {
+		interface_add_error(iface, "proto", "NO_PROTO", NULL, 0);
+		return;
+	}
+
+	proto = get_proto_handler(proto_name);
+	if (!proto)
+		interface_add_error(iface, "proto", "INVALID_PROTO", NULL, 0);
+
+	iface->proto_handler = proto;
+}
+
+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;