jessica
/
Jupiter-Bot
mirror of https://github.com/JAJames/Jupiter-Bot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Added server pinging/timeouts.

pull/3/head
JustinAJ 9 years ago
parent
b8aa2303f5
commit
548c7980cc
3 changed files with 31 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      Release/Plugins/RenX.Core.lib
  2. 28
      RenX.Core/RenX_Server.cpp
  3. 4
      RenX.Core/RenX_Server.h

BIN
Release/Plugins/RenX.Core.lib
View File

Binary file not shown.

28
RenX.Core/RenX_Server.cpp
View File

@ -29,6 +29,8 @@
#include "RenX_BanDatabase.h"
#include "RenX_Tags.h"
using namespace Jupiter::literals;
int RenX::Server::think()
{
if (RenX::Server::connected == false)
@ -45,6 +47,11 @@ int RenX::Server::think()
else
return 1;
}
else if (RenX::Server::awaitingPong && std::chrono::steady_clock::now() - RenX::Server::lastActivity >= RenX::Server::pingTimeoutThreshold) // ping timeout
{
RenX::Server::sendLogChan(STRING_LITERAL_AS_REFERENCE(IRCCOLOR "04[Error]" IRCCOLOR " Disconnected from Renegade-X server (ping timeout)."));
RenX::Server::disconnect();
}
else
{
if (RenX::Server::sock.recv() > 0)
@ -54,6 +61,7 @@ int RenX::Server::think()
if (totalLines != 0)
{
RenX::Server::lastActivity = std::chrono::steady_clock::now();
RenX::Server::lastLine.concat(buffer.getToken(0, '\n'));
if (totalLines != 1) // if there's only one token, there is no newline.
{
@ -65,7 +73,16 @@ int RenX::Server::think()
}
}
}
else if (Jupiter::Socket::getLastError() != 10035) // This is a serious error
else if (Jupiter::Socket::getLastError() == 10035)
{
if (RenX::Server::awaitingPong == false && std::chrono::steady_clock::now() - RenX::Server::lastActivity >= RenX::Server::pingRate)
{
RenX::Server::lastActivity = std::chrono::steady_clock::now();
RenX::Server::sock.send("cping\n"_jrs);
RenX::Server::awaitingPong = true;
}
}
else // This is a serious error
{
RenX::Server::wipeData();
if (RenX::Server::maxAttempts != 0)
@ -83,6 +100,7 @@ int RenX::Server::think()
}
return 0;
}
if (RenX::Server::rconVersion >= 3 && RenX::Server::players.size() != 0)
{
if (RenX::Server::clientUpdateRate != std::chrono::milliseconds::zero() && std::chrono::steady_clock::now() > RenX::Server::lastClientListUpdate + RenX::Server::clientUpdateRate)
@ -1373,6 +1391,8 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line)
}
buff.shiftLeft(1);
}
else if (this->lastCommand.equalsi("ping"))
RenX::Server::awaitingPong = false;
else if (this->lastCommand.equalsi("map"))
this->map = buff.substring(1);
else if (this->lastCommand.equalsi("serverinfo"))
@ -2381,7 +2401,10 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line)
buff.shiftLeft(1);
}
else
{
RenX::Server::sendLogChan(STRING_LITERAL_AS_REFERENCE(IRCCOLOR "04[Error]" IRCCOLOR " Disconnected from Renegade-X server (incompatible RCON version)."));
this->disconnect();
}
break;
case 'a':
@ -2436,6 +2459,7 @@ bool RenX::Server::reconnect()
void RenX::Server::wipeData()
{
RenX::Server::awaitingPong = false;
RenX::Server::rconVersion = 0;
RenX::Server::rconUser.truncate(RenX::Server::rconUser.size());
while (RenX::Server::players.size() != 0)
@ -2501,6 +2525,8 @@ void RenX::Server::init()
RenX::Server::neverSay = Jupiter::IRC::Client::Config->getBool(RenX::Server::configSection, STRING_LITERAL_AS_REFERENCE("NeverSay"), false);
RenX::Server::clientUpdateRate = std::chrono::milliseconds(Jupiter::IRC::Client::Config->getInt(RenX::Server::configSection, STRING_LITERAL_AS_REFERENCE("ClientUpdateRate"), 2500));
RenX::Server::buildingUpdateRate = std::chrono::milliseconds(Jupiter::IRC::Client::Config->getInt(RenX::Server::configSection, STRING_LITERAL_AS_REFERENCE("BuildingUpdateRate"), 7500));
RenX::Server::pingRate = std::chrono::milliseconds(Jupiter::IRC::Client::Config->getInt(RenX::Server::configSection, STRING_LITERAL_AS_REFERENCE("PingUpdateRate"), 60000));
RenX::Server::pingTimeoutThreshold = std::chrono::milliseconds(Jupiter::IRC::Client::Config->getInt(RenX::Server::configSection, STRING_LITERAL_AS_REFERENCE("PingTimeoutThreshold"), 10000));
Jupiter::INIFile &commandsFile = RenX::getCore()->getCommandsFile();
RenX::Server::commandAccessLevels = commandsFile.getSection(RenX::Server::configSection);

4
RenX.Core/RenX_Server.h
View File

@ -813,11 +813,13 @@ namespace RenX
bool firstKill = false;
bool firstDeath = false;
bool firstAction = false;
bool awaitingPong = false;
unsigned int rconVersion = 0;
time_t lastAttempt = 0;
int attempts = 0;
std::chrono::steady_clock::time_point lastClientListUpdate = std::chrono::steady_clock::now();
std::chrono::steady_clock::time_point lastBuildingListUpdate = std::chrono::steady_clock::now();
std::chrono::steady_clock::time_point lastActivity = std::chrono::steady_clock::now();
Jupiter::String lastLine;
Jupiter::StringS commandListFormat;
Jupiter::StringS gameVersion;
@ -831,6 +833,8 @@ namespace RenX
int maxAttempts;
std::chrono::milliseconds clientUpdateRate;
std::chrono::milliseconds buildingUpdateRate;
std::chrono::milliseconds pingRate;
std::chrono::milliseconds pingTimeoutThreshold;
int steamFormat; /** 16 = hex, 10 = base 10, 8 = octal, -2 = SteamID 2, -3 = SteamID 3 */
bool rconBan;
bool localBan;

Write Preview
Loading…
Cancel
Save