X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-network.c;h=1b8856afebdd9397b8a783f719a9616e779266f6;hp=91b1e3c7bdbc20ee31a21cecd8680abedc2b5529;hb=091a364c802e34a58f3260c9cb5db9b75c62215c;hpb=af4e9e2c563047d524b207e0e3d6816385693a16

diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 91b1e3c7b..1b8856afe 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -20,6 +20,7 @@
 ***/
 
 #include <ctype.h>
+#include <net/if.h>
 
 #include "networkd.h"
 #include "network-internal.h"
@@ -76,10 +77,6 @@ static int network_load_one(Manager *manager, const char *filename) {
         if (!network->routes_by_section)
                 return log_oom();
 
-        network->dns = set_new(NULL, NULL);
-        if (!network->dns)
-                return log_oom();
-
         network->filename = strdup(filename);
         if (!network->filename)
                 return log_oom();
@@ -97,7 +94,7 @@ static int network_load_one(Manager *manager, const char *filename) {
 
         LIST_PREPEND(networks, manager->networks, network);
 
-        LIST_FOREACH(static_routes, route, network->static_routes) {
+        LIST_FOREACH(routes, route, network->static_routes) {
                 if (!route->family) {
                         log_warning("Route section without Gateway field configured in %s. "
                                     "Ignoring", filename);
@@ -105,7 +102,7 @@ static int network_load_one(Manager *manager, const char *filename) {
                 }
         }
 
-        LIST_FOREACH(static_addresses, address, network->static_addresses) {
+        LIST_FOREACH(addresses, address, network->static_addresses) {
                 if (!address->family) {
                         log_warning("Address section without Address field configured in %s. "
                                     "Ignoring", filename);
@@ -163,10 +160,10 @@ void network_free(Network *network) {
 
         free(network->description);
 
-        SET_FOREACH(address, network->dns, i)
+        while ((address = network->dns)) {
+                LIST_REMOVE(addresses, network->dns, address);
                 address_free(address);
-
-        set_free(network->dns);
+        }
 
         netdev_unref(network->bridge);
 
@@ -220,7 +217,7 @@ int network_get(Manager *manager, struct udev_device *device,
                                      udev_device_get_property_value(device, "ID_NET_DRIVER"),
                                      udev_device_get_devtype(device),
                                      ifname)) {
-                        log_debug("%s: found matching network '%s'", ifname,
+                        log_debug("%*s: found matching network '%s'", IFNAMSIZ, ifname,
                                   network->filename);
                         *ret = network;
                         return 0;
@@ -238,7 +235,7 @@ int network_apply(Manager *manager, Network *network, Link *link) {
         link->network = network;
 
         if (network->dns) {
-                r = manager_update_resolv_conf(manager);
+                r = link_save(link);
                 if (r < 0)
                         return r;
         }