diff options
| author | Emīls Piņķis <emils@mullvad.net> | 2019-02-01 13:25:38 +0000 |
|---|---|---|
| committer | Emīls Piņķis <emils@mullvad.net> | 2019-02-04 15:58:43 +0000 |
| commit | 450e317bf74445bf5e7503833fadde1e0d72851c (patch) | |
| tree | 3c2df174016ce9ab22a5c68ead9dc7b032935346 | |
| parent | 5b421eb9f419cf31c5aa6446b7825f774fe61756 (diff) | |
| download | mullvadvpn-450e317bf74445bf5e7503833fadde1e0d72851c.tar.xz mullvadvpn-450e317bf74445bf5e7503833fadde1e0d72851c.zip | |
Fix wireguard config bug
| -rw-r--r-- | mullvad-cli/src/cmds/relay.rs | 2 | ||||
| -rw-r--r-- | talpid-core/src/tunnel/wireguard/config.rs | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/mullvad-cli/src/cmds/relay.rs b/mullvad-cli/src/cmds/relay.rs index 4ae68b44da..a7d571e2ce 100644 --- a/mullvad-cli/src/cmds/relay.rs +++ b/mullvad-cli/src/cmds/relay.rs @@ -226,8 +226,6 @@ impl Relay { let _ = io::stdin().lock().read_line(&mut private_key_str); if private_key_str.trim().len() == 0 { eprintln!("Expected to read private key from standard input"); - - } let private_key = Self::validate_wireguard_key(&private_key_str).into(); let peer_public_key = Self::validate_wireguard_key(&peer_key_str).into(); 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, |