pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-30 21:52:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug fix plus tweak to reset cwnd when no longer needed

Browse Source
This commit is contained in:
KimLS 2017-07-04 21:03:49 -07:00
parent 10b01e62df
commit 49505a7a45
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/net/daybreak_connection.cpp
View File

@ -140,8 +140,9 @@ void EQ::Net::DaybreakConnectionManager::Process()
if ((size_t)time_since_last_send.count() > m_options.connect_delay_ms) { if ((size_t)time_since_last_send.count() > m_options.connect_delay_ms) {
connection->SendConnect(); connection->SendConnect();
} }
}
break; break;
}
case StatusConnected: { case StatusConnected: {
if (m_options.keepalive_delay_ms != 0) { if (m_options.keepalive_delay_ms != 0) {
auto time_since_last_send = std::chrono::duration_cast<std::chrono::milliseconds>(now - connection->m_last_send); auto time_since_last_send = std::chrono::duration_cast<std::chrono::milliseconds>(now - connection->m_last_send);
@ -372,6 +373,11 @@ void EQ::Net::DaybreakConnection::Process()
} }
ProcessInboundQueue(); ProcessInboundQueue();
if (m_outstanding_bytes == 0) {
m_cwnd = 4 * m_max_packet_size;
m_ssthresh = m_owner->m_options.max_outstanding_bytes;
}
} }
catch (std::exception ex) { catch (std::exception ex) {
LogF(Logs::Detail, Logs::Netcode, "Error processing connection: {0}", ex.what()); LogF(Logs::Detail, Logs::Netcode, "Error processing connection: {0}", ex.what());
@ -480,7 +486,7 @@ void EQ::Net::DaybreakConnection::ProcessOutboundQueue()
LogF(Logs::Detail, Logs::Netcode, "Sending buffered packet {0} on stream {1}", buff.seq, i); LogF(Logs::Detail, Logs::Netcode, "Sending buffered packet {0} on stream {1}", buff.seq, i);
m_outstanding_bytes += buff.sent.packet.Length(); m_outstanding_bytes += buff.sent.packet.Length();
stream->outstanding_packets.insert(std::make_pair(buff.seq, buff.sent)); stream->outstanding_packets.insert(std::make_pair(buff.seq, buff.sent));
InternalSend(buff.sent.packet); InternalBufferedSend(buff.sent.packet);
stream->buffered_packets.pop_front(); stream->buffered_packets.pop_front();
} }
} }
@ -502,7 +508,7 @@ void EQ::Net::DaybreakConnection::IncreaseCongestionWindow()
void EQ::Net::DaybreakConnection::ReduceCongestionWindow() void EQ::Net::DaybreakConnection::ReduceCongestionWindow()
{ {
m_ssthresh = EQEmu::ClampLower(m_cwnd / 2, (size_t)(8 * m_max_packet_size)); m_ssthresh = std::max((size_t)m_cwnd / 2, (size_t)m_max_packet_size * 2);
m_cwnd = (size_t)m_max_packet_size * 4; m_cwnd = (size_t)m_max_packet_size * 4;
LogF(Logs::Detail, Logs::Netcode, "Reducing cwnd size new size is {0}", m_cwnd); LogF(Logs::Detail, Logs::Netcode, "Reducing cwnd size new size is {0}", m_cwnd);