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=7e753e15aff27f55b69ca16898825378f0163272;hp=0375194e46b822cfbf41ab9bfb9409b3eaeb06db;hb=6a0a2f860f1ca4a10932da3b41dbc3c0139757cc;hpb=3be1d7e0c5bf60658d34eb6311d4e77c6803578c

diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 0375194e4..7e753e15a 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -48,8 +48,8 @@ static int network_load_one(Manager *manager, const char *filename) {
                         return -errno;
         }
 
-        if (null_or_empty_path(filename)) {
-                log_debug("skipping empty file: %s", filename);
+        if (null_or_empty_fd(fileno(file))) {
+                log_debug("Skipping empty file: %s", filename);
                 return 0;
         }
 
@@ -62,16 +62,8 @@ static int network_load_one(Manager *manager, const char *filename) {
         LIST_HEAD_INIT(network->static_addresses);
         LIST_HEAD_INIT(network->static_routes);
 
-        network->vlans = hashmap_new(string_hash_func, string_compare_func);
-        if (!network->vlans)
-                return log_oom();
-
-        network->macvlans = hashmap_new(uint64_hash_func, uint64_compare_func);
-        if (!network->macvlans)
-                return log_oom();
-
-        network->vxlans = hashmap_new(uint64_hash_func, uint64_compare_func);
-        if (!network->vxlans)
+        network->stacked_netdevs = hashmap_new(string_hash_func, string_compare_func);
+        if (!network->stacked_netdevs)
                 return log_oom();
 
         network->addresses_by_section = hashmap_new(uint64_hash_func, uint64_compare_func);
@@ -86,6 +78,8 @@ static int network_load_one(Manager *manager, const char *filename) {
         if (!network->filename)
                 return log_oom();
 
+        network->ipv4ll_route = true;
+
         network->dhcp_ntp = true;
         network->dhcp_dns = true;
         network->dhcp_hostname = true;
@@ -93,12 +87,12 @@ static int network_load_one(Manager *manager, const char *filename) {
         network->dhcp_routes = true;
         network->dhcp_sendhost = true;
 
-        r = config_parse(NULL, filename, file, "Match\0Network\0Address\0Route\0DHCP\0DHCPv4\0", config_item_perf_lookup,
-                        (void*) network_network_gperf_lookup, false, false, network);
-        if (r < 0) {
-                log_warning("Could not parse config file %s: %s", filename, strerror(-r));
+        r = config_parse(NULL, filename, file,
+                         "Match\0Network\0Address\0Route\0DHCP\0DHCPv4\0",
+                         config_item_perf_lookup, network_network_gperf_lookup,
+                         false, false, true, network);
+        if (r < 0)
                 return r;
-        }
 
         LIST_PREPEND(networks, manager->networks, network);
 
@@ -169,33 +163,16 @@ void network_free(Network *network) {
         free(network->description);
         free(network->dhcp_vendor_class_identifier);
 
-        while ((address = network->ntp)) {
-                LIST_REMOVE(addresses, network->ntp, address);
-                address_free(address);
-        }
-
-        while ((address = network->dns)) {
-                LIST_REMOVE(addresses, network->dns, address);
-                address_free(address);
-        }
+        strv_free(network->ntp);
+        strv_free(network->dns);
 
         netdev_unref(network->bridge);
 
         netdev_unref(network->bond);
 
-        netdev_unref(network->tunnel);
-
-        HASHMAP_FOREACH(netdev, network->vlans, i)
-                netdev_unref(netdev);
-        hashmap_free(network->vlans);
-
-        HASHMAP_FOREACH(netdev, network->macvlans, i)
-                netdev_unref(netdev);
-        hashmap_free(network->macvlans);
-
-        HASHMAP_FOREACH(netdev, network->vxlans, i)
+        HASHMAP_FOREACH(netdev, network->stacked_netdevs, i)
                 netdev_unref(netdev);
-        hashmap_free(network->vxlans);
+        hashmap_free(network->stacked_netdevs);
 
         while ((route = network->static_routes))
                 route_free(route);
@@ -254,6 +231,26 @@ int network_apply(Manager *manager, Network *network, Link *link) {
 
         link->network = network;
 
+        if (network->ipv4ll_route) {
+                Route *route;
+
+                r = route_new_static(network, 0, &route);
+                if (r < 0)
+                        return r;
+
+                r = inet_pton(AF_INET, "169.254.0.0", &route->dst_addr.in);
+                if (r == 0)
+                        return -EINVAL;
+                if (r < 0)
+                        return -errno;
+
+                route->family = AF_INET;
+                route->dst_prefixlen = 16;
+                route->scope = RT_SCOPE_LINK;
+                route->metrics = IPV4LL_ROUTE_METRIC;
+                route->protocol = RTPROT_STATIC;
+        }
+
         if (network->dns || network->ntp) {
                 r = link_save(link);
                 if (r < 0)
@@ -323,28 +320,13 @@ int config_parse_netdev(const char *unit,
 
                 break;
         case NETDEV_KIND_VLAN:
-                r = hashmap_put(network->vlans, &netdev->vlanid, netdev);
-                if (r < 0) {
-                        log_syntax(unit, LOG_ERR, filename, line, EINVAL,
-                                   "Can not add VLAN to network: %s", rvalue);
-                        return 0;
-                }
-
-                break;
         case NETDEV_KIND_MACVLAN:
-                r = hashmap_put(network->macvlans, netdev->ifname, netdev);
-                if (r < 0) {
-                        log_syntax(unit, LOG_ERR, filename, line, EINVAL,
-                                   "Can not add MACVLAN to network: %s", rvalue);
-                        return 0;
-                }
-
-                break;
         case NETDEV_KIND_VXLAN:
-                r = hashmap_put(network->vxlans, netdev->ifname, netdev);
+                r = hashmap_put(network->stacked_netdevs, netdev->ifname, netdev);
                 if (r < 0) {
                         log_syntax(unit, LOG_ERR, filename, line, EINVAL,
-                                   "Can not add VXLAN to network: %s", rvalue);
+                                   "Can not add VLAN '%s' to network: %s",
+                                   rvalue, strerror(-r));
                         return 0;
                 }
 
@@ -393,7 +375,15 @@ int config_parse_tunnel(const char *unit,
                 return 0;
         }
 
-        network->tunnel = netdev;
+        r = hashmap_put(network->stacked_netdevs, netdev->ifname, netdev);
+        if (r < 0) {
+                log_syntax(unit, LOG_ERR, filename, line, EINVAL,
+                           "Can not add VLAN '%s' to network: %s",
+                           rvalue, strerror(-r));
+                return 0;
+        }
+
+        netdev_ref(netdev);
 
         return 0;
 }