update AnTCP

Xian55 · Jan 6, 2024 · d7d0d9b · d7d0d9b
1 parent 003f784
commit d7d0d9b
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 11 deletions.
diff --git a/AmeisenNavigation.Server/AmeisenNavigation.Server.vcxproj b/AmeisenNavigation.Server/AmeisenNavigation.Server.vcxproj
@@ -75,31 +75,31 @@
     <OutDir>build\$(Platform)\$(Configuration)\</OutDir>
     <IntDir>build\$(Platform)\int\$(Configuration)\</IntDir>
     <TargetName>AmeisenNavigationServer</TargetName>
-    <LibraryPath>$(SolutionDir)dep\AnTCP.Server\lib\$(Configuration)\x86\;$(SolutionDir)AmeisenNavigation\build\$(Platform)\$(Configuration)\;$(SolutionDir)recastnavigation\build\$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(SolutionDir)dep\AnTCP.Server\lib\$(Platform)\$(Configuration)\;$(SolutionDir)AmeisenNavigation\build\$(Platform)\$(Configuration)\;$(SolutionDir)recastnavigation\build\$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
     <IncludePath>$(SolutionDir)dep\AnTCP.Server\include\;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>build\$(Platform)\$(Configuration)\</OutDir>
     <IntDir>build\$(Platform)\int\$(Configuration)\</IntDir>
     <TargetName>AmeisenNavigationServer</TargetName>
-    <LibraryPath>$(SolutionDir)dep\AnTCP.Server\lib\$(Configuration)\x86\;$(SolutionDir)AmeisenNavigation\build\$(Platform)\$(Configuration)\;$(SolutionDir)recastnavigation\build\$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(SolutionDir)dep\AnTCP.Server\lib\$(Platform)\$(Configuration)\;$(SolutionDir)AmeisenNavigation\build\$(Platform)\$(Configuration)\;$(SolutionDir)recastnavigation\build\$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
     <IncludePath>$(SolutionDir)dep\AnTCP.Server\include\;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>build\$(Platform)\$(Configuration)\</OutDir>
     <IntDir>build\$(Platform)\int\$(Configuration)\</IntDir>
     <TargetName>AmeisenNavigationServer</TargetName>
-    <LibraryPath>$(SolutionDir)dep\AnTCP.Server\lib\$(Configuration)\x64\;$(SolutionDir)AmeisenNavigation\build\$(Platform)\$(Configuration)\;$(SolutionDir)recastnavigation\build\$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(SolutionDir)dep\AnTCP.Server\lib\$(Platform)\$(Configuration)\;$(SolutionDir)AmeisenNavigation\build\$(Platform)\$(Configuration)\;$(SolutionDir)recastnavigation\build\$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
     <IncludePath>$(SolutionDir)dep\AnTCP.Server\include\;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>build\$(Platform)\$(Configuration)\</OutDir>
     <IntDir>build\$(Platform)\int\$(Configuration)\</IntDir>
     <TargetName>AmeisenNavigationServer</TargetName>
-    <LibraryPath>$(SolutionDir)dep\AnTCP.Server\lib\$(Configuration)\x64\;$(SolutionDir)AmeisenNavigation\build\$(Platform)\$(Configuration)\;$(SolutionDir)recastnavigation\build\$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(SolutionDir)dep\AnTCP.Server\lib\$(Platform)\$(Configuration)\;$(SolutionDir)AmeisenNavigation\build\$(Platform)\$(Configuration)\;$(SolutionDir)recastnavigation\build\$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
     <IncludePath>$(SolutionDir)dep\AnTCP.Server\include\;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

diff --git a/AmeisenNavigation.Tester/AmeisenNavigation.Tester.csproj b/AmeisenNavigation.Tester/AmeisenNavigation.Tester.csproj
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AnTCP.Client" Version="1.0.0" />
+    <PackageReference Include="AnTCP.Client" Version="1.1.1" />
     <PackageReference Include="System.Drawing.Common" Version="8.0.0" />
   </ItemGroup>
 

diff --git a/dep/AnTCP.Client.1.0.0.nupkg b/dep/AnTCP.Client.1.0.0.nupkg
diff --git a/dep/AnTCP.Server/include/AnTcpServer.hpp b/dep/AnTCP.Server/include/AnTcpServer.hpp
@@ -151,10 +151,10 @@ class ClientHandler
     /// <returns>True if data was sent, false if not.</returns>
     inline bool SendData(AnTcpMessageType type, const void* data, size_t size) const noexcept
     {
-        const size_t packetSize = size + sizeof(AnTcpMessageType);
-        return send(Socket, reinterpret_cast<const char*>(&packetSize), static_cast<int>(sizeof(decltype(packetSize))), 0) != SOCKET_ERROR
-            && send(Socket, &type, static_cast<int>(sizeof(AnTcpMessageType)), 0) != SOCKET_ERROR
-            && send(Socket, static_cast<const char*>(data), static_cast<int>(size), 0) != SOCKET_ERROR;
+        const int packetSize = size + static_cast<int>(sizeof(AnTcpMessageType));
+        return send(Socket, reinterpret_cast<const char*>(&packetSize), sizeof(decltype(packetSize)), 0) != SOCKET_ERROR
+            && send(Socket, &type, sizeof(AnTcpMessageType), 0) != SOCKET_ERROR
+            && send(Socket, static_cast<const char*>(data), size, 0) != SOCKET_ERROR;
     }
 
     /// <summary>
@@ -342,8 +342,7 @@ class AnTcpServer
     inline void Stop() noexcept
     {
         ShouldExit = true;
-        closesocket(ListenSocket);
-        ListenSocket = INVALID_SOCKET;
+        SocketCleanup();
         Clients.clear();
         WSACleanup();
     }

diff --git a/dep/AnTCP.Server/lib/Debug/x64/AnTCP.Server.lib b/dep/AnTCP.Server/lib/Debug/x64/AnTCP.Server.lib
diff --git a/dep/AnTCP.Server/lib/Debug/x86/AnTCP.Server.lib b/dep/AnTCP.Server/lib/Debug/x86/AnTCP.Server.lib
diff --git a/dep/AnTCP.Server/lib/Release/x64/AnTCP.Server.lib b/dep/AnTCP.Server/lib/Release/x64/AnTCP.Server.lib
diff --git a/dep/AnTCP.Server/lib/Release/x86/AnTCP.Server.lib b/dep/AnTCP.Server/lib/Release/x86/AnTCP.Server.lib