utils: fix existing node check when keep_old/no_delete is enabled

[project/netifd.git] / config.c

diff --git a/config.c b/config.c
index 31ebb8d..ff0410d 100644 (file)
--- a/config.c
+++ b/config.c
@@ -2,16 +2,18 @@
 #include <stdlib.h>
 #include <stdio.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;
-static struct blob_buf b;
-static unsigned int config_version = 1;
 
+static struct uci_context *uci_ctx;
+static struct uci_package *uci_network;
+static struct blob_buf b;
 
 static void uci_attr_to_blob(struct blob_buf *b, const char *str,
                             const char *name, enum blobmsg_type type)
@@ -129,7 +131,7 @@ config_parse_bridge_interface(struct uci_section *s)
        blobmsg_add_string(&b, "name", name);
 
        uci_to_blob(&b, s, bridge_device_type.config_params);
-       if (!bridge_device_type.create(b.head)) {
+       if (!device_create(name, &bridge_device_type, b.head)) {
                DPRINTF("Failed to create bridge for interface '%s'\n", s->e.name);
                return -EINVAL;
        }
@@ -139,21 +141,12 @@ config_parse_bridge_interface(struct uci_section *s)
        return 0;
 }
 
-void
-config_set_state(struct config_state *state, 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;
+       struct blob_attr *config;
 
        DPRINTF("Create interface '%s'\n", s->e.name);
 
@@ -165,19 +158,26 @@ config_parse_interface(struct uci_section *s)
                        return;
 
        uci_to_blob(&b, s, &interface_attr_list);
-       iface = interface_alloc(s->e.name, b.head);
+       iface = calloc(1, sizeof(*iface));
        if (!iface)
                return;
 
-       blob_buf_init(&b, 0);
+       interface_init(iface, s->e.name, b.head);
+
        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;
+       config = malloc(blob_pad_len(b.head));
+       if (!config) {
+               free(iface);
+               return;
+       }
+
+       memcpy(config, b.head, blob_pad_len(b.head));
+       interface_add(iface, config);
 }
 
-void
+static void
 config_init_devices(void)
 {
        struct uci_element *e;
@@ -185,23 +185,95 @@ 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;
+               const char *type, *name;
 
                if (strcmp(s->type, "device") != 0)
                        continue;
 
-               blob_buf_init(&b, 0);
+               name = uci_lookup_option_string(uci_ctx, s, "name");
+               if (!name)
+                       continue;
+
                type = uci_lookup_option_string(uci_ctx, s, "type");
                if (type && !strcmp(type, "bridge"))
                        devtype = &bridge_device_type;
                else
                        devtype = &simple_device_type;
 
+               blob_buf_init(&b, 0);
                uci_to_blob(&b, s, devtype->config_params);
-               devtype->create(b.head);
+               device_create(name, devtype, b.head);
        }
 }
 
+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_pad_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;
+}
+
 void
 config_init_interfaces(const char *name)
 {
@@ -212,7 +284,10 @@ config_init_interfaces(const char *name)
        ctx = uci_alloc_context();
        uci_ctx = ctx;
 
+#ifdef DUMMY_MODE
        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");