Added checks to prevent sending to host connectionId

MLAPI/Data/NetworkingConfiguration.cs

@@ -20,10 +20,13 @@ namespace MLAPI
         public int SendTickrate = 64;
         public int EventTickrate = 64;
         public int MaxConnections = 100;
-        public int Port = 7777;
+        public int UDPPort = 7777;
+        public int WebsocketPort = 7778;
         public string Address = "127.0.0.1";
         public int ClientConnectionBufferTimeout = 10;
         public bool ConnectionApproval = false;
+        public bool UseUDPListener = true;
+        public bool UseWebsocketListener = false;
         public Action<byte[], int, Action<int, bool>> ConnectionApprovalCallback = null;
         public byte[] ConnectionData = new byte[0];
         public float SecondsHistory = 5;

MLAPI/MonoBehaviours/Core/NetworkingManager.cs

@@ -192,43 +192,38 @@ namespace MLAPI
                 }
             }
             HostTopology hostTopology = new HostTopology(cConfig, NetworkConfig.MaxConnections);
-            hostId = NetworkTransport.AddHost(hostTopology, NetworkConfig.Port);
+            if (netConfig.UseUDPListener)
+                hostId = NetworkTransport.AddHost(hostTopology, NetworkConfig.UDPPort);
+            if (netConfig.UseWebsocketListener)
+                hostId = NetworkTransport.AddWebsocketHost(hostTopology, NetworkConfig.WebsocketPort);
             isServer = true;
             isClient = false;
             isListening = true;
         }
 
-        public void StartClient(NetworkingConfiguration netConfig)
+        public void StartClient(NetworkingConfiguration netConfig, bool websocket = false)
         {
             ConnectionConfig cConfig = Init(netConfig);
             HostTopology hostTopology = new HostTopology(cConfig, NetworkConfig.MaxConnections);
-            hostId =  NetworkTransport.AddHost(hostTopology, 0, null);
+            if (!websocket)
+                hostId = NetworkTransport.AddHost(hostTopology, 0, null);
+            else
+                hostId = NetworkTransport.AddWebsocketHost(hostTopology, 0, null);
 
             isServer = false;
             isClient = true;
             isListening = true;
-            serverClientId = NetworkTransport.Connect(hostId, NetworkConfig.Address, NetworkConfig.Port, 0, out error);
+            int port = websocket ? NetworkConfig.WebsocketPort : NetworkConfig.UDPPort;
+            serverClientId = NetworkTransport.Connect(hostId, NetworkConfig.Address, port, 0, out error);
         }
 
         public void StopServer()
         {
-            HashSet<int> sentIds = new HashSet<int>();
             //Don't know if I have to disconnect the clients. I'm assuming the NetworkTransport does all the cleaning on shtudown. But this way the clients get a disconnect message from server (so long it does't get lost)
             foreach (KeyValuePair<int, NetworkedClient> pair in connectedClients)
             {
-                if(!sentIds.Contains(pair.Key))
+                NetworkTransport.Disconnect(ClientIdManager.GetClientIdKey(pair.Key).hostId, 
-                {
+                                            ClientIdManager.GetClientIdKey(pair.Key).connectionId, out error);
-                    sentIds.Add(pair.Key);
-                    NetworkTransport.Disconnect(hostId, pair.Key, out error);
-                }
-            }
-            foreach (int clientId in pendingClients)
-            {
-                if (!sentIds.Contains(clientId))
-                {
-                    sentIds.Add(clientId);
-                    NetworkTransport.Disconnect(hostId, clientId, out error);
-                }
             }
             Shutdown();
         }
@@ -256,7 +251,18 @@ namespace MLAPI
                 }
             }
             HostTopology hostTopology = new HostTopology(cConfig, NetworkConfig.MaxConnections);
-            hostId = NetworkTransport.AddHost(hostTopology, NetworkConfig.Port, null);
+            if (netConfig.UseWebsocketListener)
+            {
+                hostId = NetworkTransport.AddWebsocketHost(hostTopology, NetworkConfig.WebsocketPort);
+                ClientIdManager.clientIdToKey.Add(-1, new ClientIdKey(hostId, -1));
+                ClientIdManager.keyToClientId.Add(new ClientIdKey(hostId, -1), -1);
+            }
+            if (netConfig.UseUDPListener)
+            {
+                hostId = NetworkTransport.AddHost(hostTopology, NetworkConfig.UDPPort);
+                ClientIdManager.clientIdToKey.Add(-1, new ClientIdKey(hostId, -1));
+                ClientIdManager.keyToClientId.Add(new ClientIdKey(hostId, -1), -1);
+            }
             isServer = true;
             isClient = true;
             isListening = true;
@@ -297,8 +303,8 @@ namespace MLAPI
         }
 
         //Receive stuff
-        internal int hostId;
+        private int hostId;
-        private int clientId;
+        private int connectionId;
         private int channelId;
         private int receivedSize;
         private byte error;
