summaryrefslogtreecommitdiffhomepage
path: root/talpid-core/src
diff options
context:
space:
mode:
authorEmīls Piņķis <emils@mullvad.net>2019-02-05 11:18:20 +0000
committerEmīls Piņķis <emils@mullvad.net>2019-02-05 11:18:20 +0000
commit0d20edce0e6d8fdd8241d502e4e914307cc12fb2 (patch)
treedad5f0bfdc1428b79b5a3c2d3a55532bbb14e334 /talpid-core/src
parent54142b0fa0b26a33d8e6181a61e03b4b46abda00 (diff)
parent01d6d3d874fde5ad8c4ed7f7152e25841aff2433 (diff)
downloadmullvadvpn-0d20edce0e6d8fdd8241d502e4e914307cc12fb2.tar.xz
mullvadvpn-0d20edce0e6d8fdd8241d502e4e914307cc12fb2.zip
Merge branch 'adjust-cli-gui-for-wg'
Diffstat (limited to 'talpid-core/src')
-rw-r--r--talpid-core/src/tunnel/wireguard/config.rs9
1 files changed, 6 insertions, 3 deletions
diff --git a/talpid-core/src/tunnel/wireguard/config.rs b/talpid-core/src/tunnel/wireguard/config.rs
index a15f377165..ff167edb7c 100644
--- a/talpid-core/src/tunnel/wireguard/config.rs
+++ b/talpid-core/src/tunnel/wireguard/config.rs
@@ -50,7 +50,7 @@ impl Config {
wg_options: &wireguard::TunnelOptions,
generic_options: &GenericTunnelOptions,
) -> Result<Config> {
- ensure!(peers.is_empty(), ErrorKind::NoPeersSuppliedError);
+ ensure!(!peers.is_empty(), ErrorKind::NoPeersSuppliedError);
let mtu = wg_options.mtu.unwrap_or(DEFAULT_MTU);
let is_ipv6_enabled = mtu >= SMALLEST_IPV6_MTU && generic_options.enable_ipv6;
@@ -61,7 +61,7 @@ impl Config {
.cloned()
.filter(|ip| ip.is_ipv4() || is_ipv6_enabled)
.collect();
- ensure!(peer.allowed_ips.is_empty(), ErrorKind::InvalidPeerIpError);
+ ensure!(!peer.allowed_ips.is_empty(), ErrorKind::InvalidPeerIpError);
}
tunnel.addresses = tunnel
@@ -69,7 +69,10 @@ impl Config {
.into_iter()
.filter(|ip| ip.is_ipv4() || is_ipv6_enabled)
.collect();
- ensure!(tunnel.addresses.is_empty(), ErrorKind::InvalidTunnelIpError);
+ ensure!(
+ !tunnel.addresses.is_empty(),
+ ErrorKind::InvalidTunnelIpError
+ );
Ok(Config {
tunnel,