summaryrefslogtreecommitdiffhomepage
path: root/mullvad-setup/src
diff options
context:
space:
mode:
authorEmīls <emils@mullvad.net>2022-02-17 15:09:17 +0000
committerEmīls <emils@mullvad.net>2022-02-17 15:09:17 +0000
commit66e90f14b21e4c8f3205ba3b94019e25f2bf10a2 (patch)
tree4efc77f97f5c21c1255e4e3a76c5ae844dacff57 /mullvad-setup/src
parentf38e8b88675e9e2326725d883b0d9e24a4821d5e (diff)
parentfe68b3aa0f4b47b0da28dae5782e205e3700a3af (diff)
downloadmullvadvpn-66e90f14b21e4c8f3205ba3b94019e25f2bf10a2.tar.xz
mullvadvpn-66e90f14b21e4c8f3205ba3b94019e25f2bf10a2.zip
Merge branch 'refactor-firewall-args'
Diffstat (limited to 'mullvad-setup/src')
-rw-r--r--mullvad-setup/src/main.rs15
1 files changed, 5 insertions, 10 deletions
diff --git a/mullvad-setup/src/main.rs b/mullvad-setup/src/main.rs
index 287da5df6b..947f9bd9ca 100644
--- a/mullvad-setup/src/main.rs
+++ b/mullvad-setup/src/main.rs
@@ -4,7 +4,7 @@ use mullvad_rpc::MullvadRpcRuntime;
use mullvad_types::version::ParsedAppVersion;
use std::{path::PathBuf, process, time::Duration};
use talpid_core::{
- firewall::{self, Firewall, FirewallArguments, InitialFirewallState},
+ firewall::{self, Firewall},
future_retry::{constant_interval, retry_future_n},
};
use talpid_types::ErrorExt;
@@ -153,15 +153,10 @@ async fn reset_firewall() -> Result<(), Error> {
return Err(Error::DaemonIsRunning);
}
- let mut firewall = Firewall::new(FirewallArguments {
- initial_state: InitialFirewallState::None,
- allow_lan: true,
- #[cfg(target_os = "macos")]
- exclusion_gid: 0,
- })
- .map_err(Error::FirewallError)?;
-
- firewall.reset_policy().map_err(Error::FirewallError)
+ Firewall::new()
+ .map_err(Error::FirewallError)?
+ .reset_policy()
+ .map_err(Error::FirewallError)
}
async fn remove_wireguard_key() -> Result<(), Error> {