SantaSpeen/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/SantaSpeen/BeamMP-Server.git synced 2026-06-17 17:50:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix timeout in identification

Browse Source
This commit is contained in:
Lion Kortlepel
2020-11-12 02:22:49 +01:00
parent 3137f4e9db
commit 5e603c65b6
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Network/Auth.cpp
+16 -17
View File
@@ -11,13 +11,10 @@
#include <cstring> #include <cstring>
#include <algorithm> #include <algorithm>
#include <string> #include <string>
#include <atomic>
#include "UnixCompat.h" #include "UnixCompat.h"
struct Hold{
SOCKET TCPSock{};
bool Done = false;
};
bool Send(SOCKET TCPSock,std::string Data){ bool Send(SOCKET TCPSock,std::string Data){
#ifdef WIN32 #ifdef WIN32
int BytesSent; int BytesSent;
@@ -80,10 +77,15 @@ std::string GetRole(const std::string &DID){
} }
return ""; return "";
} }
void Check(Hold* S){ void Check(SOCKET TCPSock, std::reference_wrapper<std::atomic_bool> ok){
std::this_thread::sleep_for(std::chrono::seconds(5)); size_t accum = 0;
if(S != nullptr){ while (!ok.get()) {
if(!S->Done)closesocket(S->TCPSock); std::this_thread::sleep_for(std::chrono::milliseconds(100));
accum += 100;
if (accum >= 5000) {
closesocket(TCPSock);
return;
}
} }
} }
int Max(){ int Max(){
@@ -125,13 +127,12 @@ std::string GenerateM(RSA*key){
return stream.str(); return stream.str();
} }
void Identification(SOCKET TCPSock,Hold*S,RSA*Skey){ void Identification(SOCKET TCPSock, RSA*Skey){
DebugPrintTID(); DebugPrintTID();
Assert(S);
Assert(Skey); Assert(Skey);
S->TCPSock = TCPSock; std::atomic_bool ok { false };
//std::thread Timeout(Check,S); std::thread Timeout(Check, TCPSock, std::ref<std::atomic_bool>(ok));
//Timeout.detach(); Timeout.detach();
std::string Name,DID,Role; std::string Name,DID,Role;
if(!Send(TCPSock,GenerateM(Skey))) { if(!Send(TCPSock,GenerateM(Skey))) {
error("died on " + std::string(__func__) + ":" + std::to_string(__LINE__)); error("died on " + std::string(__func__) + ":" + std::to_string(__LINE__));
@@ -148,7 +149,7 @@ void Identification(SOCKET TCPSock,Hold*S,RSA*Skey){
std::string Res = Rcv(TCPSock); std::string Res = Rcv(TCPSock);
std::string Ver = Rcv(TCPSock); std::string Ver = Rcv(TCPSock);
S->Done = true; ok = true;
Ver = RSA_D(Ver,Skey); Ver = RSA_D(Ver,Skey);
if(Ver.size() > 3 && Ver.substr(0,2) == Sec("VC")){ if(Ver.size() > 3 && Ver.substr(0,2) == Sec("VC")){
Ver = Ver.substr(2); Ver = Ver.substr(2);
@@ -202,7 +203,6 @@ void Identification(SOCKET TCPSock,Hold*S,RSA*Skey){
} }
} }
void Identify(SOCKET TCPSock){ void Identify(SOCKET TCPSock){
auto* S = new Hold;
RSA*Skey = GenKey(); RSA*Skey = GenKey();
// this disgusting ifdef stuff is needed because for some // this disgusting ifdef stuff is needed because for some
// reason MSVC defines __try and __except and libg++ defines // reason MSVC defines __try and __except and libg++ defines
@@ -211,7 +211,7 @@ void Identify(SOCKET TCPSock){
/*#ifdef WIN32 /*#ifdef WIN32
__try{ __try{
#endif // WIN32*/ #endif // WIN32*/
Identification(TCPSock,S,Skey); Identification(TCPSock, Skey);
/*#ifdef WIN32 /*#ifdef WIN32
}__except(1){ }__except(1){
if(TCPSock != -1){ if(TCPSock != -1){
@@ -222,7 +222,6 @@ void Identify(SOCKET TCPSock){
#endif // WIN32*/ #endif // WIN32*/
delete Skey; delete Skey;
delete S;
} }
void TCPServerMain(){ void TCPServerMain(){