From: Serhey Popovych <serhe.popovych@gmail.com>
Date: Thu, 18 Jan 2018 18:13:42 +0000 (+0200)
Subject: utils: Always specify family for address in get_addr_1()
X-Git-Tag: v4.16.0~83^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2522007d8fee924cb098b4afc8af16f2b25829f;p=thirdparty%2Fiproute2.git

utils: Always specify family for address in get_addr_1()

Set ->family correctly when string representing address
is "default", "all" or "any": get_addr_1() might be called
with AF_UNSPEC (e.g. get_addr() -> get_addr_1()).

Extend support for zero address to all address families,
not only AF_INET and AF_INET6 when one explicitly given
as @family: use af_byte_len() to correctly set address length.

Still assume AF_INET when @family is AF_UNSPEC.

Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com>
Signed-off-by: David Ahern <dsahern@gmail.com>
---

diff --git a/lib/utils.c b/lib/utils.c
index 9fa522047..a023e747d 100644
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -543,8 +543,8 @@ int get_addr_1(inet_prefix *addr, const char *name, int family)
 	    strcmp(name, "any") == 0) {
 		if ((family == AF_DECnet) || (family == AF_MPLS))
 			return -1;
-		addr->family = family;
-		addr->bytelen = (family == AF_INET6 ? 16 : 4);
+		addr->family = (family != AF_UNSPEC) ? family : AF_INET;
+		addr->bytelen = af_byte_len(addr->family);
 		addr->bitlen = -1;
 		return 0;
 	}