pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-11 07:02:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some reverts and changes to default values and a bug fix

Browse Source
This commit is contained in:
KimLS 2017-03-01 13:00:48 -08:00
parent 25cbdf5f2c
commit 0b4484b36b
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/net/daybreak_connection.cpp
View File

@ -272,7 +272,7 @@ EQ::Net::DaybreakConnection::DaybreakConnection(DaybreakConnectionManager *owner
m_encode_passes[1] = owner->m_options.encode_passes[1]; m_encode_passes[1] = owner->m_options.encode_passes[1];
m_hold_time = Clock::now(); m_hold_time = Clock::now();
m_buffered_packets_length = 0; m_buffered_packets_length = 0;
m_resend_delay = m_owner->m_options.resend_delay_ms; m_resend_delay = m_owner->m_options.resend_delay_ms + 25;
m_rolling_ping = 100; m_rolling_ping = 100;
m_combined.reset(new char[512]); m_combined.reset(new char[512]);
m_combined[0] = 0; m_combined[0] = 0;
@ -295,7 +295,7 @@ EQ::Net::DaybreakConnection::DaybreakConnection(DaybreakConnectionManager *owner
m_crc_bytes = 0; m_crc_bytes = 0;
m_hold_time = Clock::now(); m_hold_time = Clock::now();
m_buffered_packets_length = 0; m_buffered_packets_length = 0;
m_resend_delay = m_owner->m_options.resend_delay_ms; m_resend_delay = m_owner->m_options.resend_delay_ms + 25;
m_rolling_ping = 100; m_rolling_ping = 100;
m_combined.reset(new char[512]); m_combined.reset(new char[512]);
m_combined[0] = 0; m_combined[0] = 0;
@ -356,8 +356,8 @@ void EQ::Net::DaybreakConnection::Process()
{ {
try { try {
m_resend_delay = (size_t)(m_stats.last_stat_ping * m_owner->m_options.resend_delay_factor) + m_owner->m_options.resend_delay_ms; m_resend_delay = (size_t)(m_stats.last_stat_ping * m_owner->m_options.resend_delay_factor) + m_owner->m_options.resend_delay_ms;
if (m_resend_delay > 1000) { if (m_resend_delay > 500) {
m_resend_delay = 1000; m_resend_delay = 500;
} }
auto now = Clock::now(); auto now = Clock::now();
@ -999,7 +999,7 @@ void EQ::Net::DaybreakConnection::ProcessResend(int stream)
} }
} }
else { else {
if ((size_t)time_since_last_send.count() > std::min(m_resend_delay / (entry.second.times_resent + 1), (size_t)5ULL)) { if ((size_t)time_since_last_send.count() > m_resend_delay) {
InternalBufferedSend(entry.second.packet); InternalBufferedSend(entry.second.packet);
entry.second.last_sent = now; entry.second.last_sent = now;
entry.second.times_resent++; entry.second.times_resent++;
@ -1225,6 +1225,7 @@ void EQ::Net::DaybreakConnection::InternalQueuePacket(Packet &p, int stream_id,
} }
InternalBufferedSend(p); InternalBufferedSend(p);
return;
} }
auto stream = &m_streams[stream_id]; auto stream = &m_streams[stream_id];

2
common/net/daybreak_connection.h
View File

@ -218,7 +218,7 @@ namespace EQ
DaybreakConnectionManagerOptions() { DaybreakConnectionManagerOptions() {
max_connection_count = 0; max_connection_count = 0;
keepalive_delay_ms = 9000; keepalive_delay_ms = 9000;
resend_delay_ms = 25; resend_delay_ms = 50;
resend_delay_factor = 1.5; resend_delay_factor = 1.5;
stats_delay_ms = 9000; stats_delay_ms = 9000;
connect_delay_ms = 250; connect_delay_ms = 250;

7
common/net/eqstream.cpp
View File

@ -85,12 +85,7 @@ void EQ::Net::EQStream::QueuePacket(const EQApplicationPacket *p, bool ack_req)
break; break;
} }
if (!ack_req) { m_connection->QueuePacket(out);
m_connection->QueuePacket(out, 0, false);
}
else {
m_connection->QueuePacket(out);
}
} }
} }