From 5b8d81f706da0b7dc0abb5d0d74595d5b2f60d52 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Fri, 8 Apr 2011 09:21:51 -0400 Subject: [PATCH] fix ipv6 address printing: 2001 appeared as 201, etc. --- src/network/inet_ntop.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/network/inet_ntop.c b/src/network/inet_ntop.c index 3e8a6db0..460a9486 100644 --- a/src/network/inet_ntop.c +++ b/src/network/inet_ntop.c @@ -21,9 +21,11 @@ const char *inet_ntop(int af, const void *a0, char *s, socklen_t l) memset(buf, 'x', sizeof buf); buf[sizeof buf-1]=0; snprintf(buf, sizeof buf, - "%.0x%x:%.0x%x:%.0x%x:%.0x%x:%.0x%x:%.0x%x:%.0x%x:%.0x%x", - a[0],a[1],a[2],a[3],a[4],a[5],a[6],a[7], - a[8],a[9],a[10],a[11],a[12],a[13],a[14],a[15]); + "%x:%x:%x:%x:%x:%x:%x:%x", + 256*a[0]+a[1],256*a[2]+a[3], + 256*a[4]+a[5],256*a[6]+a[7], + 256*a[8]+a[9],256*a[10]+a[11], + 256*a[12]+a[13],256*a[14]+a[15]); /* Replace longest /(^0|:)[:0]{2,}/ with "::" */ for (i=best=0, max=2; buf[i]; i++) { if (i && buf[i] != ':') continue; -- 2.20.1