diff options
| author | Emīls <emils@mullvad.net> | 2022-02-14 13:40:04 +0000 |
|---|---|---|
| committer | Emīls <emils@mullvad.net> | 2022-02-17 15:08:56 +0000 |
| commit | fe68b3aa0f4b47b0da28dae5782e205e3700a3af (patch) | |
| tree | 4efc77f97f5c21c1255e4e3a76c5ae844dacff57 | |
| parent | 2eb0e562dd9ade98aa13beaa7fd602e960791269 (diff) | |
| download | mullvadvpn-fe68b3aa0f4b47b0da28dae5782e205e3700a3af.tar.xz mullvadvpn-fe68b3aa0f4b47b0da28dae5782e205e3700a3af.zip | |
Move exclusion_gid to SharedTunnelStateValues
| -rw-r--r-- | talpid-core/src/firewall/linux.rs | 4 | ||||
| -rw-r--r-- | talpid-core/src/tunnel_state_machine/mod.rs | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/talpid-core/src/firewall/linux.rs b/talpid-core/src/firewall/linux.rs index 514079036e..8928e94e3c 100644 --- a/talpid-core/src/firewall/linux.rs +++ b/talpid-core/src/firewall/linux.rs @@ -126,10 +126,6 @@ impl Firewall { } pub fn reset_policy(&mut self) -> Result<()> { - Self::clear_policy() - } - - pub fn clear_policy() -> Result<()> { let tables = [ Table::new(&*TABLE_NAME, ProtoFamily::Inet), Table::new(&*MANGLE_TABLE_NAME_V4, ProtoFamily::Ipv4), diff --git a/talpid-core/src/tunnel_state_machine/mod.rs b/talpid-core/src/tunnel_state_machine/mod.rs index 37f246e134..7fdaf18a83 100644 --- a/talpid-core/src/tunnel_state_machine/mod.rs +++ b/talpid-core/src/tunnel_state_machine/mod.rs @@ -305,6 +305,8 @@ impl TunnelStateMachine { connectivity_check_was_enabled: None, #[cfg(target_os = "macos")] filtering_resolver, + #[cfg(target_os = "macos")] + _exclusion_gid: exclusion_gid, }; tokio::task::spawn_blocking(move || { @@ -400,6 +402,10 @@ struct SharedTunnelStateValues { /// Filtering resolver handle #[cfg(target_os = "macos")] filtering_resolver: crate::resolver::ResolverHandle, + + /// Exclusion GID + #[cfg(target_os = "macos")] + _exclusion_gid: u32, } impl SharedTunnelStateValues { |