summaryrefslogtreecommitdiffhomepage
path: root/talpid-core/src
diff options
context:
space:
mode:
authorEmīls <emils@mullvad.net>2022-02-02 15:32:47 +0000
committerEmīls <emils@mullvad.net>2022-02-17 15:08:56 +0000
commit2eb0e562dd9ade98aa13beaa7fd602e960791269 (patch)
treeb8850e5fda604935f6cf31520cc6cb12d6071737 /talpid-core/src
parenta08a616a70c8f11869611f33769a9154e1101137 (diff)
downloadmullvadvpn-2eb0e562dd9ade98aa13beaa7fd602e960791269.tar.xz
mullvadvpn-2eb0e562dd9ade98aa13beaa7fd602e960791269.zip
Remove exclusion_gid from firewall
Diffstat (limited to 'talpid-core/src')
-rw-r--r--talpid-core/src/firewall/macos.rs9
-rw-r--r--talpid-core/src/tunnel_state_machine/mod.rs2
2 files changed, 3 insertions, 8 deletions
diff --git a/talpid-core/src/firewall/macos.rs b/talpid-core/src/firewall/macos.rs
index 9ae293b868..7c2e1455b2 100644
--- a/talpid-core/src/firewall/macos.rs
+++ b/talpid-core/src/firewall/macos.rs
@@ -20,16 +20,14 @@ pub struct Firewall {
pf: pfctl::PfCtl,
pf_was_enabled: Option<bool>,
rule_logging: RuleLogging,
- /// An exclusion group ID may be used in the future to help split tunneling in the future.
- _exclusion_gid: u32,
}
impl Firewall {
- pub fn from_args(args: FirewallArguments) -> Result<Self> {
- Self::new(args.exclusion_gid)
+ pub fn from_args(_args: FirewallArguments) -> Result<Self> {
+ Self::new()
}
- fn new(exclusion_gid: u32) -> Result<Self> {
+ pub fn new() -> Result<Self> {
// Allows controlling whether firewall rules should log to pflog0. Useful for debugging the
// rules.
let firewall_debugging = env::var("TALPID_FIREWALL_DEBUG");
@@ -45,7 +43,6 @@ impl Firewall {
pf: pfctl::PfCtl::new()?,
pf_was_enabled: None,
rule_logging,
- _exclusion_gid: exclusion_gid,
})
}
diff --git a/talpid-core/src/tunnel_state_machine/mod.rs b/talpid-core/src/tunnel_state_machine/mod.rs
index 154864228b..37f246e134 100644
--- a/talpid-core/src/tunnel_state_machine/mod.rs
+++ b/talpid-core/src/tunnel_state_machine/mod.rs
@@ -237,8 +237,6 @@ impl TunnelStateMachine {
InitialFirewallState::None
},
allow_lan: settings.allow_lan,
- #[cfg(target_os = "macos")]
- exclusion_gid,
};
let firewall = Firewall::from_args(args).map_err(Error::InitFirewallError)?;