feat: Added channelId to NetworkEvent

MidLevel · May 23, 2019 · 4656f8c · 4656f8c
1 parent e69a6b3
commit 4656f8c
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 8 deletions.
diff --git a/Ruffles/Core/NetworkEvent.cs b/Ruffles/Core/NetworkEvent.cs
@@ -36,7 +36,12 @@ public struct NetworkEvent
         /// Useful for calculating exact receive times.
         /// </summary>
         /// <value>The socket receive time.</value>
-        public DateTime SocketReceiveTime { get; internal set; }
+        public DateTime SocketReceiveTime { get; internal set; }
+        /// <summary>
+        /// Gets the channelId the message was sent over.
+        /// </summary>
+        /// <value>The channelId the message was sent over.</value>
+        public byte ChannelId { get; internal set; }
 
         internal HeapMemory InternalMemory;
         internal bool AllowUserRecycle;

diff --git a/Ruffles/Core/RuffleSocket.cs b/Ruffles/Core/RuffleSocket.cs
@@ -546,7 +546,9 @@ public NetworkEvent Poll()
                 Data = new ArraySegment<byte>(),
                 AllowUserRecycle = false,
                 InternalMemory = null,
-                Type = NetworkEventType.Nothing
+                Type = NetworkEventType.Nothing,
+                ChannelId = 0,
+                SocketReceiveTime = DateTime.Now
             };
         }
 
@@ -830,7 +832,12 @@ internal void HandlePacket(ArraySegment<byte> payload, EndPoint endpoint)
                                 {
                                     Connection = connection,
                                     Socket = this,
-                                    Type = NetworkEventType.Connect
+                                    Type = NetworkEventType.Connect,
+                                    AllowUserRecycle = false,
+                                    ChannelId = 0,
+                                    Data = new ArraySegment<byte>(),
+                                    InternalMemory = null,
+                                    SocketReceiveTime = DateTime.Now
                                 });
                             }
                             else
@@ -981,7 +988,12 @@ internal void HandlePacket(ArraySegment<byte> payload, EndPoint endpoint)
                             {
                                 Connection = pendingConnection,
                                 Socket = this,
-                                Type = NetworkEventType.Connect
+                                Type = NetworkEventType.Connect,
+                                AllowUserRecycle = false,
+                                ChannelId = 0,
+                                Data = new ArraySegment<byte>(),
+                                InternalMemory = null,
+                                SocketReceiveTime = DateTime.Now
                             });
 
                             // Send the confirmation
@@ -1171,7 +1183,12 @@ internal void DisconnectConnection(Connection connection, bool sendMessage, bool
             {
                 Connection = connection,
                 Socket = this,
-                Type = timeout ? NetworkEventType.Timeout : NetworkEventType.Disconnect
+                Type = timeout ? NetworkEventType.Timeout : NetworkEventType.Disconnect,
+                AllowUserRecycle = false,
+                ChannelId = 0,
+                Data = new ArraySegment<byte>(),
+                InternalMemory = null,
+                SocketReceiveTime = DateTime.Now
             });
         }
 

diff --git a/Ruffles/Core/SocketManager.cs b/Ruffles/Core/SocketManager.cs
@@ -206,7 +206,9 @@ public NetworkEvent PollAllSockets()
                 Data = new ArraySegment<byte>(),
                 AllowUserRecycle = false,
                 InternalMemory = null,
-                Type = NetworkEventType.Nothing
+                Type = NetworkEventType.Nothing,
+                ChannelId = 0,
+                SocketReceiveTime = DateTime.Now
             };
         }
     }

diff --git a/Ruffles/Messaging/PacketHandler.cs b/Ruffles/Messaging/PacketHandler.cs
@@ -44,7 +44,8 @@ internal static void HandleIncomingMessage(ArraySegment<byte> payload, Connectio
                     AllowUserRecycle = true,
                     Data = new ArraySegment<byte>(memory.Buffer, (int)memory.VirtualOffset, (int)memory.VirtualCount),
                     InternalMemory = memory,
-                    SocketReceiveTime = DateTime.Now
+                    SocketReceiveTime = DateTime.Now,
+                    ChannelId = channelId
                 });
             }
 
@@ -67,7 +68,8 @@ internal static void HandleIncomingMessage(ArraySegment<byte> payload, Connectio
                             AllowUserRecycle = true,
                             Data = new ArraySegment<byte>(messageMemory.Buffer, (int)messageMemory.VirtualOffset, (int)messageMemory.VirtualCount),
                             InternalMemory = messageMemory,
-                            SocketReceiveTime = DateTime.Now
+                            SocketReceiveTime = DateTime.Now,
+                            ChannelId = channelId
                         });
                     }
                 }