extend vlist code to allow keeping the old data structure instead of the new one...
[project/netifd.git] / config.c
index 2442eff..8705c16 100644 (file)
--- a/config.c
+++ b/config.c
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <net/ethernet.h>
+#include <uci.h>
 
 #include "netifd.h"
 #include "interface.h"
+#include "proto.h"
+#include "config.h"
 
-struct uci_context *uci_ctx;
-static struct uci_package *uci_network;
 bool config_init = false;
 
-enum {
-       SIF_TYPE,
-       SIF_IFNAME,
-       __SIF_MAX,
-};
-
-static const struct uci_parse_option if_opts[__SIF_MAX] = {
-       [SIF_TYPE] = { "type", UCI_TYPE_STRING },
-       [SIF_IFNAME] = { "ifname", UCI_TYPE_STRING },
-};
+static struct uci_context *uci_ctx;
+static struct uci_package *uci_network;
+static struct blob_buf b;
+static unsigned int config_version = 1;
 
-static void
-config_parse_interface(struct uci_section *s)
+static void uci_attr_to_blob(struct blob_buf *b, const char *str,
+                            const char *name, enum blobmsg_type type)
 {
-       struct uci_option *opts[__SIF_MAX];
-       struct interface *iface;
-       struct device *dev;
-       const char *type;
-
-       DPRINTF("Create interface '%s'\n", s->e.name);
+       char *err;
+       int intval;
+
+       switch (type) {
+       case BLOBMSG_TYPE_STRING:
+               blobmsg_add_string(b, name, str);
+               break;
+       case BLOBMSG_TYPE_BOOL:
+               if (!strcmp(str, "true") || !strcmp(str, "1"))
+                       intval = 1;
+               else if (!strcmp(str, "false") || !strcmp(str, "0"))
+                       intval = 0;
+               else
+                       return;
 
-       iface = alloc_interface(s->e.name);
-       if (!iface)
-               return;
+               blobmsg_add_u8(b, name, intval);
+               break;
+       case BLOBMSG_TYPE_INT32:
+               intval = strtol(str, &err, 0);
+               if (*err)
+                       return;
 
-       uci_parse_section(s, if_opts, __SIF_MAX, opts);
+               blobmsg_add_u32(b, name, intval);
+               break;
+       default:
+               break;
+       }
+}
 
