diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2017-09-07 14:10:18 +0100 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2017-09-07 14:10:18 +0100 |
| commit | 815a03341859dd928d2c7188482ff83f048f8c14 (patch) | |
| tree | 63e003d576907298ca91d1238befcbc4d0a8c31a | |
| parent | b82be9e666eda6610fc1d51e1e2f4ecc2f76c0a0 (diff) | |
| parent | 241ba998c879071d5eb59d2fe6bd9bc38c211bd6 (diff) | |
| download | mullvadvpn-815a03341859dd928d2c7188482ff83f048f8c14.tar.xz mullvadvpn-815a03341859dd928d2c7188482ff83f048f8c14.zip | |
Merge branch 'update-pfctl'
| -rw-r--r-- | Cargo.lock | 4 | ||||
| -rw-r--r-- | talpid-core/src/firewall/macos.rs | 29 |
2 files changed, 12 insertions, 21 deletions
diff --git a/Cargo.lock b/Cargo.lock index f48e1f73d6..bcf7b00aa6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -872,12 +872,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "pfctl" version = "0.1.0" -source = "git+https://github.com/mullvad/pfctl-rs.git#7d4c6ec799e3b6c256f1db84a0daec3bb0cd180a" +source = "git+https://github.com/mullvad/pfctl-rs.git#17c90bca15244ae0a28fa54339c074ff306206d0" dependencies = [ "bindgen 0.29.0 (registry+https://github.com/rust-lang/crates.io-index)", "derive_builder 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "errno 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", + "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "ioctl-sys 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "ipnetwork 0.12.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/talpid-core/src/firewall/macos.rs b/talpid-core/src/firewall/macos.rs index 0258b4e56d..7a445043b1 100644 --- a/talpid-core/src/firewall/macos.rs +++ b/talpid-core/src/firewall/macos.rs @@ -8,18 +8,9 @@ pub use pfctl::{Error, ErrorKind, Result}; const ANCHOR_NAME: &'static str = "talpid_core"; -impl From<net::Endpoint> for pfctl::Endpoint { - fn from(endpoint: net::Endpoint) -> Self { - pfctl::Endpoint( - pfctl::Ip::from(endpoint.address.ip()), - pfctl::Port::from(endpoint.address.port()), - ) - } -} - -impl From<net::Endpoint> for pfctl::Proto { - fn from(endpoint: net::Endpoint) -> Self { - match endpoint.protocol { +impl From<net::TransportProtocol> for pfctl::Proto { + fn from(protocol: net::TransportProtocol) -> Self { + match protocol { net::TransportProtocol::Udp => pfctl::Proto::Udp, net::TransportProtocol::Tcp => pfctl::Proto::Tcp, } @@ -62,11 +53,11 @@ impl Firewall<Error> for PacketFilter { impl PacketFilter { fn set_rules(&mut self, policy: SecurityPolicy) -> Result<()> { let drop_all_rule = pfctl::FilterRuleBuilder::default() - .action(pfctl::RuleAction::Drop) + .action(pfctl::FilterRuleAction::Drop) .quick(true) .build()?; let allow_dns_rule = pfctl::FilterRuleBuilder::default() - .action(pfctl::RuleAction::Pass) + .action(pfctl::FilterRuleAction::Pass) .direction(pfctl::Direction::Out) .quick(true) .to(pfctl::Port::One(53, pfctl::PortUnaryModifier::Equal)) @@ -93,10 +84,10 @@ impl PacketFilter { fn get_relay_rule(relay_endpoint: net::Endpoint) -> Result<pfctl::FilterRule> { pfctl::FilterRuleBuilder::default() - .action(pfctl::RuleAction::Pass) + .action(pfctl::FilterRuleAction::Pass) .direction(pfctl::Direction::Out) - .to(relay_endpoint) - .proto(relay_endpoint) + .to(relay_endpoint.address) + .proto(relay_endpoint.protocol) .keep_state(pfctl::StatePolicy::Keep) .tcp_flags(Self::get_tcp_flags()) .quick(true) @@ -105,7 +96,7 @@ impl PacketFilter { fn get_tunnel_rule(tunnel_interface: String) -> Result<pfctl::FilterRule> { pfctl::FilterRuleBuilder::default() - .action(pfctl::RuleAction::Pass) + .action(pfctl::FilterRuleAction::Pass) .interface(tunnel_interface) .keep_state(pfctl::StatePolicy::Keep) .tcp_flags(Self::get_tcp_flags()) @@ -115,7 +106,7 @@ impl PacketFilter { fn get_loopback_rules(&self) -> Result<Vec<pfctl::FilterRule>> { let lo0_rule = pfctl::FilterRuleBuilder::default() - .action(pfctl::RuleAction::Pass) + .action(pfctl::FilterRuleAction::Pass) .interface("lo0") .keep_state(pfctl::StatePolicy::Keep) .quick(true) |