core: fixate show_status earlier, so that we actually print the welcome message

[elogind.git] / src / shared / net-util.c

diff --git a/src/shared/net-util.c b/src/shared/net-util.c
index fa89bd904fea589d52dfd63d0544fea37bd20f18..ba21ae437f3da968aae980c584a32c07a0ffca1c 100644 (file)
--- a/src/shared/net-util.c
+++ b/src/shared/net-util.c
@@ -40,49 +40,30 @@ bool net_match_config(const struct ether_addr *match_mac,
                       const char *dev_type,
                       const char *dev_name) {
 
-        if (match_mac) {
-                if (!dev_mac || memcmp(match_mac, ether_aton(dev_mac), ETH_ALEN)) {
-                        log_debug("Interface MAC address (%s) did not match MACAddress=%s",
-                                  dev_mac, ether_ntoa(match_mac));
-                        return 0;
-                }
-        }
+        if (match_mac && (!dev_mac || memcmp(match_mac, ether_aton(dev_mac), ETH_ALEN)))
+                return 0;
 
-        if (match_path) {
-                if (!streq_ptr(match_path, dev_path)) {
-                        log_debug("Interface persistent path (%s) did not match Path=%s",
-                                  dev_path, match_path);
-                        return 0;
-                }
-        }
+        if (match_path && !streq_ptr(match_path, dev_path))
+                return 0;
 
-        if (match_driver) {
-                if (!streq_ptr(match_driver, dev_driver)) {
-                        log_debug("Interface device driver (%s) did not match Driver=%s",
-                                  dev_driver, match_driver);
-                        return 0;
-                }
-        }
+        if (match_driver && !streq_ptr(match_driver, dev_driver))
+                return 0;
 
-        if (match_type) {
-                if (!streq_ptr(match_type, dev_type)) {
-                        log_debug("Interface type (%s) did not match Type=%s",
-                                  dev_type, match_type);
-                        return 0;
-                }
-        }
+        if (match_type && !streq_ptr(match_type, dev_type))
+                return 0;
 
-        if (match_name) {
-                if (!streq_ptr(match_name, dev_name)) {
-                        log_debug("Interface name (%s) did not match Name=%s",
-                                  dev_name, match_name);
-                        return 0;
-                }
-        }
+        if (match_name && !streq_ptr(match_name, dev_name))
+                return 0;
 
         return 1;
 }
 
+unsigned net_netmask_to_prefixlen(const struct in_addr *addr) {
+        assert(addr);
+
+        return 32 - u32ctz(be32toh(addr->s_addr));
+}
+
 int config_parse_ifname(const char *unit,
                         const char *filename,
                         unsigned line,
@@ -217,16 +198,24 @@ int net_parse_inaddr(const char *address, unsigned char *family, void *dst) {
 
         /* IPv4 */
         r = inet_pton(AF_INET, address, dst);
-        if (r > 0)
-                *family = AF_INET; /* successfully parsed IPv4 address */
-        else  if (r < 0)
+        if (r > 0) {
+                /* succsefully parsed IPv4 address */
+                if (*family == AF_UNSPEC)
+                        *family = AF_INET;
+                else if (*family != AF_INET)
+                        return -EINVAL;
+        } else  if (r < 0)
                 return -errno;
         else {
                 /* not an IPv4 address, so let's try IPv6 */
                 r = inet_pton(AF_INET6, address, dst);
-                if (r > 0)
-                        *family = AF_INET6; /* successfully parsed IPv6 address */
-                else if (r < 0)
+                if (r > 0) {
+                        /* successfully parsed IPv6 address */
+                        if (*family == AF_UNSPEC)
+                                *family = AF_INET6;
+                        else if (*family != AF_INET6)
+                                return -EINVAL;
+                } else if (r < 0)
                         return -errno;
                 else
                         return -EINVAL;