From patchwork Fri Feb 2 10:29:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 1894489 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=f/ljyzzy; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TRBtW6cz8z23g7 for ; Fri, 2 Feb 2024 21:32:51 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E80EB385829A for ; Fri, 2 Feb 2024 10:32:49 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id C569F3858D33 for ; Fri, 2 Feb 2024 10:29:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C569F3858D33 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org C569F3858D33 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706869784; cv=none; b=WfX7Ye0x80sxpVUjEH1T2yMEaxY2GkqZrf5rwEK52EeVCrsqNRhCjlmukEQwGbMwf/ETaQgbPeflkcWteBrA/1jnr111eCn5P2Lgbjg5y5SrlAdAolH0Ds3tEodGXFooKNV7VXnC4WsDVrnqujv8v2rZ1BkEkyE7anwv+XGhMNE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706869784; c=relaxed/simple; bh=ENybfNylseN4Xa3WFF8WI5K1gzZrIvyKqyzuL8/LTWc=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=nvb/Wlm3zRifVQKwoJByfBuMeRjTWCEuwFx45Y7C3hLvo6xTMaCzRojkTG8US6g8DUmj1o6+/nXDi7Buy5X+41c1M8rnpG+sOnXtXWl6sp7/lAAnzESrxR1uSsmIbyiZKNrmlCEB2brhksJcpaKJ8ET4PeIbv978XVwXu3lvAHQ= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706869781; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vwccfTgiSlragRE/p2yJOFEeZenXElxWHlwT95AAG34=; b=f/ljyzzyqf0VY9ayP/RIiPlV2jxgzy7hIui0xfgHUJdpebN5nwZZdpHbVMWYg0kSWr4KKL 1mj+E8AztsqoV7G7OFIRGmUn2mF+80T5lXvaMW27Vj1YoPu6067mKceHOS57AbjtbRqil+ sgqHMM3/PWqe6Nuya0cFKKbv7D+2sTk= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-9-Z8eixjiEOOaRAaOecorieg-1; Fri, 02 Feb 2024 05:29:38 -0500 X-MC-Unique: Z8eixjiEOOaRAaOecorieg-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4914D106D102; Fri, 2 Feb 2024 10:29:38 +0000 (UTC) Received: from localhost (unknown [10.42.28.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id EBD5E1C060B1; Fri, 2 Feb 2024 10:29:37 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Implement some missing functions for net::ip::network_v6 Date: Fri, 2 Feb 2024 10:29:17 +0000 Message-ID: <20240202102933.2241512-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Tested x86_64-linux. Pushed to trunk. -- >8 -- libstdc++-v3/ChangeLog: * include/experimental/internet (network_v6::network): Define. (network_v6::hosts): Finish implementing. (network_v6::to_string): Do not concatenate std::string to arbitrary std::basic_string specialization. * testsuite/experimental/net/internet/network/v6/cons.cc: New test. --- libstdc++-v3/include/experimental/internet | 26 ++++++- .../net/internet/network/v6/cons.cc | 74 +++++++++++++++++++ 2 files changed, 96 insertions(+), 4 deletions(-) create mode 100644 libstdc++-v3/testsuite/experimental/net/internet/network/v6/cons.cc diff --git a/libstdc++-v3/include/experimental/internet b/libstdc++-v3/include/experimental/internet index 82043c87aca..3f5090cfa70 100644 --- a/libstdc++-v3/include/experimental/internet +++ b/libstdc++-v3/include/experimental/internet @@ -1347,17 +1347,35 @@ namespace ip constexpr address_v6 address() const noexcept { return _M_addr; } constexpr int prefix_length() const noexcept { return _M_prefix_len; } - constexpr address_v6 network() const noexcept; // TODO + _GLIBCXX17_CONSTEXPR address_v6 + network() const noexcept + { + address_v6::bytes_type __bytes = _M_addr.to_bytes(); + int __nbytes = (_M_prefix_len + 7) / 8; + for (int __n = __nbytes; __n < 16; ++__n) + __bytes[__n] = 0; + if (int __zbits = (__nbytes * 8) - _M_prefix_len) + __bytes[__nbytes - 1] &= 0xFF << __zbits; + return address_v6(__bytes, _M_addr.scope_id()); + } address_v6_range hosts() const noexcept { if (is_host()) return { address(), *++address_v6_iterator(address()) }; - return {}; // { network(), XXX broadcast() XXX }; // TODO + + address_v6::bytes_type __bytes = _M_addr.to_bytes(); + int __nbytes = (_M_prefix_len + 7) / 8; + for (int __n = __nbytes; __n < 16; ++__n) + __bytes[__n] = 0xFF; + if (int __bits = (__nbytes * 8) - _M_prefix_len) + __bytes[__nbytes - 1] |= (1 << __bits) - 1; + address_v6 __last(__bytes, _M_addr.scope_id()); + return { network(), *++address_v6_iterator(__last) }; } - constexpr network_v6 + _GLIBCXX17_CONSTEXPR network_v6 canonical() const noexcept { return network_v6{network(), prefix_length()}; } @@ -1379,7 +1397,7 @@ namespace ip to_string(const _Allocator& __a = _Allocator()) const { return address().to_string(__a) + '/' - + std::to_string(prefix_length()); + + std::to_string(prefix_length()).c_str(); } private: diff --git a/libstdc++-v3/testsuite/experimental/net/internet/network/v6/cons.cc b/libstdc++-v3/testsuite/experimental/net/internet/network/v6/cons.cc new file mode 100644 index 00000000000..9b4b791bd02 --- /dev/null +++ b/libstdc++-v3/testsuite/experimental/net/internet/network/v6/cons.cc @@ -0,0 +1,74 @@ +// { dg-do run { target c++14 } } +// { dg-require-effective-target net_ts_ip } +// { dg-add-options net_ts } + +#include +#include +#include + +using std::experimental::net::ip::network_v6; +using std::experimental::net::ip::address_v6; + +constexpr void +test01() +{ + network_v6 n0; + VERIFY( n0.address().is_unspecified() ); + VERIFY( n0.prefix_length() == 0 ); +} + +constexpr void +test02() +{ + address_v6 a0; + network_v6 n0{ a0, 0 }; + VERIFY( n0.address() == a0 ); + VERIFY( n0.prefix_length() == 0 ); + + address_v6 a1{ address_v6::bytes_type{ 1, 2, 4, 8, 16, 32, 64, 128, + 3, 7, 47, 71, 83, 165, 199, 255 } }; + network_v6 n1{ a1, 99}; + VERIFY( n1.address() == a1 ); + VERIFY( n1.prefix_length() == 99 ); +} + +void +test02_errors() +{ + address_v6 a0; + try + { + network_v6{a0, -1}; + VERIFY(false); + } + catch(const std::out_of_range&) + { + } + + try + { + network_v6{a0, 129}; + VERIFY(false); + } + catch(const std::out_of_range&) + { + } +} + +constexpr bool +test_constexpr() +{ + test01(); + test02(); + return true; +} + +int +main() +{ + test01(); + test02(); + test02_errors(); + + static_assert( test_constexpr(), "valid in constant expressions" ); +}