summaryrefslogtreecommitdiffhomepage
path: root/windows
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2021-07-02 16:11:57 +0200
committerDavid Lönnhager <david.l@mullvad.net>2021-07-02 16:11:57 +0200
commitf77cde89c6b8d3d580ee773628f89211a24852c5 (patch)
tree93f33f7be297caa2d2e4b0c0ba032e04d82abe57 /windows
parent207ab239223686ff72c43a8a5d615565ab81b5ab (diff)
parent4b0d04e6534ebfecc4a905237468774af934bd45 (diff)
downloadmullvadvpn-f77cde89c6b8d3d580ee773628f89211a24852c5.tar.xz
mullvadvpn-f77cde89c6b8d3d580ee773628f89211a24852c5.zip
Merge branch 'split-tunnel-win-update'
Diffstat (limited to 'windows')
-rw-r--r--windows/winfw/src/winfw/rules/baseline/permitdhcp.cpp4
-rw-r--r--windows/winfw/src/winfw/rules/baseline/permitdhcpserver.cpp2
-rw-r--r--windows/winfw/src/winfw/rules/baseline/permitdns.cpp2
-rw-r--r--windows/winfw/src/winfw/rules/baseline/permitlan.cpp4
-rw-r--r--windows/winfw/src/winfw/rules/baseline/permitlanservice.cpp4
-rw-r--r--windows/winfw/src/winfw/rules/baseline/permitloopback.cpp2
-rw-r--r--windows/winfw/src/winfw/rules/baseline/permitndp.cpp2
-rw-r--r--windows/winfw/src/winfw/rules/baseline/permitvpntunnel.cpp2
-rw-r--r--windows/winfw/src/winfw/rules/baseline/permitvpntunnelservice.cpp2
-rw-r--r--windows/winfw/src/winfw/rules/dns/permitnontunnel.cpp4
-rw-r--r--windows/winfw/src/winfw/rules/dns/permittunnel.cpp4
-rw-r--r--windows/winfw/src/winfw/rules/multi/permitvpnrelay.cpp2
-rw-r--r--windows/winnet/src/winnet/winnet.cpp2
13 files changed, 19 insertions, 17 deletions
diff --git a/windows/winfw/src/winfw/rules/baseline/permitdhcp.cpp b/windows/winfw/src/winfw/rules/baseline/permitdhcp.cpp
index 6e5b2896b9..6987934f9d 100644
--- a/windows/winfw/src/winfw/rules/baseline/permitdhcp.cpp
+++ b/windows/winfw/src/winfw/rules/baseline/permitdhcp.cpp
@@ -42,7 +42,7 @@ bool PermitDhcp::applyIpv4(IObjectInstaller &objectInstaller) const
.provider(MullvadGuids::Provider())
.layer(FWPM_LAYER_ALE_AUTH_CONNECT_V4)
.sublayer(MullvadGuids::SublayerBaseline())
- .weight(wfp::FilterBuilder::WeightClass::Max)
+ .weight(wfp::FilterBuilder::WeightClass::Medium)
.permit();
{
@@ -94,7 +94,7 @@ bool PermitDhcp::applyIpv6(IObjectInstaller &objectInstaller) const
.provider(MullvadGuids::Provider())
.layer(FWPM_LAYER_ALE_AUTH_CONNECT_V6)
.sublayer(MullvadGuids::SublayerBaseline())
- .weight(wfp::FilterBuilder::WeightClass::Max)
+ .weight(wfp::FilterBuilder::WeightClass::Medium)
.permit();
{
diff --git a/windows/winfw/src/winfw/rules/baseline/permitdhcpserver.cpp b/windows/winfw/src/winfw/rules/baseline/permitdhcpserver.cpp
index a8fb2e3036..f3fa2a853d 100644
--- a/windows/winfw/src/winfw/rules/baseline/permitdhcpserver.cpp
+++ b/windows/winfw/src/winfw/rules/baseline/permitdhcpserver.cpp
@@ -46,7 +46,7 @@ bool PermitDhcpServer::applyIpv4(IObjectInstaller &objectInstaller) const
.provider(MullvadGuids::Provider())
.layer(FWPM_LAYER_ALE_AUTH_RECV_ACCEPT_V4)
.sublayer(MullvadGuids::SublayerBaseline())
- .weight(wfp::FilterBuilder::WeightClass::Max)
+ .weight(wfp::FilterBuilder::WeightClass::Medium)
.permit();
{
diff --git a/windows/winfw/src/winfw/rules/baseline/permitdns.cpp b/windows/winfw/src/winfw/rules/baseline/permitdns.cpp
index 8ce530edaa..26ca8828af 100644
--- a/windows/winfw/src/winfw/rules/baseline/permitdns.cpp
+++ b/windows/winfw/src/winfw/rules/baseline/permitdns.cpp
@@ -26,7 +26,7 @@ bool PermitDns::apply(IObjectInstaller &objectInstaller)
.provider(MullvadGuids::Provider())
.layer(FWPM_LAYER_ALE_AUTH_CONNECT_V4)
.sublayer(MullvadGuids::SublayerBaseline())
- .weight(wfp::FilterBuilder::WeightClass::Max)
+ .weight(wfp::FilterBuilder::WeightClass::Medium)
.permit();
wfp::ConditionBuilder conditionBuilder(FWPM_LAYER_ALE_AUTH_CONNECT_V4);
diff --git a/windows/winfw/src/winfw/rules/baseline/permitlan.cpp b/windows/winfw/src/winfw/rules/baseline/permitlan.cpp
index 2397c78cdd..7c4e7d8a8e 100644
--- a/windows/winfw/src/winfw/rules/baseline/permitlan.cpp
+++ b/windows/winfw/src/winfw/rules/baseline/permitlan.cpp
@@ -32,7 +32,7 @@ bool PermitLan::applyIpv4(IObjectInstaller &objectInstaller) const
.provider(MullvadGuids::Provider())
.layer(FWPM_LAYER_ALE_AUTH_CONNECT_V4)
.sublayer(MullvadGuids::SublayerBaseline())
- .weight(wfp::FilterBuilder::WeightClass::Max)
+ .weight(wfp::FilterBuilder::WeightClass::Medium)
.permit();
wfp::ConditionBuilder conditionBuilder(FWPM_LAYER_ALE_AUTH_CONNECT_V4);
@@ -84,7 +84,7 @@ bool PermitLan::applyIpv6(IObjectInstaller &objectInstaller) const
.provider(MullvadGuids::Provider())
.layer(FWPM_LAYER_ALE_AUTH_CONNECT_V6)
.sublayer(MullvadGuids::SublayerBaseline())
- .weight(wfp::FilterBuilder::WeightClass::Max)
+ .weight(wfp::FilterBuilder::WeightClass::Medium)
.permit();
wfp::ConditionBuilder conditionBuilder(FWPM_LAYER_ALE_AUTH_CONNECT_V6);
diff --git a/windows/winfw/src/winfw/rules/baseline/permitlanservice.cpp b/windows/winfw/src/winfw/rules/baseline/permitlanservice.cpp
index d729b4ad52..61aae2851c 100644
--- a/windows/winfw/src/winfw/rules/baseline/permitlanservice.cpp
+++ b/windows/winfw/src/winfw/rules/baseline/permitlanservice.cpp
@@ -32,7 +32,7 @@ bool PermitLanService::applyIpv4(IObjectInstaller &objectInstaller) const
.provider(MullvadGuids::Provider())
.layer(FWPM_LAYER_ALE_AUTH_RECV_ACCEPT_V4)
.sublayer(MullvadGuids::SublayerBaseline())
- .weight(wfp::FilterBuilder::WeightClass::Max)
+ .weight(wfp::FilterBuilder::WeightClass::Medium)
.permit();
wfp::ConditionBuilder conditionBuilder(FWPM_LAYER_ALE_AUTH_RECV_ACCEPT_V4);
@@ -60,7 +60,7 @@ bool PermitLanService::applyIpv6(IObjectInstaller &objectInstaller) const
.provider(MullvadGuids::Provider())
.layer(FWPM_LAYER_ALE_AUTH_RECV_ACCEPT_V6)
.sublayer(MullvadGuids::SublayerBaseline())
- .weight(wfp::FilterBuilder::WeightClass::Max)
+ .weight(wfp::FilterBuilder::WeightClass::Medium)
.permit();
wfp::ConditionBuilder conditionBuilder(FWPM_LAYER_ALE_AUTH_RECV_ACCEPT_V6);
diff --git a/windows/winfw/src/winfw/rules/baseline/permitloopback.cpp b/windows/winfw/src/winfw/rules/baseline/permitloopback.cpp
index 123bed4b42..fdab4b9c40 100644
--- a/windows/winfw/src/winfw/rules/baseline/permitloopback.cpp
+++ b/windows/winfw/src/winfw/rules/baseline/permitloopback.cpp
@@ -25,7 +25,7 @@ bool PermitLoopback::apply(IObjectInstaller &objectInstaller)
.provider(MullvadGuids::Provider())
.layer(FWPM_LAYER_ALE_AUTH_CONNECT_V4)
.sublayer(MullvadGuids::SublayerBaseline())
- .weight(wfp::FilterBuilder::WeightClass::Max)
+ .weight(wfp::FilterBuilder::WeightClass::Medium)
.permit();
{
diff --git a/windows/winfw/src/winfw/rules/baseline/permitndp.cpp b/windows/winfw/src/winfw/rules/baseline/permitndp.cpp
index 135fbb9979..60c95ec8e9 100644
--- a/windows/winfw/src/winfw/rules/baseline/permitndp.cpp
+++ b/windows/winfw/src/winfw/rules/baseline/permitndp.cpp
@@ -32,7 +32,7 @@ bool PermitNdp::apply(IObjectInstaller &objectInstaller)
.provider(MullvadGuids::Provider())
.layer(FWPM_LAYER_ALE_AUTH_CONNECT_V6)
.sublayer(MullvadGuids::SublayerBaseline())
- .weight(wfp::FilterBuilder::WeightClass::Max)
+ .weight(wfp::FilterBuilder::WeightClass::Medium)
.permit();
{
diff --git a/windows/winfw/src/winfw/rules/baseline/permitvpntunnel.cpp b/windows/winfw/src/winfw/rules/baseline/permitvpntunnel.cpp
index c09f7b631c..e756d68464 100644
--- a/windows/winfw/src/winfw/rules/baseline/permitvpntunnel.cpp
+++ b/windows/winfw/src/winfw/rules/baseline/permitvpntunnel.cpp
@@ -30,7 +30,7 @@ bool PermitVpnTunnel::apply(IObjectInstaller &objectInstaller)
.provider(MullvadGuids::Provider())
.layer(FWPM_LAYER_ALE_AUTH_CONNECT_V4)
.sublayer(MullvadGuids::SublayerBaseline())
- .weight(wfp::FilterBuilder::WeightClass::Max)
+ .weight(wfp::FilterBuilder::WeightClass::Medium)
.permit();
{
diff --git a/windows/winfw/src/winfw/rules/baseline/permitvpntunnelservice.cpp b/windows/winfw/src/winfw/rules/baseline/permitvpntunnelservice.cpp
index d24830db8f..00fbc8e76b 100644
--- a/windows/winfw/src/winfw/rules/baseline/permitvpntunnelservice.cpp
+++ b/windows/winfw/src/winfw/rules/baseline/permitvpntunnelservice.cpp
@@ -30,7 +30,7 @@ bool PermitVpnTunnelService::apply(IObjectInstaller &objectInstaller)
.provider(MullvadGuids::Provider())
.layer(FWPM_LAYER_ALE_AUTH_RECV_ACCEPT_V4)
.sublayer(MullvadGuids::SublayerBaseline())
- .weight(wfp::FilterBuilder::WeightClass::Max)
+ .weight(wfp::FilterBuilder::WeightClass::Medium)
.permit();
wfp::ConditionBuilder conditionBuilder(FWPM_LAYER_ALE_AUTH_RECV_ACCEPT_V4);
diff --git a/windows/winfw/src/winfw/rules/dns/permitnontunnel.cpp b/windows/winfw/src/winfw/rules/dns/permitnontunnel.cpp
index 729254d1f4..d9b6942243 100644
--- a/windows/winfw/src/winfw/rules/dns/permitnontunnel.cpp
+++ b/windows/winfw/src/winfw/rules/dns/permitnontunnel.cpp
@@ -38,7 +38,7 @@ bool PermitNonTunnel::apply(IObjectInstaller &objectInstaller)
.provider(MullvadGuids::Provider())
.layer(FWPM_LAYER_ALE_AUTH_CONNECT_V4)
.sublayer(MullvadGuids::SublayerDns())
- .weight(wfp::FilterBuilder::WeightClass::Max)
+ .weight(wfp::FilterBuilder::WeightClass::Medium)
.permit();
wfp::ConditionBuilder conditionBuilder(FWPM_LAYER_ALE_AUTH_CONNECT_V4);
@@ -77,7 +77,7 @@ bool PermitNonTunnel::apply(IObjectInstaller &objectInstaller)
.provider(MullvadGuids::Provider())
.layer(FWPM_LAYER_ALE_AUTH_CONNECT_V6)
.sublayer(MullvadGuids::SublayerDns())
- .weight(wfp::FilterBuilder::WeightClass::Max)
+ .weight(wfp::FilterBuilder::WeightClass::Medium)
.permit();
wfp::ConditionBuilder conditionBuilder(FWPM_LAYER_ALE_AUTH_CONNECT_V6);
diff --git a/windows/winfw/src/winfw/rules/dns/permittunnel.cpp b/windows/winfw/src/winfw/rules/dns/permittunnel.cpp
index cc1af84223..578038cbcf 100644
--- a/windows/winfw/src/winfw/rules/dns/permittunnel.cpp
+++ b/windows/winfw/src/winfw/rules/dns/permittunnel.cpp
@@ -38,7 +38,7 @@ bool PermitTunnel::apply(IObjectInstaller &objectInstaller)
.provider(MullvadGuids::Provider())
.layer(FWPM_LAYER_ALE_AUTH_CONNECT_V4)
.sublayer(MullvadGuids::SublayerDns())
- .weight(wfp::FilterBuilder::WeightClass::Max)
+ .weight(wfp::FilterBuilder::WeightClass::Medium)
.permit();
wfp::ConditionBuilder conditionBuilder(FWPM_LAYER_ALE_AUTH_CONNECT_V4);
@@ -73,7 +73,7 @@ bool PermitTunnel::apply(IObjectInstaller &objectInstaller)
.provider(MullvadGuids::Provider())
.layer(FWPM_LAYER_ALE_AUTH_CONNECT_V6)
.sublayer(MullvadGuids::SublayerDns())
- .weight(wfp::FilterBuilder::WeightClass::Max)
+ .weight(wfp::FilterBuilder::WeightClass::Medium)
.permit();
wfp::ConditionBuilder conditionBuilder(FWPM_LAYER_ALE_AUTH_CONNECT_V6);
diff --git a/windows/winfw/src/winfw/rules/multi/permitvpnrelay.cpp b/windows/winfw/src/winfw/rules/multi/permitvpnrelay.cpp
index ee5ffcb0c4..a403230df9 100644
--- a/windows/winfw/src/winfw/rules/multi/permitvpnrelay.cpp
+++ b/windows/winfw/src/winfw/rules/multi/permitvpnrelay.cpp
@@ -90,7 +90,7 @@ bool PermitVpnRelay::apply(IObjectInstaller &objectInstaller)
.provider(MullvadGuids::Provider())
.layer(LayerFromIp(m_relay))
.sublayer(TranslateSublayer(m_sublayer))
- .weight(wfp::FilterBuilder::WeightClass::Max)
+ .weight(wfp::FilterBuilder::WeightClass::Medium)
.permit();
wfp::ConditionBuilder conditionBuilder(LayerFromIp(m_relay));
diff --git a/windows/winnet/src/winnet/winnet.cpp b/windows/winnet/src/winnet/winnet.cpp
index e82345ebee..d7b34c1bc0 100644
--- a/windows/winnet/src/winnet/winnet.cpp
+++ b/windows/winnet/src/winnet/winnet.cpp
@@ -554,6 +554,8 @@ WinNet_DeactivateRouteManager(
{
delete g_RouteManager;
g_RouteManager = nullptr;
+
+ g_RouteManagerLogSink.reset();
}
catch (...)
{
Copyright © 2025 - 2026 Wayne Cole. WTFPL. Attribution appreciated. No warranty. Not liable for bodily damages.