fix interrupted read checks in log collection

[project/netifd.git] / config.c

diff --git a/config.c b/config.c
index ff0410d..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");
@@ -223,7 +221,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;
@@ -274,22 +272,54 @@ 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
+       } else {
+               p = uci_lookup_package(ctx, config);
+               if (p)
+                       uci_unload(ctx, p);
+       }
 
-       if (uci_load(ctx, "network", &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;
+
+       p = config_init_package("network");
+       if (!p) {
                fprintf(stderr, "Failed to load network config\n");
                return;
        }
@@ -297,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) {
@@ -308,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();
 }