chiark / gitweb /
networkd: network - if no prefixlength is given, try to deduce one from the address...
authorTom Gundersen <teg@jklm.no>
Mon, 27 Oct 2014 16:39:18 +0000 (17:39 +0100)
committerTom Gundersen <teg@jklm.no>
Mon, 27 Oct 2014 16:40:24 +0000 (17:40 +0100)
In case of a class E or F address, ignore the address.

src/network/networkd-address.c

index e595cd6..ce85109 100644 (file)
@@ -482,7 +482,7 @@ int config_parse_address(const char *unit,
                 r = safe_atou(e + 1, &i);
                 if (r < 0) {
                         log_syntax(unit, LOG_ERR, filename, line, EINVAL,
-                                   "Interface prefix length is invalid, ignoring assignment: %s", e + 1);
+                                   "Prefix length is invalid, ignoring assignment: %s", e + 1);
                         return 0;
                 }
 
@@ -499,6 +499,15 @@ int config_parse_address(const char *unit,
                 return 0;
         }
 
+        if (!e && f == AF_INET) {
+                r = in_addr_default_prefixlen(&buffer.in, &n->prefixlen);
+                if (r < 0) {
+                        log_syntax(unit, LOG_ERR, filename, line, EINVAL,
+                                   "Prefix length not specified, and a default one can not be deduced for '%s', ignoring assignment", address);
+                        return 0;
+                }
+        }
+
         if (n->family != AF_UNSPEC && f != n->family) {
                 log_syntax(unit, LOG_ERR, filename, line, EINVAL,
                            "Address is incompatible, ignoring assignment: %s", address);