diff options
Diffstat (limited to 'src/network/networkd-netdev-tunnel.c')
| -rw-r--r-- | src/network/networkd-netdev-tunnel.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/network/networkd-netdev-tunnel.c b/src/network/networkd-netdev-tunnel.c index 4561f8d0a9..56eeb99e4b 100644 --- a/src/network/networkd-netdev-tunnel.c +++ b/src/network/networkd-netdev-tunnel.c @@ -266,21 +266,28 @@ int config_parse_tunnel_address(const char *unit, void *data, void *userdata) { Tunnel *t = userdata; - union in_addr_union *addr = data; - int r; + union in_addr_union *addr = data, buffer; + int r, f; assert(filename); assert(lvalue); assert(rvalue); assert(data); - r = net_parse_inaddr(rvalue, &t->family, addr); + r = in_addr_from_string_auto(rvalue, &f, &buffer); if (r < 0) { - log_syntax(unit, LOG_ERR, filename, line, EINVAL, - "Tunnel address is invalid, ignoring assignment: %s", rvalue); + log_syntax(unit, LOG_ERR, filename, line, EINVAL, "Tunnel address is invalid, ignoring assignment: %s", rvalue); return 0; } + if (t->family != AF_UNSPEC && t->family != f) { + log_syntax(unit, LOG_ERR, filename, line, EINVAL, "Tunnel addresses incompatible, ignoring assignment: %s", rvalue); + return 0; + } + + t->family = f; + *addr = buffer; + return 0; } |