proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-08-13 18:44:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: 93fa12418d ("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>
This commit is contained in:
David Ahern 2018-04-13 09:36:33 -07:00 committed by Stephen Hemminger
parent ee53b42fd8
commit d42c7891d2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/utils.c
View File

@ -568,7 +568,7 @@ static int __get_addr_1(inet_prefix *addr, const char *name, int family)
if (strcmp(name, "default") == 0) { if (strcmp(name, "default") == 0) {
if ((family == AF_DECnet) || (family == AF_MPLS)) if ((family == AF_DECnet) || (family == AF_MPLS))
return -1; return -1;
addr->family = (family != AF_UNSPEC) ? family : AF_INET; addr->family = family;
addr->bytelen = af_byte_len(addr->family); addr->bytelen = af_byte_len(addr->family);
addr->bitlen = -2; addr->bitlen = -2;
addr->flags |= PREFIXLEN_SPECIFIED; 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) { strcmp(name, "any") == 0) {
if ((family == AF_DECnet) || (family == AF_MPLS)) if ((family == AF_DECnet) || (family == AF_MPLS))
return -1; return -1;
addr->family = AF_UNSPEC; addr->family = family;
addr->bytelen = 0; addr->bytelen = 0;
addr->bitlen = -2; addr->bitlen = -2;
return 0; return 0;