OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2026-02-05 04:10:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only send live checks when the connection has been silent for a while.

Browse Source 
Also:
* Made the timeout configurable
* Removed the stale randomcharacters config option
* Switched to time_t for time values, even though it doesn't really
matter that much
* Halved the keepAliveTimer frequency
This commit is contained in:
dongresource
2020-09-16 17:45:53 +02:00
parent 501d153894
commit f7571607ba
7 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/CNShardServer.cpp
View File

@@ -16,7 +16,7 @@ std::list<TimerEvent> CNShardServer::Timers;
CNShardServer::CNShardServer(uint16_t p) {
port = p;
pHandler = &CNShardServer::handlePacket;
REGISTER_SHARD_TIMER(keepAliveTimer, 2000);
REGISTER_SHARD_TIMER(keepAliveTimer, 4000);
REGISTER_SHARD_TIMER(periodicSaveTimer, settings::DBSAVEINTERVAL*1000);
init();
}
@@ -28,24 +28,26 @@ void CNShardServer::handlePacket(CNSocket* sock, CNPacketData* data) {
ShardPackets[data->type](sock, data);
else if (settings::VERBOSITY > 0)
std::cerr << "OpenFusion: SHARD UNIMPLM ERR. PacketType: " << Defines::p2str(CL2FE, data->type) << " (" << data->type << ")" << std::endl;
PlayerManager::players[sock].lastHeartbeat = getTime();
}
void CNShardServer::keepAliveTimer(CNServer* serv, uint64_t currTime) {
void CNShardServer::keepAliveTimer(CNServer* serv, time_t currTime) {
auto cachedPlayers = PlayerManager::players;
for (auto& pair : cachedPlayers) {
if (pair.second.lastHeartbeat != 0 && currTime - pair.second.lastHeartbeat > 60000) { // if the client hadn't responded in 60 seconds, its a dead connection so throw it out
if (pair.second.lastHeartbeat != 0 && currTime - pair.second.lastHeartbeat > settings::TIMEOUT) {
// if the client hasn't responded in 60 seconds, its a dead connection so throw it out
pair.first->kill();
continue;
} else if (pair.second.lastHeartbeat != 0 && currTime - pair.second.lastHeartbeat > settings::TIMEOUT/2) {
// if the player hasn't responded in 30 seconds, send a live check
INITSTRUCT(sP_FE2CL_REQ_LIVE_CHECK, data);
pair.first->sendPacket((void*)&data, P_FE2CL_REQ_LIVE_CHECK, sizeof(sP_FE2CL_REQ_LIVE_CHECK));
}
// passed the heartbeat, send another
INITSTRUCT(sP_FE2CL_REQ_LIVE_CHECK, data);
pair.first->sendPacket((void*)&data, P_FE2CL_REQ_LIVE_CHECK, sizeof(sP_FE2CL_REQ_LIVE_CHECK));
}
}
void CNShardServer::periodicSaveTimer(CNServer* serv, uint64_t currTime) {
void CNShardServer::periodicSaveTimer(CNServer* serv, time_t currTime) {
auto cachedPlayers = PlayerManager::players;
for (auto& pair : cachedPlayers) {
@@ -73,7 +75,7 @@ void CNShardServer::killConnection(CNSocket* cns) {
}
void CNShardServer::onStep() {
uint64_t currTime = getTime();
time_t currTime = getTime();
for (TimerEvent& event : Timers) {
if (event.scheduledEvent == 0) {