From e5f2e4f8ac5a5a1e44bfcaf66dcc6aa32e730933 Mon Sep 17 00:00:00 2001 From: Andreas Tsouchlos Date: Sat, 19 Apr 2025 23:20:56 +0200 Subject: [PATCH] Move functions to detail namespace --- src/common.hpp | 6 ++++++ src/tcp_client.cpp | 4 ++-- src/tcp_server.cpp | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/common.hpp b/src/common.hpp index 56fc4ca..1cd907d 100644 --- a/src/common.hpp +++ b/src/common.hpp @@ -15,6 +15,9 @@ namespace tcp { +namespace detail { + + inline std::expected resolve_remote_address(const char* host, uint16_t port) { hostent* server = gethostbyname(host); @@ -42,6 +45,9 @@ inline sockaddr_in get_local_address(uint16_t port) { } +} // namespace detail + + using HostString = std::array; diff --git a/src/tcp_client.cpp b/src/tcp_client.cpp index ee710f3..e585c43 100644 --- a/src/tcp_client.cpp +++ b/src/tcp_client.cpp @@ -27,7 +27,7 @@ BlockingClient::~BlockingClient() { BlockingClient::connect(const HostString& host, uint16_t port) { /// 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()}; sockaddr_in serverAddress = addrRes.value(); @@ -118,7 +118,7 @@ NonBlockingClient::~NonBlockingClient() { NonBlockingClient::connect(const HostString& host, uint16_t port) { /// 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()}; sockaddr_in serverAddress = addrRes.value(); diff --git a/src/tcp_server.cpp b/src/tcp_server.cpp index 4c60765..43025d7 100644 --- a/src/tcp_server.cpp +++ b/src/tcp_server.cpp @@ -41,7 +41,7 @@ std::expected BlockingServer::start_listening(uint16_t port) { /// 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, sizeof(serverAddress)) != 0) { @@ -205,7 +205,7 @@ std::expected NonBlockingServer::start_listening(uint16_t port) { /// 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, sizeof(serverAddress)) != 0) {