From 023a3ea8939b3f4385c205812f3a57463e8ed372 Mon Sep 17 00:00:00 2001 From: fallenoak Date: Tue, 21 Feb 2023 08:52:19 -0600 Subject: [PATCH] feat(net): clean up message and data ready callbacks --- src/net/connection/NetClient.cpp | 8 ++++---- src/net/connection/NetClient.hpp | 2 +- src/net/connection/WowConnectionResponse.hpp | 3 +++ src/net/grunt/ClientLink.hpp | 1 + 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/net/connection/NetClient.cpp b/src/net/connection/NetClient.cpp index 0e9f972..df1b9fe 100644 --- a/src/net/connection/NetClient.cpp +++ b/src/net/connection/NetClient.cpp @@ -116,10 +116,10 @@ void NetClient::WCConnected(WowConnection* conn, WowConnection* inbound, uint32_ this->m_netEventQueue->AddEvent(EVENT_ID_NET_CONNECT, conn, this, nullptr, 0); } -void NetClient::WCDataReady(WowConnection* conn, uint32_t timeStamp, uint8_t* data, int32_t len) { - // TODO -} - void NetClient::WCDisconnected(WowConnection* conn, uint32_t timeStamp, NETCONNADDR* addr) { // TODO } + +void NetClient::WCMessageReady(WowConnection *conn, uint32_t timeStamp, CDataStore* msg) { + // TODO +} diff --git a/src/net/connection/NetClient.hpp b/src/net/connection/NetClient.hpp index d11751e..05948ab 100644 --- a/src/net/connection/NetClient.hpp +++ b/src/net/connection/NetClient.hpp @@ -52,10 +52,10 @@ class NetClient : public WowConnectionResponse { 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 void WCDataReady(WowConnection* conn, uint32_t timeStamp, uint8_t* data, int32_t len); // Member functions void Connect(const char* addrStr); diff --git a/src/net/connection/WowConnectionResponse.hpp b/src/net/connection/WowConnectionResponse.hpp index 322886f..f23c600 100644 --- a/src/net/connection/WowConnectionResponse.hpp +++ b/src/net/connection/WowConnectionResponse.hpp @@ -3,15 +3,18 @@ #include "net/Types.hpp" +class CDataStore; class WowConnection; class WowConnectionResponse { public: // Virtual member functions + virtual void WCMessageReady(WowConnection* conn, uint32_t timeStamp, CDataStore* msg) = 0; virtual void WCConnected(WowConnection* conn, WowConnection* inbound, uint32_t timeStamp, const NETCONNADDR* addr) = 0; virtual void WCCantConnect(WowConnection* conn, uint32_t timeStamp, NETCONNADDR* addr) = 0; virtual void WCDisconnected(WowConnection* conn, uint32_t timeStamp, NETCONNADDR* addr) {}; virtual void WCDataReady(WowConnection* conn, uint32_t timeStamp, uint8_t* data, int32_t len) {}; + virtual void NotifyAboutToDoReads() {}; }; #endif diff --git a/src/net/grunt/ClientLink.hpp b/src/net/grunt/ClientLink.hpp index dfbaf65..8de89fc 100644 --- a/src/net/grunt/ClientLink.hpp +++ b/src/net/grunt/ClientLink.hpp @@ -53,6 +53,7 @@ class Grunt::ClientLink : public WowConnectionResponse, Grunt::Pending, Grunt::T char m_serverPublicKey[32]; // 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 WCDataReady(WowConnection* conn, uint32_t timeStamp, uint8_t* data, int32_t len);