Merge branch 'main' into zs/get-all-chunk-infoszs/get-all-chunk-infos

4 files changed, 39 insertions, 19 deletions

diff --git a/src/transports/transport-sdk/include/transportplugin.h b/src/transports/transport-sdk/include/transportplugin.h
index 2a3b8075f..4347868e6 100644
--- a/src/transports/transport-sdk/include/transportplugin.h
+++ b/src/transports/transport-sdk/include/transportplugin.h
@@ -77,11 +77,12 @@ public:
 class TransportPlugin
 {
 public:
-	virtual uint32_t AddRef() const											   = 0;
-	virtual uint32_t Release() const										   = 0;
-	virtual void	 Configure(const char* OptionTag, const char* OptionValue) = 0;
-	virtual void	 Initialize(TransportServer* ServerInterface)			   = 0;
-	virtual void	 Shutdown()												   = 0;
+	virtual uint32_t	AddRef() const											  = 0;
+	virtual uint32_t	Release() const											  = 0;
+	virtual void		Configure(const char* OptionTag, const char* OptionValue) = 0;
+	virtual void		Initialize(TransportServer* ServerInterface)			  = 0;
+	virtual void		Shutdown()												  = 0;
+	virtual const char* GetDebugName()											  = 0;
 
 	/** Check whether this transport is usable.
 	 */
@@ -99,9 +100,10 @@ public:
 class TransportConnection
 {
 public:
-	virtual int64_t WriteBytes(const void* Buffer, size_t DataSize) = 0;
-	virtual void	Shutdown(bool Receive, bool Transmit)			= 0;
-	virtual void	CloseConnection()								= 0;
+	virtual int64_t		WriteBytes(const void* Buffer, size_t DataSize) = 0;
+	virtual void		Shutdown(bool Receive, bool Transmit)			= 0;
+	virtual void		CloseConnection()								= 0;
+	virtual const char* GetDebugName()									= 0;
 };
 
 }  // namespace zen
diff --git a/src/transports/winsock/winsock.cpp b/src/transports/winsock/winsock.cpp
index 28ac10ec1..7ee2b5ed1 100644
--- a/src/transports/winsock/winsock.cpp
+++ b/src/transports/winsock/winsock.cpp
@@ -51,12 +51,13 @@ public:
 
 	// TransportPlugin implementation
 
-	virtual uint32_t AddRef() const override;
-	virtual uint32_t Release() const override;
-	virtual void	 Configure(const char* OptionTag, const char* OptionValue) override;
-	virtual void	 Initialize(TransportServer* ServerInterface) override;
-	virtual void	 Shutdown() override;
-	virtual bool	 IsAvailable() override;
+	virtual uint32_t	AddRef() const override;
+	virtual uint32_t	Release() const override;
+	virtual void		Configure(const char* OptionTag, const char* OptionValue) override;
+	virtual void		Initialize(TransportServer* ServerInterface) override;
+	virtual void		Shutdown() override;
+	virtual const char* GetDebugName() override;
+	virtual bool		IsAvailable() override;
 
 private:
 	TransportServer* m_ServerInterface = nullptr;
@@ -80,9 +81,10 @@ public:
 
 	// TransportConnection implementation
 
-	virtual int64_t WriteBytes(const void* Buffer, size_t DataSize) override;
-	virtual void	Shutdown(bool Receive, bool Transmit) override;
-	virtual void	CloseConnection() override;
+	virtual int64_t		WriteBytes(const void* Buffer, size_t DataSize) override;
+	virtual void		Shutdown(bool Receive, bool Transmit) override;
+	virtual void		CloseConnection() override;
+	virtual const char* GetDebugName() override;
 
 private:
 	zen::Ref<TransportServerConnection> m_ConnectionHandler;
@@ -153,6 +155,12 @@ WinsockTransportConnection::CloseConnection()
 	m_ClientSocket = 0;
 }
 
+const char*
+WinsockTransportConnection::GetDebugName()
+{
+	return nullptr;
+}
+
 int64_t
 WinsockTransportConnection::WriteBytes(const void* Buffer, size_t DataSize)
 {
@@ -342,6 +350,12 @@ WinsockTransportPlugin::Shutdown()
 	}
 }
 
+const char*
+WinsockTransportPlugin::GetDebugName()
+{
+	return nullptr;
+}
+
 bool
 WinsockTransportPlugin::IsAvailable()
 {
diff --git a/src/transports/winsock/xmake.lua b/src/transports/winsock/xmake.lua
index 552a62702..c14283546 100644
--- a/src/transports/winsock/xmake.lua
+++ b/src/transports/winsock/xmake.lua
@@ -6,9 +6,9 @@ target("winsock")
     add_headerfiles("**.h")
     add_files("**.cpp")
     add_links("Ws2_32")
-    add_includedirs(".", "../../zenbase/include")
+    add_includedirs(".")
     set_symbols("debug")
-    add_deps("transport-sdk")
+    add_deps("zenbase", "transport-sdk")
 
     if is_mode("release") then
         set_optimize("fastest")
diff --git a/src/transports/xmake.lua b/src/transports/xmake.lua
index 44800a8af..78d637d85 100644
--- a/src/transports/xmake.lua
+++ b/src/transports/xmake.lua
@@ -5,6 +5,10 @@ set_languages("cxx20")
 
 includes('transport-sdk')
 
+if os.isdir('zenbase') then
+    includes('zenbase')
+end
+
 if is_plat("windows") then
     includes("winsock")
 end