diff --git a/test/unittests/unittests.vcxproj b/test/unittests/unittests.vcxproj
index 1d1e7933..fc8c7aad 100644
--- a/test/unittests/unittests.vcxproj
+++ b/test/unittests/unittests.vcxproj
@@ -1,143 +1,143 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{18446924-20CC-4EB7-B639-A76C1422E5C2}</ProjectGuid>
-    <RootNamespace>unittests</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>$(OVPN3_BUILD)\amd64\mbedtls\include;$(OVPN3_BUILD)\amd64\lz4\lib;$(GTEST_ROOT)\googletest\include;$(OVPN3_CORE);$(OVPN3_BUILD)\amd64\asio\asio\include;$(OVPN3_TAP_WINDOWS)\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NOMINMAX;_WIN32_WINNT=0x0600;USE_ASIO;ASIO_STANDALONE;USE_MBEDTLS;HAVE_LZ4;OPENVPN_FORCE_TUN_NULL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>lz4.lib;mbedtls.lib;Iphlpapi.lib;gtestd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OVPN3_BUILD)\amd64\mbedtls\library;$(GTEST_ROOT)\msvc\gtest\Debug\;%(AdditionalLibraryDirectories);$(OVPN3_BUILD)\amd64\lz4\lib</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>$(OVPN3_ROOT)\deps\amd64\mbedtls\include;$(OVPN3_ROOT)\deps\amd64\lz4\lib;$(GTEST_ROOT)\googletest\include;$(OVPN3_ROOT)\core;$(OVPN3_ROOT)\deps\amd64\asio\asio\include;$(OVPN3_ROOT)\deps\amd64\tap-windows\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NOMINMAX;_WIN32_WINNT=0x0600;USE_ASIO;ASIO_STANDALONE;USE_MBEDTLS;HAVE_LZ4;OPENVPN_FORCE_TUN_NULL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>lz4.lib;mbedtls.lib;Iphlpapi.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OVPN3_ROOT)\deps\amd64\mbedtls\library;$(GTEST_ROOT)\googlemock\gtest\Debug\;%(AdditionalLibraryDirectories);$(OVPN3_ROOT)\deps\amd64\lz4\lib</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>$(OVPN3_BUILD)\amd64\mbedtls\include;$(OVPN3_BUILD)\amd64\lz4\lib;$(GTEST_ROOT)\googletest\include;$(OVPN3_CORE);$(OVPN3_BUILD)\amd64\asio\asio\include;$(OVPN3_TAP_WINDOWS)\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NOMINMAX;_WIN32_WINNT=0x0600;USE_ASIO;ASIO_STANDALONE;USE_MBEDTLS;HAVE_LZ4;OPENVPN_FORCE_TUN_NULL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>lz4.lib;mbedtls.lib;Iphlpapi.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OVPN3_BUILD)\amd64\mbedtls\library;$(GTEST_ROOT)\msvc\gtest\Release\;%(AdditionalLibraryDirectories);$(OVPN3_BUILD)\amd64\lz4\lib</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>$(OVPN3_ROOT)\deps\amd64\mbedtls\include;$(OVPN3_ROOT)\deps\amd64\lz4\lib;$(GTEST_ROOT)\googletest\include;$(OVPN3_ROOT)\core;$(OVPN3_ROOT)\deps\amd64\asio\asio\include;$(OVPN3_ROOT)\deps\amd64\tap-windows\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NOMINMAX;_WIN32_WINNT=0x0600;USE_ASIO;ASIO_STANDALONE;USE_MBEDTLS;HAVE_LZ4;OPENVPN_FORCE_TUN_NULL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>lz4.lib;mbedtls.lib;Iphlpapi.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OVPN3_ROOT)\deps\amd64\mbedtls\library;$(GTEST_ROOT)\googlemock\gtest\Release\;%(AdditionalLibraryDirectories);$(OVPN3_ROOT)\deps\amd64\lz4\lib</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="test_log.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{18446924-20CC-4EB7-B639-A76C1422E5C2}</ProjectGuid>
+    <RootNamespace>unittests</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>TurnOffAllWarnings</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>false</SDLCheck>
+      <AdditionalIncludeDirectories>$(OVPN3_BUILD)\amd64\mbedtls\include;$(OVPN3_BUILD)\amd64\lz4\lib;$(GTEST_ROOT)\googletest\include;$(OVPN3_CORE);$(OVPN3_BUILD)\amd64\asio\asio\include;$(OVPN3_TAP_WINDOWS)\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NOMINMAX;_WIN32_WINNT=0x0600;USE_ASIO;ASIO_STANDALONE;USE_MBEDTLS;HAVE_LZ4;OPENVPN_FORCE_TUN_NULL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>lz4.lib;mbedtls.lib;Iphlpapi.lib;gtestd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OVPN3_BUILD)\amd64\mbedtls\library;$(GTEST_ROOT)\msvc\gtest\Debug\;%(AdditionalLibraryDirectories);$(OVPN3_BUILD)\amd64\lz4\lib</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>TurnOffAllWarnings</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>false</SDLCheck>
+      <AdditionalIncludeDirectories>$(OVPN3_ROOT)\deps\amd64\mbedtls\include;$(OVPN3_ROOT)\deps\amd64\lz4\lib;$(GTEST_ROOT)\googletest\include;$(OVPN3_ROOT)\core;$(OVPN3_ROOT)\deps\amd64\asio\asio\include;$(OVPN3_ROOT)\deps\amd64\tap-windows\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NOMINMAX;_WIN32_WINNT=0x0600;USE_ASIO;ASIO_STANDALONE;USE_MBEDTLS;HAVE_LZ4;OPENVPN_FORCE_TUN_NULL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>lz4.lib;mbedtls.lib;Iphlpapi.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OVPN3_ROOT)\deps\amd64\mbedtls\library;$(GTEST_ROOT)\googlemock\gtest\Debug\;%(AdditionalLibraryDirectories);$(OVPN3_ROOT)\deps\amd64\lz4\lib</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>TurnOffAllWarnings</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>false</SDLCheck>
+      <AdditionalIncludeDirectories>$(OVPN3_BUILD)\amd64\mbedtls\include;$(OVPN3_BUILD)\amd64\lz4\lib;$(GTEST_ROOT)\googletest\include;$(OVPN3_CORE);$(OVPN3_BUILD)\amd64\asio\asio\include;$(OVPN3_TAP_WINDOWS)\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NOMINMAX;_WIN32_WINNT=0x0600;USE_ASIO;ASIO_STANDALONE;USE_MBEDTLS;HAVE_LZ4;OPENVPN_FORCE_TUN_NULL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>lz4.lib;mbedtls.lib;Iphlpapi.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OVPN3_BUILD)\amd64\mbedtls\library;$(GTEST_ROOT)\msvc\gtest\Release\;%(AdditionalLibraryDirectories);$(OVPN3_BUILD)\amd64\lz4\lib</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>TurnOffAllWarnings</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>false</SDLCheck>
+      <AdditionalIncludeDirectories>$(OVPN3_ROOT)\deps\amd64\mbedtls\include;$(OVPN3_ROOT)\deps\amd64\lz4\lib;$(GTEST_ROOT)\googletest\include;$(OVPN3_ROOT)\core;$(OVPN3_ROOT)\deps\amd64\asio\asio\include;$(OVPN3_ROOT)\deps\amd64\tap-windows\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NOMINMAX;_WIN32_WINNT=0x0600;USE_ASIO;ASIO_STANDALONE;USE_MBEDTLS;HAVE_LZ4;OPENVPN_FORCE_TUN_NULL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>lz4.lib;mbedtls.lib;Iphlpapi.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OVPN3_ROOT)\deps\amd64\mbedtls\library;$(GTEST_ROOT)\googlemock\gtest\Release\;%(AdditionalLibraryDirectories);$(OVPN3_ROOT)\deps\amd64\lz4\lib</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="test_log.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/win/ovpn3-core.sln b/win/ovpn3-core.sln
index e6fe3cd0..5af53dca 100644
--- a/win/ovpn3-core.sln
+++ b/win/ovpn3-core.sln
@@ -1,44 +1,45 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cli", "ovpn3-core.vcxproj", "{1F891260-2039-494F-9777-EC5166AF31BC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unittests", "..\test\unittests\unittests.vcxproj", "{18446924-20CC-4EB7-B639-A76C1422E5C2}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|ARM = Debug|ARM
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|ARM = Release|ARM
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1F891260-2039-494F-9777-EC5166AF31BC}.Debug|ARM.ActiveCfg = Debug|Win32
-		{1F891260-2039-494F-9777-EC5166AF31BC}.Debug|x64.ActiveCfg = Debug|x64
-		{1F891260-2039-494F-9777-EC5166AF31BC}.Debug|x64.Build.0 = Debug|x64
-		{1F891260-2039-494F-9777-EC5166AF31BC}.Debug|x86.ActiveCfg = Debug|Win32
-		{1F891260-2039-494F-9777-EC5166AF31BC}.Debug|x86.Build.0 = Debug|Win32
-		{1F891260-2039-494F-9777-EC5166AF31BC}.Release|ARM.ActiveCfg = Release|Win32
-		{1F891260-2039-494F-9777-EC5166AF31BC}.Release|x64.ActiveCfg = Release|x64
-		{1F891260-2039-494F-9777-EC5166AF31BC}.Release|x64.Build.0 = Release|x64
-		{1F891260-2039-494F-9777-EC5166AF31BC}.Release|x86.ActiveCfg = Release|Win32
-		{1F891260-2039-494F-9777-EC5166AF31BC}.Release|x86.Build.0 = Release|Win32
-		{18446924-20CC-4EB7-B639-A76C1422E5C2}.Debug|ARM.ActiveCfg = Debug|Win32
-		{18446924-20CC-4EB7-B639-A76C1422E5C2}.Debug|x64.ActiveCfg = Debug|x64
-		{18446924-20CC-4EB7-B639-A76C1422E5C2}.Debug|x64.Build.0 = Debug|x64
-		{18446924-20CC-4EB7-B639-A76C1422E5C2}.Debug|x86.ActiveCfg = Debug|Win32
-		{18446924-20CC-4EB7-B639-A76C1422E5C2}.Debug|x86.Build.0 = Debug|Win32
-		{18446924-20CC-4EB7-B639-A76C1422E5C2}.Release|ARM.ActiveCfg = Release|Win32
-		{18446924-20CC-4EB7-B639-A76C1422E5C2}.Release|x64.ActiveCfg = Release|x64
-		{18446924-20CC-4EB7-B639-A76C1422E5C2}.Release|x64.Build.0 = Release|x64
-		{18446924-20CC-4EB7-B639-A76C1422E5C2}.Release|x86.ActiveCfg = Release|Win32
-		{18446924-20CC-4EB7-B639-A76C1422E5C2}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.106
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cli", "ovpn3-core.vcxproj", "{1F891260-2039-494F-9777-EC5166AF31BC}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unittests", "..\test\unittests\unittests.vcxproj", "{18446924-20CC-4EB7-B639-A76C1422E5C2}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|ARM = Debug|ARM
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|ARM = Release|ARM
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{1F891260-2039-494F-9777-EC5166AF31BC}.Debug|ARM.ActiveCfg = Debug|x64
+		{1F891260-2039-494F-9777-EC5166AF31BC}.Debug|x64.ActiveCfg = Debug|x64
+		{1F891260-2039-494F-9777-EC5166AF31BC}.Debug|x64.Build.0 = Debug|x64
+		{1F891260-2039-494F-9777-EC5166AF31BC}.Debug|x86.ActiveCfg = Debug|x64
+		{1F891260-2039-494F-9777-EC5166AF31BC}.Release|ARM.ActiveCfg = Release|x64
+		{1F891260-2039-494F-9777-EC5166AF31BC}.Release|x64.ActiveCfg = Release|x64
+		{1F891260-2039-494F-9777-EC5166AF31BC}.Release|x64.Build.0 = Release|x64
+		{1F891260-2039-494F-9777-EC5166AF31BC}.Release|x86.ActiveCfg = Release|x64
+		{18446924-20CC-4EB7-B639-A76C1422E5C2}.Debug|ARM.ActiveCfg = Debug|Win32
+		{18446924-20CC-4EB7-B639-A76C1422E5C2}.Debug|x64.ActiveCfg = Debug|x64
+		{18446924-20CC-4EB7-B639-A76C1422E5C2}.Debug|x64.Build.0 = Debug|x64
+		{18446924-20CC-4EB7-B639-A76C1422E5C2}.Debug|x86.ActiveCfg = Debug|Win32
+		{18446924-20CC-4EB7-B639-A76C1422E5C2}.Debug|x86.Build.0 = Debug|Win32
+		{18446924-20CC-4EB7-B639-A76C1422E5C2}.Release|ARM.ActiveCfg = Release|Win32
+		{18446924-20CC-4EB7-B639-A76C1422E5C2}.Release|x64.ActiveCfg = Release|x64
+		{18446924-20CC-4EB7-B639-A76C1422E5C2}.Release|x64.Build.0 = Release|x64
+		{18446924-20CC-4EB7-B639-A76C1422E5C2}.Release|x86.ActiveCfg = Release|Win32
+		{18446924-20CC-4EB7-B639-A76C1422E5C2}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {2C22702B-DF56-4CEB-9CA4-C999BD01FD03}
+	EndGlobalSection
+EndGlobal
diff --git a/win/ovpn3-core.vcxproj b/win/ovpn3-core.vcxproj
index bd9421d4..76083756 100644
--- a/win/ovpn3-core.vcxproj
+++ b/win/ovpn3-core.vcxproj
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
@@ -18,9 +10,6 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\test\ovpncli\cli.cpp" />
-  </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\client\ovpncli.hpp" />
     <ClInclude Include="..\openvpn\addr\addrlist.hpp" />
