From: Thomas Egerer <hakke_007@gmx.de>
Date: Tue, 14 Apr 2009 23:15:17 +0000 (-0700)
Subject: Fix display of xfrm
X-Git-Tag: v2.6.31~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9ab720e33748cd022f095620e75ca7eba24a965;p=thirdparty%2Fiproute2.git

Fix display of xfrm

When using iproute2 to display information on policies installed in kernel
(ip x p s) output is incorrect: IPv6 addresses printed as IPv4 addresses.
In case I am dealing with inter protocol policies where the template's address
family differs from those of the policy itself.
The patch attached solves this problem.
---

diff --git a/ip/ipxfrm.c b/ip/ipxfrm.c
index 24b21146b..708ce9fe5 100644
--- a/ip/ipxfrm.c
+++ b/ip/ipxfrm.c
@@ -609,7 +609,7 @@ static void xfrm_tmpl_print(struct xfrm_user_tmpl *tmpls, int len,
 			fputs(prefix, fp);
 
 		xfrm_id_info_print(&tmpl->saddr, &tmpl->id, tmpl->mode,
-				   tmpl->reqid, family, 0, fp, prefix, "tmpl ");
+				   tmpl->reqid, tmpl->family, 0, fp, prefix, "tmpl ");
 
 		if (show_stats > 0 || tmpl->optional) {
 			if (prefix)