From patchwork Wed Jun 4 20:42:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 894013 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:430c:b0:3a4:ee3f:8f15 with SMTP id eq12csp24354wrb; Wed, 4 Jun 2025 13:45:28 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCVk3Fetg20zNrY2EAvmW9W4ktbw14XBnL7CSLuWs45kTjdSmBS21TL+AUuU2ZvlnEvylxkfag==@linaro.org X-Google-Smtp-Source: AGHT+IFa4LM2prZGagt7Pza9S61YfC3pxHcRCO6oejqN5XGq535/HhggnEqXolWBGtLA2Jd1iBnJ X-Received: by 2002:a05:620a:17a7:b0:7ca:f021:4d3a with SMTP id af79cd13be357-7d2198dadb6mr588278485a.39.1749069928142; Wed, 04 Jun 2025 13:45:28 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1749069928; cv=pass; d=google.com; s=arc-20240605; b=ESs9GnogB5DCv2A/7sXCiW7VoRCSY4ceeqohT1/+yF4r8wIOxw5xiWOZSbImzF+y2o /Y/UreKipHO6qgTDn/uMsX3K60yDpG7eUeuLv2hgMVJflOGHr6R117k7T0T4qFy00Z5H AU4wy0b7pEgzNBAwFZyejK3qEyeZUV/24sC5+8kgIWQZwq+QCYYqqOADO5wTbGWEuyrL Pk61/VzRzQTVmCZzNs//IDJDGdS63C7gPf1/Qo7HAroJeZW7HQmcWt/LB0/XXO9gCW6i 4ECZJIqCRW2Ly4I/9RCWzUv7tjz+ULG33dSAu1whsmJuXuc24bfGiAneDEUt20wSAEg4 c7Ow== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature:dkim-filter:arc-filter:dmarc-filter :delivered-to:dkim-filter; bh=iA5TsipNkFbmrboLyLVAbcbjzD5vZAX64b8lCr111Gw=; fh=15rxvXN7K0X9p6jPVVxe1y5/53BpC+bqjxiOTDwET+E=; b=Rhhc1h0cRE0d5CvIg3Z47QouaA6gd9fyG7gLl/ct4A0gIA95JiWBvAi3o406juXRCy E3bvzDpSjSn/9adrG/u0WUlRJpiHc5V3WJ0IqqKtrv7eavM706xfJ3WiGeAHZk+OFuIL iN5VArwa7/LmQEULBqAka938V5K8zN4WGWYGCWWgtewCOq1ULZ0A6God1zaRWi7EOMY3 Q/BFj2Euh7KYMS56LbBJvwkUWOz9HgXZbggWATljcSr5bBjVTEgGa3WGukBAwOfWF6vS p9HRPnCN96L+4nerGacAJ97MexCJxgmhpqCZ5bEv9gKgIR0w12y35leODUj7WcG78gk2 eLAw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VTOfDYsj; arc=pass (i=1); spf=pass (google.com: domain of libc-alpha-bounces~patch=linaro.org@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="libc-alpha-bounces~patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id af79cd13be357-7d09a1fc305si1632251385a.425.2025.06.04.13.45.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Jun 2025 13:45:28 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-bounces~patch=linaro.org@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VTOfDYsj; arc=pass (i=1); spf=pass (google.com: domain of libc-alpha-bounces~patch=linaro.org@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="libc-alpha-bounces~patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B44AC3857BB0 for ; Wed, 4 Jun 2025 20:45:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B44AC3857BB0 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=VTOfDYsj X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-vs1-xe34.google.com (mail-vs1-xe34.google.com [IPv6:2607:f8b0:4864:20::e34]) by sourceware.org (Postfix) with ESMTPS id C2E2A385772F for ; Wed, 4 Jun 2025 20:43:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C2E2A385772F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org C2E2A385772F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::e34 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1749069826; cv=none; b=hj+DOt7H6WZcAN5gqlsQ5+35P+sA2Tme8NQ26MU2FtBqEv8SVkaHKFIo2k2R3WgXYx+a9JRldAVaM+CVuTW3y3gdJyTfoB9yINutlmGk0G4cJuIxWg9enO/IWHEnE6puPdkGuBfSNxKzoO5jxaBTCLIgG2xew0UEU+anMb2c4nk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1749069826; c=relaxed/simple; bh=o6rdcPfRzfoAjGdpb8xia7DNFo6Bz07w9R5zOH9uMxQ=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=UjbrGRaY/hKI6SJCOezA5cZWoszeBsQOtStc6qAxVmQMP8qVKAXQhJC+QD6LauQEulQNzv3aYELvZdKYZJdNs+PLfOO25RiCxF3GONHrqW5VsO4LwTmnIcixzh/71+PavFBHiJK687MrMVYyG2+w1YhQBdfUh6MvtVqDvil4xpo= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C2E2A385772F Received: by mail-vs1-xe34.google.com with SMTP id ada2fe7eead31-4e45a626663so79588137.0 for ; Wed, 04 Jun 2025 13:43:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1749069825; x=1749674625; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=iA5TsipNkFbmrboLyLVAbcbjzD5vZAX64b8lCr111Gw=; b=VTOfDYsjO9tez/GGFQQozRaTxzuVSdS/qiqFGLs7tBDclhjz/SGK3tyATtDoHQUwIF lRIoZ8jn36ToGMerTpvjLMmjY7DT7J2cE1RtR8sEiwUwOTRUGktOBJ+QDpmolfi74f/A jeZaMNAa0/2eIhz51g198rwN6llnnNaSw7l8QtkfFnCuGqY9C45UjHEm/X4ADot7WQR4 eRQQguvre/LlWpJwkP8yO9+L/vMFy/kMim1BZ2dIpaFhTxS1UbaFEYU8vANFkMVPkQPZ PK4RrxDK+g6MlUXiVwnmzQ0QSeHydlBDsJXaNzfaO6eD8obECYhcc+I2wYFtTP0jpOp1 WiLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749069825; x=1749674625; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iA5TsipNkFbmrboLyLVAbcbjzD5vZAX64b8lCr111Gw=; b=KN6CU1ZxtRjw8VPVwiVylKtt6uFB4yiOeK3AApZGjCcfZbcSgoq2RV9hgf+7ZB9FOI P8hp8c7u/cubuq8X7/SldSEJNqXJmOvRuUmT5G3SR7Abv8WZ1FNdmlMT0mLQ2axS9dcj eEF5A9Rl1WjO5lR8xOyn3rRsPxaSxKJMU+OR2sdBTLoI5qkmCanjOw5Aldm9k99EbXKY dmnvlH1LVEzbswp9IOEmIOvGQsnNr5TISFjyUUyCDiLSsg82WQYf2j+NIcpJ3jCJJ4nz 2s3BpwyIOg/7lw4iw+jGD4lXYRpamqRlZ+95g6J5zhbDTGdd/CSfNEDWMIySBednOTz8 SEkA== X-Gm-Message-State: AOJu0YwCJ8uVJ4mOIQsZnObX4mORuXhOz5HEzQvpYOdPqFmUdUFwHytj WYODpcvmmprtIutWmmC80jSoCfb+y/I+GC//8uV1lzuYV+NimHUNM4JFeKo3I6Ba7OQuA+LhEjm bqZu9 X-Gm-Gg: ASbGnctSwFMpU2uz4iOMT0Fh3INX4MI2FL3cJZxXNvwYAEG67jvo8AashzJQk2SgR8V anUyRbt9/tQbd6R83QrX7oDlOJHlRKPCnwwu1XEQCDmDMnhCoUNxb1v98cVgdvqiNbvDeoXYZMS O/D+IMcTUUjBwu17kCRI74t6PTfACbxs8CcZRuDsCdgQTPUDQWQaTR8a475quU2Xhpy3osJHkET lwBASqvr5NhxHRnRdNq9kBRE1c1mkn2vNV61yYgnUCii0C+RVhuDJT4TMflquXYfsn6dZYh1s6B ru4OTarCOEvK5cG60MbT1zPHpgfSKJ9aDtmLilLNcxlpkJxdbcBSMKyt2PQ5/lH7 X-Received: by 2002:a05:6102:5ccc:b0:4e7:3efd:ac76 with SMTP id ada2fe7eead31-4e746cff8a9mr4344032137.8.1749069825433; Wed, 04 Jun 2025 13:43:45 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c2:8c5f:1160:8942:85f9:1203]) by smtp.gmail.com with ESMTPSA id a1e0cc1a2514c-87eaac49cdesm1020317241.2.2025.06.04.13.43.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Jun 2025 13:43:45 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Cc: Collin Funk , Paul Eggert , Florian Weimer Subject: [PATCH v2 4/5] resolv: Optimize inet_ntop Date: Wed, 4 Jun 2025 17:42:43 -0300 Message-ID: <20250604204332.2090912-5-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250604204332.2090912-1-adhemerval.zanella@linaro.org> References: <20250604204332.2090912-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patch=linaro.org@sourceware.org The benchtests/inet_ntop_ipv4 and benchtests/inet_ntop_ipv6 profile shows that most of time is spent in costly sprint operations: $ perf record ./benchtests/bench-inet_ntop_ipv4 && perf report --stdio [...] 38.53% bench-inet_ntop libc.so [.] __printf_buffer 18.69% bench-inet_ntop libc.so [.] __printf_buffer_write 11.01% bench-inet_ntop libc.so [.] _itoa_word 8.02% bench-inet_ntop bench-inet_ntop_ipv4 [.] bench_start 6.99% bench-inet_ntop libc.so [.] __memmove_avx_unaligned_erms 3.86% bench-inet_ntop libc.so [.] __strchrnul_avx2 2.82% bench-inet_ntop libc.so [.] __strcpy_avx2 1.90% bench-inet_ntop libc.so [.] inet_ntop4 1.78% bench-inet_ntop libc.so [.] __vsprintf_internal 1.55% bench-inet_ntop libc.so [.] __sprintf_chk 1.18% bench-inet_ntop libc.so [.] __GI___inet_ntop $ perf record ./benchtests/bench-inet_ntop_ipv6 && perf report --stdio 35.44% bench-inet_ntop libc.so [.] __printf_buffer 14.35% bench-inet_ntop libc.so [.] __printf_buffer_write 10.27% bench-inet_ntop libc.so [.] __GI___inet_ntop 7.93% bench-inet_ntop libc.so [.] _itoa_word 7.00% bench-inet_ntop libc.so [.] __sprintf_chk 6.20% bench-inet_ntop libc.so [.] __vsprintf_internal 5.26% bench-inet_ntop libc.so [.] __strchrnul_avx2 5.05% bench-inet_ntop bench-inet_ntop_ipv6 [.] bench_start 3.70% bench-inet_ntop libc.so [.] __memmove_avx_unaligned_erms 2.11% bench-inet_ntop libc.so [.] __printf_buffer_done A new implementation is used instead: * The printf usage is replaced with an expanded function that prints either an IPv4 octet or an IPv6 quartet; * The strcpy is replaced with a memcpy (since ABIs usually tends to optimize the latter); * For IPv6, the '::' shorthanding is done in-place instead of using a temporary buffer. * An temporary buffer is used iff the size if larger than INET_ADDRSTRLEN/INET6_ADDRSTRLEN. * Inline is used for both inet_ntop4 and inet_ntop6, The code is significand rewrote, so I take this requires a new license. The performance results on aarch64 Neoverse1 with gcc 14.2.1: * master aarch64-linux-gnu-master$ ./benchtests/bench-inet_ntop_ipv4 "inet_ntop_ipv4": { "workload-ipv4-random": { "duration": 1.43067e+09, "iterations": 8e+06, "reciprocal-throughput": 178.572, "latency": 179.096, "max-throughput": 5.59997e+06, "min-throughput": 5.58359e+06 } aarch64-linux-gnu-master$ ./benchtests/bench-inet_ntop_ipv6 "inet_ntop_ipv6": { "workload-ipv6-random": { "duration": 1.68539e+09, "iterations": 4e+06, "reciprocal-throughput": 421.307, "latency": 421.388, "max-throughput": 2.37357e+06, "min-throughput": 2.37311e+06 } } * patched aarch64-linux-gnu$ ./benchtests/bench-inet_ntop_ipv4 "inet_ntop_ipv4": { "workload-ipv4-random": { "duration": 1.06133e+09, "iterations": 5.6e+07, "reciprocal-throughput": 18.8482, "latency": 19.0565, "max-throughput": 5.30555e+07, "min-throughput": 5.24755e+07 } } aarch64-linux-gnu$ ./benchtests/bench-inet_ntop_ipv6 "inet_ntop_ipv6": { "workload-ipv6-random": { "duration": 1.01246e+09, "iterations": 2.4e+07, "reciprocal-throughput": 42.5576, "latency": 41.8139, "max-throughput": 2.34976e+07, "min-throughput": 2.39155e+07 } } Checked on aarch64-linux-gnu and x86_64-linux-gnu. --- resolv/inet_ntop.c | 301 +++++++++++++++++++++++---------------------- 1 file changed, 156 insertions(+), 145 deletions(-) diff --git a/resolv/inet_ntop.c b/resolv/inet_ntop.c index 5c414373b7..299756f8ee 100644 --- a/resolv/inet_ntop.c +++ b/resolv/inet_ntop.c @@ -1,136 +1,155 @@ -/* - * Copyright (c) 1996-1999 by Internet Software Consortium. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS - * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE - * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS - * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS - * SOFTWARE. - */ +/* Convert IPv4/IPv6 addresses from binary to text form. + Copyright (C) 1996-2025 Free Software Foundation, Inc. + This file is part of the GNU C Library. -#include -#include -#include + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ -#include #include #include - #include -#include #include +#include <_itoa.h> -#ifdef SPRINTF_CHAR -# define SPRINTF(x) strlen (sprintf /**/ x) -#else -# define SPRINTF(x) ((size_t) sprintf x) -#endif - -/* - * WARNING: Don't even consider trying to compile this on a system where - * sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX. - */ - -static const char *inet_ntop4 (const u_char *src, char *dst, socklen_t size); -static const char *inet_ntop6 (const u_char *src, char *dst, socklen_t size); - -/* char * - * __inet_ntop(af, src, dst, size) - * convert a network format address to presentation format. - * return: - * pointer to presentation format address (`dst'), or NULL (see errno). - * author: - * Paul Vixie, 1996. - */ -const char * -__inet_ntop (int af, const void *src, char *dst, socklen_t size) +static inline char * +put_uint8 (uint8_t word, char *tp) { - switch (af) + int s = 1; + if (word >= 10) { - case AF_INET: - return (inet_ntop4 (src, dst, size)); - case AF_INET6: - return (inet_ntop6 (src, dst, size)); - default: - __set_errno (EAFNOSUPPORT); - return (NULL); + if (word >= 100) + { + tp[2] = '0' + word % 10; + word /= 10; + s += 1; + } + + tp[1] = '0' + word % 10; + word /= 10; + s += 1; } - /* NOTREACHED */ + *tp = '0' + word % 10; + return tp + s; } -libc_hidden_def (__inet_ntop) -weak_alias (__inet_ntop, inet_ntop) -/* const char * - * inet_ntop4(src, dst, size) - * format an IPv4 address - * return: - * `dst' (as a const) - * notes: - * (1) uses no statics - * (2) takes a u_char* not an in_addr as input - * author: - * Paul Vixie, 1996. - */ -static const char * -inet_ntop4 (const u_char *src, char *dst, socklen_t size) +static inline char * +put_uint16 (uint16_t word, char *tp) { - static const char fmt[] = "%u.%u.%u.%u"; - char tmp[sizeof "255.255.255.255"]; + if (word >= 0x1000) + *tp++ = _itoa_lower_digits[(word >> 12) & 0xf]; + if (word >= 0x100) + *tp++ = _itoa_lower_digits[(word >> 8) & 0xf]; + if (word >= 0x10) + *tp++ = _itoa_lower_digits[(word >> 4) & 0xf]; + *tp++ = _itoa_lower_digits[word & 0xf]; + return tp; +} - if (SPRINTF ((tmp, fmt, src[0], src[1], src[2], src[3])) >= size) +static __always_inline char * +inet_ntop4_format (const uint8_t *src, char *dst) +{ + dst = put_uint8 (src[0], dst); + *(dst++) = '.'; + dst = put_uint8 (src[1], dst); + *(dst++) = '.'; + dst = put_uint8 (src[2], dst); + *(dst++) = '.'; + dst = put_uint8 (src[3], dst); + *dst++ = '\0'; + return dst; +} + +static __always_inline const char * +inet_ntop4 (const uint8_t *src, char *dst, socklen_t size) +{ + if (size >= INET_ADDRSTRLEN) + { + inet_ntop4_format (src, dst); + return dst; + } + + char tmp[INET_ADDRSTRLEN]; + char *tp = inet_ntop4_format (src, tmp); + socklen_t tmp_s = tp - tmp; + if (tmp_s > size) { __set_errno (ENOSPC); - return (NULL); + return NULL; } - return strcpy (dst, tmp); + return memcpy (dst, tmp, tmp_s); } -/* const char * - * inet_ntop6(src, dst, size) - * convert IPv6 binary address into presentation (printable) format - * author: - * Paul Vixie, 1996. - */ -static const char * -inet_ntop6 (const u_char *src, char *dst, socklen_t size) +struct best_t { - /* - * Note that int32_t and int16_t need only be "at least" large enough - * to contain a value of the specified size. On some systems, like - * Crays, there is no such thing as an integer variable with 16 bits. - * Keep this in mind if you think this function should have been coded - * to use pointer overlays. All the world's not a VAX. - */ - char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp; - struct - { - int base, len; - } best, cur; - u_int words[NS_IN6ADDRSZ / NS_INT16SZ]; - int i; + int base; + int len; +}; - /* - * Preprocess: - * Copy the input (bytewise) array into a wordwise array. - * Find the longest run of 0x00's in src[] for :: shorthanding. - */ - memset (words, '\0', sizeof words); - for (i = 0; i < NS_IN6ADDRSZ; i += 2) - words[i / 2] = (src[i] << 8) | src[i + 1]; - best.base = -1; - cur.base = -1; - best.len = 0; - cur.len = 0; - for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) +static inline uint16_t +in6_addr_addr16 (const struct in6_addr *src, int idx) +{ + const struct { uint16_t x; } __attribute__((__packed__)) *pptr = + (typeof(pptr))(&src->s6_addr16[idx]); + return ntohs (pptr->x); +} + +static __always_inline char * +inet_ntop6_format (const struct in6_addr *src, struct best_t best, char *dst) +{ + char *tp = dst; + for (int i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) { - if (words[i] == 0) + /* Are we inside the best run of 0x00's? */ + if (best.base != -1 && i >= best.base && i < (best.base + best.len)) + { + if (i == best.base) + *tp++ = ':'; + continue; + } + /* Are we following an initial run of 0x00s or any real hex? */ + if (i != 0) + *tp++ = ':'; + /* Is this address an encapsulated IPv4? */ + if (i == 6 && best.base == 0 + && (best.len == 6 || (best.len == 5 + && in6_addr_addr16 (src, 5) == 0xffff))) + { + if (!inet_ntop4 (src->s6_addr + 12, tp, + INET6_ADDRSTRLEN - (tp - dst))) + return NULL; + tp += strlen (tp); + break; + } + tp = put_uint16 (in6_addr_addr16 (src, i), tp); + } + /* Was it a trailing run of 0x00's? */ + if (best.base != -1 && (best.base + best.len) == (NS_IN6ADDRSZ / NS_INT16SZ)) + *tp++ = ':'; + *tp++ = '\0'; + + return tp; +} + +static inline const char * +inet_ntop6 (const struct in6_addr *src, char *dst, socklen_t size) +{ + struct best_t best = { -1, 0 }, cur = { -1, 0 }; + + /* ind the longest run of 0x00's in src[] for :: shorthanding. */ + for (int i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) + { + if (in6_addr_addr16 (src, i) == 0) { if (cur.base == -1) cur.base = i, cur.len = 1; @@ -155,45 +174,37 @@ inet_ntop6 (const u_char *src, char *dst, socklen_t size) if (best.base != -1 && best.len < 2) best.base = -1; - /* - * Format the result. - */ - tp = tmp; - for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) + if (size >= INET6_ADDRSTRLEN) { - /* Are we inside the best run of 0x00's? */ - if (best.base != -1 && i >= best.base && i < (best.base + best.len)) - { - if (i == best.base) - *tp++ = ':'; - continue; - } - /* Are we following an initial run of 0x00s or any real hex? */ - if (i != 0) - *tp++ = ':'; - /* Is this address an encapsulated IPv4? */ - if (i == 6 && best.base == 0 - && (best.len == 6 || (best.len == 5 && words[5] == 0xffff))) - { - if (!inet_ntop4 (src + 12, tp, sizeof tmp - (tp - tmp))) - return (NULL); - tp += strlen (tp); - break; - } - tp += SPRINTF ((tp, "%x", words[i])); + inet_ntop6_format (src, best, dst); + return dst; } - /* Was it a trailing run of 0x00's? */ - if (best.base != -1 && (best.base + best.len) == (NS_IN6ADDRSZ / NS_INT16SZ)) - *tp++ = ':'; - *tp++ = '\0'; - /* - * Check for overflow, copy, and we're done. - */ - if ((socklen_t) (tp - tmp) > size) + char tmp[INET6_ADDRSTRLEN]; + char *tp = inet_ntop6_format (src, best, tmp); + + socklen_t tmp_s = tp - tmp; + if (tmp_s > size) { __set_errno (ENOSPC); return (NULL); } - return strcpy (dst, tmp); + return memcpy (dst, tmp, tmp_s); } + +const char * +__inet_ntop (int af, const void *src, char *dst, socklen_t size) +{ + switch (af) + { + case AF_INET: + return (inet_ntop4 (src, dst, size)); + case AF_INET6: + return (inet_ntop6 (src, dst, size)); + default: + __set_errno (EAFNOSUPPORT); + return (NULL); + } +} +libc_hidden_def (__inet_ntop) +weak_alias (__inet_ntop, inet_ntop)