@@ -31,6 +20,8 @@
     <ClInclude Include="..\openvpn\addr\ipv6.hpp" />
     <ClInclude Include="..\openvpn\addr\macaddr.hpp" />
     <ClInclude Include="..\openvpn\addr\pool.hpp" />
+    <ClInclude Include="..\openvpn\addr\quoteip.hpp" />
+    <ClInclude Include="..\openvpn\addr\randaddr.hpp" />
     <ClInclude Include="..\openvpn\addr\range.hpp" />
     <ClInclude Include="..\openvpn\addr\regex.hpp" />
     <ClInclude Include="..\openvpn\addr\route.hpp" />
@@ -62,6 +53,7 @@
     <ClInclude Include="..\openvpn\asio\asiocontext.hpp" />
     <ClInclude Include="..\openvpn\asio\asioerr.hpp" />
     <ClInclude Include="..\openvpn\asio\asiopolysock.hpp" />
+    <ClInclude Include="..\openvpn\asio\asioresolverres.hpp" />
     <ClInclude Include="..\openvpn\asio\asiosignal.hpp" />
     <ClInclude Include="..\openvpn\asio\asiostop.hpp" />
     <ClInclude Include="..\openvpn\asio\asiowork.hpp" />
@@ -81,6 +73,7 @@
     <ClInclude Include="..\openvpn\buffer\bufread.hpp" />
     <ClInclude Include="..\openvpn\buffer\bufstr.hpp" />
     <ClInclude Include="..\openvpn\buffer\bufstream.hpp" />
