networkd: add support for [Address] sections

[elogind.git] / src / network / networkd-network.c

diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 69c55edb8fe3ef588bb5d13a45a3817cb332c581..dc2af9dd24e776f4f3156d9708e90cfe71271575 100644 (file)
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -42,9 +42,24 @@ static int network_load_one(Manager *manager, const char *filename) {
         if (!network)
                 return log_oom();
 
+        network->manager = manager;
+
         LIST_HEAD_INIT(network->addresses);
+        LIST_HEAD_INIT(network->routes);
+
+        network->addresses_by_section = hashmap_new(uint64_hash_func, uint64_compare_func);
+        if (!network->addresses_by_section)
+                return log_oom();
+
+        network->routes_by_section = hashmap_new(uint64_hash_func, uint64_compare_func);
+        if (!network->routes_by_section)
+                return log_oom();
+
+        network->filename = strdup(filename);
+        if (!network->filename)
+                return log_oom();
 
-        r = config_parse(NULL, filename, file, "Match\0Network\0", config_item_perf_lookup,
+        r = config_parse(NULL, filename, file, "Match\0Network\0Address\0Route\0", config_item_perf_lookup,
                         (void*) network_gperf_lookup, false, false, network);
         if (r < 0) {
                 log_warning("Could not parse config file %s: %s", filename, strerror(-r));
@@ -52,10 +67,6 @@ static int network_load_one(Manager *manager, const char *filename) {
         } else
                 log_debug("Parsed configuration file %s", filename);
 
-        network->filename = strdup(filename);
-        if (!network->filename)
-                return log_oom();
-
         LIST_PREPEND(networks, manager->networks, network);
         network = NULL;
 
@@ -119,6 +130,9 @@ void network_free(Network *network) {
         while ((address = network->addresses))
                 address_free(address);
 
+        hashmap_free(network->addresses_by_section);
+        hashmap_free(network->routes_by_section);
+
         LIST_REMOVE(networks, network->manager->networks, network);
 
         free(network);
@@ -157,8 +171,6 @@ int network_get(Manager *manager, struct udev_device *device, Network **ret) {
 }
 
 int network_apply(Manager *manager, Network *network, Link *link) {
-        Address *address;
-        Route *route;
         int r;
 
         log_info("Network '%s' being applied to link '%u'",
@@ -166,21 +178,9 @@ int network_apply(Manager *manager, Network *network, Link *link) {
 
         link->network = network;
 
-        LIST_FOREACH(addresses, address, network->addresses) {
-                r = address_configure(manager, address, link);
-                if (r < 0)
-                        return r;
-        }
-
-        r = link_up(manager, link);
+        r = link_configure(link);
         if (r < 0)
                 return r;
 
-        LIST_FOREACH(routes, route, network->routes) {
-                r = route_configure(manager, route, link);
-                if (r < 0)
-                        return r;
-        }
-
         return 0;
 }