add unsynced test. fix #369 #370

RevenantX · May 20, 2020 · d3ee215 · d3ee215
1 parent 0e5880b
commit d3ee215
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 19 deletions.
diff --git a/LiteNetLib.Tests/CommunicationTest.cs b/LiteNetLib.Tests/CommunicationTest.cs
@@ -59,6 +59,24 @@ public void ConnectionByIpV4()
             Assert.AreEqual(1, client.ConnectedPeersCount);
         }
 
+        [Test, Timeout(TestTimeout)]
+        public void ConnectionByIpV4Unsynced()
+        {
+            var server = ManagerStack.Server(1);
+            server.UnsyncedEvents = true;
+            var client = ManagerStack.Client(1);
+            client.UnsyncedEvents = true;
+            client.Connect("127.0.0.1", DefaultPort, DefaultAppKey);
+
+            while (server.ConnectedPeersCount != 1 || client.ConnectedPeersCount != 1)
+            {
+                Thread.Sleep(15);
+            }
+
+            Assert.AreEqual(1, server.ConnectedPeersCount);
+            Assert.AreEqual(1, client.ConnectedPeersCount);
+        }
+
         [Test, Timeout(TestTimeout)]
         public void DeliveryTest()
         {

diff --git a/LiteNetLib/NetManager.cs b/LiteNetLib/NetManager.cs
@@ -901,35 +901,27 @@ private void DataReceived(byte[] reusableBuffer, int count, IPEndPoint remoteEnd
                 return;
             }
 
-            NetPeer netPeer;
-
             //special case connect request
-            if (packet.Property == PacketProperty.ConnectRequest)
+            if (packet.Property == PacketProperty.ConnectRequest && 
+            NetConnectRequestPacket.GetProtocolId(packet) != NetConstants.ProtocolId)
             {
-                if (NetConnectRequestPacket.GetProtocolId(packet) != NetConstants.ProtocolId)
-                {
-                    SendRawAndRecycle(NetPacketPool.GetWithProperty(PacketProperty.InvalidProtocol), remoteEndPoint);
-                    return;
-                }
-                var connRequest = NetConnectRequestPacket.FromData(packet);
-                if (connRequest != null)
-                {
-                    _peersLock.EnterUpgradeableReadLock();
-                    _peersDict.TryGetValue(remoteEndPoint, out netPeer);
-                    //here new peer can be created
-                    ProcessConnectRequest(remoteEndPoint, netPeer, connRequest);
-                    _peersLock.ExitUpgradeableReadLock();
-                }
+                SendRawAndRecycle(NetPacketPool.GetWithProperty(PacketProperty.InvalidProtocol), remoteEndPoint);
                 return;
             }
 
+            NetPeer netPeer;
             _peersLock.EnterReadLock();
             bool peerFound = _peersDict.TryGetValue(remoteEndPoint, out netPeer);
             _peersLock.ExitReadLock();
 
             //Check normal packets
             switch (packet.Property)
             {
+                case PacketProperty.ConnectRequest:
+                    var connRequest = NetConnectRequestPacket.FromData(packet);
+                    if (connRequest != null)
+                        ProcessConnectRequest(remoteEndPoint, netPeer, connRequest);
+                    break;
                 case PacketProperty.PeerNotFound:
                     if (peerFound)
                     {

diff --git a/LiteNetLib/Utils/NetSerializer.cs b/LiteNetLib/Utils/NetSerializer.cs
@@ -574,7 +574,7 @@ public void Register<T>()
         }
 
         /// <summary>
-        /// Serialize struct to NetDataWriter (fast)
+        /// Serialize object to NetDataWriter (fast)
         /// </summary>
         /// <param name="writer">Serialization target NetDataWriter</param>
         /// <param name="obj">Object to serialize</param>
@@ -585,7 +585,7 @@ public void Register<T>()
         }
 
         /// <summary>
-        /// Serialize struct to byte array
+        /// Serialize object to byte array
         /// </summary>
         /// <param name="obj">Object to serialize</param>
         /// <returns>byte array with serialized data</returns>

diff --git a/LiteNetLibSampleUnity/Assets/LiteNetLib.dll b/LiteNetLibSampleUnity/Assets/LiteNetLib.dll