Fix checksum problem at relayed ACK.

zestyroad · zestyroad · commit 69103e03b385 · 2020-11-23T14:04:39.000+09:00
diff --git a/sandbox/Dev/Client/Assets/Plugins/EuNet/Runtime/EuNet.Core/Channel/ReliableChannel.cs b/sandbox/Dev/Client/Assets/Plugins/EuNet/Runtime/EuNet.Core/Channel/ReliableChannel.cs
@@ -147,7 +147,31 @@ public bool SendPendingPacket()
                     if (_sendAcks == true)
                     {
                         _sendAcks = false;
-                        _udpChannel.SendTo(_ackPacket.RawData, 0, _ackPacket.Size, UdpChannel.SendMode.Buffered);
+
+                        IPacketFilter filter = _channelOption.PacketFilter;
+                        if(filter != null)
+                        {
+                            var poolingPacket = NetPool.PacketPool.Alloc(_ackPacket, 0);
+                            try
+                            {
+
+                                while (filter != null)
+                                {
+                                    poolingPacket = filter.Encode(poolingPacket);
+                                    filter = filter.NextFilter;
+                                }
+
+                                _udpChannel.SendTo(poolingPacket.RawData, 0, poolingPacket.Size, UdpChannel.SendMode.Buffered);
+                            }
+                            finally
+                            {
+                                NetPool.PacketPool.Free(poolingPacket);
+                            }
+                        }
+                        else
+                        {
+                            _udpChannel.SendTo(_ackPacket.RawData, 0, _ackPacket.Size, UdpChannel.SendMode.Buffered);
+                        }
                     }
                 }
             }
diff --git a/sandbox/Dev/Client/Assets/Plugins/EuNet/Runtime/EuNet.Core/Channel/SequencedChannel.cs b/sandbox/Dev/Client/Assets/Plugins/EuNet/Runtime/EuNet.Core/Channel/SequencedChannel.cs
@@ -120,7 +120,30 @@ public bool SendPendingPacket()
                 _mustSendAck = false;
                 _ackPacket.Sequence = _remoteSequence;
 
-                _udpChannel.SendTo(_ackPacket.RawData, 0, _ackPacket.Size, UdpChannel.SendMode.Buffered);
+                IPacketFilter filter = _channelOption.PacketFilter;
+                if (filter != null)
+                {
+                    var poolingPacket = NetPool.PacketPool.Alloc(_ackPacket, 0);
+                    try
+                    {
+
+                        while (filter != null)
+                        {
+                            poolingPacket = filter.Encode(poolingPacket);
+                            filter = filter.NextFilter;
+                        }
+
+                        _udpChannel.SendTo(poolingPacket.RawData, 0, poolingPacket.Size, UdpChannel.SendMode.Buffered);
+                    }
+                    finally
+                    {
+                        NetPool.PacketPool.Free(poolingPacket);
+                    }
+                }
+                else
+                {
+                    _udpChannel.SendTo(_ackPacket.RawData, 0, _ackPacket.Size, UdpChannel.SendMode.Buffered);
+                }
             }
 
             return true;
diff --git a/sandbox/Dev/Client/Assets/Plugins/EuNet/Runtime/EuNet.Core/PacketFilter/TeaPacketFilter.cs b/sandbox/Dev/Client/Assets/Plugins/EuNet/Runtime/EuNet.Core/PacketFilter/TeaPacketFilter.cs
@@ -56,7 +56,7 @@ public NetPacket Decode(NetPacket packet)
             byte checksum = GetChecksum(data, headerSize, size - headerSize);
 
             if (InitChecksumValue != checksum)
-                throw new Exception("not match packet checksum");
+                throw new Exception($"Not match packet checksum [{packet.Property}]");
 
             return packet;
         }
diff --git a/sandbox/Dev/Client/Assets/Plugins/EuNet/Runtime/EuNet.Core/PacketFilter/XorPacketFilter.cs b/sandbox/Dev/Client/Assets/Plugins/EuNet/Runtime/EuNet.Core/PacketFilter/XorPacketFilter.cs
@@ -51,7 +51,7 @@ public NetPacket Decode(NetPacket packet)
             byte checksum = GetChecksum(data, headerSize, size - headerSize);
 
             if (InitChecksumValue != checksum)
