Disconnect race condition fix

Have not been able to reproduce issue #59, but with well detailed description, was able to change code to hopefully avoid the problem

Code/Client/NetImgui_Api.h

@@ -4,12 +4,12 @@
 //! @Name		: NetImgui
 //=================================================================================================
 //! @author		: Sammy Fatnassi
-//! @date		: 2024/05/26
-//!	@version	: v1.11.0
+//! @date		: 2024/08/03
+//!	@version	: v1.11.1
 //! @Details	: For integration info : https://github.com/sammyfreg/netImgui/wiki
 //=================================================================================================
-#define NETIMGUI_VERSION		"1.11"	// Version 1.1 Release
-#define NETIMGUI_VERSION_NUM	11100
+#define NETIMGUI_VERSION		"1.11.1"	// Fix for rare disconnect issue (Github issue #59)
+#define NETIMGUI_VERSION_NUM	11101
 
 
 

Code/Client/Private/NetImgui_Api.cpp

@@ -85,6 +85,7 @@ bool ConnectFromApp(const char* clientName, uint32_t serverPort, ThreadFunctPtr
 	if (client.mpSocketPending.load() != nullptr)
 	{				
 		client.ContextInitialize();
+		client.mSocketListenPort = serverPort;
 		client.mThreadFunction(Client::CommunicationsHost, &client);
 	}
 
@@ -97,9 +98,16 @@ void Disconnect(void)
 {
 	if (!gpClientInfo) return;
 
+	// Attempt fake connection on local socket waiting for a Server connection, 
+	// so the blocking operation can terminate and release the communication thread
 	Client::ClientInfo& client	= *gpClientInfo;
 	client.mbDisconnectRequest	= true;
-	client.KillSocketListen();
+	if( client.mSocketListenPort != 0 )
+	{
+		Network::SocketInfo* FakeSocket = Network::Connect("127.0.0.1", client.mSocketListenPort);
+		client.mSocketListenPort		= 0;
+		Network::Disconnect(FakeSocket);
+	}
 }
 
 //=================================================================================================

Code/Client/Private/NetImgui_Client.cpp

@@ -411,7 +411,9 @@ void CommunicationsHost(void* pClientVoid)
 		}
 		std::this_thread::sleep_for(std::chrono::milliseconds(16));	// Prevents this thread from taking entire core, waiting on server connection
 	}
-	pClient->KillSocketListen();
+
+	Network::SocketInfo* pSocket 	= pClient->mpSocketListen.exchange(nullptr);
+	NetImgui::Internal::Network::Disconnect(pSocket);
 	pClient->mbListenThreadActive	= false;
 }
 

Code/Client/Private/NetImgui_Client.h

@@ -75,6 +75,7 @@ struct ClientInfo
 	std::atomic<Network::SocketInfo*>	mpSocketPending;						// Hold socket info until communication is established
 	std::atomic<Network::SocketInfo*>	mpSocketComs;							// Socket used for communications with server
 	std::atomic<Network::SocketInfo*>	mpSocketListen;							// Socket used to wait for communication request from server
+	uint32_t							mSocketListenPort			= 0;		// Socket Port number used to wait for communication request from server
 	VecTexture							mTextures;								// List if textures created by this client (used un main thread)
 	char								mName[64]					= {};
 	uint64_t							mFrameIndex					= 0;		// Incremented everytime we send a DrawFrame Command	
@@ -127,7 +128,6 @@ struct ClientInfo
 	inline bool							IsConnectPending()const;
 	inline bool							IsActive()const;
 	inline void							KillSocketComs();						// Kill communication sockets (should only be called from communication thread)
-	inline void							KillSocketListen();						// Kill connecting listening socket (should only be called from communication thread)
 
 // Prevent warnings about implicitly created copy
 protected:

Code/Client/Private/NetImgui_Client.inl

@@ -45,15 +45,6 @@ void ClientInfo::KillSocketComs()
 	}
 }
 
-void ClientInfo::KillSocketListen()
-{
-	Network::SocketInfo* pSocket = mpSocketListen.exchange(nullptr);
-	if (pSocket)
-	{
-		NetImgui::Internal::Network::Disconnect(pSocket);
-	}
-}
-
 bool ClientInfo::IsContextOverriden()const
 {
 	return mSavedContextValues.mSavedContext;