1 files changed, 23 insertions, 79 deletions

diff --git a/NorthstarDLL/serverauthentication.h b/NorthstarDLL/serverauthentication.h
index e79577e6..b010e6b1 100644
--- a/NorthstarDLL/serverauthentication.h
+++ b/NorthstarDLL/serverauthentication.h
@@ -1,10 +1,11 @@
 #pragma once
 #include "convar.h"
 #include "httplib.h"
+#include "r2engine.h"
 #include <unordered_map>
 #include <string>
 
-struct AuthData
+struct RemoteAuthData
 {
 	char uid[33];
 	char username[64];
@@ -14,99 +15,42 @@ struct AuthData
 	size_t pdataSize;
 };
 
-struct AdditionalPlayerData
+struct PlayerAuthenticationData
 {
 	bool usingLocalPdata;
 	size_t pdataSize;
 	bool needPersistenceWriteOnLeave = true;
-
-	double lastClientCommandQuotaStart = -1.0;
-	int numClientCommandsInQuota = 0;
-
-	double lastNetChanProcessingLimitStart = -1.0;
-	double netChanProcessingLimitTime = 0.0;
-
-	double lastSayTextLimitStart = -1.0;
-	int sayTextLimitCount = 0;
-
-	uint64_t uid;
-};
-
-#pragma once
-typedef enum
-{
-	NA_NULL = 0,
-	NA_LOOPBACK,
-	NA_IP,
-} netadrtype_t;
-
-#pragma pack(push, 1)
-typedef struct netadr_s
-{
-	netadrtype_t type;
-	unsigned char ip[16]; // IPv6
-	// IPv4's 127.0.0.1 is [::ffff:127.0.0.1], that is:
-	// 00 00 00 00 00 00 00 00    00 00 FF FF 7F 00 00 01
-	unsigned short port;
-} netadr_t;
-#pragma pack(pop)
-
-#pragma pack(push, 1)
-typedef struct netpacket_s
-{
-	netadr_t adr; // sender address
-	// int				source;		// received source
-	char unk[10];
-	double received_time;
-	unsigned char* data; // pointer to raw packet data
-	void* message; // easy bitbuf data access // 'inpacket.message' etc etc (pointer)
-	char unk2[16];
-	int size;
-
-	// bf_read			message;	// easy bitbuf data access // 'inpacket.message' etc etc (pointer)
-	// int				size;		// size in bytes
-	// int				wiresize;   // size in bytes before decompression
-	// bool			stream;		// was send as stream
-	// struct netpacket_s* pNext;	// for internal use, should be NULL in public
-} netpacket_t;
-#pragma pack(pop)
-
-struct UnconnectedPlayerSendData
-{
-	char ip[16];
-	double lastQuotaStart = 0.0;
-	int packetCount = 0;
-	double timeoutEnd = -1.0;
 };
 
 class ServerAuthenticationManager
 {
   private:
-	httplib::Server m_playerAuthServer;
+	httplib::Server m_PlayerAuthServer;
 
   public:
-	std::mutex m_authDataMutex;
-	std::unordered_map<std::string, AuthData> m_authData;
-	std::unordered_map<void*, AdditionalPlayerData> m_additionalPlayerData;
-	std::vector<UnconnectedPlayerSendData> m_unconnectedPlayerSendData;
-	bool m_runningPlayerAuthThread = false;
+	ConVar* Cvar_ns_player_auth_port;
+	ConVar* Cvar_ns_erase_auth_info;
+	ConVar* CVar_ns_auth_allow_insecure;
+	ConVar* CVar_ns_auth_allow_insecure_write;
+
+	std::mutex m_AuthDataMutex;
+	std::unordered_map<std::string, RemoteAuthData> m_RemoteAuthenticationData;
+	std::unordered_map<R2::CBaseClient*, PlayerAuthenticationData> m_PlayerAuthenticationData;
+	bool m_bRequireClientAuth = true;
+	bool m_bAllowDuplicateAccounts = false;
+	bool m_bRunningPlayerAuthThread = false;
 	bool m_bNeedLocalAuthForNewgame = false;
-	bool m_bForceReadLocalPlayerPersistenceFromDisk = false;
+	bool m_bForceResetLocalPlayerPersistence = false;
 
   public:
 	void StartPlayerAuthServer();
 	void StopPlayerAuthServer();
-	bool AuthenticatePlayer(void* player, int64_t uid, char* authToken);
-	char* VerifyPlayerName(void* player, char* authToken, char* name);
-	bool RemovePlayerAuthData(void* player);
-	void WritePersistentData(void* player);
-	bool CheckPlayerChatRatelimit(void* player);
+	void AddPlayerData(R2::CBaseClient* player, const char* pToken);
+	bool CheckDuplicateAccounts(R2::CBaseClient* player);
+	bool AuthenticatePlayer(R2::CBaseClient* player, uint64_t uid, char* authToken);
+	void VerifyPlayerName(R2::CBaseClient* player, char* authToken, char* name);
+	bool RemovePlayerAuthData(R2::CBaseClient* player);
+	void WritePersistentData(R2::CBaseClient* player);
 };
 
-typedef void (*CBaseClient__DisconnectType)(void* self, uint32_t unknownButAlways1, const char* reason, ...);
-extern CBaseClient__DisconnectType CBaseClient__Disconnect;
-
-void InitialiseServerAuthentication(HMODULE baseAddress);
-
-extern ServerAuthenticationManager* g_ServerAuthenticationManager;
-extern ConVar* Cvar_ns_player_auth_port;
+extern ServerAuthenticationManager* g_pServerAuthentication;