RomanRom2/thunderbrew
1
0
Fork 0
mirror of https://github.com/thunderbrewhq/thunderbrew synced 2025-04-16 01:55:21 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore(net): clean up member visibility in NetClient

Browse Source
This commit is contained in:
fallenoak 2023-02-25 17:28:04 -06:00
parent 5e2c1e7769
commit 431ed626c9
No known key found for this signature in database
GPG Key ID: 7628F8E61AEA070D
3 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/ClientServices.cpp
View File

@ -26,7 +26,7 @@ void ClientServices::ConnectToSelectedServer() {
return;
}
if (ClientServices::Connection()->m_netState != NS_INITIALIZED) {
if (ClientServices::Connection()->GetState() != NS_INITIALIZED) {
ClientServices::Connection()->SetStatus(0, 39);
return;
}

4
src/net/connection/NetClient.cpp
View File

@ -170,6 +170,10 @@ bool NetClient::GetDelete() {
return this->m_deleteMe;
}
NETSTATE NetClient::GetState() {
return this->m_netState;
}
int32_t NetClient::HandleCantConnect() {
// TODO
return 1;

54
src/net/connection/NetClient.hpp
View File

@ -47,6 +47,34 @@ class NETEVENTQUEUE {
class NetClient : public WowConnectionResponse {
public:
// Virtual member functions
virtual void WCMessageReady(WowConnection* conn, uint32_t timeStamp, CDataStore* msg);
virtual void WCConnected(WowConnection* conn, WowConnection* inbound, uint32_t timeStamp, const NETCONNADDR* addr);
virtual void WCCantConnect(WowConnection* conn, uint32_t timeStamp, NETCONNADDR* addr);
virtual void WCDisconnected(WowConnection* conn, uint32_t timeStamp, NETCONNADDR* addr);
virtual int32_t HandleData(uint32_t timeReceived, void* data, int32_t size);
virtual int32_t HandleAuthChallenge(AuthenticationChallenge* challenge) = 0;
virtual int32_t HandleConnect();
virtual int32_t HandleDisconnect();
virtual int32_t HandleCantConnect();
// Member functions
void AddRef();
void AuthChallengeHandler(WowConnection* conn, CDataStore* msg);
void Connect(const char* addrStr);
int32_t ConnectInternal(const char* host, uint16_t port);
void DelRef();
bool GetDelete();
NETSTATE GetState();
void HandleIdle();
int32_t Initialize();
void PollEventQueue();
void PongHandler(WowConnection* conn, CDataStore* msg);
void SetDelete();
void SetLoginData(LoginData* loginData);
void SetMessageHandler(NETMESSAGE msgId, MESSAGE_HANDLER handler, void* param);
private:
// Static variables
static int32_t s_clientCount;
@ -67,32 +95,6 @@ class NetClient : public WowConnectionResponse {
uint32_t m_latencyStart;
uint32_t m_latencyEnd;
SCritSect m_pingLock;
// Virtual member functions
virtual void WCMessageReady(WowConnection* conn, uint32_t timeStamp, CDataStore* msg);
virtual void WCConnected(WowConnection* conn, WowConnection* inbound, uint32_t timeStamp, const NETCONNADDR* addr);
virtual void WCCantConnect(WowConnection* conn, uint32_t timeStamp, NETCONNADDR* addr);
virtual void WCDisconnected(WowConnection* conn, uint32_t timeStamp, NETCONNADDR* addr);
virtual int32_t HandleData(uint32_t timeReceived, void* data, int32_t size);
virtual int32_t HandleAuthChallenge(AuthenticationChallenge* challenge) = 0;
virtual int32_t HandleConnect();
virtual int32_t HandleDisconnect();
virtual int32_t HandleCantConnect();
// Member functions
void AddRef();
void AuthChallengeHandler(WowConnection* conn, CDataStore* msg);
void Connect(const char* addrStr);
int32_t ConnectInternal(const char* host, uint16_t port);
void DelRef();
bool GetDelete();
void HandleIdle();
int32_t Initialize();
void PollEventQueue();
void PongHandler(WowConnection* conn, CDataStore* msg);
void SetDelete();
void SetLoginData(LoginData* loginData);
void SetMessageHandler(NETMESSAGE msgId, MESSAGE_HANDLER handler, void* param);
};
#endif