Fix for UE Network

sammyfreg · Nov 17, 2024 · ab9d516 · ab9d516
1 parent 5d0ab0a
commit ab9d516
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 16 deletions.
diff --git a/Code/Client/Private/NetImgui_NetworkPosix.cpp b/Code/Client/Private/NetImgui_NetworkPosix.cpp
@@ -11,6 +11,17 @@
 #include <unistd.h>
 #include <fcntl.h>
 
+//NOTE: The socket handling has been modified to improve speed, but the Posix version 
+//		has not been updated. Please review the changes made to 'NetImgui_NetworkWin32.cpp'
+//		between version 1.11 and 1.12 and bring them over to this file. In particular :
+//			-Sockets set to non blocking and immediate sending
+//			-Added 'DataReceivePending' function
+//			-Reworked 'DataReceive' and 'DataSend' to be non blocking socket operation
+//			 but wait until all data has been processed
+//			-Connect now handle timeout instead of letting the socket timeout internally
+//			 after a long time
+static_assert(0)
+
 namespace NetImgui { namespace Internal { namespace Network 
 {
 

diff --git a/Code/Client/Private/NetImgui_NetworkUE4.cpp b/Code/Client/Private/NetImgui_NetworkUE4.cpp
@@ -1,6 +1,6 @@
 #include "NetImgui_Shared.h"
 
-// Tested with Unreal Engine 4.27, 5.0, 5.2
+// Tested with Unreal Engine 4.27, 5.0, 5.2, 5.3, 5.4
 
 #if NETIMGUI_ENABLED && defined(__UNREAL__)
 
@@ -63,31 +63,31 @@ void Shutdown()
 //=================================================================================================
 SocketInfo* Connect(const char* ServerHost, uint32_t ServerPort)
 {
-	SocketInfo* pSocketInfo				= nullptr;
-	ISocketSubsystem* SocketSubSystem	= ISocketSubsystem::Get();
-	auto ResolveInfo					= SocketSubSystem->GetHostByName(ServerHost);
-
-	while( ResolveInfo && !ResolveInfo->IsComplete() ){
-		FPlatformProcess::YieldThread();
-	}
-
-	if ( ResolveInfo && ResolveInfo->GetErrorCode() == 0)
+	SocketInfo* pSocketInfo					= nullptr;
+	ISocketSubsystem* SocketSubSystem		= ISocketSubsystem::Get(PLATFORM_SOCKETSUBSYSTEM);
+	TSharedPtr<FInternetAddr> IpAddressFind	= SocketSubSystem->GetAddressFromString((TCHAR*)StringCast<TCHAR>(static_cast<const ANSICHAR*>(ServerHost)).Get());
+	if(IpAddressFind)
 	{
-		TSharedRef<FInternetAddr> IpAddress	= ResolveInfo->GetResolvedAddress().Clone();
+		TSharedRef<FInternetAddr> IpAddress	= IpAddressFind->Clone();
 		IpAddress->SetPort(ServerPort);
 		if (IpAddress->IsValid())
 		{
 			FSocket* pNewSocket	= SocketSubSystem->CreateSocket(NAME_Stream, "NetImgui", IpAddress->GetProtocolType());
 			if (pNewSocket)
 			{
 				pNewSocket->SetNonBlocking(true);
-				if (pNewSocket->Connect(IpAddress.Get()))
+				if (pNewSocket->Connect(*IpAddress))
 				{
-					pSocketInfo = netImguiNew<SocketInfo>(pNewSocket);
-					return pSocketInfo;
+					bool bConnectionReady = false;
+					pNewSocket->WaitForPendingConnection(bConnectionReady, FTimespan::FromSeconds(1.0f));
+					if( bConnectionReady )
+					{
+						pSocketInfo = netImguiNew<SocketInfo>(pNewSocket);
+						return pSocketInfo;
+					}
 				}
 			}
-		}		
+		}
 	}
 	netImguiDelete(pSocketInfo);
 	return nullptr;

diff --git a/Code/ServerApp/Source/NetImguiServer_Network.cpp b/Code/ServerApp/Source/NetImguiServer_Network.cpp
@@ -380,7 +380,7 @@ void NetworkConnectRequest_Send()
 			{
 				NetImguiServer::Config::Client::SetProperty_ConnectRequest(clientConfig.mRuntimeID, false, false);	// Reset the Connection request, we are processing it
 				NetImguiServer::Config::Client::SetProperty_Status(clientConfig.mRuntimeID, NetImguiServer::Config::Client::eStatus::Disconnected);
-				clientConfigID	= clientConfig.mRuntimeID;													// Keep track of ClientConfig we are attempting to connect to
+				clientConfigID	= clientConfig.mRuntimeID;															// Keep track of ClientConfig we are attempting to connect to
 				pClientSocket	= NetImgui::Internal::Network::Connect(clientConfig.mHostName, clientConfig.mHostPort);
 			}
 		}