BeamMP/BeamMP-Launcher
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Launcher.git synced 2026-04-17 13:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add command-line options (#90)

Browse Source 
This PR adds command-line options as outlined in #74 

Closes #74
This commit is contained in:
Lion
2024-10-06 23:49:47 +02:00
committed by GitHub
parent f57ebb7a92 afac729505
commit 259b21502e
11 changed files with 192 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Network/Core.cpp
View File

@@ -30,11 +30,11 @@
#include <nlohmann/json.hpp>
#include <set>
#include <thread>
#include "Options.h"
extern int TraceBack;
std::set<std::string>* ConfList = nullptr;
bool TCPTerminate = false;
int DEFAULT_PORT = 4444;
bool Terminate = false;
bool LoginAuth = false;
std::string Username = "";
@@ -288,7 +288,7 @@ void localRes() {
ConfList = new std::set<std::string>;
}
void CoreMain() {
debug("Core Network on start!");
debug("Core Network on start! port: " + std::to_string(options.port));
SOCKET LSocket, CSocket;
struct addrinfo* res = nullptr;
struct addrinfo hints { };
@@ -306,7 +306,7 @@ void CoreMain() {
hints.ai_socktype = SOCK_STREAM;
hints.ai_protocol = IPPROTO_TCP;
hints.ai_flags = AI_PASSIVE;
iRes = getaddrinfo(nullptr, std::to_string(DEFAULT_PORT).c_str(), &hints, &res);
iRes = getaddrinfo(nullptr, std::to_string(options.port).c_str(), &hints, &res);
if (iRes) {
debug("(Core) addr info failed with error: " + std::to_string(iRes));
WSACleanup();

3
src/Network/GlobalHandler.cpp
View File

@@ -26,6 +26,7 @@
#include <mutex>
#include <string>
#include <thread>
#include "Options.h"
std::chrono::time_point<std::chrono::high_resolution_clock> PingStart, PingEnd;
bool GConnected = false;
@@ -161,7 +162,7 @@ SOCKET SetupListener() {
hints.ai_socktype = SOCK_STREAM;
hints.ai_protocol = IPPROTO_TCP;
hints.ai_flags = AI_PASSIVE;
iRes = getaddrinfo(nullptr, std::to_string(DEFAULT_PORT + 1).c_str(), &hints, &result);
iRes = getaddrinfo(nullptr, std::to_string(options.port + 1).c_str(), &hints, &result);
if (iRes != 0) {
error("(Proxy) info failed with error: " + std::to_string(iRes));
WSACleanup();