@@ -313,7 +319,11 @@ namespace MLAPI
                 {
                     foreach (KeyValuePair<int, NetworkedClient> pair in connectedClients)
                     {
-                        NetworkTransport.SendQueuedMessages(hostId, pair.Key, out error);
+                        //Don't send messages to the -1 client id. That's the host
+                        if (pair.Key == -1)
+                            continue;
+                        NetworkTransport.SendQueuedMessages(ClientIdManager.GetClientIdKey(pair.Key).hostId, 
+                                                            ClientIdManager.GetClientIdKey(pair.Key).connectionId, out error);
                     }
                     lastSendTickTime = Time.time;
                 }
@@ -324,14 +334,15 @@ namespace MLAPI
                     do
                     {
                         processedEvents++;
-                        eventType = NetworkTransport.Receive(out hostId, out clientId, out channelId, messageBuffer, messageBuffer.Length, out receivedSize, out error);
+                        int hostId;
+                        eventType = NetworkTransport.Receive(out hostId, out connectionId, out channelId, messageBuffer, messageBuffer.Length, out receivedSize, out error);
                         NetworkError networkError = (NetworkError)error;
                         if (networkError == NetworkError.Timeout)
                         {
                             //Client timed out. 
                             if (isServer)
                             {
-                                OnClientDisconnect(clientId);
+                                OnClientDisconnect(ClientIdManager.GetClientId(hostId, connectionId));
                                 return;
                             }
                         }
@@ -346,6 +357,7 @@ namespace MLAPI
                             case NetworkEventType.ConnectEvent:
                                 if (isServer)
                                 {
+                                    int clientId = ClientIdManager.AddClientId(connectionId, hostId);
                                     pendingClients.Add(clientId);
                                     StartCoroutine(ApprovalTimeout(clientId));
                                 }
@@ -366,16 +378,19 @@ namespace MLAPI
                                                 writer.Write(NetworkConfig.ConnectionData);
                                             }
                                         }
-                                        Send(clientId, "MLAPI_CONNECTION_REQUEST", "MLAPI_INTERNAL", writeStream.GetBuffer());
+                                        Send(connectionId, "MLAPI_CONNECTION_REQUEST", "MLAPI_INTERNAL", writeStream.GetBuffer());
                                     }
                                 }
                                 break;
                             case NetworkEventType.DataEvent:
-                                HandleIncomingData(clientId, messageBuffer, channelId);
+                                if (isServer)
+                                    HandleIncomingData(ClientIdManager.GetClientId(hostId, connectionId), messageBuffer, channelId);
+                                else
+                                    HandleIncomingData(connectionId, messageBuffer, channelId);
                                 break;
                             case NetworkEventType.DisconnectEvent:
                                 if (isServer)
-                                    OnClientDisconnect(clientId);
+                                    OnClientDisconnect(ClientIdManager.GetClientId(hostId, connectionId));
                                 break;
                         }
                         // Only do another iteration if: there are no more messages AND (there is no limit to max events or we have processed less than the maximum)
@@ -850,7 +865,9 @@ namespace MLAPI
                     writer.Write((ushort)data.Length);
                     writer.Write(data);
                 }
-                NetworkTransport.QueueMessageForSending(hostId, targetId, channelId, stream.GetBuffer(), sizeOfStream, out error);
+                NetworkTransport.QueueMessageForSending(ClientIdManager.GetClientIdKey(targetId).hostId, 
+                                                        ClientIdManager.GetClientIdKey(targetId).connectionId, 
+                                                        channelId, stream.GetBuffer(), sizeOfStream, out error);
             }
         }
 
@@ -898,7 +915,10 @@ namespace MLAPI
                 }
                 if (isPassthrough)
                     clientId = serverClientId;
-                NetworkTransport.QueueMessageForSending(hostId, clientId, MessageManager.channels[channelName], stream.GetBuffer(), sizeOfStream, out error);
+                NetworkTransport.QueueMessageForSending(ClientIdManager.GetClientIdKey(clientId).hostId, 
+                                                        ClientIdManager.GetClientIdKey(clientId).connectionId, 
+                                                        MessageManager.channels[channelName], stream.GetBuffer(), 
+                                                        sizeOfStream, out error);
             }
         }
 
@@ -935,7 +955,9 @@ namespace MLAPI
                         //Client trying to send data to host
                         clientId = serverClientId;
                     }
-                    NetworkTransport.QueueMessageForSending(hostId, clientId, channel, stream.GetBuffer(), sizeOfStream, out error);
+                    NetworkTransport.QueueMessageForSending(ClientIdManager.GetClientIdKey(clientId).hostId, 
+                                                            ClientIdManager.GetClientIdKey(clientId).connectionId, 
+                                                            channel, stream.GetBuffer(), sizeOfStream, out error);
                 }
             }
         }
@@ -974,7 +996,9 @@ namespace MLAPI
                         //Client trying to send data to host
                         clientId = serverClientId;
                     }
