Merge pull request #16 from Tivoyagefeak/master

Get Sender IP Address
getnamo · Mar 1, 2021 · f1d80b1 · f1d80b1
2 parents 7a51a92 + 205c4df
commit f1d80b1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Source/UDPWrapper/Private/UDPComponent.cpp b/Source/UDPWrapper/Private/UDPComponent.cpp
@@ -32,9 +32,9 @@ void UUDPComponent::LinkupCallbacks()
 	{
 		OnReceiveSocketClosed.Broadcast(Port);
 	};
-	Native->OnReceivedBytes = [this](const TArray<uint8>& Data)
+	Native->OnReceivedBytes = [this](const TArray<uint8>& Data, const FString& Endpoint)
 	{
-		OnReceivedBytes.Broadcast(Data);
+		OnReceivedBytes.Broadcast(Data, Endpoint);
 	};
 }
 
@@ -226,18 +226,18 @@ void FUDPNative::OpenReceiveSocket(const int32 InListenPort /*= 3002*/)
 		if (Settings.bReceiveDataOnGameThread)
 		{
 			//Pass the reference to be used on gamethread
-			AsyncTask(ENamedThreads::GameThread, [this, Data]()
+			AsyncTask(ENamedThreads::GameThread, [this, Data, Endpoint]()
 			{
 				//double check we're still bound on this thread
 				if (OnReceivedBytes)
 				{
-					OnReceivedBytes(Data);
+					OnReceivedBytes(Data, Endpoint.Address.ToString());
 				}
 			});
 		}
 		else
 		{
-			OnReceivedBytes(Data);
+			OnReceivedBytes(Data, Endpoint.Address.ToString());
 		}
 	});
 

diff --git a/Source/UDPWrapper/Public/UDPComponent.h b/Source/UDPWrapper/Public/UDPComponent.h
@@ -59,7 +59,7 @@ class UDPWRAPPER_API FUDPNative
 {
 public:
 
-	TFunction<void(const TArray<uint8>&)> OnReceivedBytes;
+	TFunction<void(const TArray<uint8>&, const FString&)> OnReceivedBytes;
 	TFunction<void(int32 Port)> OnReceiveOpened;
 	TFunction<void(int32 Port)> OnReceiveClosed;
 	TFunction<void(int32 Port)> OnSendOpened;
@@ -94,7 +94,7 @@ class UDPWRAPPER_API FUDPNative
 };
 
 DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FUDPSocketStateSignature, int32, Port);
-DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FUDPMessageSignature, const TArray<uint8>&, Bytes);
+DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FUDPMessageSignature, const TArray<uint8>&, Bytes, const FString, IPAddress);
 
 UCLASS(ClassGroup = "Networking", meta = (BlueprintSpawnableComponent))
 class UDPWRAPPER_API UUDPComponent : public UActorComponent