-                throw new Exception("not match packet checksum");
+                throw new Exception($"Not match packet checksum [{packet.Property}]");
 
             packet.Size -= 1;
 
diff --git a/sandbox/Dev/Client/Assets/Plugins/EuNet/Runtime/EuNet.Unity/NetClientP2pBehaviour.cs b/sandbox/Dev/Client/Assets/Plugins/EuNet/Runtime/EuNet.Unity/NetClientP2pBehaviour.cs
@@ -37,8 +37,6 @@ protected override void Awake()
 
         protected override void Start()
         {
-            base.Start();
-
             _clientOption.IsServiceUdp = true;
             _clientOption.UdpServerAddress = ServerAddress;
             _clientOption.UdpServerPort = UdpServerPort;
diff --git a/sandbox/Dev/Client/Assets/Plugins/EuNet/package.json b/sandbox/Dev/Client/Assets/Plugins/EuNet/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.zestylife.eunet",
   "displayName": "EuNet",
-  "version": "1.1.11",
+  "version": "1.1.12",
   "unity": "2018.4",
   "description": "Easy Unity Network (EuNet) is a network solution for multiplayer games.",
   "keywords": [ "P2P", "HolePunching", "RPC", "RELAY" ],
diff --git a/sandbox/Dev/Client/Assets/Scenes/Login.unity b/sandbox/Dev/Client/Assets/Scenes/Login.unity
@@ -537,7 +537,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _isDontDestroyOnLoad: 1
   LogLevel: 3
-  ServerAddress: 220.120.190.34
+  ServerAddress: 220.120.190.48
   TcpServerPort: 12000
   IsCheckAlive: 1
   CheckAliveInterval: 40000
diff --git a/sandbox/Dev/Client/Assets/Scripts/Network/GameClient.cs b/sandbox/Dev/Client/Assets/Scripts/Network/GameClient.cs
@@ -20,7 +20,16 @@ protected override void Awake()
         base.Awake();
 
         _client = GetComponent<NetClientP2pBehaviour>();
+        _client.SetClientOptionFunc = (clientOption) =>
+        {
+            clientOption.PacketFilter = new XorPacketFilter(1);
+        };
+
+        CustomResolver.Register(GeneratedResolver.Instance);
+    }
 
+    private void Start()
+    {
         Client.OnConnected = OnConnected;
         Client.OnClosed = OnClosed;
         Client.OnReceived = OnReceive;
@@ -32,8 +41,6 @@ protected override void Awake()
         // 자동으로 생성된 Rpc 서비스를 사용하기 위해 등록함
         Client.AddRpcService(new ActorViewRpcServiceView());
         Client.AddRpcService(new ActorScaleRpcServiceView());
-
-        CustomResolver.Register(GeneratedResolver.Instance);
     }
 
     private void OnConnected()
diff --git a/sandbox/Dev/Server/Server.cs b/sandbox/Dev/Server/Server.cs
@@ -37,6 +37,7 @@ public async Task Start()
                 IsCheckAlive = true,
                 CheckAliveInterval = 50000,
                 CheckAliveTimeout = 60000,
+                PacketFilter = new XorPacketFilter(1)
             };
 
             // 로거 팩토리를 생성
diff --git a/src/EuNet.Client/EuNet.Client.csproj b/src/EuNet.Client/EuNet.Client.csproj
@@ -5,7 +5,7 @@
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <Authors>zestylife</Authors>
     <Company></Company>
-    <Version>1.1.11</Version>
+    <Version>1.1.12</Version>
     <Copyright></Copyright>
     <PackageProjectUrl>https://github.com/zestylife/EuNet</PackageProjectUrl>
     <RepositoryUrl>https://github.com/zestylife/EuNet</RepositoryUrl>
diff --git a/src/EuNet.CodeGenerator.Templates/EuNet.CodeGenerator.Templates.csproj b/src/EuNet.CodeGenerator.Templates/EuNet.CodeGenerator.Templates.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    <Version>1.1.11</Version>
+    <Version>1.1.12</Version>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageOutputPath>../../nupkg</PackageOutputPath>
     <NuspecFile>EuNet.CodeGenerator.Templates.nuspec</NuspecFile>
