From b3070dc0258831c7e2b13624f75fa3dbd80d9833 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Sat, 4 Jan 2014 21:13:47 +0100 Subject: networkd: refuse to use .network files with missing Address/Gateway key These keys are mandatory in [Address]/[Route] sections. Otherwise, we hit an assert: ens3: setting addresses Assertion 'address->family == 2 || address->family == 10' failed at /build/amd64-generic/tmp/portage/sys-apps/systemd-9999-r1/work/systemd-9999/src/network/networkd-address.c:137, function address_configure(). Aborting. Reported-by: Alex Polvi At the same time make sure Route's Destination and Gateway uses the same address family. --- src/network/networkd-route.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/network/networkd-route.c') diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c index 488d3f5013..83dad655db 100644 --- a/src/network/networkd-route.c +++ b/src/network/networkd-route.c @@ -231,7 +231,7 @@ int config_parse_destination(const char *unit, return log_oom(); } - r = net_parse_inaddr(address, &n->family, &n->dst_addr); + r = net_parse_inaddr(address, &n->dst_family, &n->dst_addr); if (r < 0) { log_syntax(unit, LOG_ERR, filename, line, EINVAL, "Destination is invalid, ignoring assignment: %s", address); @@ -252,7 +252,7 @@ int config_parse_destination(const char *unit, n->dst_prefixlen = (unsigned char) i; } else { - switch (n->family) { + switch (n->dst_family) { case AF_INET: n->dst_prefixlen = 32; break; -- cgit v1.2.3-54-g00ecf