MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-09-30 12:48:54 +02:00
Code Issues Releases Wiki Activity

ircd::net: Minor cleanup/movement.

Browse source
This commit is contained in:
Jason Volk 2017-12-29 22:45:15 -07:00
parent 126df4b54a
commit c7d97eaf00
1 changed files with 79 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

156
ircd/net.cc
View file

@ -1380,81 +1380,6 @@ const
return *ssl.native_handle();
}
///////////////////////////////////////////////////////////////////////////////
//
// net/asio.h
//
std::string
ircd::net::string(const ip::address &addr)
{
return addr.to_string();
}
std::string
ircd::net::string(const ip::tcp::endpoint &ep)
{
std::string ret(256, char{});
const auto addr{string(net::addr(ep))};
const auto data{const_cast<char *>(ret.data())};
ret.resize(snprintf(data, ret.size(), "%s:%u", addr.c_str(), port(ep)));
return ret;
}
std::string
ircd::net::host(const ip::tcp::endpoint &ep)
{
return string(addr(ep));
}
boost::asio::ip::address
ircd::net::addr(const ip::tcp::endpoint &ep)
{
return ep.address();
}
uint16_t
ircd::net::port(const ip::tcp::endpoint &ep)
{
return ep.port();
}
std::string
ircd::net::string(const boost::system::system_error &e)
{
return string(e.code());
}
std::string
ircd::net::string(const boost::system::error_code &ec)
{
std::string ret(128, char{});
ret.resize(string(mutable_buffer{ret}, ec).size());
return ret;
}
ircd::string_view
ircd::net::string(const mutable_buffer &buf,
const boost::system::system_error &e)
{
return string(buf, e.code());
}
ircd::string_view
ircd::net::string(const mutable_buffer &buf,
const boost::system::error_code &ec)
{
const auto len
{
fmt::sprintf
{
buf, "%s: %s", ec.category().name(), ec.message()
}
};
return { data(buf), size_t(len) };
}
///////////////////////////////////////////////////////////////////////////////
//
// net/resolve.h
@ -1479,7 +1404,8 @@ ircd::net::resolve::resolve(const vector_view<ipport> &in,
for(; a < count; ++a) resolve
{
in[a], [&b, &c, &count, &ret(out[a])]
(std::exception_ptr eptr, std::string hostname) noexcept
(std::exception_ptr eptr, std::string hostname)
noexcept
{
ret = std::move(hostname);
if(++b >= count)
@ -1502,7 +1428,8 @@ ircd::net::resolve::resolve(const vector_view<hostport> &in,
for(; a < count; ++a) resolve
{
in[a], [&b, &c, &count, &ret(out[a])]
(std::exception_ptr eptr, const ipport &ip) noexcept
(std::exception_ptr eptr, const ipport &ip)
noexcept
{
ret = ip;
if(++b >= count)
@ -1864,6 +1791,81 @@ ircd::net::operator<<(std::ostream &s, const hostport &t)
return s;
}
///////////////////////////////////////////////////////////////////////////////
//
// net/asio.h
//
std::string
ircd::net::string(const ip::address &addr)
{
return addr.to_string();
}
std::string
ircd::net::string(const ip::tcp::endpoint &ep)
{
std::string ret(256, char{});
const auto addr{string(net::addr(ep))};
const auto data{const_cast<char *>(ret.data())};
ret.resize(snprintf(data, ret.size(), "%s:%u", addr.c_str(), port(ep)));
return ret;
}
std::string
ircd::net::host(const ip::tcp::endpoint &ep)
{
return string(addr(ep));
}
boost::asio::ip::address
ircd::net::addr(const ip::tcp::endpoint &ep)
{
return ep.address();
}
uint16_t
ircd::net::port(const ip::tcp::endpoint &ep)
{
return ep.port();
}
std::string
ircd::net::string(const boost::system::system_error &e)
{
return string(e.code());
}
std::string
ircd::net::string(const boost::system::error_code &ec)
{
std::string ret(128, char{});
ret.resize(string(mutable_buffer{ret}, ec).size());
return ret;
}
ircd::string_view
ircd::net::string(const mutable_buffer &buf,
const boost::system::system_error &e)
{
return string(buf, e.code());
}
ircd::string_view
ircd::net::string(const mutable_buffer &buf,
const boost::system::error_code &ec)
{
const auto len
{
fmt::sprintf
{
buf, "%s: %s", ec.category().name(), ec.message()
}
};
return { data(buf), size_t(len) };
}
///////////////////////////////////////////////////////////////////////////////
//
// buffer.h - provide definition for the null buffers and asio conversion