diff --git a/src/EuNet.CodeGenerator.Templates/EuNet.CodeGenerator.Templates.nuspec b/src/EuNet.CodeGenerator.Templates/EuNet.CodeGenerator.Templates.nuspec
@@ -3,7 +3,7 @@
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>EuNet.CodeGenerator.Templates</id>
     <title>EuNet.CodeGenerator.Templates</title>
-    <version>1.1.11</version>
+    <version>1.1.12</version>
     <authors>zestylife</authors>
     <owners>zestylife</owners>
     <description>EuNet.CodeGenerator.Templates</description>
@@ -13,8 +13,8 @@
     <releaseNotes>EuNet.CodeGenerator.Templates</releaseNotes>
     <tags>C# TCP P2P UDP Network Unity RPC HolePunching Relay</tags>
     <dependencies>
-      <dependency id="EuNet.Core" version="1.1.11" />
-      <dependency id="EuNet.Rpc" version="1.1.11" />
+      <dependency id="EuNet.Core" version="1.1.12" />
+      <dependency id="EuNet.Rpc" version="1.1.12" />
     </dependencies>
     <references>
     </references>
diff --git a/src/EuNet.CodeGenerator/EuNet.CodeGenerator.csproj b/src/EuNet.CodeGenerator/EuNet.CodeGenerator.csproj
@@ -6,7 +6,7 @@
     <PackAsTool>true</PackAsTool>
     <ToolCommandName>enc</ToolCommandName>
     <PackageOutputPath>../../nupkg</PackageOutputPath>
-    <Version>1.1.11</Version>
+    <Version>1.1.12</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/src/EuNet.Core/Channel/ReliableChannel.cs b/src/EuNet.Core/Channel/ReliableChannel.cs
@@ -147,7 +147,31 @@ public bool SendPendingPacket()
                     if (_sendAcks == true)
                     {
                         _sendAcks = false;
-                        _udpChannel.SendTo(_ackPacket.RawData, 0, _ackPacket.Size, UdpChannel.SendMode.Buffered);
+
+                        IPacketFilter filter = _channelOption.PacketFilter;
+                        if(filter != null)
+                        {
+                            var poolingPacket = NetPool.PacketPool.Alloc(_ackPacket, 0);
+                            try
+                            {
+
+                                while (filter != null)
+                                {
+                                    poolingPacket = filter.Encode(poolingPacket);
+                                    filter = filter.NextFilter;
+                                }
+
+                                _udpChannel.SendTo(poolingPacket.RawData, 0, poolingPacket.Size, UdpChannel.SendMode.Buffered);
+                            }
+                            finally
+                            {
+                                NetPool.PacketPool.Free(poolingPacket);
+                            }
+                        }
+                        else
+                        {
+                            _udpChannel.SendTo(_ackPacket.RawData, 0, _ackPacket.Size, UdpChannel.SendMode.Buffered);
+                        }
                     }
                 }
             }
diff --git a/src/EuNet.Core/Channel/SequencedChannel.cs b/src/EuNet.Core/Channel/SequencedChannel.cs
@@ -120,7 +120,30 @@ public bool SendPendingPacket()
                 _mustSendAck = false;
                 _ackPacket.Sequence = _remoteSequence;
 
-                _udpChannel.SendTo(_ackPacket.RawData, 0, _ackPacket.Size, UdpChannel.SendMode.Buffered);
+                IPacketFilter filter = _channelOption.PacketFilter;
+                if (filter != null)
+                {
+                    var poolingPacket = NetPool.PacketPool.Alloc(_ackPacket, 0);
+                    try
+                    {
+
+                        while (filter != null)
+                        {
+                            poolingPacket = filter.Encode(poolingPacket);
+                            filter = filter.NextFilter;
+                        }
+
+                        _udpChannel.SendTo(poolingPacket.RawData, 0, poolingPacket.Size, UdpChannel.SendMode.Buffered);
+                    }
+                    finally
+                    {
+                        NetPool.PacketPool.Free(poolingPacket);
+                    }
+                }
+                else
+                {
+                    _udpChannel.SendTo(_ackPacket.RawData, 0, _ackPacket.Size, UdpChannel.SendMode.Buffered);
+                }
             }
 
             return true;
diff --git a/src/EuNet.Core/EuNet.Core.csproj b/src/EuNet.Core/EuNet.Core.csproj
@@ -5,7 +5,7 @@
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <Authors>zestylife</Authors>
     <Company></Company>
