diff options
| author | David Lönnhager <david.l@mullvad.net> | 2025-08-14 16:10:20 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2025-08-21 14:58:30 +0200 |
| commit | 0a7a9169b07c090beeebeab4bed2ca256839b143 (patch) | |
| tree | 20b023a56cf7f58081cedb5021fe0f1d71b0fe7a /windows | |
| parent | e3d0cab9bbb56af9a1e92da0a5040365bb0917d3 (diff) | |
| download | mullvadvpn-0a7a9169b07c090beeebeab4bed2ca256839b143.tar.xz mullvadvpn-0a7a9169b07c090beeebeab4bed2ca256839b143.zip | |
Fix ignored errors when adding filters in WinFw
Diffstat (limited to 'windows')
| -rw-r--r-- | windows/winfw/src/winfw/rules/baseline/permitvpntunnel.cpp | 27 | ||||
| -rw-r--r-- | windows/winfw/src/winfw/rules/baseline/permitvpntunnelservice.cpp | 27 |
2 files changed, 30 insertions, 24 deletions
diff --git a/windows/winfw/src/winfw/rules/baseline/permitvpntunnel.cpp b/windows/winfw/src/winfw/rules/baseline/permitvpntunnel.cpp index 5ee9c2d966..07ad39995b 100644 --- a/windows/winfw/src/winfw/rules/baseline/permitvpntunnel.cpp +++ b/windows/winfw/src/winfw/rules/baseline/permitvpntunnel.cpp @@ -220,20 +220,23 @@ bool PermitVpnTunnel::apply(IObjectInstaller &objectInstaller) objectInstaller ); } - AddEndpointFilter( - std::make_optional<Endpoint>(m_potentialEndpoints.value().endpoint1), - MullvadGuids::Filter_Baseline_PermitVpnTunnel_Outbound_Ipv4_1(), - MullvadGuids::Filter_Baseline_PermitVpnTunnel_Outbound_Ipv6_1(), - objectInstaller - ); + if (!AddEndpointFilter( + std::make_optional<Endpoint>(m_potentialEndpoints.value().endpoint1), + MullvadGuids::Filter_Baseline_PermitVpnTunnel_Outbound_Ipv4_1(), + MullvadGuids::Filter_Baseline_PermitVpnTunnel_Outbound_Ipv6_1(), + objectInstaller + )) + { + return false; + } if (m_potentialEndpoints.value().endpoint2.has_value()) { - AddEndpointFilter( - m_potentialEndpoints.value().endpoint2.value(), - MullvadGuids::Filter_Baseline_PermitVpnTunnel_Outbound_Ipv4_2(), - MullvadGuids::Filter_Baseline_PermitVpnTunnel_Outbound_Ipv6_2(), - objectInstaller - ); + return AddEndpointFilter( + m_potentialEndpoints.value().endpoint2.value(), + MullvadGuids::Filter_Baseline_PermitVpnTunnel_Outbound_Ipv4_2(), + MullvadGuids::Filter_Baseline_PermitVpnTunnel_Outbound_Ipv6_2(), + objectInstaller + ); } return true; } diff --git a/windows/winfw/src/winfw/rules/baseline/permitvpntunnelservice.cpp b/windows/winfw/src/winfw/rules/baseline/permitvpntunnelservice.cpp index b185dccbd2..50cdc45733 100644 --- a/windows/winfw/src/winfw/rules/baseline/permitvpntunnelservice.cpp +++ b/windows/winfw/src/winfw/rules/baseline/permitvpntunnelservice.cpp @@ -221,20 +221,23 @@ bool PermitVpnTunnelService::apply(IObjectInstaller &objectInstaller) objectInstaller ); } - AddEndpointFilter( - std::make_optional<Endpoint>(m_potentialEndpoints.value().endpoint1), - MullvadGuids::Filter_Baseline_PermitVpnTunnelService_Ipv4_1(), - MullvadGuids::Filter_Baseline_PermitVpnTunnelService_Ipv6_1(), - objectInstaller - ); + if (!AddEndpointFilter( + std::make_optional<Endpoint>(m_potentialEndpoints.value().endpoint1), + MullvadGuids::Filter_Baseline_PermitVpnTunnelService_Ipv4_1(), + MullvadGuids::Filter_Baseline_PermitVpnTunnelService_Ipv6_1(), + objectInstaller + )) + { + return false; + } if (m_potentialEndpoints.value().endpoint2.has_value()) { - AddEndpointFilter( - m_potentialEndpoints.value().endpoint2.value(), - MullvadGuids::Filter_Baseline_PermitVpnTunnelService_Ipv4_2(), - MullvadGuids::Filter_Baseline_PermitVpnTunnelService_Ipv6_2(), - objectInstaller - ); + return AddEndpointFilter( + m_potentialEndpoints.value().endpoint2.value(), + MullvadGuids::Filter_Baseline_PermitVpnTunnelService_Ipv4_2(), + MullvadGuids::Filter_Baseline_PermitVpnTunnelService_Ipv6_2(), + objectInstaller + ); } return true; } |