constify

[project/netifd.git] / config.c

diff --git a/config.c b/config.c
index 7ba6875..b184165 100644 (file)
--- a/config.c
+++ b/config.c
@@ -4,11 +4,13 @@
 
 #include "netifd.h"
 #include "interface.h"
+#include "proto.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 void uci_attr_to_blob(struct blob_buf *b, const char *str,
@@ -72,7 +74,7 @@ static void uci_array_to_blob(struct blob_buf *b, struct uci_option *o,
 static void __uci_to_blob(struct blob_buf *b, struct uci_section *s,
                          const struct config_param_list *p)
 {
-       const struct blobmsg_policy *attr;
+       const struct blobmsg_policy *attr = NULL;
        struct uci_element *e;
        struct uci_option *o;
        void *array;
@@ -137,10 +139,22 @@ config_parse_bridge_interface(struct uci_section *s)
        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);
@@ -151,7 +165,16 @@ config_parse_interface(struct uci_section *s)
                        return;
 
        uci_to_blob(&b, s, &interface_attr_list);
-       interface_alloc(s->e.name, s, b.head);
+       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;
 }
 
 void
@@ -210,7 +233,7 @@ config_init_interfaces(const char *name)
                if (!strcmp(s->type, "interface"))
                        config_parse_interface(s);
        }
-       device_free_all();
+       device_free_unused(NULL);
        config_init = false;
 
        interface_start_pending();