-    <Version>1.1.11</Version>
+    <Version>1.1.12</Version>
     <Copyright></Copyright>
     <PackageProjectUrl>https://github.com/zestylife/EuNet</PackageProjectUrl>
     <RepositoryUrl>https://github.com/zestylife/EuNet</RepositoryUrl>
diff --git a/src/EuNet.Core/PacketFilter/TeaPacketFilter.cs b/src/EuNet.Core/PacketFilter/TeaPacketFilter.cs
@@ -56,7 +56,7 @@ public NetPacket Decode(NetPacket packet)
             byte checksum = GetChecksum(data, headerSize, size - headerSize);
 
             if (InitChecksumValue != checksum)
-                throw new Exception("not match packet checksum");
+                throw new Exception($"Not match packet checksum [{packet.Property}]");
 
             return packet;
         }
diff --git a/src/EuNet.Core/PacketFilter/XorPacketFilter.cs b/src/EuNet.Core/PacketFilter/XorPacketFilter.cs
@@ -51,7 +51,7 @@ public NetPacket Decode(NetPacket packet)
             byte checksum = GetChecksum(data, headerSize, size - headerSize);
 
             if (InitChecksumValue != checksum)
-                throw new Exception("not match packet checksum");
+                throw new Exception($"Not match packet checksum [{packet.Property}]");
 
             packet.Size -= 1;
 
diff --git a/src/EuNet.Rpc/EuNet.Rpc.csproj b/src/EuNet.Rpc/EuNet.Rpc.csproj
@@ -5,7 +5,7 @@
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <Authors>zestylife</Authors>
     <Company></Company>
-    <Version>1.1.11</Version>
+    <Version>1.1.12</Version>
     <Copyright></Copyright>
     <PackageProjectUrl>https://github.com/zestylife/EuNet</PackageProjectUrl>
     <RepositoryUrl>https://github.com/zestylife/EuNet</RepositoryUrl>
diff --git a/src/EuNet.Server/EuNet.Server.csproj b/src/EuNet.Server/EuNet.Server.csproj
@@ -5,7 +5,7 @@
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <Authors>zestylife</Authors>
     <Company></Company>
-    <Version>1.1.11</Version>
+    <Version>1.1.12</Version>
     <Copyright></Copyright>
     <PackageProjectUrl>https://github.com/zestylife/EuNet</PackageProjectUrl>
     <RepositoryUrl>https://github.com/zestylife/EuNet</RepositoryUrl>
diff --git a/src/EuNet.Server/Server/NetServer.cs b/src/EuNet.Server/Server/NetServer.cs
@@ -397,23 +397,25 @@ private bool OnPreProcessUdpRawData(byte[] data, int size, NetPacket cachedPacke
                                 Interlocked.Add(ref _statistic.RelayServBytes, size);
 
                                 var targetSession = _sessionManager.FindSession(sessionId) as ServerSession;
+                                if (targetSession == null)
+                                    return true;
+
+                                var targetEp = targetSession.UdpChannel.PunchedEndPoint;
+                                if (targetEp == null)
+                                    return true;
 
                                 ISession senderSession;
                                 _udpSocket.TryGetSession(endPoint, out senderSession);
+                                if (senderSession == null)
+                                    return true;
 
-                                if (senderSession != null &&
-                                    targetSession != null &&
-                                    targetSession.UdpChannel != null &&
-                                    targetSession.UdpChannel.PunchedEndPoint != null)
-                                {
-                                    //_logger.LogInformation($"Relay to {sessionId}  {targetSession.UdpChannel.PunchedEndPoint} from {senderSession.SessionId}");
+                                //_logger.LogInformation($"Relay to {sessionId}  {targetSession.UdpChannel.PunchedEndPoint} from {senderSession.SessionId}");
 
-                                    // 보낸이를 수정해서 보내주자
-                                    cachedPacket.P2pSessionId = senderSession.SessionId;
+                                // 보낸이를 수정해서 보내주자
+                                cachedPacket.P2pSessionId = senderSession.SessionId;
 
-                                    SocketError error = SocketError.Success;
-                                    _udpSocket.SendTo(data, 0, size, targetSession.UdpChannel.PunchedEndPoint, ref error);
-                                }
+                                SocketError error = SocketError.Success;
+                                _udpSocket.SendTo(data, 0, size, targetEp, ref error);
                             }
                             catch
                             {
diff --git a/src/EuNet.Unity/Assets/Plugins/EuNet/Runtime/EuNet.Core/Channel/ReliableChannel.cs b/src/EuNet.Unity/Assets/Plugins/EuNet/Runtime/EuNet.Core/Channel/ReliableChannel.cs
@@ -147,7 +147,31 @@ public bool SendPendingPacket()
                     if (_sendAcks == true)
                     {
                         _sendAcks = false;
-                        _udpChannel.SendTo(_ackPacket.RawData, 0, _ackPacket.Size, UdpChannel.SendMode.Buffered);
+
+                        IPacketFilter filter = _channelOption.PacketFilter;
+                        if(filter != null)
+                        {
+                            var poolingPacket = NetPool.PacketPool.Alloc(_ackPacket, 0);
+                            try
+                            {
+
+                                while (filter != null)
+                                {
+                                    poolingPacket = filter.Encode(poolingPacket);
+                                    filter = filter.NextFilter;
+                                }
+
+                                _udpChannel.SendTo(poolingPacket.RawData, 0, poolingPacket.Size, UdpChannel.SendMode.Buffered);
+                            }
+                            finally
+                            {
+                                NetPool.PacketPool.Free(poolingPacket);
+                            }
+                        }
+                        else
+                        {
+                            _udpChannel.SendTo(_ackPacket.RawData, 0, _ackPacket.Size, UdpChannel.SendMode.Buffered);
+                        }
                     }
                 }
             }
