system-linux: set the point to point address if present

[project/netifd.git] / config.c

diff --git a/config.c b/config.c
index c8f7807..5687b4c 100644 (file)
--- a/config.c
+++ b/config.c
@@ -1,3 +1,16 @@
+/*
+ * netifd - network interface daemon
+ * Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -6,6 +19,7 @@
 
 #include "netifd.h"
 #include "interface.h"
+#include "interface-ip.h"
 #include "proto.h"
 #include "config.h"
 
@@ -147,6 +161,7 @@ config_parse_interface(struct uci_section *s)
        struct interface *iface;
        const char *type;
        struct blob_attr *config;
+       struct device *dev;
 
        blob_buf_init(&b, 0);
 
@@ -173,6 +188,37 @@ config_parse_interface(struct uci_section *s)
 
        memcpy(config, b.head, blob_pad_len(b.head));
        interface_add(iface, config);
+
+       /*
+        * need to look up the interface name again, in case of config update,
+        * the pointer will have changed
+        */
+       iface = vlist_find(&interfaces, s->e.name, iface, node);
+       if (!iface)
+               return;
+
+       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
+config_parse_route(struct uci_section *s, bool v6)
+{
+       void *route;
+
+       blob_buf_init(&b, 0);
+       route = blobmsg_open_array(&b, "route");
+       uci_to_blob(&b, s, &route_attr_list);
+       blobmsg_close_array(&b, route);
+       interface_ip_add_route(NULL, blob_data(b.head), v6);
 }
 
 static void
@@ -182,7 +228,7 @@ 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 struct device_type *devtype = NULL;
                const char *type, *name;
 
                if (strcmp(s->type, "device") != 0)
@@ -193,9 +239,14 @@ config_init_devices(void)
                        continue;
 
                type = uci_lookup_option_string(uci_ctx, s, "type");
-               if (type && !strcmp(type, "bridge"))
-                       devtype = &bridge_device_type;
-               else
+               if (type) {
+                       if (!strcmp(type, "bridge"))
+                               devtype = &bridge_device_type;
+                       else if (!strcmp(type, "tunnel"))
+                               devtype = &tunnel_device_type;
+               }
+
+               if (!devtype)
                        devtype = &simple_device_type;
 
                blob_buf_init(&b, 0);
@@ -244,6 +295,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));
@@ -306,43 +363,71 @@ config_init_package(const char *config)
                        uci_unload(ctx, p);
        }
 
-       if (uci_load(ctx, "network", &p))
+       if (uci_load(ctx, config, &p))
                return NULL;
 
        return p;
 }
 
-void
-config_init_interfaces(const char *name)
+static void
+config_init_interfaces(void)
 {
-       struct uci_package *p = NULL;
        struct uci_element *e;
 
-       p = config_init_package("network");
-       if (!p) {
+       uci_foreach_element(&uci_network->sections, e) {
+               struct uci_section *s = uci_to_section(e);
+
+               if (!strcmp(s->type, "interface"))
+                       config_parse_interface(s);
+       }
+}
+
+static void
+config_init_routes(void)
+{
+       struct interface *iface;
+       struct uci_element *e;
+
+       vlist_for_each_element(&interfaces, iface, node)
+               interface_ip_update_start(&iface->config_ip);
+
+       uci_foreach_element(&uci_network->sections, e) {
+               struct uci_section *s = uci_to_section(e);
+
+               if (!strcmp(s->type, "route"))
+                       config_parse_route(s, false);
+               else if (!strcmp(s->type, "route6"))
+                       config_parse_route(s, true);
+       }
+
+       vlist_for_each_element(&interfaces, iface, node)
+               interface_ip_update_complete(&iface->config_ip);
+}
+
+void
+config_init_all(void)
+{
+       uci_network = config_init_package("network");
+       if (!uci_network) {
                fprintf(stderr, "Failed to load network config\n");
                return;
        }
 
-       uci_network = p;
+       vlist_update(&interfaces);
        config_init = true;
+       device_lock();
 
        device_reset_config();
        config_init_devices();
+       config_init_interfaces();
+       config_init_routes();
 
-       uci_foreach_element(&p->sections, e) {
-               struct uci_section *s = uci_to_section(e);
-
-               if (name && strcmp(s->e.name, name) != 0)
-                       continue;
-
-               if (!strcmp(s->type, "interface"))
-                       config_parse_interface(s);
-       }
        config_init = false;
+       device_unlock();
 
        device_reset_old();
        device_init_pending();
        device_free_unused(NULL);
+       vlist_flush(&interfaces);
        interface_start_pending();
 }