minor cleanup

[project/netifd.git] / config.c

diff --git a/config.c b/config.c
index ff0410d..4158cc8 100644 (file)
--- a/config.c
+++ b/config.c
@@ -132,7 +132,7 @@ config_parse_bridge_interface(struct uci_section *s)
 
        uci_to_blob(&b, s, bridge_device_type.config_params);
        if (!device_create(name, &bridge_device_type, b.head)) {
-               DPRINTF("Failed to create bridge for interface '%s'\n", s->e.name);
+               D(INTERFACE, "Failed to create bridge for interface '%s'\n", s->e.name);
                return -EINVAL;
        }
 
@@ -147,8 +147,7 @@ config_parse_interface(struct uci_section *s)
        struct interface *iface;
        const char *type;
        struct blob_attr *config;
-
-       DPRINTF("Create interface '%s'\n", s->e.name);
+       struct device *dev;
 
        blob_buf_init(&b, 0);
 
@@ -175,6 +174,17 @@ config_parse_interface(struct uci_section *s)
 
        memcpy(config, b.head, blob_pad_len(b.head));
        interface_add(iface, config);
+
+       dev = iface->main_dev.dev;
+       if (!dev || !dev->default_config)
+               return;
+
+       blob_buf_init(&b, 0);
+       uci_to_blob(&b, s, dev->type->config_params);
+       if (blob_len(b.head) == 0)
+               return;
+
+       device_set_config(dev, dev->type, b.head);
 }
 
 static void
@@ -223,7 +233,7 @@ config_diff(struct blob_attr **tb1, struct blob_attr **tb2,
                if (blob_len(tb1[i]) != blob_len(tb2[i]))
                        goto mark;
 
-               if (memcmp(tb1[i], tb2[i], blob_pad_len(tb1[i])) != 0)
+               if (memcmp(tb1[i], tb2[i], blob_raw_len(tb1[i])) != 0)
                        goto mark;
 
                continue;
@@ -246,6 +256,12 @@ __config_check_equal(struct blob_attr *c1, struct blob_attr *c2,
 {
        struct blob_attr **tb1, **tb2;
 
+       if (!!c1 ^ !!c2)
+               return false;
+
+       if (!c1 && !c2)
+               return true;
+
        tb1 = alloca(config->n_params * sizeof(struct blob_attr *));
        blobmsg_parse(config->params, config->n_params, tb1,
                blob_data(c1), blob_len(c1));
@@ -274,42 +290,80 @@ config_check_equal(struct blob_attr *c1, struct blob_attr *c2,
        return true;
 }
 
-void
-config_init_interfaces(const char *name)
+struct blob_attr *
+config_memdup(struct blob_attr *attr)
 {
-       struct uci_context *ctx;
+       struct blob_attr *ret;
+       int size = blob_pad_len(attr);
+
+       ret = malloc(size);
+       if (!ret)
+               return NULL;
+
+       memcpy(ret, attr, size);
+       return ret;
+}
+
+static struct uci_package *
+config_init_package(const char *config)
+{
+       struct uci_context *ctx = uci_ctx;
        struct uci_package *p = NULL;
-       struct uci_element *e;
 
-       ctx = uci_alloc_context();
-       uci_ctx = ctx;
+       if (!ctx) {
+               ctx = uci_alloc_context();
+               uci_ctx = ctx;
 
 #ifdef DUMMY_MODE
-       uci_set_confdir(ctx, "./config");
-       uci_set_savedir(ctx, "./tmp");
+               uci_set_confdir(ctx, "./config");
+               uci_set_savedir(ctx, "./tmp");
 #endif
-
-       if (uci_load(ctx, "network", &p)) {
-               fprintf(stderr, "Failed to load network config\n");
-               return;
+       } else {
+               p = uci_lookup_package(ctx, config);
+               if (p)
+                       uci_unload(ctx, p);
        }
 
-       uci_network = p;
-       config_init = true;
+       if (uci_load(ctx, "network", &p))
+               return NULL;
 
-       config_init_devices();
+       return p;
+}
 
-       uci_foreach_element(&p->sections, e) {
-               struct uci_section *s = uci_to_section(e);
+static void
+config_init_interfaces(void)
+{
+       struct uci_element *e;
 
-               if (name && strcmp(s->e.name, name) != 0)
-                       continue;
+       uci_foreach_element(&uci_network->sections, e) {
+               struct uci_section *s = uci_to_section(e);
 
                if (!strcmp(s->type, "interface"))
                        config_parse_interface(s);
        }
-       device_free_unused(NULL);
+}
+
+void
+config_init_all(void)
+{
+       uci_network = config_init_package("network");
+       if (!uci_network) {
+               fprintf(stderr, "Failed to load network config\n");
+               return;
+       }
+
+       config_init = true;
+       device_lock();
+
+       device_reset_config();
+       config_init_devices();
+       config_init_interfaces();
+
        config_init = false;
+       device_unlock();
 
+       device_reset_old();
+       device_init_pending();
+       device_free_unused(NULL);
        interface_start_pending();
 }