remove the uci dependency from protocol handlers

[project/netifd.git] / config.c

diff --git a/config.c b/config.c
index 1e465c5..1649cee 100644 (file)
--- a/config.c
+++ b/config.c
@@ -4,6 +4,7 @@
 
 #include "netifd.h"
 #include "interface.h"
+#include "proto.h"
 
 struct uci_context *uci_ctx;
 static struct uci_package *uci_network;
@@ -72,7 +73,7 @@ static void uci_array_to_blob(struct blob_buf *b, struct uci_option *o,
 static void __uci_to_blob(struct blob_buf *b, struct uci_section *s,
                          const struct config_param_list *p)
 {
-       const struct blobmsg_policy *attr;
+       const struct blobmsg_policy *attr = NULL;
        struct uci_element *e;
        struct uci_option *o;
        void *array;
@@ -117,14 +118,51 @@ static void uci_to_blob(struct blob_buf *b, struct uci_section *s,
                uci_to_blob(b, s, p->next[i]);
 }
 
+static int
+config_parse_bridge_interface(struct uci_section *s)
+{
+       char *name;
+
+       name = alloca(strlen(s->e.name) + 4);
+       sprintf(name, "br-%s", s->e.name);
+       blobmsg_add_string(&b, "name", name);
+
+       uci_to_blob(&b, s, bridge_device_type.config_params);
+       if (!bridge_device_type.create(b.head)) {
+               DPRINTF("Failed to create bridge for interface '%s'\n", s->e.name);
+               return -EINVAL;
+       }
+
+       blob_buf_init(&b, 0);
+       blobmsg_add_string(&b, "ifname", name);
+       return 0;
+}
+
 static void
 config_parse_interface(struct uci_section *s)
 {
+       struct interface *iface;
+       const char *type;
+
        DPRINTF("Create interface '%s'\n", s->e.name);
 
        blob_buf_init(&b, 0);
+
+       type = uci_lookup_option_string(uci_ctx, s, "type");
+       if (type && !strcmp(type, "bridge"))
+               if (config_parse_bridge_interface(s))
+                       return;
+
        uci_to_blob(&b, s, &interface_attr_list);
-       interface_alloc(s->e.name, s, b.head);
+       iface = interface_alloc(s->e.name, b.head);
+       if (!iface)
+               return;
+
+       blob_buf_init(&b, 0);
+       if (iface->proto_handler && iface->proto_handler->config_params)
+               uci_to_blob(&b, s, iface->proto_handler->config_params);
+
+       proto_init_interface(iface, b.head);
 }
 
 void
@@ -134,13 +172,21 @@ config_init_devices(void)
 
        uci_foreach_element(&uci_network->sections, e) {
                struct uci_section *s = uci_to_section(e);
+               const struct device_type *devtype;
+               const char *type;
 
                if (strcmp(s->type, "device") != 0)
                        continue;
 
                blob_buf_init(&b, 0);
-               uci_to_blob(&b, s, &device_attr_list);
-               device_create(b.head, s);
+               type = uci_lookup_option_string(uci_ctx, s, "type");
+               if (type && !strcmp(type, "bridge"))
+                       devtype = &bridge_device_type;
+               else
+                       devtype = &simple_device_type;
+
+               uci_to_blob(&b, s, devtype->config_params);
+               devtype->create(b.head);
        }
 }