X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-network.c;h=45c1ab0f4c9a1346a53a10fd9f917d998958b019;hb=326cb4061a7d6ec4107f298b6f947d645512ad76;hp=76381c4f6c576b3d6807cca4252262751f26f702;hpb=987efa17dd5c9be156d8f49ddd942df20a72dcb1;p=elogind.git

diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 76381c4f6..45c1ab0f4 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -69,6 +69,10 @@ static int network_load_one(Manager *manager, const char *filename) {
         if (!network->macvlans)
                 return log_oom();
 
+        network->vxlans = hashmap_new(uint64_hash_func, uint64_compare_func);
+        if (!network->vxlans)
+                return log_oom();
+
         network->addresses_by_section = hashmap_new(uint64_hash_func, uint64_compare_func);
         if (!network->addresses_by_section)
                 return log_oom();
@@ -77,14 +81,11 @@ 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();
 
+        network->dhcp_ntp = true;
         network->dhcp_dns = true;
         network->dhcp_hostname = true;
         network->dhcp_domainname = true;
@@ -98,7 +99,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);
@@ -106,7 +107,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);
@@ -164,10 +165,15 @@ void network_free(Network *network) {
 
         free(network->description);
 
-        SET_FOREACH(address, network->dns, i)
+        while ((address = network->ntp)) {
+                LIST_REMOVE(addresses, network->ntp, address);
                 address_free(address);
+        }
 
-        set_free(network->dns);
+        while ((address = network->dns)) {
+                LIST_REMOVE(addresses, network->dns, address);
+                address_free(address);
+        }
 
         netdev_unref(network->bridge);
 
@@ -181,6 +187,10 @@ void network_free(Network *network) {
                 netdev_unref(netdev);
         hashmap_free(network->macvlans);
 
+        HASHMAP_FOREACH(netdev, network->vxlans, i)
+                netdev_unref(netdev);
+        hashmap_free(network->vxlans);
+
         while ((route = network->static_routes))
                 route_free(route);
 
@@ -221,7 +231,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'", IFNAMSIZ, ifname,
+                        log_debug("%-*s: found matching network '%s'", IFNAMSIZ, ifname,
                                   network->filename);
                         *ret = network;
                         return 0;
@@ -238,8 +248,8 @@ int network_apply(Manager *manager, Network *network, Link *link) {
 
         link->network = network;
 
-        if (network->dns) {
-                r = manager_update_resolv_conf(manager);
+        if (network->dns || network->ntp) {
+                r = link_save(link);
                 if (r < 0)
                         return r;
         }
@@ -323,6 +333,15 @@ int config_parse_netdev(const char *unit,
                         return 0;
                 }
 
+                break;
+        case NETDEV_KIND_VXLAN:
+                r = hashmap_put(network->vxlans, netdev->ifname, netdev);
+                if (r < 0) {
+                        log_syntax(unit, LOG_ERR, filename, line, EINVAL,
+                                   "Can not add VXLAN to network: %s", rvalue);
+                        return 0;
+                }
+
                 break;
         default:
                 assert_not_reached("Can not parse NetDev");
@@ -361,7 +380,8 @@ int config_parse_tunnel(const char *unit,
 
         if (netdev->kind != NETDEV_KIND_IPIP &&
             netdev->kind != NETDEV_KIND_SIT &&
-            netdev->kind != NETDEV_KIND_GRE) {
+            netdev->kind != NETDEV_KIND_GRE &&
+            netdev->kind != NETDEV_KIND_VTI) {
                 log_syntax(unit, LOG_ERR, filename, line, EINVAL,
                            "NetDev is not a tunnel, ignoring assignment: %s", rvalue);
                 return 0;