+    <ClInclude Include="..\openvpn\buffer\lz4.hpp" />
     <ClInclude Include="..\openvpn\buffer\memq.hpp" />
     <ClInclude Include="..\openvpn\buffer\safestr.hpp" />
     <ClInclude Include="..\openvpn\buffer\zlib.hpp" />
@@ -101,12 +94,14 @@
     <ClInclude Include="..\openvpn\common\abort.hpp" />
     <ClInclude Include="..\openvpn\common\action.hpp" />
     <ClInclude Include="..\openvpn\common\actionthread.hpp" />
+    <ClInclude Include="..\openvpn\common\appversion.hpp" />
     <ClInclude Include="..\openvpn\common\arch.hpp" />
     <ClInclude Include="..\openvpn\common\argv.hpp" />
     <ClInclude Include="..\openvpn\common\arraysize.hpp" />
     <ClInclude Include="..\openvpn\common\asyncsleep.hpp" />
     <ClInclude Include="..\openvpn\common\autoreset.hpp" />
     <ClInclude Include="..\openvpn\common\base64.hpp" />
+    <ClInclude Include="..\openvpn\common\bigmutex.hpp" />
     <ClInclude Include="..\openvpn\common\binprefix.hpp" />
     <ClInclude Include="..\openvpn\common\circ_list.hpp" />
     <ClInclude Include="..\openvpn\common\cleanup.hpp" />
