From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 674AE3857C69; Tue, 31 Aug 2021 16:37:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 674AE3857C69 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-3262] libstdc++: Improve error handling in Net TS name resolution X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 48b20d46f9597a4b1e19e0e2d4a0c68d056d7662 X-Git-Newrev: feec7ef6672bf28d5c79950a21d435533a10710d Message-Id: <20210831163724.674AE3857C69@sourceware.org> Date: Tue, 31 Aug 2021 16:37:24 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Aug 2021 16:37:24 -0000 https://gcc.gnu.org/g:feec7ef6672bf28d5c79950a21d435533a10710d commit r12-3262-gfeec7ef6672bf28d5c79950a21d435533a10710d Author: Jonathan Wakely Date: Tue Aug 31 13:09:26 2021 +0100 libstdc++: Improve error handling in Net TS name resolution Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: * include/experimental/internet (__make_resolver_error_code): Handle EAI_SYSTEM errors. (basic_resolver_results): Use __make_resolver_error_code. Use Glibc NI_MAXHOST and NI_MAXSERV values for buffer sizes. Diff: --- libstdc++-v3/include/experimental/internet | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/include/experimental/internet b/libstdc++-v3/include/experimental/internet index 6ce070ae775..65c97de07d9 100644 --- a/libstdc++-v3/include/experimental/internet +++ b/libstdc++-v3/include/experimental/internet @@ -89,6 +89,12 @@ namespace ip host_not_found = EAI_NONAME, host_not_found_try_again = EAI_AGAIN, service_not_found = EAI_SERVICE + // N.B. POSIX defines additional errors that have no enumerator here: + // EAI_BADFLAGS, EAI_FAIL, EAI_FAMILY, EAI_MEMORY, EAI_SOCKTYPE, EAI_SYSTEM + // Some C libraries define additional errors: + // EAI_BADHINTS, EAI_OVERFLOW, EAI_PROTOCOL + // Some C libraries define additional (obsolete?) errors: + // EAI_ADDRFAMILY, EAI_NODATA #endif }; @@ -117,6 +123,19 @@ namespace ip inline error_condition make_error_condition(resolver_errc __e) noexcept { return error_condition(static_cast(__e), resolver_category()); } + /// @cond undocumented + inline error_code + __make_resolver_error_code(int __ai_err, + [[__maybe_unused__]] int __sys_err) noexcept + { +#ifdef EAI_SYSTEM + if (__builtin_expect(__ai_err == EAI_SYSTEM, 0)) + return error_code(__sys_err, std::generic_category()); +#endif + return error_code(__ai_err, resolver_category()); + } + /// @endcond + /// @} using port_type = uint_least16_t; ///< Type used for port numbers. @@ -2011,7 +2030,7 @@ namespace ip if (int __err = ::getaddrinfo(__h, __s, &__hints, &__sai._M_p)) { - __ec.assign(__err, resolver_category()); + __ec = ip::__make_resolver_error_code(__err, errno); return; } __ec.clear(); @@ -2040,8 +2059,8 @@ namespace ip basic_resolver_results(const endpoint_type& __ep, error_code& __ec) { #ifdef _GLIBCXX_HAVE_NETDB_H - char __host_name[256]; - char __service_name[128]; + char __host_name[1025]; // glibc NI_MAXHOST + char __service_name[32]; // glibc NI_MAXSERV int __flags = 0; if (__ep.protocol().type() == SOCK_DGRAM) __flags |= NI_DGRAM; @@ -2059,7 +2078,7 @@ namespace ip __flags); } if (__err) - __ec.assign(__err, resolver_category()); + __ec = ip::__make_resolver_error_code(__err, errno); else { __ec.clear();