Merge pull request #1162 from EOS-Contrib/revert-1160-Update-EOS-1.17.1-43712763-9dca

Revert "Update eos 1.17.1 43712763 9dca"

Author: EOSPluginJeff

Assets/Plugins/Linux/Core/LinuxPlatformSpecifics.cs

@@ -65,7 +65,7 @@ public override void LoadDelegatesWithEOSBindingAPI()
         {
 #if EOS_DYNAMIC_BINDINGS || UNITY_EDITOR
             // TODO: This code does not appear to do anything...
-            const string EOSBinaryName = Epic.OnlineServices.Common.LIBRARY_NAME;
+            const string EOSBinaryName = Epic.OnlineServices.Config.LibraryName;
             var eosLibraryHandle = EOSManager.EOSSingleton.LoadDynamicLibrary(EOSBinaryName);
 #endif
         }

Assets/Plugins/Windows/Core/WindowsPlatformSpecifics.cs

@@ -95,7 +95,7 @@ public override void LoadDelegatesWithEOSBindingAPI()
         {
             // In the editor, EOS needs to be dynamically bound.
 #if EOS_DYNAMIC_BINDINGS || UNITY_EDITOR
-            const string EOSBinaryName = Epic.OnlineServices.Common.LIBRARY_NAME;
+            const string EOSBinaryName = Epic.OnlineServices.Config.LibraryName;
             var eosLibraryHandle = EOSManager.EOSSingleton.LoadDynamicLibrary(EOSBinaryName);
             Epic.OnlineServices.WindowsBindings.Hook<DLLHandle>(eosLibraryHandle, (DLLHandle handle, string functionName) => {
                 return handle.LoadFunctionAsIntPtr(functionName);

Assets/Plugins/Windows/x64/DynamicLibraryLoaderHelper-x64.dll

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2f957da436d0ad17909ae2d192d6ab4b1836ce0c09a165ad234d112474f0e3e1
-size 125440
+oid sha256:9d8f034fe2e08482bc0a131702fd9a4066337fc5149527c8b1877a870b6ac9a4
+size 122880

Assets/Plugins/Windows/x64/GfxPluginNativeRender-x64.dll

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1da114c20fc09c662b54bb089383189f0a94f83bac57e1d13afd11f26f39ee1d
-size 636416
+oid sha256:71d77cd8cb1d153472ab5d01e9ae62f7415c95c0baa8c4e54cc856fc2842e758
+size 604672

Assets/Plugins/Windows/x86/DynamicLibraryLoaderHelper-x86.dll

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c3ede5c79d720914671c994d42f50149d701aba4b2c5cf100995d1af7cccb34b
-size 110592
+oid sha256:cb8494abca7f617353dd1e1f900ead28a1de316dc84779b63bcf74efcd83ef74
+size 87040

Assets/Plugins/Windows/x86/GfxPluginNativeRender-x86.dll

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:49f41bf1f6308319f8495b1a1be9e2e634ae03e6a7e6367806e42fffab4620b0
-size 483328
+oid sha256:ac77b32eaebef7dc1c75aa070bc92ca521ede00c70dcf0c6b5262c3430a5d2c7
+size 467968

Assets/Scripts/EOSFriendsManager.cs

@@ -817,7 +817,7 @@ public void SubscribeToFriendUpdates(EpicAccountId userId)
             var addNotifyFriendsUpdateOptions = new AddNotifyFriendsUpdateOptions();
             ulong notificationId = FriendsHandle.AddNotifyFriendsUpdate(ref addNotifyFriendsUpdateOptions, null, OnFriendsUpdateCallbackHandler);
 
-            if(notificationId == Common.INVALID_NOTIFICATIONID)
+            if(notificationId == Common.InvalidNotificationid)
             {
                 Debug.LogError("Friends (SubscribeToFriendUpdates): Could not subscribe to friend update notifications.");
             }
@@ -830,7 +830,7 @@ public void SubscribeToFriendUpdates(EpicAccountId userId)
             var addNotifyOnPresenceChangedOptions = new AddNotifyOnPresenceChangedOptions();
             ulong presenceNotificationId = PresenceHandle.AddNotifyOnPresenceChanged(ref addNotifyOnPresenceChangedOptions , null, OnPresenceChangedCallbackHandler);
 
-            if(presenceNotificationId == Common.INVALID_NOTIFICATIONID)
+            if(presenceNotificationId == Common.InvalidNotificationid)
             {
                 Debug.LogError("Friends (SubscribeToFriendUpdates): Could not subscribe to presence changed notifications.");
             }

Assets/Scripts/EOSPeer2PeerManager.cs

@@ -89,19 +89,6 @@ public class EOSPeer2PeerManager : IEOSSubManager
 
         public UIPeer2PeerParticleController ParticleController;
         public Transform parent;
-        private enum PeerConnectionAppState
-        {
-            NotConnected,
-            IceConnected,
-            HandshakePending,
-            FullyConnected
-        }
-
-        private Dictionary<ProductUserId, PeerConnectionAppState> connectionStates = new();
-
-    private string Request = "hreq";
-    private string Acknowledgement = "hack";
-     private string Ping = "ping";
 
 #if UNITY_EDITOR
         void OnPlayModeChanged(UnityEditor.PlayModeStateChange modeChange)
@@ -139,19 +126,7 @@ public bool GetChatDataCache(out Dictionary<ProductUserId, ChatWithFriendData> C
             ChatDataCache = this.ChatDataCache;
             return ChatDataCacheDirty;
         }
-        public void Initialize()
-        {
-            SubscribeToConnectionRequest();
-
-            var options = new AddNotifyPeerConnectionEstablishedOptions
-            {
-                LocalUserId = EOSManager.Instance.GetProductUserId() 
-            };
 
-            P2PHandle.AddNotifyPeerConnectionEstablished(ref options, null, OnPeerConnectionEstablished);
-
-            Debug.Log("EOSPeer2PeerManager initialized: connection listeners registered.");
-        }
         private void RefreshNATType()
         {
             var options = new QueryNATTypeOptions();
@@ -213,12 +188,6 @@ public void SendMessage(ProductUserId friendId, messageData message)
                 Debug.LogError("EOS P2PNAT SendMessage: bad input data: account id is wrong.");
                 return;
             }
-            if (!connectionStates.TryGetValue(friendId, out var state) || state != PeerConnectionAppState.FullyConnected)
-            {
-                Debug.LogWarning($"SendMessage: Cannot send to {friendId}, not fully connected (State={state}).");
-                return;
-            }
-
             if (message.type == messageType.textMessage)
             {
                 if (string.IsNullOrEmpty(message.textData))
@@ -314,8 +283,6 @@ public void SendMessage(ProductUserId friendId, messageData message)
 
         public ProductUserId HandleReceivedMessages()
         {
-            
-
             if (P2PHandle == null)
             {
                 return null;
@@ -363,21 +330,6 @@ public ProductUserId HandleReceivedMessages()
                 }
 
                 string message = System.Text.Encoding.UTF8.GetString(data);
-                // --- Handshake protocol ---
-                if (message == Request)
-                {
-                    SendHandshakeAck(peerId);
-                    connectionStates[peerId] = PeerConnectionAppState.FullyConnected;
-                    Debug.Log($"Received handshake request from {peerId}. Sending ack and setting FullyConnected.");
-                    return null;
-                }
-                else if (message == Acknowledgement)
-                {
-                    connectionStates[peerId] = PeerConnectionAppState.FullyConnected;
-                    Debug.Log($"Received handshake ack from {peerId}. Connection is now FullyConnected.");
-                    return null;
-                }
-                // --- End handshake ---
 
                 if (message.StartsWith("t"))
                 {
@@ -419,11 +371,9 @@ public ProductUserId HandleReceivedMessages()
 
                     return peerId;
                 }
-                else if (message == Ping)
-                {
-                    Debug.Log($"EOS P2PNAT HandleReceivedMessages: received ping from {peerId}, ignoring.");
-                    return null;
-                }
+
+
+
                 else
                 {
                     Debug.LogErrorFormat("EOS P2PNAT HandleReceivedMessages: error while reading data, code: {0}", result);
@@ -492,61 +442,11 @@ private void OnIncomingConnectionRequest(ref OnIncomingConnectionRequestInfo dat
             };
 
             Result result = P2PHandle.AcceptConnection(ref options);
-            SendHandshakeRequest(data.RemoteUserId);
-            if (result != Result.Success)
-            {
-                Debug.LogErrorFormat("P2p (OnIncomingConnectionRequest): error while accepting connection, code: {0}", result);
-            }
-        }
-        private void SendHandshakeRequest(ProductUserId remoteUserId)
-        {
-            SendRaw(remoteUserId, "hreq");
-            connectionStates[remoteUserId] = PeerConnectionAppState.HandshakePending;
-        }
-
-        private void SendHandshakeAck(ProductUserId remoteUserId)
-        {
-            SendRaw(remoteUserId, "hack");
-        }
-
-        private void SendRaw(ProductUserId remoteUserId, string rawMessage)
-        {
-            SocketId socketId = new SocketId() { SocketName = "CHAT" };
 
-            SendPacketOptions options = new SendPacketOptions()
-            {
-                LocalUserId = EOSManager.Instance.GetProductUserId(),
-                RemoteUserId = remoteUserId,
-                SocketId = socketId,
-                AllowDelayedDelivery = true,
-                Channel = 0,
-                Reliability = PacketReliability.ReliableOrdered,
-                Data = new ArraySegment<byte>(Encoding.UTF8.GetBytes(rawMessage))
-            };
-
-            var result = P2PHandle.SendPacket(ref options);
             if (result != Result.Success)
             {
-                Debug.LogError($"SendRaw failed: {result}");
-            }
-        }
-        private void OnPeerConnectionEstablished(ref OnPeerConnectionEstablishedInfo info)
-        {
-            Debug.Log($"[P2P] Connection established with {info.RemoteUserId}");
-
-            if (!connectionStates.ContainsKey(info.RemoteUserId))
-            {
-                connectionStates[info.RemoteUserId] = PeerConnectionAppState.IceConnected;
-                SendHandshakeRequest(info.RemoteUserId);
-                connectionStates[info.RemoteUserId] = PeerConnectionAppState.HandshakePending;
+                Debug.LogErrorFormat("P2p (OnIncomingConnectionRequest): error while accepting connection, code: {0}", result);
             }
         }
-        public void SendTrigger(ProductUserId peerId)
-        {
-            if (!peerId.IsValid()) return;
-            string trigger = "ping";
-            SendRaw(peerId, trigger);
-        }
     }
-
 }

Assets/Scripts/P2PNetcodeSample/Networking/EOSTransportManager.cs

@@ -50,13 +50,13 @@ public class EOSTransportManager : IEOSSubManager
         /// Maximum packet byte length
         /// </summary>
         /// <value><c>1170</c> due to DTLS/SCTP/UDP packet overhead.</value>
-        public const int MaxPacketSize = P2PInterface.MAX_PACKET_SIZE;
+        public const int MaxPacketSize = P2PInterface.MaxPacketSize;
 
         /// <summary>
         /// Maximum concurrent connections with any individual remote peer.
         /// </summary>
         /// <value><c>32</c></value>
-        public const int MaxConnections = P2PInterface.MAX_CONNECTIONS;
+        public const int MaxConnections = P2PInterface.MaxConnections;
 
         // Connection data, socket name must be unique within an individual remote peer.
         public class Connection : IEquatable<Connection>

Assets/Scripts/StandardSamples/Services/TitleStorageService.cs

@@ -199,9 +199,9 @@ private ReadResult OnFileDataReceived(ref ReadFileDataCallbackInfo data)
         {
             return ReceiveData(data.Filename, data.DataChunk, data.TotalFileSizeBytes) switch
             {
-                FileTransferResult.FailRequest => ReadResult.RrFailRequest,
-                FileTransferResult.CancelRequest => ReadResult.RrCancelRequest,
-                FileTransferResult.ContinueReading => ReadResult.RrContinueReading,
+                FileTransferResult.FailRequest => ReadResult.RrFailrequest,
+                FileTransferResult.CancelRequest => ReadResult.RrCancelrequest,
+                FileTransferResult.ContinueReading => ReadResult.RrContinuereading,
                 _ => throw new ArgumentOutOfRangeException()
             };
         }