-       if (opts[SIF_TYPE]) {
-               type = opts[SIF_TYPE]->v.string;
+static void uci_array_to_blob(struct blob_buf *b, struct uci_option *o,
+                             enum blobmsg_type type)
+{
+       struct uci_element *e;
+       char *str, *next, *word;
 
-               if (!strcmp(type, "bridge")) {
-                       interface_attach_bridge(iface, s);
-                       return;
+       if (o->type == UCI_TYPE_LIST) {
+               uci_foreach_element(&o->v.list, e) {
+                       uci_attr_to_blob(b, e->name, NULL, type);
                }
+               return;
        }
 
-       if (opts[SIF_IFNAME]) {
-               dev = get_device(opts[SIF_IFNAME]->v.string, true);
-               if (!dev)
-                       return;
+       str = strdup(o->v.string);
+       next = str;
+
+       while ((word = strsep(&next, " \t")) != NULL) {
+               if (!*word)
+                       continue;
 
-               add_device_user(&iface->main_dev, dev);
+               uci_attr_to_blob(b, word, NULL, type);
        }
+
+       free(str);
 }
 
-enum {
-       SDEV_NAME,
-       SDEV_TYPE,
-       SDEV_MTU,
-       SDEV_MACADDR,
-       SDEV_TXQUEUELEN,
-       __SDEV_MAX,
-};
-
-static const struct uci_parse_option dev_opts[__SDEV_MAX] = {
-       [SDEV_NAME] = { "name", UCI_TYPE_STRING },
-       [SDEV_TYPE] = { "type", UCI_TYPE_STRING },
-       [SDEV_MTU] = { "mtu", UCI_TYPE_STRING },
-       [SDEV_MACADDR] = { "macaddr", UCI_TYPE_STRING },
-       [SDEV_TXQUEUELEN] = { "txqueuelen", UCI_TYPE_STRING },
-};
-
-static bool
-add_int_option(struct uci_option *o, unsigned int *dest)
+static void __uci_to_blob(struct blob_buf *b, struct uci_section *s,
+                         const struct config_param_list *p)
 {
-       char *error = NULL;
-       int val;
+       const struct blobmsg_policy *attr = NULL;
+       struct uci_element *e;
+       struct uci_option *o;
+       void *array;
+       int i;
+
+       uci_foreach_element(&s->options, e) {
+               for (i = 0; i < p->n_params; i++) {
+                       attr = &p->params[i];
+                       if (!strcmp(attr->name, e->name))
+                               break;
+               }
 
-       if (!o)
-               return false;
+               if (i == p->n_params)
+                       continue;
 
-       val = strtoul(o->v.string, &error, 0);
-       if (error && *error)
-               return false;
+               o = uci_to_option(e);
 
-       *dest = val;
-       return true;
+               if (attr->type == BLOBMSG_TYPE_ARRAY) {
+                       if (!p->info)
+                               continue;
+
+                       array = blobmsg_open_array(b, attr->name);
+                       uci_array_to_blob(b, o, p->info[i].type);
+                       blobmsg_close_array(b, array);
+                       continue;
+               }
+
+               if (o->type == UCI_TYPE_LIST)
+                       continue;
+
+               uci_attr_to_blob(b, o->v.string, attr->name, attr->type);
+       }
 }
 
-static void
-config_init_device_settings(struct device *dev, struct uci_option **opts)
+static void uci_to_blob(struct blob_buf *b, struct uci_section *s,
+                       const struct config_param_list *p)
 {
-       struct ether_addr *ea;
+       int i;
 
-       dev->flags = 0;
+       __uci_to_blob(b, s, p);
+       for (i = 0; i < p->n_next; i++)
+               uci_to_blob(b, s, p->next[i]);
+}
 
-       if (add_int_option(opts[SDEV_MTU], &dev->mtu))
-               dev->flags |= DEV_OPT_MTU;
+static int
+config_parse_bridge_interface(struct uci_section *s)
+{
+       char *name;
 
-       if (add_int_option(opts[SDEV_TXQUEUELEN], &dev->txqueuelen))
-               dev->flags |= DEV_OPT_TXQUEUELEN;
+       name = alloca(strlen(s->e.name) + 4);
+       sprintf(name, "br-%s", s->e.name);
+       blobmsg_add_string(&b, "name", name);
 
-       if (opts[SDEV_MACADDR]) {
-               ea = ether_aton(opts[SDEV_MACADDR]->v.string);
-               if (ea) {
-                       memcpy(dev->macaddr, ea, sizeof(dev->macaddr));
-                       dev->flags |= DEV_OPT_MACADDR;
-               }
+       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;
 }
 
 void
+config_set_state(struct config_state *state, const struct blob_attr *attr)
+{
+       state->data = malloc(blob_pad_len(attr));
+       if (!state->data)
+               return;
+
+       memcpy(state->data, attr, blob_pad_len(attr));
+}
+
+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);
+       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);
+       iface->config.version = config_version;
+}
+
+static void
 config_init_devices(void)
 {
        struct uci_element *e;
-       struct device *dev;
-       struct uci_option *opts[__SDEV_MAX];
 
        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;
 
-               uci_parse_section(s, dev_opts, __SDEV_MAX, opts);
-               if (!opts[SDEV_NAME])
-                       continue;
-
-               dev = NULL;
-               if (opts[SDEV_TYPE]) {
-                       const char *type = opts[SDEV_TYPE]->v.string;
-
-                       if (!strcmp(type, "bridge"))
-                               dev = bridge_create(opts[SDEV_NAME]->v.string, s);
-               } else {
-                       dev = get_device(opts[SDEV_NAME]->v.string, true);
-               }
-
-               if (!dev)
-                       continue;
+               blob_buf_init(&b, 0);
+               type = uci_lookup_option_string(uci_ctx, s, "type");
+               if (type && !strcmp(type, "bridge"))
+                       devtype = &bridge_device_type;
+               else
+                       devtype = &simple_device_type;
 
-               config_init_device_settings(dev, opts);
-               dev->config_hash = uci_hash_options(opts, __SDEV_MAX);
+               uci_to_blob(&b, s, devtype->config_params);
+               devtype->create(b.head);
        }
 }
 
@@ -159,7 +215,9 @@ config_init_interfaces(const char *name)
        ctx = uci_alloc_context();
        uci_ctx = ctx;
 
+#ifdef DUMMY_MODE
        uci_set_confdir(ctx, "./config");
+#endif
 
        if (uci_load(ctx, "network", &p)) {
                fprintf(stderr, "Failed to load network config\n");
@@ -180,8 +238,8 @@ config_init_interfaces(const char *name)
                if (!strcmp(s->type, "interface"))
                        config_parse_interface(s);
        }
-       cleanup_devices();
+       device_free_unused(NULL);
        config_init = false;
 
-       start_pending_interfaces();
+       interface_start_pending();
 }