50 lines
1.9 KiB
Diff
50 lines
1.9 KiB
Diff
From 0c0499e4ff787ae76f9b1e5e8cb104794c9b8826 Mon Sep 17 00:00:00 2001
|
|
From: David Ahern <dsahern@gmail.com>
|
|
Date: Fri, 13 Apr 2018 09:36:33 -0700
|
|
Subject: [PATCH] utils: Do not reset family for default, any, all addresses
|
|
|
|
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>
|
|
(cherry picked from commit d42c7891d26e4d5616a55aac9fe10813767fcf9c)
|
|
Signed-off-by: Phil Sutter <psutter@redhat.com>
|
|
---
|
|
lib/utils.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/lib/utils.c b/lib/utils.c
|
|
index b9e9a6caaf548..803bcc45f2f24 100644
|
|
--- a/lib/utils.c
|
|
+++ b/lib/utils.c
|
|
@@ -566,7 +566,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;
|
|
@@ -577,7 +577,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;
|
|
--
|
|
2.17.0
|
|
|