diff options
author | DongHun Kwak <dh0128.kwak@samsung.com> | 2019-12-05 15:11:01 +0900 |
---|---|---|
committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2019-12-05 15:11:01 +0900 |
commit | 3fdc3e5ee96dca5b11d1694975a65200787eab86 (patch) | |
tree | 5c1733853892b8397d67706fa453a9bd978d2102 /boost/asio/ip/impl/address_v4.ipp | |
parent | 88e602c57797660ebe0f9e15dbd64c1ff16dead3 (diff) | |
download | boost-3fdc3e5ee96dca5b11d1694975a65200787eab86.tar.gz boost-3fdc3e5ee96dca5b11d1694975a65200787eab86.tar.bz2 boost-3fdc3e5ee96dca5b11d1694975a65200787eab86.zip |
Imported Upstream version 1.66.0upstream/1.66.0
Diffstat (limited to 'boost/asio/ip/impl/address_v4.ipp')
-rw-r--r-- | boost/asio/ip/impl/address_v4.ipp | 118 |
1 files changed, 75 insertions, 43 deletions
diff --git a/boost/asio/ip/impl/address_v4.ipp b/boost/asio/ip/impl/address_v4.ipp index 440217bcb2..d6db61f80d 100644 --- a/boost/asio/ip/impl/address_v4.ipp +++ b/boost/asio/ip/impl/address_v4.ipp @@ -17,6 +17,7 @@ #include <boost/asio/detail/config.hpp> #include <climits> +#include <limits> #include <stdexcept> #include <boost/asio/error.hpp> #include <boost/asio/detail/socket_ops.hpp> @@ -45,15 +46,13 @@ address_v4::address_v4(const address_v4::bytes_type& bytes) memcpy(&addr_.s_addr, bytes.data(), 4); } -address_v4::address_v4(unsigned long addr) +address_v4::address_v4(address_v4::uint_type addr) { -#if ULONG_MAX > 0xFFFFFFFF - if (addr > 0xFFFFFFFF) + if ((std::numeric_limits<uint_type>::max)() > 0xFFFFFFFF) { - std::out_of_range ex("address_v4 from unsigned long"); + std::out_of_range ex("address_v4 from unsigned integer"); boost::asio::detail::throw_exception(ex); } -#endif // ULONG_MAX > 0xFFFFFFFF addr_.s_addr = boost::asio::detail::socket_ops::host_to_network_long( static_cast<boost::asio::detail::u_long_type>(addr)); @@ -71,19 +70,32 @@ address_v4::bytes_type address_v4::to_bytes() const return bytes; } +address_v4::uint_type address_v4::to_uint() const +{ + return boost::asio::detail::socket_ops::network_to_host_long(addr_.s_addr); +} + +#if !defined(BOOST_ASIO_NO_DEPRECATED) unsigned long address_v4::to_ulong() const { return boost::asio::detail::socket_ops::network_to_host_long(addr_.s_addr); } +#endif // !defined(BOOST_ASIO_NO_DEPRECATED) std::string address_v4::to_string() const { boost::system::error_code ec; - std::string addr = to_string(ec); - boost::asio::detail::throw_error(ec); + char addr_str[boost::asio::detail::max_addr_v4_str_len]; + const char* addr = + boost::asio::detail::socket_ops::inet_ntop( + BOOST_ASIO_OS_DEF(AF_INET), &addr_, addr_str, + boost::asio::detail::max_addr_v4_str_len, 0, ec); + if (addr == 0) + boost::asio::detail::throw_error(ec); return addr; } +#if !defined(BOOST_ASIO_NO_DEPRECATED) std::string address_v4::to_string(boost::system::error_code& ec) const { char addr_str[boost::asio::detail::max_addr_v4_str_len]; @@ -95,69 +107,44 @@ std::string address_v4::to_string(boost::system::error_code& ec) const return std::string(); return addr; } - -address_v4 address_v4::from_string(const char* str) -{ - boost::system::error_code ec; - address_v4 addr = from_string(str, ec); - boost::asio::detail::throw_error(ec); - return addr; -} - -address_v4 address_v4::from_string( - const char* str, boost::system::error_code& ec) -{ - address_v4 tmp; - if (boost::asio::detail::socket_ops::inet_pton( - BOOST_ASIO_OS_DEF(AF_INET), str, &tmp.addr_, 0, ec) <= 0) - return address_v4(); - return tmp; -} - -address_v4 address_v4::from_string(const std::string& str) -{ - return from_string(str.c_str()); -} - -address_v4 address_v4::from_string( - const std::string& str, boost::system::error_code& ec) -{ - return from_string(str.c_str(), ec); -} +#endif // !defined(BOOST_ASIO_NO_DEPRECATED) bool address_v4::is_loopback() const { - return (to_ulong() & 0xFF000000) == 0x7F000000; + return (to_uint() & 0xFF000000) == 0x7F000000; } bool address_v4::is_unspecified() const { - return to_ulong() == 0; + return to_uint() == 0; } +#if !defined(BOOST_ASIO_NO_DEPRECATED) bool address_v4::is_class_a() const { - return (to_ulong() & 0x80000000) == 0; + return (to_uint() & 0x80000000) == 0; } bool address_v4::is_class_b() const { - return (to_ulong() & 0xC0000000) == 0x80000000; + return (to_uint() & 0xC0000000) == 0x80000000; } bool address_v4::is_class_c() const { - return (to_ulong() & 0xE0000000) == 0xC0000000; + return (to_uint() & 0xE0000000) == 0xC0000000; } +#endif // !defined(BOOST_ASIO_NO_DEPRECATED) bool address_v4::is_multicast() const { - return (to_ulong() & 0xF0000000) == 0xE0000000; + return (to_uint() & 0xF0000000) == 0xE0000000; } +#if !defined(BOOST_ASIO_NO_DEPRECATED) address_v4 address_v4::broadcast(const address_v4& addr, const address_v4& mask) { - return address_v4(addr.to_ulong() | (mask.to_ulong() ^ 0xFFFFFFFF)); + return address_v4(addr.to_uint() | (mask.to_uint() ^ 0xFFFFFFFF)); } address_v4 address_v4::netmask(const address_v4& addr) @@ -170,6 +157,51 @@ address_v4 address_v4::netmask(const address_v4& addr) return address_v4(0xFFFFFF00); return address_v4(0xFFFFFFFF); } +#endif // !defined(BOOST_ASIO_NO_DEPRECATED) + +address_v4 make_address_v4(const char* str) +{ + boost::system::error_code ec; + address_v4 addr = make_address_v4(str, ec); + boost::asio::detail::throw_error(ec); + return addr; +} + +address_v4 make_address_v4( + const char* str, boost::system::error_code& ec) +{ + address_v4::bytes_type bytes; + if (boost::asio::detail::socket_ops::inet_pton( + BOOST_ASIO_OS_DEF(AF_INET), str, &bytes, 0, ec) <= 0) + return address_v4(); + return address_v4(bytes); +} + +address_v4 make_address_v4(const std::string& str) +{ + return make_address_v4(str.c_str()); +} + +address_v4 make_address_v4( + const std::string& str, boost::system::error_code& ec) +{ + return make_address_v4(str.c_str(), ec); +} + +#if defined(BOOST_ASIO_HAS_STD_STRING_VIEW) + +address_v4 make_address_v4(string_view str) +{ + return make_address_v4(static_cast<std::string>(str)); +} + +address_v4 make_address_v4(string_view str, + boost::system::error_code& ec) +{ + return make_address_v4(static_cast<std::string>(str), ec); +} + +#endif // defined(BOOST_ASIO_HAS_STD_STRING_VIEW) } // namespace ip } // namespace asio |