diff options
| author | David Lönnhager <david.l@mullvad.net> | 2019-12-02 12:35:03 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2019-12-03 09:17:30 +0100 |
| commit | 478240a0a572a15b45c4fd6033ffb4e28d496f82 (patch) | |
| tree | 2f6c726df7c58ec755405d7932d0ffca868c4502 /windows/windns/src | |
| parent | 4b8d6a6fb9c7b00de6feca0a6a7229fa49e4dc95 (diff) | |
| download | mullvadvpn-478240a0a572a15b45c4fd6033ffb4e28d496f82.tar.xz mullvadvpn-478240a0a572a15b45c4fd6033ffb4e28d496f82.zip | |
Move InterfaceUtils into shared library, and move Nci into libcommon
Diffstat (limited to 'windows/windns/src')
| -rw-r--r-- | windows/windns/src/windns/windns.cpp | 16 | ||||
| -rw-r--r-- | windows/windns/src/windns/windns.vcxproj | 2 | ||||
| -rw-r--r-- | windows/windns/src/windns/windns.vcxproj.filters | 2 |
3 files changed, 5 insertions, 15 deletions
diff --git a/windows/windns/src/windns/windns.cpp b/windows/windns/src/windns/windns.cpp index 1687586c7b..db3c9bf2b2 100644 --- a/windows/windns/src/windns/windns.cpp +++ b/windows/windns/src/windns/windns.cpp @@ -1,10 +1,11 @@ #include "stdafx.h" +#include <libcommon/guid.h> #include <libcommon/string.h> #include <libcommon/network/adapters.h> +#include <libcommon/network/ncicontext.h> #include "windns.h" #include "confineoperation.h" #include "netsh.h" -#include "ncicontext.h" #include "logsink.h" #include <memory> #include <vector> @@ -97,20 +98,13 @@ AdapterDnsAddresses GetAdapterDnsAddresses(const std::wstring &adapterAlias) const IP_ADAPTER_ADDRESSES *adapter; - NciContext nci; + common::network::NciContext nci; while (nullptr != (adapter = adapters.next())) { std::wstring name; - IID guidObj = { 0 }; - - auto guid = std::string(adapter->AdapterName); - auto wguid = std::wstring(guid.begin(), guid.end()); - - if (S_OK != IIDFromString(&wguid[0], &guidObj)) - { - throw std::runtime_error("IIDFromString() failed"); - } + const auto guidObj = + common::Guid::FromString(common::string::ToWide(adapter->AdapterName)); try { diff --git a/windows/windns/src/windns/windns.vcxproj b/windows/windns/src/windns/windns.vcxproj index 308cfb1aea..b2b68a999f 100644 --- a/windows/windns/src/windns/windns.vcxproj +++ b/windows/windns/src/windns/windns.vcxproj @@ -178,7 +178,6 @@ <ClInclude Include="confineoperation.h" /> <ClInclude Include="logsink.h" /> <ClInclude Include="ilogsink.h" /> - <ClInclude Include="ncicontext.h" /> <ClInclude Include="netsh.h" /> <ClInclude Include="stdafx.h" /> <ClInclude Include="targetver.h" /> @@ -188,7 +187,6 @@ <ClCompile Include="confineoperation.cpp" /> <ClCompile Include="dllmain.cpp" /> <ClCompile Include="logsink.cpp" /> - <ClCompile Include="ncicontext.cpp" /> <ClCompile Include="netsh.cpp" /> <ClCompile Include="stdafx.cpp"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader> diff --git a/windows/windns/src/windns/windns.vcxproj.filters b/windows/windns/src/windns/windns.vcxproj.filters index d551081fe0..e71bf3e814 100644 --- a/windows/windns/src/windns/windns.vcxproj.filters +++ b/windows/windns/src/windns/windns.vcxproj.filters @@ -8,7 +8,6 @@ <ClInclude Include="confineoperation.h" /> <ClInclude Include="ilogsink.h" /> <ClInclude Include="logsink.h" /> - <ClInclude Include="ncicontext.h" /> </ItemGroup> <ItemGroup> <ClCompile Include="dllmain.cpp" /> @@ -17,7 +16,6 @@ <ClCompile Include="netsh.cpp" /> <ClCompile Include="confineoperation.cpp" /> <ClCompile Include="logsink.cpp" /> - <ClCompile Include="ncicontext.cpp" /> </ItemGroup> <ItemGroup> <ResourceCompile Include="windns.rc" /> |