From: Mike Rapoport <mike.rapoport@ravellosystems.com>
Date: Thu, 20 Mar 2014 11:06:10 +0000 (+0200)
Subject: bridge: fix reporting of IPv6 addresses
X-Git-Tag: v3.14.0~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e763fa5d332f5839673aaf4a7cae10e97932564;p=thirdparty%2Fiproute2.git

bridge: fix reporting of IPv6 addresses

Signed-off-by: Mike Rapoport <mike.rapoport@ravellosystems.com>
---

diff --git a/bridge/fdb.c b/bridge/fdb.c
index e2e53f1fe..9b720e30f 100644
--- a/bridge/fdb.c
+++ b/bridge/fdb.c
@@ -103,8 +103,13 @@ int print_fdb(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
 
 	if (tb[NDA_DST]) {
 		SPRINT_BUF(abuf);
+		int family = AF_INET;
+
+		if (RTA_PAYLOAD(tb[NDA_DST]) == sizeof(struct in6_addr))
+			family = AF_INET6;
+
 		fprintf(fp, "dst %s ",
-			format_host(AF_INET,
+			format_host(family,
 				    RTA_PAYLOAD(tb[NDA_DST]),
 				    RTA_DATA(tb[NDA_DST]),
 				    abuf, sizeof(abuf)));