use /lib/netifd as main path when dummy mode is disabled

[project/netifd.git] / config.c

diff --git a/config.c b/config.c
index 3dda5cf..c8f7807 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;
        }
 
@@ -148,8 +148,6 @@ config_parse_interface(struct uci_section *s)
        const char *type;
        struct blob_attr *config;
 
-       DPRINTF("Create interface '%s'\n", s->e.name);
-
        blob_buf_init(&b, 0);
 
        type = uci_lookup_option_string(uci_ctx, s, "type");
@@ -206,22 +204,122 @@ config_init_devices(void)
        }
 }
 
-void
-config_init_interfaces(const char *name)
+bool
+config_diff(struct blob_attr **tb1, struct blob_attr **tb2,
+           const struct config_param_list *config, unsigned long *diff)
+{
+       bool ret = false;
+       int i;
+
+       for (i = 0; i < config->n_params; i++) {
+               if (!tb1[i] && !tb2[i])
+                       continue;
+
+               if (!!tb1[i] != !!tb2[i])
+                       goto mark;
+
+               if (blob_len(tb1[i]) != blob_len(tb2[i]))
+                       goto mark;
+
+               if (memcmp(tb1[i], tb2[i], blob_raw_len(tb1[i])) != 0)
+                       goto mark;
+
+               continue;
+
+mark:
+               ret = true;
+               if (diff)
+                       set_bit(diff, i);
+               else
+                       return ret;
+       }
+
+       return ret;
+}
+
+
+static bool
+__config_check_equal(struct blob_attr *c1, struct blob_attr *c2,
+                    const struct config_param_list *config)
+{
+       struct blob_attr **tb1, **tb2;
+
+       tb1 = alloca(config->n_params * sizeof(struct blob_attr *));
+       blobmsg_parse(config->params, config->n_params, tb1,
+               blob_data(c1), blob_len(c1));
+
+       tb2 = alloca(config->n_params * sizeof(struct blob_attr *));
+       blobmsg_parse(config->params, config->n_params, tb2,
+               blob_data(c2), blob_len(c2));
+
+       return !config_diff(tb1, tb2, config, NULL);
+}
+
+bool
+config_check_equal(struct blob_attr *c1, struct blob_attr *c2,
+                  const struct config_param_list *config)
+{
+       int i;
+
+       if (!__config_check_equal(c1, c2, config))
+               return false;
+
+       for (i = 0; i < config->n_next; i++) {
+               if (!__config_check_equal(c1, c2, config->next[i]))
+                       return false;
+       }
+
+       return true;
+}
+
+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
+       } else {
+               p = uci_lookup_package(ctx, config);
+               if (p)
+                       uci_unload(ctx, p);
+       }
+
+       if (uci_load(ctx, "network", &p))
+               return NULL;
+
+       return p;
+}
+
+void
+config_init_interfaces(const char *name)
+{
+       struct uci_package *p = NULL;
+       struct uci_element *e;
 
-       if (uci_load(ctx, "network", &p)) {
+       p = config_init_package("network");
+       if (!p) {
                fprintf(stderr, "Failed to load network config\n");
                return;
        }
@@ -229,6 +327,7 @@ config_init_interfaces(const char *name)
        uci_network = p;
        config_init = true;
 
+       device_reset_config();
        config_init_devices();
 
        uci_foreach_element(&p->sections, e) {
@@ -240,8 +339,10 @@ config_init_interfaces(const char *name)
                if (!strcmp(s->type, "interface"))
                        config_parse_interface(s);
        }
-       device_free_unused(NULL);
        config_init = false;
 
+       device_reset_old();
+       device_init_pending();
+       device_free_unused(NULL);
        interface_start_pending();
 }