diff --git a/src/EuNet.Unity/Assets/Plugins/EuNet/Runtime/EuNet.Core/Channel/SequencedChannel.cs b/src/EuNet.Unity/Assets/Plugins/EuNet/Runtime/EuNet.Core/Channel/SequencedChannel.cs
diff --git a/src/EuNet.Unity/Assets/Plugins/EuNet/Runtime/EuNet.Core/PacketFilter/TeaPacketFilter.cs b/src/EuNet.Unity/Assets/Plugins/EuNet/Runtime/EuNet.Core/PacketFilter/TeaPacketFilter.cs
diff --git a/src/EuNet.Unity/Assets/Plugins/EuNet/Runtime/EuNet.Core/PacketFilter/XorPacketFilter.cs b/src/EuNet.Unity/Assets/Plugins/EuNet/Runtime/EuNet.Core/PacketFilter/XorPacketFilter.cs
diff --git a/src/EuNet.Unity/Assets/Plugins/EuNet/package.json b/src/EuNet.Unity/Assets/Plugins/EuNet/package.json
diff --git a/src/EuNet.UnityShims/EuNet.UnityShims.csproj b/src/EuNet.UnityShims/EuNet.UnityShims.csproj
diff --git a/src/EuNet/EuNet.csproj b/src/EuNet/EuNet.csproj

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public NetPacket Decode(NetPacket packet)`
`56`	`56`	`byte checksum = GetChecksum(data, headerSize, size - headerSize);`
`57`	`57`
`58`	`58`	`if (InitChecksumValue != checksum)`
`59`		`- throw new Exception("not match packet checksum");`
	`59`	`+ throw new Exception($"Not match packet checksum [{packet.Property}]");`
`60`	`60`
`61`	`61`	`return packet;`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,6 @@ protected override void Awake()`
`37`	`37`
`38`	`38`	`protected override void Start()`
`39`	`39`	`{`
`40`		`- base.Start();`
`41`		`-`
`42`	`40`	`_clientOption.IsServiceUdp = true;`
`43`	`41`	`_clientOption.UdpServerAddress = ServerAddress;`
`44`	`42`	`_clientOption.UdpServerPort = UdpServerPort;`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "com.zestylife.eunet",`
`3`	`3`	`"displayName": "EuNet",`
`4`		`- "version": "1.1.11",`
	`4`	`+ "version": "1.1.12",`
`5`	`5`	`"unity": "2018.4",`
`6`	`6`	`"description": "Easy Unity Network (EuNet) is a network solution for multiplayer games.",`
`7`	`7`	`"keywords": [ "P2P", "HolePunching", "RPC", "RELAY" ],`