From patchwork Wed Jan 25 09:56:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 719609 X-Patchwork-Delegate: joe.hershberger@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3v7gT10355z9ryZ for ; Wed, 25 Jan 2017 20:57:25 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hxlRdxWd"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CDBF3B38B0; Wed, 25 Jan 2017 10:57:22 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EFOWxPuTcP-t; Wed, 25 Jan 2017 10:57:22 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5FA1DB3867; Wed, 25 Jan 2017 10:57:18 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 71E46B386F for ; Wed, 25 Jan 2017 10:56:54 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KHNz5L5HsEOS for ; Wed, 25 Jan 2017 10:56:54 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by theia.denx.de (Postfix) with ESMTPS id 08B90B3864 for ; Wed, 25 Jan 2017 10:56:51 +0100 (CET) Received: by mail-pg0-f66.google.com with SMTP id 3so1529435pgj.1 for ; Wed, 25 Jan 2017 01:56:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=n6JCRJ3LhWOAIvxwFqV3Wysa4++4k4VeFmG94PkMr1E=; b=hxlRdxWdT0q2eowvAk6OMbox9UPHVKmgFF2a6kjER5KMNEdeXPqgKOgY7z8FgSjjlt s6JHOfXjF1EtZd+YuvmrRL94xJ05pEFR4yFpfoj4F61/WZFjv1lj0SJQRzZPctPbC2jz 31W7SfriNnzuzJgR3PNT0G9sxL28cwoOJ+a6y/xac1pbSdcjLUK5ZhuOpcQSt0AyyP3s 0AFc0bHWuSQgENH/xfkSGxKKCuSl0EFhtcXir+R8BT2d6ZGQxNvakPqcUuISwal32Byj I0t2oM1fQyfMJco/ZTZ0vwXrfeCFiuW3wFVedCQmTbi096nTPfPaGnJLUymEVT/7EJ9V aqVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=n6JCRJ3LhWOAIvxwFqV3Wysa4++4k4VeFmG94PkMr1E=; b=Y1LAazx6TVIqE/WmRwt58BzUAMDSz1w9xxprgiZSmRvLBzOXF/qikNL7rEEbhAGG4S jsC8hoUojtGWEAFby3R7DojYFIHgUVamLi9FAP8u9u9884rK2rhLF6WbnwdSYXLqkOdw 1Nj7UjVDQWOv1Fox1eVSmKkFY8x92OGJkMUK937eR/fd5C2328LtFUvVzqnq3+lsPuCQ tWEeSWjtL/1Fp2uR/sTI3kXwiVtg7zpdV0Vw/gaIrlRqdDM9mhlkH/FEtQFBz3Ue8IU8 Bo+kIvRBYc1NQ0JqoVTwx3Jekm6iEZzc1oyfB+vFfYyNi1re0GiLnfoDLffJDEVD4uN0 Rjqg== X-Gm-Message-State: AIkVDXL6ZnKxq06gscrXK7L2Xd/JWc8rYnuz9SMbzL6Xs3HlFbs7DgUzuklGVNQxPG0Mlg== X-Received: by 10.84.148.134 with SMTP id k6mr2315412pla.142.1485338210026; Wed, 25 Jan 2017 01:56:50 -0800 (PST) Received: from chrisp-dl.atlnz.lc ([2001:df5:b000:22:8d2c:469e:c0fc:f3ee]) by smtp.gmail.com with ESMTPSA id t87sm50980162pfe.59.2017.01.25.01.56.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 25 Jan 2017 01:56:49 -0800 (PST) From: Chris Packham To: u-boot@lists.denx.de, Joe Hershberger Date: Wed, 25 Jan 2017 22:56:13 +1300 Message-Id: <20170125095622.20326-3-judge.packham@gmail.com> X-Mailer: git-send-email 2.11.0.24.ge6920cf In-Reply-To: <20170125095622.20326-1-judge.packham@gmail.com> References: <20170125095622.20326-1-judge.packham@gmail.com> Cc: Tom Rini , Angga , hannah@marvell.com, jp.tosoni@acksys.fr, luka.kovacica@gmail.com, reed@fb.com, Chris Packham Subject: [U-Boot] [RFC PATCH v3 02/11] lib: vsprintf: add IPv6 compressed format %pI6c X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Add support for "human friendly" IPv6 address representations as specified in https://www.rfc-editor.org/rfc/rfc5952.txt This code has been adapted from Linux kernel with minimal modification. Signed-off-by: Chris Packham Reviewed-by: Simon Glass --- Changes in v3: None Changes in v2: None include/net6.h | 13 +++++ lib/vsprintf.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 144 insertions(+), 23 deletions(-) diff --git a/include/net6.h b/include/net6.h index b62295181d45..1b82c25ec76e 100644 --- a/include/net6.h +++ b/include/net6.h @@ -45,4 +45,17 @@ struct ip6_hdr { struct in6_addr daddr; }; +/* ::ffff:0:0/96 is reserved for v4 mapped addresses */ +static inline int ipv6_addr_v4mapped(const struct in6_addr *a) +{ + return (a->s6_addr32[0] | a->s6_addr32[1] | + (a->s6_addr32[2] ^ htonl(0x0000ffff))) == 0; +} + +/* Intra-Site Automatic Tunnel Addressing Protocol Address */ +static inline int ipv6_addr_is_isatap(const struct in6_addr *a) +{ + return (a->s6_addr32[2] | htonl(0x02000000)) == htonl(0x02005EFE); +} + #endif /* __NET6_H__ */ diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 874a2951f705..54f1e632fdc1 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -19,6 +19,7 @@ #include #include +#include #define noinline __attribute__((noinline)) /* we use this so that we can do without the ctype library */ @@ -140,6 +141,7 @@ static noinline char *put_dec(char *buf, uint64_t num) #define LEFT 16 /* left justified */ #define SMALL 32 /* Must be 32 == 0x20 */ #define SPECIAL 64 /* 0x */ +#define COMPRESSED 128 /* use compressed format */ /* * Macro to add a new character to our output string, but only if it will @@ -301,12 +303,121 @@ static char *mac_address_string(char *buf, char *end, u8 *addr, int field_width, flags & ~SPECIAL); } -static char *ip6_addr_string(char *buf, char *end, u8 *addr, int field_width, +static char *ip4_string(char *p, u8 *addr) +{ + char temp[3]; /* hold each IP quad in reverse order */ + int i, digits; + + for (i = 0; i < 4; i++) { + digits = put_dec_trunc(temp, addr[i]) - temp; + /* reverse the digits in the quad */ + while (digits--) + *p++ = temp[digits]; + if (i != 3) + *p++ = '.'; + } + *p = '\0'; + + return p; +} + +static char *ip4_addr_string(char *buf, char *end, u8 *addr, int field_width, int precision, int flags) { - /* (8 * 4 hex digits), 7 colons and trailing zero */ - char ip6_addr[8 * 5]; - char *p = ip6_addr; + char ip4_addr[sizeof("255.255.255.255")]; + + ip4_string(ip4_addr, addr); + + return string(buf, end, ip4_addr, field_width, precision, + flags & ~SPECIAL); +} +#endif + +#ifdef CONFIG_NET6 +static char *ip6_compressed_string(char *p, u8 *addr) +{ + int i, j, range; + unsigned char zerolength[8]; + int longest = 1; + int colonpos = -1; + u16 word; + u8 hi, lo; + int needcolon = 0; + int useIPv4; + struct in6_addr in6; + + memcpy(&in6, addr, sizeof(struct in6_addr)); + + useIPv4 = ipv6_addr_v4mapped(&in6) || ipv6_addr_is_isatap(&in6); + + memset(zerolength, 0, sizeof(zerolength)); + + if (useIPv4) + range = 6; + else + range = 8; + + /* find position of longest 0 run */ + for (i = 0; i < range; i++) { + for (j = i; j < range; j++) { + if (in6.s6_addr16[j] != 0) + break; + zerolength[i]++; + } + } + for (i = 0; i < range; i++) { + if (zerolength[i] > longest) { + longest = zerolength[i]; + colonpos = i; + } + } + if (longest == 1) /* don't compress a single 0 */ + colonpos = -1; + + /* emit address */ + for (i = 0; i < range; i++) { + if (i == colonpos) { + if (needcolon || i == 0) + *p++ = ':'; + *p++ = ':'; + needcolon = 0; + i += longest - 1; + continue; + } + if (needcolon) { + *p++ = ':'; + needcolon = 0; + } + /* hex u16 without leading 0s */ + word = ntohs(in6.s6_addr16[i]); + hi = word >> 8; + lo = word & 0xff; + if (hi) { + if (hi > 0x0f) + p = pack_hex_byte(p, hi); + else + *p++ = hex_asc_lo(hi); + p = pack_hex_byte(p, lo); + } else if (lo > 0x0f) { + p = pack_hex_byte(p, lo); + } else { + *p++ = hex_asc_lo(lo); + } + needcolon = 1; + } + + if (useIPv4) { + if (needcolon) + *p++ = ':'; + p = ip4_string(p, &in6.s6_addr[12]); + } + *p = '\0'; + + return p; +} + +static char *ip6_string(char *p, u8 *addr, int flags) +{ int i; for (i = 0; i < 8; i++) { @@ -317,30 +428,20 @@ static char *ip6_addr_string(char *buf, char *end, u8 *addr, int field_width, } *p = '\0'; - return string(buf, end, ip6_addr, field_width, precision, - flags & ~SPECIAL); + return p; } -static char *ip4_addr_string(char *buf, char *end, u8 *addr, int field_width, +static char *ip6_addr_string(char *buf, char *end, u8 *addr, int field_width, int precision, int flags) { - /* (4 * 3 decimal digits), 3 dots and trailing zero */ - char ip4_addr[4 * 4]; - char temp[3]; /* hold each IP quad in reverse order */ - char *p = ip4_addr; - int i, digits; + char ip6_addr[sizeof("xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:255.255.255.255")]; - for (i = 0; i < 4; i++) { - digits = put_dec_trunc(temp, addr[i]) - temp; - /* reverse the digits in the quad */ - while (digits--) - *p++ = temp[digits]; - if (i != 3) - *p++ = '.'; - } - *p = '\0'; + if (flags & COMPRESSED) + ip6_compressed_string(ip6_addr, addr); + else + ip6_string(ip6_addr, addr, flags); - return string(buf, end, ip4_addr, field_width, precision, + return string(buf, end, ip6_addr, field_width, precision, flags & ~SPECIAL); } #endif @@ -358,6 +459,8 @@ static char *ip4_addr_string(char *buf, char *end, u8 *addr, int field_width, * decimal for v4 and colon separated network-order 16 bit hex for v6) * - 'i' [46] for 'raw' IPv4/IPv6 addresses, IPv6 omits the colons, IPv4 is * currently the same + * - 'I6c' for IPv6 addresses printed as specified by + * http://tools.ietf.org/html/rfc5952 * * Note: The difference between 'S' and 'F' is that on ia64 and ppc64 * function pointers are really function descriptors, which contain a @@ -401,9 +504,14 @@ static char *pointer(const char *fmt, char *buf, char *end, void *ptr, flags |= SPECIAL; /* Fallthrough */ case 'I': - if (fmt[1] == '6') +#ifdef CONFIG_NET6 + if (fmt[1] == '6') { + if (fmt[2] == 'c') + flags |= COMPRESSED; return ip6_addr_string(buf, end, ptr, field_width, precision, flags); + } +#endif if (fmt[1] == '4') return ip4_addr_string(buf, end, ptr, field_width, precision, flags);