R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

partial commit

Browse Source
This commit is contained in:
Alex 2021-12-28 03:31:33 +02:00
parent 899bde2af0
commit 433f14c352
3 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
r5dev/core/stdafx.h
View File

@ -45,6 +45,8 @@
#include "public/include/httplib.h"
#include "public/include/json.hpp"
#include "networksystem/net_structs.h"
#ifndef SDKLAUNCHER
namespace
{

22
r5dev/networksystem/r5net.h
View File

@ -6,22 +6,20 @@ namespace R5Net
class Client
{
public:
Client(std::string serverString) : m_HttpClient(serverString.c_str())
Client(std::string masterServerConnectionString) : HttpClient(masterServerConnectionString.c_str())
{
m_HttpClient.set_connection_timeout(10);
HttpClient.set_connection_timeout(25);
}
std::vector<ServerListing> GetServersList(std::string& svOutMessage);
bool PostServerHost(std::string& svOutMessage, std::string& svOutToken, const ServerListing& slServerListing);
bool GetServerByToken(ServerListing& slOutServer, std::string& svOutMessage, const std::string svToken);
bool GetClientIsBanned(std::string svIpAddress, std::int64_t nOriginID, std::string& svOutErrCl);
std::string GetSDKVersion();
Client* pR5net = nullptr;
Client* GetR5Net() { return pR5net; }
private:
httplib::Client m_HttpClient;
R5NET_GET_ENDPOINT(GetGlobalStats, "/api/stats", GetGlobalStatsMSResponse)
R5NET_GET_ENDPOINT(GetGameServersList, "/api/game_servers/list", GetGameServersListMSResponse)
R5NET_POST_ENDPOINT(UpdateMyGameServer, "/api/game_servers/update", UpdateGameServerMSRequest, UpdateGameServerMSResponse)
R5NET_POST_ENDPOINT(GetClientIsBanned, "/api/ban_system/is_user_banned", GetIsUserBannedMSRequest, GetIsUserBannedMSResponse)
};
}
extern R5Net::Client* g_pR5net;

11
r5dev/server/server.cpp
View File

@ -12,7 +12,16 @@
void IsClientBanned(R5Net::Client* pR5net, const std::string svIPAddr, std::int64_t nNucleusID)
{
std::string svError = std::string();
bool bCompBanned = pR5net && pR5net->GetClientIsBanned(svIPAddr, nNucleusID, svError);
R5Net::GetIsUserBannedMSRequest req{nNucleusID, svIPAddr};
R5Net::GetIsUserBannedMSResponse res = pR5net->GetClientIsBanned(req);
switch (res.status)
{
// TODO: EVENTUALLY IMPLEMENT SITUATIONS WHERE REQUEST DIDNT SUCCEED
}
bool bCompBanned = res.isBanned;
if (bCompBanned)
{
while (bCompBanned)