1.5.0

- FishNetworking 1.3.1 Multipass transport support.
FirstGearGames · Feb 19, 2022 · 0071c3a · 0071c3a
1 parent 81bfaaa
commit 0071c3a
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 27 deletions.
diff --git a/FishNet/Plugins/FishySteamworks/CHANGELOG.txt b/FishNet/Plugins/FishySteamworks/CHANGELOG.txt
@@ -1,3 +1,6 @@
+1.5.0
+	- FishNetworking 1.3.1 Multipass transport support.
+
 1.4.4
 	- Removed obsolete method.
 

diff --git a/FishNet/Plugins/FishySteamworks/Core/ClientHostSocket.cs b/FishNet/Plugins/FishySteamworks/Core/ClientHostSocket.cs
@@ -95,7 +95,7 @@ internal void IterateIncoming()
             while (_incoming.TryDequeue(out LocalPacket packet))
             {
                 ArraySegment<byte> segment = new ArraySegment<byte>(packet.Data, 0, packet.Length);
-                base.Transport.HandleClientReceivedDataArgs(new ClientReceivedDataArgs(segment, (Channel)packet.Channel));
+                base.Transport.HandleClientReceivedDataArgs(new ClientReceivedDataArgs(segment, (Channel)packet.Channel, Transport.Index));
                 ByteArrayPool.Store(packet.Data);
             }
         }

diff --git a/FishNet/Plugins/FishySteamworks/Core/ClientSocket.cs b/FishNet/Plugins/FishySteamworks/Core/ClientSocket.cs
@@ -184,7 +184,7 @@ internal void IterateIncoming()
                 for (int i = 0; i < messageCount; i++)
                 {
                     base.GetMessage(base.MessagePointers[i], InboundBuffer, out ArraySegment<byte> segment, out byte channel);
-                    base.Transport.HandleClientReceivedDataArgs(new ClientReceivedDataArgs(segment, (Channel)channel));
+                    base.Transport.HandleClientReceivedDataArgs(new ClientReceivedDataArgs(segment, (Channel)channel, Transport.Index));
                 }
             }
         }

diff --git a/FishNet/Plugins/FishySteamworks/Core/CommonSocket.cs b/FishNet/Plugins/FishySteamworks/Core/CommonSocket.cs
@@ -39,9 +39,9 @@ protected virtual void SetLocalConnectionState(LocalConnectionStates connectionS
             _connectionState = connectionState;
 
             if (server)
-                Transport.HandleServerConnectionState(new ServerConnectionStateArgs(connectionState));
+                Transport.HandleServerConnectionState(new ServerConnectionStateArgs(connectionState, Transport.Index));
             else
-                Transport.HandleClientConnectionState(new ClientConnectionStateArgs(connectionState));
+                Transport.HandleClientConnectionState(new ClientConnectionStateArgs(connectionState, Transport.Index));
         }
         #endregion
 

diff --git a/FishNet/Plugins/FishySteamworks/Core/ServerSocket.cs b/FishNet/Plugins/FishySteamworks/Core/ServerSocket.cs
@@ -221,7 +221,7 @@ private bool StopConnection(int connectionId, HSteamNetConnection socket)
             _steamIds.Remove(connectionId);
             if (base.Transport.NetworkManager.CanLog(LoggingType.Common))
                 Debug.Log($"Client with ConnectionID {connectionId} disconnected.");
-            base.Transport.HandleRemoteConnectionState(new RemoteConnectionStateArgs(RemoteConnectionStates.Stopped, connectionId));
+            base.Transport.HandleRemoteConnectionState(new RemoteConnectionStateArgs(RemoteConnectionStates.Stopped, connectionId, Transport.Index));
             _cachedConnectionIds.Enqueue(connectionId);
 
             return true;
