return 1;
}
+unsigned net_netmask_to_prefixlen(const struct in_addr *addr) {
+ unsigned len = 0;
+ uint32_t mask;
+
+ assert(addr);
+
+ mask = be32toh(addr->s_addr);
+ while (mask) {
+ len++;
+ mask = mask << 1;
+ }
+
+ return len;
+}
+
int config_parse_ifname(const char *unit,
const char *filename,
unsigned line,
/* 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;