Codechange: ensure OnConnect() always gets called with a valid socket (#9729)

This should already be the case, but now assert()s will tell us
if this isn't.
This commit is contained in:
Patric Stout 2021-12-04 18:32:06 +01:00 committed by GitHub
parent 802ca4e722
commit 9c36c12c85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 1 deletions

View File

@ -217,6 +217,8 @@ Packet *NetworkTCPSocketHandler::ReceivePacket()
*/ */
bool NetworkTCPSocketHandler::CanSendReceive() bool NetworkTCPSocketHandler::CanSendReceive()
{ {
assert(this->sock != INVALID_SOCKET);
fd_set read_fd, write_fd; fd_set read_fd, write_fd;
struct timeval tv; struct timeval tv;

View File

@ -451,6 +451,8 @@ bool TCPServerConnecter::CheckActivity()
*/ */
void TCPServerConnecter::SetConnected(SOCKET sock) void TCPServerConnecter::SetConnected(SOCKET sock)
{ {
assert(sock != INVALID_SOCKET);
this->socket = sock; this->socket = sock;
this->status = Status::CONNECTED; this->status = Status::CONNECTED;
} }

View File

@ -566,6 +566,8 @@ void ClientNetworkCoordinatorSocketHandler::ConnectFailure(const std::string &to
*/ */
void ClientNetworkCoordinatorSocketHandler::ConnectSuccess(const std::string &token, SOCKET sock, NetworkAddress &address) void ClientNetworkCoordinatorSocketHandler::ConnectSuccess(const std::string &token, SOCKET sock, NetworkAddress &address)
{ {
assert(sock != INVALID_SOCKET);
/* Connecter will destroy itself. */ /* Connecter will destroy itself. */
this->game_connecter = nullptr; this->game_connecter = nullptr;

View File

@ -41,7 +41,7 @@ public:
{ {
this->handler->connecter = nullptr; this->handler->connecter = nullptr;
handler->sock = s; this->handler->sock = s;
} }
}; };