summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOdd Stranne <odd@mullvad.net>2019-04-17 13:55:55 +0200
committerOdd Stranne <odd@mullvad.net>2019-04-17 15:13:59 +0200
commit46903298d84840da499fd9e72d8c1daba854877b (patch)
treed2821627e26496ef5ba6c1148e9f5aad779244bc
parentd29351b023dff0c393d721a4e71f45b39b43a7dc (diff)
downloadmullvadvpn-46903298d84840da499fd9e72d8c1daba854877b.tar.xz
mullvadvpn-46903298d84840da499fd9e72d8c1daba854877b.zip
Update 'winnet' loader used for testing
-rw-r--r--windows/winnet/src/extras/loader/loader.cpp19
-rw-r--r--windows/winnet/src/extras/loader/loader.vcxproj4
2 files changed, 22 insertions, 1 deletions
diff --git a/windows/winnet/src/extras/loader/loader.cpp b/windows/winnet/src/extras/loader/loader.cpp
index 1ee58a7df5..43ec54978c 100644
--- a/windows/winnet/src/extras/loader/loader.cpp
+++ b/windows/winnet/src/extras/loader/loader.cpp
@@ -1,9 +1,26 @@
#include "stdafx.h"
#include "../../winnet/winnet.h"
+#include <iostream>
int main()
{
- const auto status = WinNet_GetTapInterfaceIpv6Status(nullptr, nullptr);
+ wchar_t *alias = nullptr;
+
+ const auto status = WinNet_GetTapInterfaceAlias(&alias, nullptr, nullptr);
+
+ switch (status)
+ {
+ case WINNET_GTIA_STATUS::FAILURE:
+ {
+ std::wcout << L"Could not determine alias" << std::endl;
+ break;
+ }
+ case WINNET_GTIA_STATUS::SUCCESS:
+ {
+ std::wcout << L"Interface alias: " << alias << std::endl;
+ WinNet_ReleaseString(alias);
+ }
+ };
return 0;
}
diff --git a/windows/winnet/src/extras/loader/loader.vcxproj b/windows/winnet/src/extras/loader/loader.vcxproj
index 40f6888214..325f813778 100644
--- a/windows/winnet/src/extras/loader/loader.vcxproj
+++ b/windows/winnet/src/extras/loader/loader.vcxproj
@@ -106,6 +106,7 @@
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@@ -122,6 +123,7 @@
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@@ -140,6 +142,7 @@
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@@ -160,6 +163,7 @@
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>