do not attempt to get an interface if PROTO_FLAG_NODEV is set
[project/netifd.git] / proto.c
diff --git a/proto.c b/proto.c
index a345b35..d8f16b3 100644 (file)
--- a/proto.c
+++ b/proto.c
@@ -3,8 +3,23 @@
 #include <stdio.h>
 
 #include "netifd.h"
+#include "interface.h"
 #include "proto.h"
 
+static struct avl_tree handlers;
+
+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)
 {
@@ -12,10 +27,97 @@ 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;
+}
+
+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->free = default_proto_free;
+       proto->cb = no_proto_handler;
+
+       return proto;
+}
+
+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;
+       int ret;
+
+       ret = proto->cb(proto, cmd, force);
+       if (ret || !(proto->handler->flags & PROTO_FLAG_IMMEDIATE))
+               goto out;
 
        switch(cmd) {
        case PROTO_CMD_SETUP:
@@ -28,15 +130,7 @@ default_proto_handler(struct interface_proto_state *proto,
                return -EINVAL;
        }
        proto->proto_event(proto, ev);
-       return 0;
-}
 
-struct interface_proto_state *get_default_proto(void)
-{
-       struct interface_proto_state *proto;
-
-       proto = calloc(1, sizeof(*proto));
-       proto->handler = default_proto_handler;
-       proto->free = default_proto_free;
-       return proto;
+out:
+       return ret;
 }