This makes output consistent with iptunnel, also supporting reverse DNS
lookup for remote address if requested.
Signed-off-by: Phil Sutter <p...@nwl.cc>
---
ip/ip6tunnel.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/ip/ip6tunnel.c b/ip/ip6tunnel.c
index ba92518..9eb5b2f 100644
--- a/ip/ip6tunnel.c
+++ b/ip/ip6tunnel.c
@@ -68,14 +68,17 @@ static void usage(void)
static void print_tunnel(struct ip6_tnl_parm2 *p)
{
- char remote[64];
- char local[64];
-
- inet_ntop(AF_INET6, &p->raddr, remote, sizeof(remote));
- inet_ntop(AF_INET6, &p->laddr, local, sizeof(local));
+ char s1[1024];
+ char s2[1024];
+ /* Do not use format_host() for local addr,
+ * symbolic name will not be useful.
+ */
printf("%s: %s/ipv6 remote %s local %s",
- p->name, tnl_strproto(p->proto), remote, local);
+ p->name,
+ tnl_strproto(p->proto),
+ format_host(AF_INET6, 16, &p->raddr, s1, sizeof(s1)),
+ rt_addr_n2a(AF_INET6, 16, &p->laddr, s2, sizeof(s2)));
if (p->link) {
const char *n = ll_index_to_name(p->link);
if (n)
--
2.1.2
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
