From 0d1873f91f0e42241d583871653276b39fabf12d Mon Sep 17 00:00:00 2001 From: Naomi Kirby Date: Tue, 20 Aug 2024 16:38:32 -0700 Subject: [PATCH 1/2] Fix contention between LAN bypass and DNS killswitch on Windows --- src/platforms/windows/daemon/windowsfirewall.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/platforms/windows/daemon/windowsfirewall.cpp b/src/platforms/windows/daemon/windowsfirewall.cpp index 7d9df06eef..b29d546655 100644 --- a/src/platforms/windows/daemon/windowsfirewall.cpp +++ b/src/platforms/windows/daemon/windowsfirewall.cpp @@ -212,9 +212,8 @@ bool WindowsFirewall::enableLanBypass(const QList& ranges) { }); // Blocking unprotected traffic - logger.info() << "Blocking unprotected traffic"; for (const IPAddress& prefix : ranges) { - if (!allowTrafficTo(prefix, MED_WEIGHT, "Allow LAN bypass traffic")) { + if (!allowTrafficTo(prefix, LOW_WEIGHT+1, "Allow LAN bypass traffic")) { return false; } } From e14393ff085504068c31d570d6475956d69bc15a Mon Sep 17 00:00:00 2001 From: Naomi Kirby Date: Tue, 20 Aug 2024 17:03:59 -0700 Subject: [PATCH 2/2] Attack of the Killer Lint! --- src/platforms/windows/daemon/windowsfirewall.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/platforms/windows/daemon/windowsfirewall.cpp b/src/platforms/windows/daemon/windowsfirewall.cpp index b29d546655..771edb9716 100644 --- a/src/platforms/windows/daemon/windowsfirewall.cpp +++ b/src/platforms/windows/daemon/windowsfirewall.cpp @@ -213,7 +213,7 @@ bool WindowsFirewall::enableLanBypass(const QList& ranges) { // Blocking unprotected traffic for (const IPAddress& prefix : ranges) { - if (!allowTrafficTo(prefix, LOW_WEIGHT+1, "Allow LAN bypass traffic")) { + if (!allowTrafficTo(prefix, LOW_WEIGHT + 1, "Allow LAN bypass traffic")) { return false; } }