Move functions to detail namespace
This commit is contained in:
parent
6c693d5aa0
commit
e5f2e4f8ac
@ -15,6 +15,9 @@
|
|||||||
namespace tcp {
|
namespace tcp {
|
||||||
|
|
||||||
|
|
||||||
|
namespace detail {
|
||||||
|
|
||||||
|
|
||||||
inline std::expected<sockaddr_in, int> resolve_remote_address(const char* host,
|
inline std::expected<sockaddr_in, int> resolve_remote_address(const char* host,
|
||||||
uint16_t port) {
|
uint16_t port) {
|
||||||
hostent* server = gethostbyname(host);
|
hostent* server = gethostbyname(host);
|
||||||
@ -42,6 +45,9 @@ inline sockaddr_in get_local_address(uint16_t port) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
} // namespace detail
|
||||||
|
|
||||||
|
|
||||||
using HostString = std::array<char, 64>;
|
using HostString = std::array<char, 64>;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -27,7 +27,7 @@ BlockingClient::~BlockingClient() {
|
|||||||
BlockingClient::connect(const HostString& host, uint16_t port) {
|
BlockingClient::connect(const HostString& host, uint16_t port) {
|
||||||
/// Resolve host
|
/// Resolve host
|
||||||
|
|
||||||
auto addrRes = resolve_remote_address(host.data(), port);
|
auto addrRes = detail::resolve_remote_address(host.data(), port);
|
||||||
if (!addrRes) return std::unexpected{addrRes.error()};
|
if (!addrRes) return std::unexpected{addrRes.error()};
|
||||||
sockaddr_in serverAddress = addrRes.value();
|
sockaddr_in serverAddress = addrRes.value();
|
||||||
|
|
||||||
@ -118,7 +118,7 @@ NonBlockingClient::~NonBlockingClient() {
|
|||||||
NonBlockingClient::connect(const HostString& host, uint16_t port) {
|
NonBlockingClient::connect(const HostString& host, uint16_t port) {
|
||||||
/// Resolve host
|
/// Resolve host
|
||||||
|
|
||||||
auto addrRes = resolve_remote_address(host.data(), port);
|
auto addrRes = detail::resolve_remote_address(host.data(), port);
|
||||||
if (!addrRes) return std::unexpected{addrRes.error()};
|
if (!addrRes) return std::unexpected{addrRes.error()};
|
||||||
sockaddr_in serverAddress = addrRes.value();
|
sockaddr_in serverAddress = addrRes.value();
|
||||||
|
|
||||||
|
|||||||
@ -41,7 +41,7 @@ std::expected<void, int> BlockingServer::start_listening(uint16_t port) {
|
|||||||
|
|
||||||
/// Bind socket and start listening
|
/// Bind socket and start listening
|
||||||
|
|
||||||
const struct sockaddr_in serverAddress = get_local_address(port);
|
const struct sockaddr_in serverAddress = detail::get_local_address(port);
|
||||||
|
|
||||||
if (::bind(m_serverSocket, (struct sockaddr*)&serverAddress,
|
if (::bind(m_serverSocket, (struct sockaddr*)&serverAddress,
|
||||||
sizeof(serverAddress)) != 0) {
|
sizeof(serverAddress)) != 0) {
|
||||||
@ -205,7 +205,7 @@ std::expected<void, int> NonBlockingServer::start_listening(uint16_t port) {
|
|||||||
|
|
||||||
/// Bind socket and start listening
|
/// Bind socket and start listening
|
||||||
|
|
||||||
const struct sockaddr_in serverAddress = get_local_address(port);
|
const struct sockaddr_in serverAddress = detail::get_local_address(port);
|
||||||
|
|
||||||
if (::bind(m_serverSocket, (struct sockaddr*)&serverAddress,
|
if (::bind(m_serverSocket, (struct sockaddr*)&serverAddress,
|
||||||
sizeof(serverAddress)) != 0) {
|
sizeof(serverAddress)) != 0) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user