matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ip: Properly display AF_BRIDGE address information for neighbor events 

The vxlan driver when a neighbor add/delete event occurs sends
NDA_DST filled with a union:

union vxlan_addr {
	struct sockaddr_in sin;
	struct sockaddr_in6 sin6;
	struct sockaddr sa;
};

This eventually calls rt_addr_n2a_r which had no handler for the
AF_BRIDGE family and "???" was being printed.

Add code to properly display this data when requested.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Donald Sharp 2018-02-23 14:10:09 -05:00 committed by Stephen Hemminger
parent 4ac152d003
commit 728eb8d00b
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/utils.c
View File

@ -983,6 +983,25 @@ const char *rt_addr_n2a_r(int af, int len,
} }
case AF_PACKET: case AF_PACKET:
return ll_addr_n2a(addr, len, ARPHRD_VOID, buf, buflen); return ll_addr_n2a(addr, len, ARPHRD_VOID, buf, buflen);
case AF_BRIDGE:
{
const union {
struct sockaddr sa;
struct sockaddr_in sin;
struct sockaddr_in6 sin6;
} *sa = addr;
switch (sa->sa.sa_family) {
case AF_INET:
return inet_ntop(AF_INET, &sa->sin.sin_addr,
buf, buflen);
case AF_INET6:
return inet_ntop(AF_INET6, &sa->sin6.sin6_addr,
buf, buflen);
}
/* fallthrough */
}
default: default:
return "???"; return "???";
} }