From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id A793D3865488; Fri, 12 Feb 2021 15:12:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A793D3865488 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 r11-7219] libstdc++: Include scope ID in net::internet::address_v6::to_string() X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 970ba719250ec06767e0617658bb92a64fde0f3f X-Git-Newrev: d1a821b93c45bfe7606b5dee8d160c7172b37e3e Message-Id: <20210212151208.A793D3865488@sourceware.org> Date: Fri, 12 Feb 2021 15:12:08 +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: Fri, 12 Feb 2021 15:12:08 -0000 https://gcc.gnu.org/g:d1a821b93c45bfe7606b5dee8d160c7172b37e3e commit r11-7219-gd1a821b93c45bfe7606b5dee8d160c7172b37e3e Author: Jonathan Wakely Date: Fri Feb 12 15:08:29 2021 +0000 libstdc++: Include scope ID in net::internet::address_v6::to_string() libstdc++-v3/ChangeLog: * include/experimental/internet (address_v6::to_string): Include scope ID in string. * testsuite/experimental/net/internet/address/v6/members.cc: Test to_string() results. Diff: --- libstdc++-v3/include/experimental/internet | 24 ++++++++++++++++------ .../net/internet/address/v6/members.cc | 18 ++++++++++++++-- 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/libstdc++-v3/include/experimental/internet b/libstdc++-v3/include/experimental/internet index 57831676a29..288c61ba25a 100644 --- a/libstdc++-v3/include/experimental/internet +++ b/libstdc++-v3/include/experimental/internet @@ -344,9 +344,23 @@ namespace ip to_string(const _Allocator& __a = _Allocator()) const { __string_with<_Allocator> __str(__a); - __str.resize(INET6_ADDRSTRLEN); - if (inet_ntop(AF_INET6, &_M_bytes, &__str.front(), __str.size())) - __str.erase(__str.find('\0')); + __str.resize(INET6_ADDRSTRLEN + (_M_scope_id ? 11 : 0)); + char* const __p = &__str.front(); + if (inet_ntop(AF_INET6, &_M_bytes, __p, __str.size())) + { + auto __end = __str.find('\0'); + if (unsigned long __scope = _M_scope_id) + { + __end += +#if _GLIBCXX_USE_C99_STDIO + __builtin_snprintf(__p + __end, __str.size() - __end, + "%%%lu", __scope); +#else + __builtin_sprintf(__p + __end, "%%%lu", __scope); +#endif + } + __str.erase(__end); + } else __str.resize(0); return __str; @@ -364,9 +378,7 @@ namespace ip static constexpr address_v6 loopback() noexcept { - address_v6 __addr; - __addr._M_bytes[15] = 1; - return __addr; + return {bytes_type{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1}}; } private: diff --git a/libstdc++-v3/testsuite/experimental/net/internet/address/v6/members.cc b/libstdc++-v3/testsuite/experimental/net/internet/address/v6/members.cc index 506345dc990..b77d6a29e3d 100644 --- a/libstdc++-v3/testsuite/experimental/net/internet/address/v6/members.cc +++ b/libstdc++-v3/testsuite/experimental/net/internet/address/v6/members.cc @@ -86,16 +86,30 @@ static_assert(test02(), ""); void test03() { + // Assume these addresses use the preferred forms: VERIFY( address_v6::any().to_string() == "::" ); VERIFY( address_v6::loopback().to_string() == "::1" ); + + // Choose values with no leading zeros, so output is portable: + address_v6 a{address_v6::bytes_type{21,22,23,24,25,26,27,28,29}, 42}; + const std::string s = a.to_string(); + if (s.find("::") != s.npos) + VERIFY( s == "1516:1718:191a:1b1c:1d00::%42" ); + else + { + // Contiguous zeros were not shortened to "::" + VERIFY( s.substr(0, 25) == "1516:1718:191a:1b1c:1d00:" ); + VERIFY( s.substr(s.size() - 3) == "%42" ); + } } void test04() { + address_v6 a{address_v6::bytes_type{1,2,3,4,5,6,7,8,9}, 42}; std::ostringstream ss; - ss << address_v6::any() << ' ' << address_v6::loopback(); - VERIFY( ss.str() == ":: ::1" ); + ss << address_v6::any() << ' ' << address_v6::loopback() << ' ' << a; + VERIFY( ss.str() == (":: ::1 " + a.to_string()) ); } int