Change filter string for QUIC protocol dropping, and change filter ordering

Have highest priority to HTTP/S handle. This is a reversion.

Author: TechnikEmpire

CitadelCore.Windows/CitadelCore.Windows/CitadelCore.Windows.csproj

@@ -2,19 +2,19 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>1.3.3</Version>
+    <Version>1.3.4</Version>
     <Authors>Jesse Nicholson</Authors>
     <Company>Technik Empire</Company>
     <Description>Transparent filtering proxy engine for Windows.</Description>
     <Copyright>Copyright 2017 Jesse Nicholson</Copyright>
     <PackageLicenseUrl>https://www.gnu.org/licenses/lgpl-3.0.en.html</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/TechnikEmpire/CitadelCore.Windows</PackageProjectUrl>
     <RepositoryUrl>https://github.com/TechnikEmpire/CitadelCore.Windows</RepositoryUrl>
-    <PackageReleaseNotes>Fixes a bug where IPV6 address conversion from unmanaged memory to managed IPAddress objects was not done correctly, causing browser IPV6 traffic to escape filtering.</PackageReleaseNotes>
+    <PackageReleaseNotes>Changes QUIC filter string priority.</PackageReleaseNotes>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <AssemblyVersion>1.3.3.0</AssemblyVersion>
-    <FileVersion>1.3.3.0</FileVersion>
+    <AssemblyVersion>1.3.4.0</AssemblyVersion>
+    <FileVersion>1.3.4.0</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

CitadelCore.Windows/CitadelCore.Windows/Diversion/WindowsDiverter.cs

@@ -181,17 +181,17 @@ public void Start(int numThreads)
 #else
                 string mainFilterString = "outbound and tcp";
 #endif
-                string QUICFilterString = "outbound and udp.DstPort == 80 || udp.DstPort == 443";
+                string QUICFilterString = "udp and (udp.DstPort == 80 || udp.DstPort == 443)";
 
-                m_diversionHandle = WinDivertMethods.WinDivertOpen(mainFilterString, WINDIVERT_LAYER.WINDIVERT_LAYER_NETWORK, -999, 0);
+                m_diversionHandle = WinDivertMethods.WinDivertOpen(mainFilterString, WINDIVERT_LAYER.WINDIVERT_LAYER_NETWORK, -1000, 0);
 
                 if(m_diversionHandle == new IntPtr(-1) || m_diversionHandle == IntPtr.Zero)
                 {
                     // Invalid handle value.
                     throw new Exception(string.Format("Failed to open main diversion handle. Got Win32 error code {0}.", Marshal.GetLastWin32Error()));
                 }
 
-                m_QUICDropHandle = WinDivertMethods.WinDivertOpen(QUICFilterString, WINDIVERT_LAYER.WINDIVERT_LAYER_NETWORK, -1000, WinDivertConstants.WINDIVERT_FLAG_DROP);
+                m_QUICDropHandle = WinDivertMethods.WinDivertOpen(QUICFilterString, WINDIVERT_LAYER.WINDIVERT_LAYER_NETWORK, -999, WinDivertConstants.WINDIVERT_FLAG_DROP);
 
                 if(m_QUICDropHandle == new IntPtr(-1) || m_QUICDropHandle == IntPtr.Zero)
                 {

CitadelCore.Windows/CitadelCoreTest/CitadelCoreTest_x64.csproj

@@ -61,7 +61,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="CitadelCore.Windows">
-      <Version>1.3.3</Version>
+      <Version>1.3.4</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />