diff options
| author | David Lönnhager <david.l@mullvad.net> | 2020-01-20 15:43:28 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2020-01-20 17:04:56 +0100 |
| commit | a64020b195a83b0960fe79ff11904c4f35348ec8 (patch) | |
| tree | 67353ac90f69ea7bf810c0c7b341f8f77867be4a | |
| parent | e6ea3bd0d617a91645d96e89459f988bd67b4117 (diff) | |
| download | mullvadvpn-a64020b195a83b0960fe79ff11904c4f35348ec8.tar.xz mullvadvpn-a64020b195a83b0960fe79ff11904c4f35348ec8.zip | |
Refactor Windows process headers
| -rw-r--r-- | windows/nsis-plugins/src/cleanup/cleaningops.cpp | 2 | ||||
| -rw-r--r-- | windows/nsis-plugins/src/tray/tray.cpp | 2 | ||||
| -rw-r--r-- | windows/windns/src/windns/netsh.cpp | 16 | ||||
| -rw-r--r-- | windows/windns/src/windns/netsh.h | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/windows/nsis-plugins/src/cleanup/cleaningops.cpp b/windows/nsis-plugins/src/cleanup/cleaningops.cpp index 671ff3c73d..88cf20ad55 100644 --- a/windows/nsis-plugins/src/cleanup/cleaningops.cpp +++ b/windows/nsis-plugins/src/cleanup/cleaningops.cpp @@ -5,7 +5,7 @@ #include <libcommon/string.h> #include <libcommon/memory.h> #include <libcommon/security.h> -#include <libcommon/process.h> +#include <libcommon/process/process.h> #include <filesystem> #include <utility> #include <functional> diff --git a/windows/nsis-plugins/src/tray/tray.cpp b/windows/nsis-plugins/src/tray/tray.cpp index dc5c02ea91..e86162e0fa 100644 --- a/windows/nsis-plugins/src/tray/tray.cpp +++ b/windows/nsis-plugins/src/tray/tray.cpp @@ -9,7 +9,7 @@ #include <libcommon/registry/registry.h> #include <libcommon/resourcedata.h> #include <libcommon/filesystem.h> -#include <libcommon/process.h> +#include <libcommon/process/process.h> #include <libcommon/security.h> #include <nsis/pluginapi.h> #include <stdexcept> diff --git a/windows/windns/src/windns/netsh.cpp b/windows/windns/src/windns/netsh.cpp index d8354e4e0b..8129c4b207 100644 --- a/windows/windns/src/windns/netsh.cpp +++ b/windows/windns/src/windns/netsh.cpp @@ -11,7 +11,7 @@ namespace { -__declspec(noreturn) void ThrowWithDetails(std::string &&error, common::ApplicationRunner &netsh) +__declspec(noreturn) void ThrowWithDetails(std::string &&error, common::process::ApplicationRunner &netsh) { std::string details("Failed to capture output from 'netsh'"); @@ -65,7 +65,7 @@ void NetSh::setIpv4StaticDns(uint32_t interfaceIndex, << nameServers[0] << L" validate=no"; - auto netsh = common::ApplicationRunner::StartWithoutConsole(m_netShPath, ss.str()); + auto netsh = common::process::ApplicationRunner::StartWithoutConsole(m_netShPath, ss.str()); validateShellOut(*netsh, timeout); } @@ -86,7 +86,7 @@ void NetSh::setIpv4StaticDns(uint32_t interfaceIndex, << i + 1 << L" validate=no"; - auto netsh = common::ApplicationRunner::StartWithoutConsole(m_netShPath, ss.str()); + auto netsh = common::process::ApplicationRunner::StartWithoutConsole(m_netShPath, ss.str()); validateShellOut(*netsh, timeout); } @@ -106,7 +106,7 @@ void NetSh::setIpv4DhcpDns(uint32_t interfaceIndex, uint32_t timeout) << interfaceIndex << L" source=dhcp"; - auto netsh = common::ApplicationRunner::StartWithoutConsole(m_netShPath, ss.str()); + auto netsh = common::process::ApplicationRunner::StartWithoutConsole(m_netShPath, ss.str()); validateShellOut(*netsh, timeout); } @@ -137,7 +137,7 @@ void NetSh::setIpv6StaticDns(uint32_t interfaceIndex, << nameServers[0] << L" validate=no"; - auto netsh = common::ApplicationRunner::StartWithoutConsole(m_netShPath, ss.str()); + auto netsh = common::process::ApplicationRunner::StartWithoutConsole(m_netShPath, ss.str()); validateShellOut(*netsh, timeout); } @@ -158,7 +158,7 @@ void NetSh::setIpv6StaticDns(uint32_t interfaceIndex, << i + 1 << L" validate=no"; - auto netsh = common::ApplicationRunner::StartWithoutConsole(m_netShPath, ss.str()); + auto netsh = common::process::ApplicationRunner::StartWithoutConsole(m_netShPath, ss.str()); validateShellOut(*netsh, timeout); } @@ -178,12 +178,12 @@ void NetSh::setIpv6DhcpDns(uint32_t interfaceIndex, uint32_t timeout) << interfaceIndex << L" source=dhcp"; - auto netsh = common::ApplicationRunner::StartWithoutConsole(m_netShPath, ss.str()); + auto netsh = common::process::ApplicationRunner::StartWithoutConsole(m_netShPath, ss.str()); validateShellOut(*netsh, timeout); } -void NetSh::validateShellOut(common::ApplicationRunner &netsh, uint32_t timeout) +void NetSh::validateShellOut(common::process::ApplicationRunner &netsh, uint32_t timeout) { const uint32_t actualTimeout = (0 == timeout ? 10000 : timeout); diff --git a/windows/windns/src/windns/netsh.h b/windows/windns/src/windns/netsh.h index 3b0b2b0251..732a151a65 100644 --- a/windows/windns/src/windns/netsh.h +++ b/windows/windns/src/windns/netsh.h @@ -1,7 +1,7 @@ #pragma once #include <libcommon/logging/ilogsink.h> -#include <libcommon/applicationrunner.h> +#include <libcommon/process/applicationrunner.h> #include <string> #include <vector> #include <cstdint> @@ -29,5 +29,5 @@ private: std::shared_ptr<common::logging::ILogSink> m_logSink; std::wstring m_netShPath; - void validateShellOut(common::ApplicationRunner &netsh, uint32_t timeout); + void validateShellOut(common::process::ApplicationRunner &netsh, uint32_t timeout); }; |