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

Fixed windows build

Browse Source
This commit is contained in:
Anonymous275 2021-03-09 01:46:03 +02:00
parent 33e0cac4c1
commit 44fa68e6da
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/TConsole.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#undef max //fixes windows macro
#include "TLuaFile.h"
#include "commandline/commandline.h" #include "commandline/commandline.h"
#include "TLuaFile.h"
#include <atomic> #include <atomic>
#include <fstream> #include <fstream>

2
include/commandline

@ -1 +1 @@
Subproject commit 412ece748dea50766702435db0f0478c5ae7c7ad Subproject commit 19184df67e80cecb02de957d922477f7218b7703

7
src/TNetwork.cpp
View File

@ -1,9 +1,9 @@
#include "TNetwork.h" #include "TNetwork.h"
#include "Client.h" #include "Client.h"
#include <CustomAssert.h> #include <CustomAssert.h>
#include <Http.h> #include <Http.h>
#include <cstring> #include <cstring>
#include <array>
TNetwork::TNetwork(TServer& Server, TPPSMonitor& PPSMonitor, TResourceManager& ResourceManager) TNetwork::TNetwork(TServer& Server, TPPSMonitor& PPSMonitor, TResourceManager& ResourceManager)
: mServer(Server) : mServer(Server)
@ -119,8 +119,10 @@ void TNetwork::TCPServerMain() {
error("Invalid listening socket"); error("Invalid listening socket");
return; return;
} }
if (listen(Listener, SOMAXCONN)) { if (listen(Listener, SOMAXCONN)) {
error("listener failed " + std::to_string(GetLastError())); error("listener failed " + std::to_string(GetLastError()));
//TODO Fix me leak for Listener socket
return; return;
} }
info("Vehicle event network online"); info("Vehicle event network online");
@ -131,7 +133,7 @@ void TNetwork::TCPServerMain() {
warn("Got an invalid client socket on connect! Skipping..."); warn("Got an invalid client socket on connect! Skipping...");
continue; continue;
} }
std::thread ID(&TTCPServer::Identify, this, client); std::thread ID(&TNetwork::Identify, this, client);
ID.detach(); ID.detach();
} catch (const std::exception& e) { } catch (const std::exception& e) {
error("fatal: " + std::string(e.what())); error("fatal: " + std::string(e.what()));
@ -163,6 +165,7 @@ void TNetwork::TCPServerMain() {
} }
if (listen(Listener, SOMAXCONN)) { if (listen(Listener, SOMAXCONN)) {
error(("listener failed ") + std::string(strerror(errno))); error(("listener failed ") + std::string(strerror(errno)));
//TODO fix me leak Listener
return; return;
} }
info(("Vehicle event network online")); info(("Vehicle event network online"));