summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOdd Stranne <odd@mullvad.net>2020-03-03 15:26:24 +0100
committerOdd Stranne <odd@mullvad.net>2020-03-03 15:28:21 +0100
commit2311d206951012483503ae142372109c8d6b85bb (patch)
tree91d97ff1ffbd1e6ea709563c41bb76569d1e004d
parentfb1030ed83d7bfe4fedf7f1cec36254bc3b49e41 (diff)
downloadmullvadvpn-2311d206951012483503ae142372109c8d6b85bb.tar.xz
mullvadvpn-2311d206951012483503ae142372109c8d6b85bb.zip
Make winfw testing tool compile
-rw-r--r--windows/winfw/src/extras/cli/commands/winfw/deinit.cpp2
-rw-r--r--windows/winfw/src/extras/cli/commands/winfw/policy.cpp10
2 files changed, 6 insertions, 6 deletions
diff --git a/windows/winfw/src/extras/cli/commands/winfw/deinit.cpp b/windows/winfw/src/extras/cli/commands/winfw/deinit.cpp
index 5fa2c91278..013159f062 100644
--- a/windows/winfw/src/extras/cli/commands/winfw/deinit.cpp
+++ b/windows/winfw/src/extras/cli/commands/winfw/deinit.cpp
@@ -28,7 +28,7 @@ void Deinit::handleRequest(const std::vector<std::wstring> &arguments)
THROW_ERROR("Invalid argument(s). Cannot complete request.");
}
- m_messageSink((WinFw_Deinitialize()
+ m_messageSink((WinFw_Deinitialize(WINFW_CLEANUP_POLICY_RESET_FIREWALL)
? L"Deinitialization completed successfully."
: L"Deinitialization failed. See above for details, if any."));
}
diff --git a/windows/winfw/src/extras/cli/commands/winfw/policy.cpp b/windows/winfw/src/extras/cli/commands/winfw/policy.cpp
index ca84187e98..a722501832 100644
--- a/windows/winfw/src/extras/cli/commands/winfw/policy.cpp
+++ b/windows/winfw/src/extras/cli/commands/winfw/policy.cpp
@@ -111,8 +111,8 @@ void Policy::processConnecting(const KeyValuePairs &arguments)
auto success = WinFw_ApplyPolicyConnecting
(
- settings,
- relay,
+ &settings,
+ &relay,
nullptr
);
@@ -140,8 +140,8 @@ void Policy::processConnected(const KeyValuePairs &arguments)
auto success = WinFw_ApplyPolicyConnected
(
- settings,
- relay,
+ &settings,
+ &relay,
GetArgumentValue(arguments, L"tunnel").c_str(),
GetArgumentValue(arguments, L"dns").c_str(),
nullptr
@@ -160,7 +160,7 @@ void Policy::processBlocked(const KeyValuePairs &arguments)
GetArgumentValue(arguments, L"lan")
);
- auto success = WinFw_ApplyPolicyBlocked(settings);
+ auto success = WinFw_ApplyPolicyBlocked(&settings);
m_messageSink((success
? L"Successfully applied policy."