X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-network.c;h=1606042264b584758f9a7cd7b80076d17c1acc4b;hp=9533aff8e32cc85163d910404c464b693990ef79;hb=2ad8416dd057e7e3185169609ca3006e7649f576;hpb=7384fa923e1ba403454903133b33f559b735fe75

diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 9533aff8e..160604226 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -24,10 +24,13 @@
 #include "path-util.h"
 #include "conf-files.h"
 #include "conf-parser.h"
+#include "util.h"
 
 static int network_load_one(Manager *manager, const char *filename) {
         _cleanup_network_free_ Network *network = NULL;
         _cleanup_fclose_ FILE *file = NULL;
+        Route *route;
+        Address *address;
         int r;
 
         assert(manager);
@@ -70,6 +73,29 @@ static int network_load_one(Manager *manager, const char *filename) {
         }
 
         LIST_PREPEND(networks, manager->networks, network);
+
+        LIST_FOREACH(static_routes, route, network->static_routes) {
+                if (!route->family) {
+                        log_warning("Route section without Gateway field configured in %s. "
+                                    "Ignoring", filename);
+                        return 0;
+                }
+
+                if (route->dst_family && route->family != route->dst_family) {
+                        log_warning("Route section with conflicting Gateway and Destination address "
+                                    "family configured in %s. Ignoring", filename);
+                        return 0;
+                }
+        }
+
+        LIST_FOREACH(static_addresses, address, network->static_addresses) {
+                if (!address->family) {
+                        log_warning("Address section without Address field configured in %s. "
+                                    "Ignoring", filename);
+                        return 0;
+                }
+        }
+
         network = NULL;
 
         return 0;
@@ -77,7 +103,8 @@ static int network_load_one(Manager *manager, const char *filename) {
 
 int network_load(Manager *manager) {
         Network *network;
-        char **files, **f;
+        _cleanup_strv_free_ char **files = NULL;
+        char **f;
         int r;
 
         assert(manager);
@@ -85,7 +112,7 @@ int network_load(Manager *manager) {
         while ((network = manager->networks))
                 network_free(network);
 
-        r = conf_files_list_strv(&files, ".network", NULL, (const char **)manager->network_dirs);
+        r = conf_files_list_strv(&files, ".network", NULL, network_dirs);
         if (r < 0) {
                 log_error("Failed to enumerate network files: %s", strerror(-r));
                 return r;
@@ -97,8 +124,6 @@ int network_load(Manager *manager) {
                         return r;
         }
 
-        strv_free(files);
-
         return 0;
 }
 
@@ -109,8 +134,6 @@ void network_free(Network *network) {
         if (!network)
                 return;
 
-        assert(network->manager);
-
         free(network->filename);
 
         free(network->match_mac);
@@ -130,7 +153,7 @@ void network_free(Network *network) {
         hashmap_free(network->addresses_by_section);
         hashmap_free(network->routes_by_section);
 
-        if (network->manager->networks)
+        if (network->manager && network->manager->networks)
                 LIST_REMOVE(networks, network->manager->networks, network);
 
         free(network);