upgrade windivert

j4ckzh0u · Dec 26, 2022 · f59f7d2 · f59f7d2
1 parent a9fc4a5
commit f59f7d2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,7 @@
 # Upcoming
+### Client
+* Update: Upgrade WinDiver to 2.2.2
+
 ### Server
 * Update: Windows updater write its log
 

diff --git a/VpnHood.Client.Device.WinDivert/Resources/WinDivertLib.zip b/VpnHood.Client.Device.WinDivert/Resources/WinDivertLib.zip
diff --git a/VpnHood.Client.Device.WinDivert/WinDivertPacketCapture.cs b/VpnHood.Client.Device.WinDivert/WinDivertPacketCapture.cs
@@ -149,7 +149,7 @@ public void Dispose()
     private static void SetWinDivertDllFolder()
     {
         // I got sick trying to add it to nuget as a native library in (x86/x64) folder, OOF!
-        var tempLibFolder = Path.Combine(Path.GetTempPath(), "VpnHood-WinDivertDevice");
+        var tempLibFolder = Path.Combine(Path.GetTempPath(), "VpnHood-WinDivertDevice", "2.2.2");
         var dllFolderPath = Environment.Is64BitOperatingSystem
             ? Path.Combine(tempLibFolder, "x64")
             : Path.Combine(tempLibFolder, "x86");

diff --git a/VpnHood.Server/Session.cs b/VpnHood.Server/Session.cs
@@ -232,7 +232,7 @@ public void LogTrack(string protocol, int localPort, IPEndPoint destinationEndPo
         var destinationPortStr = _trackingOptions.TrackDestinationPort ? destinationEndPoint.Port.ToString() : "*";
 
         VhLogger.Instance.LogInformation(GeneralEventId.Track,
-            "Proto: {Proto}, SessionId: {SessionId}, Tcp: {TcpCount}, Udp: {UdpCount}, TcpWait: {TcpConnectWaitCount}, SrcPort: {SrcPort}, DstIp:{DstIp}, DstPort: {DstPort}",
+            "Proto: {Proto}, SessionId: {SessionId}, TcpCount: {TcpCount}, UdpCount: {UdpCount}, TcpWait: {TcpConnectWaitCount}, SrcPort: {SrcPort}, DstIp:{DstIp}, DstPort: {DstPort}",
             protocol, SessionId, TcpChannelCount, _proxyManager.UsedUdpPortCount, TcpConnectWaitCount,
             localPortStr, destinationIpStr, destinationPortStr);
     }