diff options
| author | Emīls Piņķis <emils@mullvad.net> | 2019-03-01 12:54:16 +0000 |
|---|---|---|
| committer | Emīls Piņķis <emils@mullvad.net> | 2019-03-01 12:54:16 +0000 |
| commit | a3e1da3778fae852a22e124ebcb8614c01f0430b (patch) | |
| tree | 9e50e4fae97474c3f0907f02029ca710410f16d0 /windows | |
| parent | 55117d52ce234f5ed8b3ef81ee484b56b799ba6a (diff) | |
| download | mullvadvpn-a3e1da3778fae852a22e124ebcb8614c01f0430b.tar.xz mullvadvpn-a3e1da3778fae852a22e124ebcb8614c01f0430b.zip | |
Fix bad C++ in WinFW
Diffstat (limited to 'windows')
| -rw-r--r-- | windows/winfw/src/winfw/fwcontext.cpp | 2 | ||||
| -rw-r--r-- | windows/winfw/src/winfw/rules/restrictdns.cpp | 4 | ||||
| -rw-r--r-- | windows/winfw/src/winfw/rules/restrictdns.h | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/windows/winfw/src/winfw/fwcontext.cpp b/windows/winfw/src/winfw/fwcontext.cpp index 3a90c97b9f..f971f24b2e 100644 --- a/windows/winfw/src/winfw/fwcontext.cpp +++ b/windows/winfw/src/winfw/fwcontext.cpp @@ -114,7 +114,7 @@ bool FwContext::applyPolicyConnected(const WinFwSettings &settings, const WinFwR ruleset.emplace_back(std::make_unique<rules::RestrictDns>( tunnelInterfaceAlias, wfp::IpAddress(v4Gateway), - (v6Gateway != nullptr) ? &wfp::IpAddress(v6Gateway) : nullptr + (v6Gateway != nullptr) ? std::make_unique<wfp::IpAddress>(v6Gateway) : nullptr )); return applyRuleset(ruleset); diff --git a/windows/winfw/src/winfw/rules/restrictdns.cpp b/windows/winfw/src/winfw/rules/restrictdns.cpp index 53c303cc47..9009dcc4ee 100644 --- a/windows/winfw/src/winfw/rules/restrictdns.cpp +++ b/windows/winfw/src/winfw/rules/restrictdns.cpp @@ -12,10 +12,10 @@ using namespace wfp::conditions; namespace rules { -RestrictDns::RestrictDns(const std::wstring &tunnelInterfaceAlias, const wfp::IpAddress v4DnsHost, wfp::IpAddress *v6DnsHost) +RestrictDns::RestrictDns(const std::wstring &tunnelInterfaceAlias, const wfp::IpAddress v4DnsHost, std::unique_ptr<wfp::IpAddress> v6DnsHost) : m_tunnelInterfaceAlias(tunnelInterfaceAlias) , m_v4DnsHost(v4DnsHost) - , m_v6DnsHost(v6DnsHost) + , m_v6DnsHost(std::move(v6DnsHost)) { } diff --git a/windows/winfw/src/winfw/rules/restrictdns.h b/windows/winfw/src/winfw/rules/restrictdns.h index ca3057a5cd..0dba66a048 100644 --- a/windows/winfw/src/winfw/rules/restrictdns.h +++ b/windows/winfw/src/winfw/rules/restrictdns.h @@ -11,15 +11,15 @@ class RestrictDns : public IFirewallRule { public: - RestrictDns(const std::wstring &tunnelInterfaceAlias, const wfp::IpAddress v4DnsHost, wfp::IpAddress *v6DnsHost); - + RestrictDns(const std::wstring &tunnelInterfaceAlias, const wfp::IpAddress v4DnsHost, std::unique_ptr<wfp::IpAddress> v6DnsHost); + bool apply(IObjectInstaller &objectInstaller) override; private: const std::wstring m_tunnelInterfaceAlias; const wfp::IpAddress m_v4DnsHost; - const wfp::IpAddress *m_v6DnsHost; + const std::unique_ptr<wfp::IpAddress> m_v6DnsHost; }; |