[iproute2] utils: Do not reset family for default, any, all addresses

Message ID 20180413163633.1844-1-dsahern@gmail.com
State Accepted
Delegated to: stephen hemminger
Headers show
Series
  • [iproute2] utils: Do not reset family for default, any, all addresses
Related show

Commit Message

David Ahern April 13, 2018, 4:36 p.m.
Thomas reported a change in behavior with respect to autodectecting
address families. Specifically, 'ip ro add default via fe80::1'
syntax was failing to treat fe80::1 as an IPv6 address as it did in
prior releases. The root causes appears to be a change in family when
the default keyword is parsed.

'default', 'any' and 'all' are relevant outside of AF_INET. Leave the
family arg as is for these when setting addr.

Fixes: 93fa12418dc6 ("utils: Always specify family and ->bytelen in get_prefix_1()")
Reported-by: Thomas Deutschmann <whissi@gentoo.org>
Signed-off-by: David Ahern <dsahern@gmail.com>
Cc: Serhey Popovych <serhe.popovych@gmail.com>
---
 lib/utils.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Thomas Deutschmann April 15, 2018, 7:14 p.m. | #1
Hi,

I can confirm that this patch solves the issue for us and restores
previous behavior.

Thank you.
Stephen Hemminger April 17, 2018, 12:01 a.m. | #2
On Fri, 13 Apr 2018 09:36:33 -0700
David Ahern <dsahern@gmail.com> wrote:

> Thomas reported a change in behavior with respect to autodectecting
> address families. Specifically, 'ip ro add default via fe80::1'
> syntax was failing to treat fe80::1 as an IPv6 address as it did in
> prior releases. The root causes appears to be a change in family when
> the default keyword is parsed.
> 
> 'default', 'any' and 'all' are relevant outside of AF_INET. Leave the
> family arg as is for these when setting addr.
> 
> Fixes: 93fa12418dc6 ("utils: Always specify family and ->bytelen in get_prefix_1()")
> Reported-by: Thomas Deutschmann <whissi@gentoo.org>
> Signed-off-by: David Ahern <dsahern@gmail.com>
> Cc: Serhey Popovych <serhe.popovych@gmail.com>

Looks good, thanks for fixing.
Applied

Patch

diff --git a/lib/utils.c b/lib/utils.c
index 60d7eb14b438..8a0bff0babeb 100644
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -568,7 +568,7 @@  static int __get_addr_1(inet_prefix *addr, const char *name, int family)
 	if (strcmp(name, "default") == 0) {
 		if ((family == AF_DECnet) || (family == AF_MPLS))
 			return -1;
-		addr->family = (family != AF_UNSPEC) ? family : AF_INET;
+		addr->family = family;
 		addr->bytelen = af_byte_len(addr->family);
 		addr->bitlen = -2;
 		addr->flags |= PREFIXLEN_SPECIFIED;
@@ -579,7 +579,7 @@  static 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 = AF_UNSPEC;
+		addr->family = family;
 		addr->bytelen = 0;
 		addr->bitlen = -2;
 		return 0;