From dd226bd45a5b151cba22733e4aabd2df048ad0ab Mon Sep 17 00:00:00 2001 From: momo5502 Date: Sun, 12 Jan 2025 08:43:34 +0100 Subject: [PATCH] Fix compilation --- src/common/network/tcp_client_socket.cpp | 6 +++++- src/common/network/tcp_client_socket.hpp | 2 +- src/common/network/tcp_server_socket.cpp | 8 +++++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/common/network/tcp_client_socket.cpp b/src/common/network/tcp_client_socket.cpp index 83953d38..9739b394 100644 --- a/src/common/network/tcp_client_socket.cpp +++ b/src/common/network/tcp_client_socket.cpp @@ -1,5 +1,7 @@ #include "tcp_client_socket.hpp" +#include + namespace network { tcp_client_socket::tcp_client_socket(const int af) @@ -7,9 +9,11 @@ namespace network { } - tcp_client_socket::tcp_client_socket(SOCKET s) + tcp_client_socket::tcp_client_socket(SOCKET s, const address& target) : socket(s) { + (void)target; + assert(this->get_target() == target); } tcp_client_socket::~tcp_client_socket() diff --git a/src/common/network/tcp_client_socket.hpp b/src/common/network/tcp_client_socket.hpp index 8d297215..e5b586a1 100644 --- a/src/common/network/tcp_client_socket.hpp +++ b/src/common/network/tcp_client_socket.hpp @@ -29,6 +29,6 @@ namespace network private: friend tcp_server_socket; - tcp_client_socket(SOCKET s); + tcp_client_socket(SOCKET s, const address& target); }; } diff --git a/src/common/network/tcp_server_socket.cpp b/src/common/network/tcp_server_socket.cpp index 806bb875..026f5952 100644 --- a/src/common/network/tcp_server_socket.cpp +++ b/src/common/network/tcp_server_socket.cpp @@ -13,7 +13,13 @@ namespace network address a{}; auto len = a.get_max_size(); - return ::accept(this->get_socket(), &a.get_addr(), &len); + const auto s = ::accept(this->get_socket(), &a.get_addr(), &len); + if (s == INVALID_SOCKET) + { + return {}; + } + + return {s, a}; } void tcp_server_socket::listen()