BeamMP/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Server.git synced 2025-07-04 00:36:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor fixes, version bump

Browse Source
This commit is contained in:
Lion Kortlepel 2021-07-31 20:19:35 +02:00 committed by Anonymous275
parent a1ca8e0576
commit 3d0d5e9e4c
4 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Common.h
View File

@ -50,7 +50,7 @@ public:
// Causes all threads to finish up and exit gracefull gracefully // Causes all threads to finish up and exit gracefull gracefully
static void GracefullyShutdown(); static void GracefullyShutdown();
static TConsole& Console() { return *mConsole; } static TConsole& Console() { return *mConsole; }
static std::string ServerVersion() { return "2.1.4"; } static std::string ServerVersion() { return "2.2.0"; }
static std::string ClientVersion() { return "2.0"; } static std::string ClientVersion() { return "2.0"; }
static std::string PPS() { return mPPS; } static std::string PPS() { return mPPS; }
static void SetPPS(std::string NewPPS) { mPPS = NewPPS; } static void SetPPS(std::string NewPPS) { mPPS = NewPPS; }

2
include/TConfig.h
View File

@ -8,7 +8,7 @@ class TConfig {
public: public:
explicit TConfig(); explicit TConfig();
bool Failed() const { return mFailed; } [[nodiscard]] bool Failed() const { return mFailed; }
private: private:
void CreateConfigFile(std::string_view name); void CreateConfigFile(std::string_view name);

28
src/TNetwork.cpp
View File

@ -702,19 +702,29 @@ void TNetwork::Parse(TClient& c, const std::string& Packet) {
} }
} }
void TNetwork::SendFile(TClient& c, const std::string& Name) { void TNetwork::SendFile(TClient& c, const std::string& UnsafeName) {
info(c.GetName() + " requesting : " + Name.substr(Name.find_last_of('/'))); info(c.GetName() + " requesting : " + UnsafeName.substr(UnsafeName.find_last_of('/')));
if (!std::filesystem::exists(Name)) { if (!fs::path(UnsafeName).has_filename()) {
if (!TCPSend(c, "CO")) { if (!TCPSend(c, "CO")) {
// TODO: handle // TODO: handle
} }
warn("File " + Name + " could not be accessed!"); warn("File " + UnsafeName + " is not a file!");
return; return;
} else { }
if (!TCPSend(c, "AG")) { auto FileName = fs::path(UnsafeName).filename().string();
FileName = Application::Settings.Resource + "/Client/" + FileName;
if (!std::filesystem::exists(FileName)) {
if (!TCPSend(c, "CO")) {
// TODO: handle // TODO: handle
} }
warn("File " + UnsafeName + " could not be accessed!");
return;
}
if (!TCPSend(c, "AG")) {
// TODO: handle
} }
///Wait for connections ///Wait for connections
@ -731,14 +741,14 @@ void TNetwork::SendFile(TClient& c, const std::string& Name) {
return; return;
} }
size_t Size = size_t(std::filesystem::file_size(Name)), MSize = Size / 2; size_t Size = size_t(std::filesystem::file_size(FileName)), MSize = Size / 2;
std::thread SplitThreads[2] { std::thread SplitThreads[2] {
std::thread([&] { std::thread([&] {
SplitLoad(c, 0, MSize, false, Name); SplitLoad(c, 0, MSize, false, FileName);
}), }),
std::thread([&] { std::thread([&] {
SplitLoad(c, MSize, Size, true, Name); SplitLoad(c, MSize, Size, true, FileName);
}) })
}; };

2
src/TResourceManager.cpp
View File

@ -19,7 +19,7 @@ TResourceManager::TResourceManager() {
++i; ++i;
File = File.substr(i,pos-i); File = File.substr(i,pos-i);
} }
mTrimmedList += File + ';'; mTrimmedList += "/" + fs::path(File).filename().string() + ';';
mFileSizes += std::to_string(size_t(fs::file_size(entry.path()))) + ';'; mFileSizes += std::to_string(size_t(fs::file_size(entry.path()))) + ';';
mMaxModSize += size_t(fs::file_size(entry.path())); mMaxModSize += size_t(fs::file_size(entry.path()));
mModsLoaded++; mModsLoaded++;