@@ -134,17 +129,19 @@
     <ClInclude Include="..\openvpn\common\hostlist.hpp" />
     <ClInclude Include="..\openvpn\common\hostname.hpp" />
     <ClInclude Include="..\openvpn\common\hostport.hpp" />
-    <ClInclude Include="..\openvpn\common\inotify.hpp" />
+    <ClInclude Include="..\openvpn\common\jsonlib.hpp" />
     <ClInclude Include="..\openvpn\common\lex.hpp" />
     <ClInclude Include="..\openvpn\common\likely.hpp" />
     <ClInclude Include="..\openvpn\common\link.hpp" />
     <ClInclude Include="..\openvpn\common\logrotate.hpp" />
     <ClInclude Include="..\openvpn\common\memneq.hpp" />
     <ClInclude Include="..\openvpn\common\mode.hpp" />
+    <ClInclude Include="..\openvpn\common\modstat.hpp" />
     <ClInclude Include="..\openvpn\common\msgwin.hpp" />
     <ClInclude Include="..\openvpn\common\number.hpp" />
     <ClInclude Include="..\openvpn\common\olong.hpp" />
     <ClInclude Include="..\openvpn\common\options.hpp" />
+    <ClInclude Include="..\openvpn\common\option_error.hpp" />
     <ClInclude Include="..\openvpn\common\ostream.hpp" />
     <ClInclude Include="..\openvpn\common\path.hpp" />
     <ClInclude Include="..\openvpn\common\peercred.hpp" />
@@ -182,6 +179,7 @@
     <ClInclude Include="..\openvpn\common\usecount.hpp" />
     <ClInclude Include="..\openvpn\common\usergroup.hpp" />
     <ClInclude Include="..\openvpn\common\userpass.hpp" />
+    <ClInclude Include="..\openvpn\common\valgrind.hpp" />
     <ClInclude Include="..\openvpn\common\version.hpp" />
     <ClInclude Include="..\openvpn\common\waitbarrier.hpp" />
     <ClInclude Include="..\openvpn\common\write.hpp" />
@@ -210,6 +208,9 @@
     <ClInclude Include="..\openvpn\crypto\packet_id.hpp" />
     <ClInclude Include="..\openvpn\crypto\selftest.hpp" />
     <ClInclude Include="..\openvpn\crypto\static_key.hpp" />
+    <ClInclude Include="..\openvpn\crypto\tls_crypt.hpp" />
+    <ClInclude Include="..\openvpn\dco\dcocli.hpp" />
+    <ClInclude Include="..\openvpn\dco\ipcollbase.hpp" />
     <ClInclude Include="..\openvpn\error\error.hpp" />
     <ClInclude Include="..\openvpn\error\excode.hpp" />
     <ClInclude Include="..\openvpn\frame\frame.hpp" />
@@ -226,6 +227,7 @@
     <ClInclude Include="..\openvpn\http\urlencode.hpp" />
     <ClInclude Include="..\openvpn\http\urlparm.hpp" />
     <ClInclude Include="..\openvpn\http\urlparse.hpp" />
+    <ClInclude Include="..\openvpn\http\validate_uri.hpp" />
     <ClInclude Include="..\openvpn\http\webexcept.hpp" />
     <ClInclude Include="..\openvpn\init\cryptoinit.hpp" />
     <ClInclude Include="..\openvpn\init\engineinit.hpp" />
@@ -233,14 +235,26 @@
     <ClInclude Include="..\openvpn\io\io.hpp" />
     <ClInclude Include="..\openvpn\ip\dhcp.hpp" />
     <ClInclude Include="..\openvpn\ip\eth.hpp" />
-    <ClInclude Include="..\openvpn\ip\icmp.hpp" />
-    <ClInclude Include="..\openvpn\ip\ip.hpp" />
+    <ClInclude Include="..\openvpn\ip\icmp4.hpp" />
+    <ClInclude Include="..\openvpn\ip\icmp6.hpp" />
+    <ClInclude Include="..\openvpn\ip\ip4.hpp" />
+    <ClInclude Include="..\openvpn\ip\ip6.hpp" />
+    <ClInclude Include="..\openvpn\ip\ipcommon.hpp" />
     <ClInclude Include="..\openvpn\ip\udp.hpp" />
+    <ClInclude Include="..\openvpn\kovpn\kocrypto.hpp" />
+    <ClInclude Include="..\openvpn\kovpn\kodev.hpp" />
+    <ClInclude Include="..\openvpn\kovpn\korekey.hpp" />
+    <ClInclude Include="..\openvpn\kovpn\koroute.hpp" />
+    <ClInclude Include="..\openvpn\kovpn\kostats.hpp" />
+    <ClInclude Include="..\openvpn\kovpn\kovpn.hpp" />
     <ClInclude Include="..\openvpn\legal\copyright.hpp" />
     <ClInclude Include="..\openvpn\linux\core.hpp" />
     <ClInclude Include="..\openvpn\linux\daemon_alive.hpp" />
+    <ClInclude Include="..\openvpn\linux\procfs.hpp" />
     <ClInclude Include="..\openvpn\log\logbase.hpp" />
     <ClInclude Include="..\openvpn\log\logbasesimple.hpp" />
+    <ClInclude Include="..\openvpn\log\logbasesimplemac.hpp" />
+    <ClInclude Include="..\openvpn\log\logdatetime.hpp" />
     <ClInclude Include="..\openvpn\log\lognull.hpp" />
     <ClInclude Include="..\openvpn\log\logperiod.hpp" />
     <ClInclude Include="..\openvpn\log\logsimple.hpp" />
