Browse Source

Changed how RCON gets parsed/tokenized. All parts of all RCON strings are now translated to UTF-8.

Updated Jupiter version.
commandListFormat is now a TokenizeResult.
Corrected some variable organization in RenX::Server.
pull/3/head
JustinAJ 9 years ago
parent
commit
ad29b0eba5
  1. 2
      Jupiter
  2. BIN
      Release/Bot.lib
  3. BIN
      Release/Plugins/RenX.Core.lib
  4. 494
      RenX.Core/RenX_Server.cpp
  5. 32
      RenX.Core/RenX_Server.h

2
Jupiter

@ -1 +1 @@
Subproject commit 5a45d44a5000587917a5d9ae53fac712e8247e98 Subproject commit 2da95b3b90aecddf373268fa9e12fdf9b0bdc409

BIN
Release/Bot.lib

Binary file not shown.

BIN
Release/Plugins/RenX.Core.lib

Binary file not shown.

494
RenX.Core/RenX_Server.cpp

File diff suppressed because it is too large

32
RenX.Core/RenX_Server.h

@ -739,7 +739,7 @@ namespace RenX
* *
* @param function Function to calculate UUIDs with. * @param function Function to calculate UUIDs with.
*/ */
void setUUIDFunction(uuid_func); void setUUIDFunction(uuid_func function);
/** /**
* @brief Fetches the current UUID calculation function. * @brief Fetches the current UUID calculation function.
@ -894,35 +894,40 @@ namespace RenX
int timeLimit = 0; int timeLimit = 0;
unsigned int rconVersion = 0; unsigned int rconVersion = 0;
double crateRespawnAfterPickup = 0.0; double crateRespawnAfterPickup = 0.0;
uuid_func calc_uuid;
std::chrono::steady_clock::time_point lastAttempt = std::chrono::steady_clock::now(); std::chrono::steady_clock::time_point lastAttempt = std::chrono::steady_clock::now();
std::chrono::steady_clock::time_point gameStart = std::chrono::steady_clock::now(); std::chrono::steady_clock::time_point gameStart = std::chrono::steady_clock::now();
std::chrono::steady_clock::time_point lastClientListUpdate = std::chrono::steady_clock::now(); 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 lastBuildingListUpdate = std::chrono::steady_clock::now();
std::chrono::steady_clock::time_point lastActivity = std::chrono::steady_clock::now(); std::chrono::steady_clock::time_point lastActivity = std::chrono::steady_clock::now();
Jupiter::String lastLine; Jupiter::String lastLine;
Jupiter::StringS commandListFormat; Jupiter::StringS rconUser;
Jupiter::StringS gameVersion; Jupiter::StringS gameVersion;
Jupiter::StringS serverName;
Jupiter::StringS map;
Jupiter::StringS lastCommand;
Jupiter::StringS lastCommandParams;
Jupiter::TCPSocket sock;
Jupiter::ReadableString::TokenizeResult<Jupiter::String_Strict> commandListFormat;
Jupiter::ArrayList<RenX::GameCommand> commands; Jupiter::ArrayList<RenX::GameCommand> commands;
/** Configuration variables */ /** Configuration variables */
bool rconBan;
bool localBan;
bool localSteamBan;
bool localIPBan;
bool localNameBan;
bool neverSay;
unsigned short port; unsigned short port;
int logChanType; int logChanType;
int adminLogChanType; int adminLogChanType;
int maxAttempts; int maxAttempts;
int steamFormat; /** 16 = hex, 10 = base 10, 8 = octal, -2 = SteamID 2, -3 = SteamID 3 */
std::chrono::milliseconds delay; std::chrono::milliseconds delay;
std::chrono::milliseconds clientUpdateRate; std::chrono::milliseconds clientUpdateRate;
std::chrono::milliseconds buildingUpdateRate; std::chrono::milliseconds buildingUpdateRate;
std::chrono::milliseconds pingRate; std::chrono::milliseconds pingRate;
std::chrono::milliseconds pingTimeoutThreshold; std::chrono::milliseconds pingTimeoutThreshold;
int steamFormat; /** 16 = hex, 10 = base 10, 8 = octal, -2 = SteamID 2, -3 = SteamID 3 */
bool rconBan;
bool localBan;
bool localSteamBan;
bool localIPBan;
bool localNameBan;
bool neverSay;
uuid_func calc_uuid;
Jupiter::TCPSocket sock;
Jupiter::CStringS clientHostname; Jupiter::CStringS clientHostname;
Jupiter::CStringS hostname; Jupiter::CStringS hostname;
Jupiter::StringS pass; Jupiter::StringS pass;
@ -930,11 +935,6 @@ namespace RenX
Jupiter::StringS rules; Jupiter::StringS rules;
Jupiter::StringS IRCPrefix; Jupiter::StringS IRCPrefix;
Jupiter::StringS CommandPrefix; Jupiter::StringS CommandPrefix;
Jupiter::StringS rconUser;
Jupiter::StringS serverName;
Jupiter::StringS lastCommand;
Jupiter::StringS lastCommandParams;
Jupiter::StringS map;
Jupiter::INIFile::Section *commandAccessLevels; Jupiter::INIFile::Section *commandAccessLevels;
Jupiter::INIFile::Section *commandAliases; Jupiter::INIFile::Section *commandAliases;
}; };

Loading…
Cancel
Save