X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-network.c;h=24fc26b92931db81c817776335e1e911eb12679d;hb=6073b6f26ab9fc6bf335faa7073ec443eef093fd;hp=0375194e46b822cfbf41ab9bfb9409b3eaeb06db;hpb=3be1d7e0c5bf60658d34eb6311d4e77c6803578c;p=elogind.git

diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 0375194e4..24fc26b92 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;
         }
 
@@ -66,11 +66,11 @@ static int network_load_one(Manager *manager, const char *filename) {
         if (!network->vlans)
                 return log_oom();
 
-        network->macvlans = hashmap_new(uint64_hash_func, uint64_compare_func);
+        network->macvlans = hashmap_new(string_hash_func, string_compare_func);
         if (!network->macvlans)
                 return log_oom();
 
-        network->vxlans = hashmap_new(uint64_hash_func, uint64_compare_func);
+        network->vxlans = hashmap_new(string_hash_func, string_compare_func);
         if (!network->vxlans)
                 return log_oom();
 
@@ -93,12 +93,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,15 +169,8 @@ 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);
 
@@ -323,10 +316,11 @@ int config_parse_netdev(const char *unit,
 
                 break;
         case NETDEV_KIND_VLAN:
-                r = hashmap_put(network->vlans, &netdev->vlanid, netdev);
+                r = hashmap_put(network->vlans, netdev->ifname, netdev);
                 if (r < 0) {
                         log_syntax(unit, LOG_ERR, filename, line, EINVAL,
-                                   "Can not add VLAN to network: %s", rvalue);
+                                   "Can not add VLAN '%s' to network: %s",
+                                   rvalue, strerror(-r));
                         return 0;
                 }
 
@@ -335,7 +329,8 @@ int config_parse_netdev(const char *unit,
                 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);
+                                   "Can not add MACVLAN '%s' to network: %s",
+                                   rvalue, strerror(-r));
                         return 0;
                 }
 
@@ -344,7 +339,8 @@ int config_parse_netdev(const char *unit,
                 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);
+                                   "Can not add VXLAN '%s' to network: %s",
+                                   rvalue, strerror(-r));
                         return 0;
                 }