@@ -298,6 +312,7 @@
     <ClInclude Include="..\openvpn\proxy\proxyauth.hpp" />
     <ClInclude Include="..\openvpn\random\devurand.hpp" />
     <ClInclude Include="..\openvpn\random\mtrandapi.hpp" />
+    <ClInclude Include="..\openvpn\random\rand2.hpp" />
     <ClInclude Include="..\openvpn\random\randapi.hpp" />
     <ClInclude Include="..\openvpn\random\randbytestore.hpp" />
     <ClInclude Include="..\openvpn\reliable\relack.hpp" />
@@ -325,6 +340,7 @@
     <ClInclude Include="..\openvpn\ssl\sslapi.hpp" />
     <ClInclude Include="..\openvpn\ssl\sslchoose.hpp" />
     <ClInclude Include="..\openvpn\ssl\sslconsts.hpp" />
+    <ClInclude Include="..\openvpn\ssl\ssllog.hpp" />
     <ClInclude Include="..\openvpn\ssl\tlsprf.hpp" />
     <ClInclude Include="..\openvpn\ssl\tlsver.hpp" />
     <ClInclude Include="..\openvpn\ssl\tls_cert_profile.hpp" />
@@ -332,9 +348,12 @@
     <ClInclude Include="..\openvpn\time\asiotimer.hpp" />
     <ClInclude Include="..\openvpn\time\coarsetime.hpp" />
     <ClInclude Include="..\openvpn\time\durhelper.hpp" />
+    <ClInclude Include="..\openvpn\time\epoch.hpp" />
     <ClInclude Include="..\openvpn\time\time.hpp" />
     <ClInclude Include="..\openvpn\time\timestr.hpp" />
     <ClInclude Include="..\openvpn\transport\altproxy.hpp" />
+    <ClInclude Include="..\openvpn\transport\client\extern\config.hpp" />
+    <ClInclude Include="..\openvpn\transport\client\extern\fw.hpp" />
     <ClInclude Include="..\openvpn\transport\client\httpcli.hpp" />
     <ClInclude Include="..\openvpn\transport\client\relay.hpp" />
     <ClInclude Include="..\openvpn\transport\client\tcpcli.hpp" />
@@ -349,6 +368,8 @@
     <ClInclude Include="..\openvpn\transport\server\transbase.hpp" />
     <ClInclude Include="..\openvpn\transport\socket_protect.hpp" />
     <ClInclude Include="..\openvpn\transport\tcplink.hpp" />
+    <ClInclude Include="..\openvpn\transport\tcplinkbase.hpp" />
+    <ClInclude Include="..\openvpn\transport\tcplinkcommon.hpp" />
     <ClInclude Include="..\openvpn\transport\udplink.hpp" />
     <ClInclude Include="..\openvpn\tun\builder\base.hpp" />
     <ClInclude Include="..\openvpn\tun\builder\capture.hpp" />
@@ -365,13 +386,15 @@
     <ClInclude Include="..\openvpn\tun\ipv6_setting.hpp" />
     <ClInclude Include="..\openvpn\tun\layer.hpp" />
     <ClInclude Include="..\openvpn\tun\linux\client\tuncli.hpp" />
-    <ClInclude Include="..\openvpn\tun\linux\tun.hpp" />
+    <ClInclude Include="..\openvpn\tun\linux\client\tunsetup.hpp" />
     <ClInclude Include="..\openvpn\tun\mac\client\tuncli.hpp" />
     <ClInclude Include="..\openvpn\tun\mac\client\tunsetup.hpp" />
+    <ClInclude Include="..\openvpn\tun\mac\dsdict.hpp" />
     <ClInclude Include="..\openvpn\tun\mac\gwv4.hpp" />
     <ClInclude Include="..\openvpn\tun\mac\macdns.hpp" />
     <ClInclude Include="..\openvpn\tun\mac\macdns_watchdog.hpp" />
     <ClInclude Include="..\openvpn\tun\mac\macgw.hpp" />
+    <ClInclude Include="..\openvpn\tun\mac\macproxy.hpp" />
     <ClInclude Include="..\openvpn\tun\mac\tunutil.hpp" />
     <ClInclude Include="..\openvpn\tun\mac\utun.hpp" />
     <ClInclude Include="..\openvpn\tun\persist\tunpersist.hpp" />
@@ -402,30 +425,20 @@
     <ClInclude Include="..\openvpn\win\unicode.hpp" />
     <ClInclude Include="..\openvpn\win\winerr.hpp" />
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\test\ovpncli\cli.cpp" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{1F891260-2039-494F-9777-EC5166AF31BC}</ProjectGuid>
     <RootNamespace>ovpn3core</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
     <ProjectName>cli</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
