X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=proto.c;h=d8f16b33e2e45c9f5003e5c9670920edf0157e3b;hp=5126107b53c2cb98c467fc4a01447929c4599b42;hb=924d9c4e48ed2044efe712eac9cd170f4da4b447;hpb=6b7accf51072d883a7692d7a4bb1d7d1a2e7242b

diff --git a/proto.c b/proto.c
index 5126107..d8f16b3 100644
--- a/proto.c
+++ b/proto.c
@@ -35,28 +35,38 @@ invalid_proto_handler(struct interface_proto_state *proto,
 
 static int
 no_proto_handler(struct interface_proto_state *proto,
-		      enum interface_proto_cmd cmd, bool force)
+		 enum interface_proto_cmd cmd, bool force)
 {
 	return 0;
 }
 
 static struct interface_proto_state *
-get_default_proto(void)
+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->free = default_proto_free;
-	proto->flags = PROTO_FLAG_IMMEDIATE;
+	proto->cb = no_proto_handler;
 
 	return proto;
 }
 
-struct proto_handler *
+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;
 
@@ -64,44 +74,39 @@ get_proto_handler(const char *name)
 }
 
 void
-proto_attach_interface(struct interface *iface, struct uci_section *s)
+proto_init_interface(struct interface *iface, struct blob_attr *attr)
 {
+	const struct proto_handler *proto = iface->proto_handler;
 	struct interface_proto_state *state = NULL;
-	struct proto_handler *proto = NULL;
-	const char *proto_name;
-	const char *error = NULL;
 
-	proto_name = uci_lookup_option_string(uci_ctx, s, "proto");
-	if (!proto_name) {
-		error = "NO_PROTO";
-		goto error;
-	}
+	if (proto)
+		state = proto->attach(proto, iface, attr);
 
-	if (!strcmp(proto_name, "none")) {
-		state = get_default_proto();
-		state->handler = no_proto_handler;
-		goto out;
+	if (!state) {
+		state = no_proto.attach(&no_proto, iface, attr);
+		state->cb = invalid_proto_handler;
 	}
 
-	proto = get_proto_handler(proto_name);
-	if (!proto) {
-		error = "INVALID_PROTO";
-		goto error;
-	}
+	state->handler = proto;
+	interface_set_proto_state(iface, state);
+}
 
-	state = proto->attach(proto, iface, s);
+void
+proto_attach_interface(struct interface *iface, const char *proto_name)
+{
+	const struct proto_handler *proto = NULL;
 
-error:
-	if (error) {
-		interface_add_error(iface, "proto", error, NULL, 0);
-		state = get_default_proto();
-		state->handler = invalid_proto_handler;
+	if (!proto_name) {
+		interface_add_error(iface, "proto", "NO_PROTO", NULL, 0);
+		return;
 	}
 
-out:
-	interface_set_proto_state(iface, state);
-}
+	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,
@@ -110,8 +115,8 @@ interface_proto_event(struct interface_proto_state *proto,
 	enum interface_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) {