mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-04 13:42:55 +01:00
Code Issues Releases Wiki Activity

Merge pull request #1881 from zsilencer/develop

Browse Source 
disable naggle
This commit is contained in:
Ted John
2015-09-03 12:01:40 +01:00
parent 2975cb7038 6ea9b6666c
commit 081ebeccf4
2 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/network/network.cpp
View File

@@ -170,6 +170,9 @@ int NetworkConnection::ReadPacket()
inboundpacket.transferred += readBytes;
if (inboundpacket.transferred == sizeof(inboundpacket.size)) {
inboundpacket.size = ntohs(inboundpacket.size);
if(inboundpacket.size == 0){ // Can't have a size 0 packet
return NETWORK_DISCONNECTED;
}
inboundpacket.data->resize(inboundpacket.size);
}
} else {
@@ -192,30 +195,23 @@ int NetworkConnection::ReadPacket()
return NETWORK_MORE_DATA;
}
int NetworkConnection::SendPacket(NetworkPacket& packet)
bool NetworkConnection::SendPacket(NetworkPacket& packet)
{
uint16 sizen = htons(packet.size);
std::vector<uint8> tosend;
tosend.insert(tosend.end(), (uint8*)&sizen, (uint8*)&sizen + sizeof(sizen));
tosend.insert(tosend.end(), packet.data->begin(), packet.data->end());
while (1) {
if (packet.transferred < sizeof(packet.size)) {
// send packet size
uint16 size = htons(packet.size);
int sentBytes = send(socket, &((char*)&size)[packet.transferred], sizeof(size) - packet.transferred, 0);
if (sentBytes == SOCKET_ERROR) {
return 0;
}
packet.transferred += sentBytes;
} else {
// send packet data
int sentBytes = send(socket, (const char*)&packet.GetData()[packet.transferred - sizeof(packet.size)], packet.data->size(), 0);
if (sentBytes == SOCKET_ERROR) {
return 0;
}
packet.transferred += sentBytes;
if (packet.transferred == sizeof(packet.size) + packet.data->size()) {
return 1;
}
int sentBytes = send(socket, (const char*)&tosend[packet.transferred], tosend.size() - packet.transferred, 0);
if (sentBytes == SOCKET_ERROR) {
return false;
}
packet.transferred += sentBytes;
if (packet.transferred == tosend.size()) {
return true;
}
}
return 0;
return false;
}
void NetworkConnection::QueuePacket(std::unique_ptr<NetworkPacket> packet)
@@ -233,6 +229,11 @@ void NetworkConnection::SendQueuedPackets()
}
}
bool NetworkConnection::SetTCPNoDelay(bool on)
{
return setsockopt(socket, IPPROTO_TCP, TCP_NODELAY, (const char*)&on, sizeof(on)) == 0;
}
Network::Network()
{
wsa_initialized = false;
@@ -330,6 +331,7 @@ bool Network::BeginClient(const char* host, unsigned short port)
}
server_connection.socket = server_socket;
server_connection.SetTCPNoDelay(true);
mode = NETWORK_MODE_CLIENT;
@@ -703,6 +705,7 @@ void Network::AddClient(SOCKET socket)
{
auto connection = std::unique_ptr<NetworkConnection>(new NetworkConnection); // change to make_unique in c++14
connection->socket = socket;
connection->SetTCPNoDelay(true);
client_connection_list.push_back(std::move(connection));
}

5
src/network/network.h
View File

@@ -84,7 +84,7 @@ public:
void Write(uint8* bytes, unsigned int size);
void WriteString(const char* string);
template <typename T>
NetworkPacket& operator>>(T& value) { if (read + sizeof(value) > size) { value = 0; } else { value = ByteSwapBE(*((T*)&GetData()[read])); read += sizeof(value); } return *this; };
NetworkPacket& operator>>(T& value) { if (read + sizeof(value) > size) { value = 0; } else { value = ByteSwapBE(*((T*)&GetData()[read])); read += sizeof(value); } return *this; }
const uint8* Read(unsigned int size);
const char* ReadString();
void Clear();
@@ -112,6 +112,7 @@ public:
int ReadPacket();
void QueuePacket(std::unique_ptr<NetworkPacket> packet);
void SendQueuedPackets();
bool SetTCPNoDelay(bool on);
SOCKET socket;
NetworkPacket inboundpacket;
@@ -120,7 +121,7 @@ public:
uint32 ping_time;
private:
int SendPacket(NetworkPacket& packet);
bool SendPacket(NetworkPacket& packet);
std::list<std::unique_ptr<NetworkPacket>> outboundpackets;
};