types: Make all address conversion constexpr
Change-Id: If9d5e14e37e868c9a567c567ab8cb64913564a4f
Signed-off-by: William A. Kennington III <wak@google.com>
diff --git a/src/types.cpp b/src/types.cpp
index ff49313..0d20d7d 100644
--- a/src/types.cpp
+++ b/src/types.cpp
@@ -4,119 +4,11 @@
#include <charconv>
-namespace phosphor::network
-{
-
-void IfAddr::invalidPfx(uint8_t pfx)
+void phosphor::network::IfAddr::invalidPfx(uint8_t pfx)
{
throw std::invalid_argument(fmt::format("Invalid prefix {}", pfx));
}
-namespace detail
-{
-
-std::string_view AddrBufMaker<ether_addr>::operator()(ether_addr val) noexcept
-{
- for (char* ptr = buf.data() + 2; ptr < buf.end(); ptr += 3)
- {
- *ptr = ':';
- }
- for (size_t i = 0; i < 6; ++i)
- {
- char* tmp = buf.data() + i * 3;
- uint8_t byte = val.ether_addr_octet[i];
- if (byte < 16)
- {
- *(tmp++) = '0';
- }
- std::to_chars(tmp, buf.end(), byte, 16);
- }
- return {buf.begin(), buf.size()};
-}
-
-static char* makeInAddr(char* ptr, char* end, in_addr val) noexcept
-{
- auto v = bswap(ntoh(val.s_addr));
- for (size_t i = 0; i < 3; ++i)
- {
- const auto res = std::to_chars(ptr, end, v & 0xff, 10);
- *res.ptr = '.';
- ptr = res.ptr + 1;
- v >>= 8;
- }
- return std::to_chars(ptr, end, v & 0xff, 10).ptr;
-}
-
-std::string_view AddrBufMaker<in_addr>::operator()(in_addr val) noexcept
-{
- return {buf.data(), makeInAddr(buf.data(), buf.end(), val)};
-}
-
-std::string_view AddrBufMaker<in6_addr>::operator()(in6_addr val) noexcept
-{
- // IPv4 in IPv6 Addr
- if (val.s6_addr32[0] == 0 && val.s6_addr32[1] == 0 &&
- val.s6_addr32[2] == hton(uint32_t(0xffff)))
- {
- constexpr auto prefix = std::string_view("::ffff:");
- return {buf.data(),
- makeInAddr(std::copy(prefix.begin(), prefix.end(), buf.begin()),
- buf.end(), {val.s6_addr32[3]})};
- }
-
- size_t skip_start = 0;
- size_t skip_size = 0;
- {
- size_t new_start = 0;
- size_t new_size = 0;
- for (size_t i = 0; i < 9; ++i)
- {
- if (i < 8 && val.s6_addr16[i] == 0)
- {
- if (new_start + new_size == i)
- {
- new_size++;
- }
- else
- {
- new_start = i;
- new_size = 1;
- }
- }
- else if (new_start + new_size == i && new_size > skip_size)
- {
- skip_start = new_start;
- skip_size = new_size;
- }
- }
- }
- char* ptr = buf.begin();
- for (size_t i = 0; i < 8; ++i)
- {
- if (i == skip_start && skip_size > 1)
- {
- if (i == 0)
- {
- *(ptr++) = ':';
- }
- *(ptr++) = ':';
- i += skip_size - 1;
- continue;
- }
- const auto res =
- std::to_chars(ptr, buf.end(), ntoh(val.s6_addr16[i]), 16);
- ptr = res.ptr;
- if (i < 7)
- {
- *(ptr++) = ':';
- }
- }
- return {buf.data(), ptr};
-}
-
-} // namespace detail
-} // namespace phosphor::network
-
std::size_t std::hash<in_addr>::operator()(in_addr addr) const noexcept
{
return std::hash<decltype(addr.s_addr)>{}(addr.s_addr);
@@ -136,22 +28,24 @@
std::string std::to_string(ether_addr value)
{
- return string(phosphor::network::detail::AddrBufMaker<ether_addr>{}(value));
+ return string(phosphor::network::detail::ToStrBuf<ether_addr>{}(value));
}
std::string std::to_string(in_addr value)
{
- return string(phosphor::network::detail::AddrBufMaker<in_addr>{}(value));
+ return string(phosphor::network::detail::ToStrBuf<in_addr>{}(value));
}
std::string std::to_string(in6_addr value)
{
- return string(phosphor::network::detail::AddrBufMaker<in6_addr>{}(value));
+ return string(phosphor::network::detail::ToStrBuf<in6_addr>{}(value));
}
std::string std::to_string(phosphor::network::InAddrAny value)
{
- return std::visit([](auto v) { return std::to_string(v); }, value);
+ phosphor::network::detail::ToStrBuf<phosphor::network::InAddrAny> tsb;
+ return string(tsb(value));
}
std::string std::to_string(phosphor::network::IfAddr value)
{
- return fmt::to_string(value);
+ phosphor::network::detail::ToStrBuf<phosphor::network::IfAddr> tsb;
+ return string(tsb(value));
}