@@ -442,21 +455,6 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>$(OVPN3_BUILD)\amd64\mbedtls\include;$(OVPN3_TAP_WINDOWS)\src;$(OVPN3_BUILD)\amd64\asio\asio\include;$(OVPN3_BUILD)\amd64\lz4\lib;$(OVPN3_CORE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NOMINMAX;_WIN32_WINNT=0x0600;USE_ASIO;ASIO_STANDALONE;USE_MBEDTLS;HAVE_LZ4;TAP_WIN_COMPONENT_ID=tap0901;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(OVPN3_BUILD)\amd64\mbedtls\library;$(OVPN3_BUILD)\amd64\lz4\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>lz4.lib;mbedtls.lib;fwpuclnt.lib;ws2_32.lib;crypt32.lib;iphlpapi.lib;winmm.lib;advapi32.lib;wininet.lib;shell32.lib;ole32.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <WarningLevel>TurnOffAllWarnings</WarningLevel>
@@ -476,24 +474,6 @@
       <ShowProgress>NotSet</ShowProgress>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>false</SDLCheck>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NOMINMAX;_WIN32_WINNT=0x0600;USE_ASIO;ASIO_STANDALONE;USE_MBEDTLS;HAVE_LZ4;TAP_WIN_COMPONENT_ID=tap0901;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(OVPN3_BUILD)\amd64\mbedtls\include;$(OVPN3_TAP_WINDOWS)\src;$(OVPN3_BUILD)\amd64\asio\asio\include;$(OVPN3_BUILD)\amd64\lz4\lib;$(OVPN3_CORE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(OVPN3_BUILD)\amd64\mbedtls\library;$(OVPN3_BUILD)\amd64\lz4\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>lz4.lib;mbedtls.lib;fwpuclnt.lib;ws2_32.lib;crypt32.lib;iphlpapi.lib;winmm.lib;advapi32.lib;wininet.lib;shell32.lib;ole32.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <WarningLevel>TurnOffAllWarnings</WarningLevel>
diff --git a/win/ovpn3-core.vcxproj.filters b/win/ovpn3-core.vcxproj.filters
index dbc6aef2..2ac8cfab 100644
--- a/win/ovpn3-core.vcxproj.filters
+++ b/win/ovpn3-core.vcxproj.filters
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\test\ovpncli\cli.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\client\ovpncli.hpp" />
     <ClInclude Include="..\openvpn\addr\addrlist.hpp" />
     <ClInclude Include="..\openvpn\addr\addrpair.hpp" />
     <ClInclude Include="..\openvpn\addr\ip.hpp" />
@@ -13,6 +9,8 @@
     <ClInclude Include="..\openvpn\addr\ipv6.hpp" />
     <ClInclude Include="..\openvpn\addr\macaddr.hpp" />
     <ClInclude Include="..\openvpn\addr\pool.hpp" />
+    <ClInclude Include="..\openvpn\addr\quoteip.hpp" />
+    <ClInclude Include="..\openvpn\addr\randaddr.hpp" />
     <ClInclude Include="..\openvpn\addr\range.hpp" />
     <ClInclude Include="..\openvpn\addr\regex.hpp" />
     <ClInclude Include="..\openvpn\addr\route.hpp" />
@@ -44,6 +42,7 @@
     <ClInclude Include="..\openvpn\asio\asiocontext.hpp" />
     <ClInclude Include="..\openvpn\asio\asioerr.hpp" />
     <ClInclude Include="..\openvpn\asio\asiopolysock.hpp" />
+    <ClInclude Include="..\openvpn\asio\asioresolverres.hpp" />
     <ClInclude Include="..\openvpn\asio\asiosignal.hpp" />
     <ClInclude Include="..\openvpn\asio\asiostop.hpp" />
     <ClInclude Include="..\openvpn\asio\asiowork.hpp" />
@@ -63,6 +62,7 @@
     <ClInclude Include="..\openvpn\buffer\bufread.hpp" />
     <ClInclude Include="..\openvpn\buffer\bufstr.hpp" />
     <ClInclude Include="..\openvpn\buffer\bufstream.hpp" />
+    <ClInclude Include="..\openvpn\buffer\lz4.hpp" />
     <ClInclude Include="..\openvpn\buffer\memq.hpp" />
     <ClInclude Include="..\openvpn\buffer\safestr.hpp" />
     <ClInclude Include="..\openvpn\buffer\zlib.hpp" />
@@ -83,12 +83,14 @@
     <ClInclude Include="..\openvpn\common\abort.hpp" />
     <ClInclude Include="..\openvpn\common\action.hpp" />
     <ClInclude Include="..\openvpn\common\actionthread.hpp" />
+    <ClInclude Include="..\openvpn\common\appversion.hpp" />
     <ClInclude Include="..\openvpn\common\arch.hpp" />
     <ClInclude Include="..\openvpn\common\argv.hpp" />
     <ClInclude Include="..\openvpn\common\arraysize.hpp" />
     <ClInclude Include="..\openvpn\common\asyncsleep.hpp" />
     <ClInclude Include="..\openvpn\common\autoreset.hpp" />
     <ClInclude Include="..\openvpn\common\base64.hpp" />
+    <ClInclude Include="..\openvpn\common\bigmutex.hpp" />
     <ClInclude Include="..\openvpn\common\binprefix.hpp" />
     <ClInclude Include="..\openvpn\common\circ_list.hpp" />
     <ClInclude Include="..\openvpn\common\cleanup.hpp" />
@@ -116,17 +118,19 @@
     <ClInclude Include="..\openvpn\common\hostlist.hpp" />
     <ClInclude Include="..\openvpn\common\hostname.hpp" />
     <ClInclude Include="..\openvpn\common\hostport.hpp" />
-    <ClInclude Include="..\openvpn\common\inotify.hpp" />
+    <ClInclude Include="..\openvpn\common\jsonlib.hpp" />
     <ClInclude Include="..\openvpn\common\lex.hpp" />
     <ClInclude Include="..\openvpn\common\likely.hpp" />
     <ClInclude Include="..\openvpn\common\link.hpp" />
     <ClInclude Include="..\openvpn\common\logrotate.hpp" />
     <ClInclude Include="..\openvpn\common\memneq.hpp" />
     <ClInclude Include="..\openvpn\common\mode.hpp" />
+    <ClInclude Include="..\openvpn\common\modstat.hpp" />
     <ClInclude Include="..\openvpn\common\msgwin.hpp" />
     <ClInclude Include="..\openvpn\common\number.hpp" />
     <ClInclude Include="..\openvpn\common\olong.hpp" />
     <ClInclude Include="..\openvpn\common\options.hpp" />
+    <ClInclude Include="..\openvpn\common\option_error.hpp" />
     <ClInclude Include="..\openvpn\common\ostream.hpp" />
     <ClInclude Include="..\openvpn\common\path.hpp" />
     <ClInclude Include="..\openvpn\common\peercred.hpp" />
@@ -164,6 +168,7 @@
     <ClInclude Include="..\openvpn\common\usecount.hpp" />
     <ClInclude Include="..\openvpn\common\usergroup.hpp" />
     <ClInclude Include="..\openvpn\common\userpass.hpp" />
+    <ClInclude Include="..\openvpn\common\valgrind.hpp" />
     <ClInclude Include="..\openvpn\common\version.hpp" />
     <ClInclude Include="..\openvpn\common\waitbarrier.hpp" />
     <ClInclude Include="..\openvpn\common\write.hpp" />
@@ -192,6 +197,9 @@
     <ClInclude Include="..\openvpn\crypto\packet_id.hpp" />
     <ClInclude Include="..\openvpn\crypto\selftest.hpp" />
     <ClInclude Include="..\openvpn\crypto\static_key.hpp" />
+    <ClInclude Include="..\openvpn\crypto\tls_crypt.hpp" />
+    <ClInclude Include="..\openvpn\dco\dcocli.hpp" />
+    <ClInclude Include="..\openvpn\dco\ipcollbase.hpp" />
     <ClInclude Include="..\openvpn\error\error.hpp" />
     <ClInclude Include="..\openvpn\error\excode.hpp" />
     <ClInclude Include="..\openvpn\frame\frame.hpp" />
@@ -208,6 +216,7 @@
     <ClInclude Include="..\openvpn\http\urlencode.hpp" />
     <ClInclude Include="..\openvpn\http\urlparm.hpp" />
     <ClInclude Include="..\openvpn\http\urlparse.hpp" />
+    <ClInclude Include="..\openvpn\http\validate_uri.hpp" />
     <ClInclude Include="..\openvpn\http\webexcept.hpp" />
     <ClInclude Include="..\openvpn\init\cryptoinit.hpp" />
     <ClInclude Include="..\openvpn\init\engineinit.hpp" />
@@ -215,14 +224,26 @@
     <ClInclude Include="..\openvpn\io\io.hpp" />
     <ClInclude Include="..\openvpn\ip\dhcp.hpp" />
     <ClInclude Include="..\openvpn\ip\eth.hpp" />
-    <ClInclude Include="..\openvpn\ip\icmp.hpp" />
-    <ClInclude Include="..\openvpn\ip\ip.hpp" />
+    <ClInclude Include="..\openvpn\ip\icmp4.hpp" />
+    <ClInclude Include="..\openvpn\ip\icmp6.hpp" />
+    <ClInclude Include="..\openvpn\ip\ip4.hpp" />
+    <ClInclude Include="..\openvpn\ip\ip6.hpp" />
+    <ClInclude Include="..\openvpn\ip\ipcommon.hpp" />
     <ClInclude Include="..\openvpn\ip\udp.hpp" />
+    <ClInclude Include="..\openvpn\kovpn\kocrypto.hpp" />
+    <ClInclude Include="..\openvpn\kovpn\kodev.hpp" />
+    <ClInclude Include="..\openvpn\kovpn\korekey.hpp" />
+    <ClInclude Include="..\openvpn\kovpn\koroute.hpp" />
+    <ClInclude Include="..\openvpn\kovpn\kostats.hpp" />
+    <ClInclude Include="..\openvpn\kovpn\kovpn.hpp" />
     <ClInclude Include="..\openvpn\legal\copyright.hpp" />
     <ClInclude Include="..\openvpn\linux\core.hpp" />
     <ClInclude Include="..\openvpn\linux\daemon_alive.hpp" />
+    <ClInclude Include="..\openvpn\linux\procfs.hpp" />
     <ClInclude Include="..\openvpn\log\logbase.hpp" />
     <ClInclude Include="..\openvpn\log\logbasesimple.hpp" />
+    <ClInclude Include="..\openvpn\log\logbasesimplemac.hpp" />
+    <ClInclude Include="..\openvpn\log\logdatetime.hpp" />
     <ClInclude Include="..\openvpn\log\lognull.hpp" />
     <ClInclude Include="..\openvpn\log\logperiod.hpp" />
     <ClInclude Include="..\openvpn\log\logsimple.hpp" />
@@ -280,6 +301,7 @@
     <ClInclude Include="..\openvpn\proxy\proxyauth.hpp" />
     <ClInclude Include="..\openvpn\random\devurand.hpp" />
     <ClInclude Include="..\openvpn\random\mtrandapi.hpp" />
+    <ClInclude Include="..\openvpn\random\rand2.hpp" />
     <ClInclude Include="..\openvpn\random\randapi.hpp" />
     <ClInclude Include="..\openvpn\random\randbytestore.hpp" />
     <ClInclude Include="..\openvpn\reliable\relack.hpp" />
@@ -307,6 +329,7 @@
     <ClInclude Include="..\openvpn\ssl\sslapi.hpp" />
     <ClInclude Include="..\openvpn\ssl\sslchoose.hpp" />
     <ClInclude Include="..\openvpn\ssl\sslconsts.hpp" />
+    <ClInclude Include="..\openvpn\ssl\ssllog.hpp" />
     <ClInclude Include="..\openvpn\ssl\tlsprf.hpp" />
     <ClInclude Include="..\openvpn\ssl\tlsver.hpp" />
     <ClInclude Include="..\openvpn\ssl\tls_cert_profile.hpp" />
@@ -314,9 +337,12 @@
     <ClInclude Include="..\openvpn\time\asiotimer.hpp" />
     <ClInclude Include="..\openvpn\time\coarsetime.hpp" />
     <ClInclude Include="..\openvpn\time\durhelper.hpp" />
+    <ClInclude Include="..\openvpn\time\epoch.hpp" />
     <ClInclude Include="..\openvpn\time\time.hpp" />
     <ClInclude Include="..\openvpn\time\timestr.hpp" />
     <ClInclude Include="..\openvpn\transport\altproxy.hpp" />
+    <ClInclude Include="..\openvpn\transport\client\extern\config.hpp" />
+    <ClInclude Include="..\openvpn\transport\client\extern\fw.hpp" />
     <ClInclude Include="..\openvpn\transport\client\httpcli.hpp" />
     <ClInclude Include="..\openvpn\transport\client\relay.hpp" />
     <ClInclude Include="..\openvpn\transport\client\tcpcli.hpp" />
@@ -331,6 +357,8 @@
     <ClInclude Include="..\openvpn\transport\server\transbase.hpp" />
     <ClInclude Include="..\openvpn\transport\socket_protect.hpp" />
     <ClInclude Include="..\openvpn\transport\tcplink.hpp" />
+    <ClInclude Include="..\openvpn\transport\tcplinkbase.hpp" />
+    <ClInclude Include="..\openvpn\transport\tcplinkcommon.hpp" />
     <ClInclude Include="..\openvpn\transport\udplink.hpp" />
     <ClInclude Include="..\openvpn\tun\builder\base.hpp" />
     <ClInclude Include="..\openvpn\tun\builder\capture.hpp" />
@@ -347,18 +375,21 @@
     <ClInclude Include="..\openvpn\tun\ipv6_setting.hpp" />
     <ClInclude Include="..\openvpn\tun\layer.hpp" />
     <ClInclude Include="..\openvpn\tun\linux\client\tuncli.hpp" />
-    <ClInclude Include="..\openvpn\tun\linux\tun.hpp" />
+    <ClInclude Include="..\openvpn\tun\linux\client\tunsetup.hpp" />
     <ClInclude Include="..\openvpn\tun\mac\client\tuncli.hpp" />
     <ClInclude Include="..\openvpn\tun\mac\client\tunsetup.hpp" />
+    <ClInclude Include="..\openvpn\tun\mac\dsdict.hpp" />
     <ClInclude Include="..\openvpn\tun\mac\gwv4.hpp" />
     <ClInclude Include="..\openvpn\tun\mac\macdns.hpp" />
     <ClInclude Include="..\openvpn\tun\mac\macdns_watchdog.hpp" />
     <ClInclude Include="..\openvpn\tun\mac\macgw.hpp" />
+    <ClInclude Include="..\openvpn\tun\mac\macproxy.hpp" />
     <ClInclude Include="..\openvpn\tun\mac\tunutil.hpp" />
     <ClInclude Include="..\openvpn\tun\mac\utun.hpp" />
     <ClInclude Include="..\openvpn\tun\persist\tunpersist.hpp" />
     <ClInclude Include="..\openvpn\tun\persist\tunwrap.hpp" />
     <ClInclude Include="..\openvpn\tun\persist\tunwrapasio.hpp" />
+    <ClInclude Include="..\openvpn\tun\proxy.hpp" />
     <ClInclude Include="..\openvpn\tun\server\tunbase.hpp" />
     <ClInclude Include="..\openvpn\tun\tunio.hpp" />
     <ClInclude Include="..\openvpn\tun\tunlog.hpp" />
@@ -370,10 +401,12 @@
     <ClInclude Include="..\openvpn\tun\win\nrpt.hpp" />
     <ClInclude Include="..\openvpn\tun\win\tunutil.hpp" />
     <ClInclude Include="..\openvpn\tun\win\wfp.hpp" />
+    <ClInclude Include="..\openvpn\tun\win\winproxy.hpp" />
     <ClInclude Include="..\openvpn\win\call.hpp" />
     <ClInclude Include="..\openvpn\win\cmd.hpp" />
     <ClInclude Include="..\openvpn\win\console.hpp" />
     <ClInclude Include="..\openvpn\win\handle.hpp" />
+    <ClInclude Include="..\openvpn\win\impersonate.hpp" />
     <ClInclude Include="..\openvpn\win\modname.hpp" />
     <ClInclude Include="..\openvpn\win\reg.hpp" />
     <ClInclude Include="..\openvpn\win\scoped_handle.hpp" />
@@ -383,5 +416,14 @@
     <ClInclude Include="..\openvpn\tun\win\winproxy.hpp" />
     <ClInclude Include="..\openvpn\tun\proxy.hpp" />
     <ClInclude Include="..\openvpn\win\impersonate.hpp" />
+    <ClInclude Include="..\openvpn\ip\icmp4.hpp" />
+    <ClInclude Include="..\openvpn\ip\icmp6.hpp" />
+    <ClInclude Include="..\openvpn\ip\ip4.hpp" />
+    <ClInclude Include="..\openvpn\ip\ip6.hpp" />
+    <ClInclude Include="..\openvpn\ip\ipcommon.hpp" />
+    <ClInclude Include="..\client\ovpncli.hpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\test\ovpncli\cli.cpp" />
   </ItemGroup>
 </Project>
\ No newline at end of file