@@ -272,7 +272,7 @@ private void OnRemoteConnectionState(SteamNetConnectionStatusChangedCallback_t a
 
                 if (base.Transport.NetworkManager.CanLog(LoggingType.Common))
                     Debug.Log($"Client with SteamID {clientSteamID} connected. Assigning connection id {connectionId}");
-                base.Transport.HandleRemoteConnectionState(new RemoteConnectionStateArgs(RemoteConnectionStates.Started, connectionId));
+                base.Transport.HandleRemoteConnectionState(new RemoteConnectionStateArgs(RemoteConnectionStates.Started, connectionId, Transport.Index));
             }
             else if (args.m_info.m_eState == ESteamNetworkingConnectionState.k_ESteamNetworkingConnectionState_ClosedByPeer || args.m_info.m_eState == ESteamNetworkingConnectionState.k_ESteamNetworkingConnectionState_ProblemDetectedLocally)
             {
@@ -321,7 +321,7 @@ internal void IterateIncoming()
             while (_clientHostIncoming.TryDequeue(out LocalPacket packet))
             {
                 ArraySegment<byte> segment = new ArraySegment<byte>(packet.Data, 0, packet.Length);
-                base.Transport.HandleServerReceivedDataArgs(new ServerReceivedDataArgs(segment, (Channel)packet.Channel, FishySteamworks.CLIENT_HOST_ID));
+                base.Transport.HandleServerReceivedDataArgs(new ServerReceivedDataArgs(segment, (Channel)packet.Channel, FishySteamworks.CLIENT_HOST_ID, Transport.Index));
             }
 
             foreach (KeyValuePair<HSteamNetConnection, int> item in _steamConnections.First)
@@ -340,7 +340,7 @@ internal void IterateIncoming()
                     for (int i = 0; i < messageCount; i++)
                     {
                         base.GetMessage(base.MessagePointers[i], InboundBuffer, out ArraySegment<byte> segment, out byte channel);
-                        base.Transport.HandleServerReceivedDataArgs(new ServerReceivedDataArgs(segment, (Channel)channel, connectionId));
+                        base.Transport.HandleServerReceivedDataArgs(new ServerReceivedDataArgs(segment, (Channel)channel, connectionId, Transport.Index));
                     }
                 }
             }
@@ -445,11 +445,11 @@ internal void OnClientHostState(bool started)
             if (!started)
             {
                 while (_clientHostIncoming.TryDequeue(out _)) ;
-                base.Transport.HandleRemoteConnectionState(new RemoteConnectionStateArgs(RemoteConnectionStates.Stopped, FishySteamworks.CLIENT_HOST_ID));
+                base.Transport.HandleRemoteConnectionState(new RemoteConnectionStateArgs(RemoteConnectionStates.Stopped, FishySteamworks.CLIENT_HOST_ID, Transport.Index));
             }
             else
             {
-                base.Transport.HandleRemoteConnectionState(new RemoteConnectionStateArgs(RemoteConnectionStates.Started, FishySteamworks.CLIENT_HOST_ID));
+                base.Transport.HandleRemoteConnectionState(new RemoteConnectionStateArgs(RemoteConnectionStates.Started, FishySteamworks.CLIENT_HOST_ID, Transport.Index));
             }
 
 

diff --git a/FishNet/Plugins/FishySteamworks/FishySteamworks.cs b/FishNet/Plugins/FishySteamworks/FishySteamworks.cs
@@ -85,9 +85,9 @@ public class FishySteamworks : Transport
         internal const int CLIENT_HOST_ID = short.MaxValue;
         #endregion
 
-        public override void Initialize(NetworkManager networkManager)
+        public override void Initialize(NetworkManager networkManager, int transportIndex)
         {
-            base.Initialize(networkManager);
+            base.Initialize(networkManager, transportIndex);
 
             _client = new Client.ClientSocket();
             _clientHost = new Client.ClientHostSocket();
@@ -558,20 +558,6 @@ private bool StopClient(int connectionId, bool immediately)
 
         #region Channels.
         /// <summary>
-        /// Returns which channel to use by default for reliable.
-        /// </summary>
-        public override byte GetDefaultReliableChannel()
-        {
-            return 0;
-        }
-        /// <summary>
-        /// Returns which channel to use by default for unreliable.
-        /// </summary>
-        public override byte GetDefaultUnreliableChannel()
-        {
-            return 1;
-        }
-        /// <summary>
         /// Gets the MTU for a channel. This should take header size into consideration.
         /// For example, if MTU is 1200 and a packet header for this channel is 10 in size, this method should return 1190.
         /// </summary>

diff --git a/FishNet/Plugins/FishySteamworks/VERSION.txt b/FishNet/Plugins/FishySteamworks/VERSION.txt
@@ -1 +1 @@
-1.4.4
+1.5.0