dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add client desync log to server desync log output

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-05-21 18:58:13 +01:00
parent cb0ca43eae
commit 97baff6fd8
12 changed files with 112 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/network/network_client.cpp
View File

@@ -174,16 +174,22 @@ NetworkRecvStatus ClientNetworkGameSocketHandler::CloseConnection(NetworkRecvSta
*/
if (this->sock == INVALID_SOCKET) return status;
DEBUG(net, 1, "Closed client connection %d", this->client_id);
DEBUG(net, 1, "Shutting down client connection %d", this->client_id);
SetBlocking(this->sock);
this->SendPackets(true);
ShutdownSocket(this->sock, false, true, 2);
/* Wait a number of ticks so our leave message can reach the server.
* This is especially needed for Windows servers as they seem to get
* the "socket is closed" message before receiving our leave message,
* which would trigger the server to close the connection as well. */
CSleep(3 * MILLISECONDS_PER_TICK);
DEBUG(net, 1, "Shutdown client connection %d", this->client_id);
delete this->GetInfo();
delete this;
@@ -223,6 +229,8 @@ void ClientNetworkGameSocketHandler::ClientError(NetworkRecvStatus res)
SendError(errorno);
}
this->SendPackets();
ClientNetworkEmergencySave();
_switch_mode = SM_MENU;
@@ -281,9 +289,11 @@ void ClientNetworkGameSocketHandler::ClientError(NetworkRecvStatus res)
NetworkError(STR_NETWORK_ERROR_DESYNC);
DEBUG(desync, 1, "sync_err: date{%08x; %02x; %02x}", _date, _date_fract, _tick_skip_counter);
DEBUG(net, 0, "Sync error detected!");
my_client->ClientError(NETWORK_RECV_STATUS_DESYNC);
CrashLog::DesyncCrashLog();
std::string desync_log;
CrashLog::DesyncCrashLog(nullptr, &desync_log);
my_client->SendDesyncLog(desync_log);
my_client->ClientError(NETWORK_RECV_STATUS_DESYNC);
return false;
}
@@ -469,6 +479,22 @@ NetworkRecvStatus ClientNetworkGameSocketHandler::SendError(NetworkErrorCode err
return NETWORK_RECV_STATUS_OKAY;
}
/** Send an error-packet over the network */
NetworkRecvStatus ClientNetworkGameSocketHandler::SendDesyncLog(const std::string &log)
{
for (size_t offset = 0; offset < log.size();) {
size_t size = min<size_t>(log.size() - offset, SHRT_MAX - 2);
Packet *p = new Packet(PACKET_CLIENT_DESYNC_LOG);
p->Send_uint16(size);
p->Send_binary(log.data() + offset, size);
my_client->SendPacket(p);
offset += size;
}
return NETWORK_RECV_STATUS_OKAY;
}
/**
* Tell the server that we like to change the password of the company.
* @param password The new password.