pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-04-14 16:02:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change default settings

Browse Source
This commit is contained in:
KimLS 2017-03-10 23:31:51 -08:00
parent d494048ff6
commit 56fdc6aaac
3 changed files with 39 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
common/net/daybreak_connection.cpp
View File

@ -407,24 +407,42 @@ void EQ::Net::DaybreakConnection::ProcessPacket(Packet &p)
return; return;
} }
EQ::Net::DynamicPacket temp; if (m_encode_passes[0] == EncodeCompression || m_encode_passes[1] == EncodeCompression)
temp.PutPacket(0, p); {
temp.Resize(temp.Length() - m_crc_bytes); EQ::Net::DynamicPacket temp;
temp.PutPacket(0, p);
temp.Resize(temp.Length() - m_crc_bytes);
for (int i = 1; i >= 0; --i) { for (int i = 1; i >= 0; --i) {
switch (m_encode_passes[i]) { switch (m_encode_passes[i]) {
case EncodeCompression: case EncodeCompression:
Decompress(temp, DaybreakHeader::size(), temp.Length() - DaybreakHeader::size()); Decompress(temp, DaybreakHeader::size(), temp.Length() - DaybreakHeader::size());
break; break;
case EncodeXOR: case EncodeXOR:
Decode(temp, DaybreakHeader::size(), temp.Length() - DaybreakHeader::size()); Decode(temp, DaybreakHeader::size(), temp.Length() - DaybreakHeader::size());
break; break;
default: default:
break; break;
}
} }
}
ProcessDecodedPacket(StaticPacket(temp.Data(), temp.Length())); ProcessDecodedPacket(StaticPacket(temp.Data(), temp.Length()));
}
else {
EQ::Net::StaticPacket temp(p.Data(), p.Length() - m_crc_bytes);
for (int i = 1; i >= 0; --i) {
switch (m_encode_passes[i]) {
case EncodeXOR:
Decode(temp, DaybreakHeader::size(), temp.Length() - DaybreakHeader::size());
break;
default:
break;
}
}
ProcessDecodedPacket(StaticPacket(temp.Data(), temp.Length()));
}
} }
else { else {
ProcessDecodedPacket(p); ProcessDecodedPacket(p);

10
common/net/daybreak_connection.h
View File

@ -218,11 +218,11 @@ namespace EQ
DaybreakConnectionManagerOptions() { DaybreakConnectionManagerOptions() {
max_connection_count = 0; max_connection_count = 0;
keepalive_delay_ms = 9000; keepalive_delay_ms = 9000;
resend_delay_ms = 250; resend_delay_ms = 300;
resend_delay_factor = 1.5; resend_delay_factor = 1.5;
resend_delay_max = 2500; resend_delay_max = 5000;
stats_delay_ms = 9000; stats_delay_ms = 9000;
connect_delay_ms = 250; connect_delay_ms = 500;
stale_connection_ms = 60000; stale_connection_ms = 60000;
connect_stale_ms = 5000; connect_stale_ms = 5000;
crc_length = 2; crc_length = 2;
@ -231,10 +231,10 @@ namespace EQ
encode_passes[1] = DaybreakEncodeType::EncodeNone; encode_passes[1] = DaybreakEncodeType::EncodeNone;
port = 0; port = 0;
hold_size = 384; hold_size = 384;
hold_length_ms = 50; hold_length_ms = 10;
simulated_in_packet_loss = 0; simulated_in_packet_loss = 0;
simulated_out_packet_loss = 0; simulated_out_packet_loss = 0;
tic_rate_hertz = 20.0; tic_rate_hertz = 10.0;
} }
size_t max_packet_size; size_t max_packet_size;

2
zone/net.cpp
View File

@ -451,7 +451,7 @@ int main(int argc, char** argv) {
if (!eqsf_open && Config->ZonePort != 0) { if (!eqsf_open && Config->ZonePort != 0) {
Log.Out(Logs::General, Logs::Zone_Server, "Starting EQ Network server on port %d", Config->ZonePort); Log.Out(Logs::General, Logs::Zone_Server, "Starting EQ Network server on port %d", Config->ZonePort);
EQ::Net::EQStreamManagerOptions opts(Config->ZonePort, false, true); EQ::Net::EQStreamManagerOptions opts(Config->ZonePort, false, false);
eqsm.reset(new EQ::Net::EQStreamManager(opts)); eqsm.reset(new EQ::Net::EQStreamManager(opts));
eqsf_open = true; eqsf_open = true;