-                    NetworkTransport.QueueMessageForSending(hostId, clientId, channel, stream.GetBuffer(), sizeOfStream, out error);
+                    NetworkTransport.QueueMessageForSending(ClientIdManager.GetClientIdKey(clientId).hostId, 
+                                                            ClientIdManager.GetClientIdKey(clientId).connectionId, 
+                                                            channel, stream.GetBuffer(), sizeOfStream, out error);
                 }
             }
         }
@@ -1013,7 +1037,9 @@ namespace MLAPI
                         //Client trying to send data to host
                         clientId = serverClientId;
                     }
-                    NetworkTransport.QueueMessageForSending(hostId, clientId, channel, stream.GetBuffer(), sizeOfStream, out error);
+                    NetworkTransport.QueueMessageForSending(ClientIdManager.GetClientIdKey(clientId).hostId, 
+                                                            ClientIdManager.GetClientIdKey(clientId).connectionId, 
+                                                            channel, stream.GetBuffer(), sizeOfStream, out error);
                     
                 }
             }
@@ -1055,7 +1081,9 @@ namespace MLAPI
                         //Client trying to send data to host
                         clientId = serverClientId;
                     }
-                    NetworkTransport.QueueMessageForSending(hostId, clientId, channel, stream.GetBuffer(), sizeOfStream, out error);
+                    NetworkTransport.QueueMessageForSending(ClientIdManager.GetClientIdKey(clientId).hostId, 
+                                                            ClientIdManager.GetClientIdKey(clientId).connectionId, 
+                                                            channel, stream.GetBuffer(), sizeOfStream, out error);
                 }
             }
         }
@@ -1068,7 +1096,9 @@ namespace MLAPI
                 pendingClients.Remove(clientId);
             if (connectedClients.ContainsKey(clientId))
                 connectedClients.Remove(clientId);
-            NetworkTransport.Disconnect(hostId, clientId, out error);          
+            NetworkTransport.Disconnect(ClientIdManager.GetClientIdKey(clientId).hostId, 
+                                        ClientIdManager.GetClientIdKey(clientId).connectionId, out error); 
+            ClientIdManager.ReleaseClientId(clientId);
         }
 
         private void OnClientDisconnect(int clientId)
@@ -1092,6 +1122,7 @@ namespace MLAPI
 
             if (isServer)
             {
+                ClientIdManager.ReleaseClientId(clientId);
                 using (MemoryStream stream = new MemoryStream(4))
                 {
                     using (BinaryWriter writer = new BinaryWriter(stream))
@@ -1215,7 +1246,8 @@ namespace MLAPI
             {
                 if (pendingClients.Contains(clientId))
                     pendingClients.Remove(clientId);
-                NetworkTransport.Disconnect(hostId, clientId, out error);
+                NetworkTransport.Disconnect(ClientIdManager.GetClientIdKey(clientId).hostId, 
+                                            ClientIdManager.GetClientIdKey(clientId).connectionId, out error);
             }
         }
     }

MLAPI/NetworkingManagerComponents/ClientIdManager.cs

@@ -12,7 +12,7 @@ namespace MLAPI.NetworkingManagerComponents
         internal static Dictionary<int, ClientIdKey> clientIdToKey;
         internal static Dictionary<ClientIdKey, int> keyToClientId;
 
-        internal static int GetClientId(int connectionId, int hostId)
+        internal static int AddClientId(int connectionId, int hostId)
         {
             int clientId;
             if (releasedClientIds.Count > 0)
@@ -29,6 +29,20 @@ namespace MLAPI.NetworkingManagerComponents
             return clientId;
         }
 
+        internal static int GetClientId(int hostId, int connectionId)
+        {
+            if (!keyToClientId.ContainsKey(new ClientIdKey(hostId, connectionId)))
+                return 0;
+            return keyToClientId[new ClientIdKey(hostId, connectionId)];
+        }
+
+        internal static ClientIdKey GetClientIdKey(int clientId)
+        {
+            if (!clientIdToKey.ContainsKey(clientId))
+                return new ClientIdKey(0, 0);
+            return clientIdToKey[clientId];
+        }
+
         internal static void ReleaseClientId(int clientId)
         {
             ClientIdKey key = clientIdToKey[clientId];

MLAPI/NetworkingManagerComponents/LagCompensationManager.cs

@@ -38,7 +38,8 @@ namespace MLAPI.NetworkingManagerComponents
                 Debug.LogWarning("MLAPI: Lag compensation simulations are only to be ran on the server.");
                 return;
             }
-            float milisecondsDelay = NetworkTransport.GetCurrentRTT(NetworkingManager.singleton.hostId, clientId, out error) / 2f;
+            float milisecondsDelay = NetworkTransport.GetCurrentRTT(ClientIdManager.GetClientIdKey(clientId).hostId, 
+                                                                    ClientIdManager.GetClientIdKey(clientId).connectionId, out error) / 2f;
             Simulate(milisecondsDelay * 1000f, action);
         }