cpp/openttd-patchpack/source File Diff

File diff r27641:5b60a93d31de → r27642:94cf4b1c58ae

src/network/core/tcp_game.cpp

➞

Show inline comments

@@ @@ -63,9 +63,15 @@ NetworkRecvStatus NetworkGameSocketHandl @@
+{
 	PacketGameType type = (PacketGameType)p->Recv_uint8();
 	if (this->HasClientQuit()) {
 		Debug(net, 0, "[tcp/game] Received invalid packet from client {}", this->client_id);
 		this->CloseConnection();
 		return NETWORK_RECV_STATUS_MALFORMED_PACKET;
+	}
 	this->last_packet = std::chrono::steady_clock::now();
-	switch (this->HasClientQuit() ? PACKET_END : type) {
 	switch (type) {
 		case PACKET_SERVER_FULL:                  return this->Receive_SERVER_FULL(p);
 		case PACKET_SERVER_BANNED:                return this->Receive_SERVER_BANNED(p);
 		case PACKET_CLIENT_JOIN:                  return this->Receive_CLIENT_JOIN(p);
@@ @@ -112,13 +118,8 @@ NetworkRecvStatus NetworkGameSocketHandl @@
 		case PACKET_SERVER_CONFIG_UPDATE:         return this->Receive_SERVER_CONFIG_UPDATE(p);
 		default:
 			Debug(net, 0, "[tcp/game] Received invalid packet type {} from client {}", type, this->client_id);
 			this->CloseConnection();
 			if (this->HasClientQuit()) {
 				Debug(net, 0, "[tcp/game] Received invalid packet type {} from client {}", type, this->client_id);
 			} else {
 				Debug(net, 0, "[tcp/game] Received illegal packet from client {}", this->client_id);
+			}
 			return NETWORK_RECV_STATUS_MALFORMED_PACKET;
+	}
+}