diff options
| author | David Lönnhager <david.l@mullvad.net> | 2021-01-18 18:10:44 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2021-03-01 13:49:45 +0100 |
| commit | ea12d9b2b55ed19e23566fc3a03fc6095d30bd4f (patch) | |
| tree | 0620d6583e45eb45c8b9651aedd342ba36f3ce21 | |
| parent | b78b67b16de4a1cfe55b1bcecc6832e3beb7c368 (diff) | |
| download | mullvadvpn-ea12d9b2b55ed19e23566fc3a03fc6095d30bd4f.tar.xz mullvadvpn-ea12d9b2b55ed19e23566fc3a03fc6095d30bd4f.zip | |
List IPv6 addresses with 'mullvad relay list'
| -rw-r--r-- | Cargo.lock | 14 | ||||
| -rw-r--r-- | mullvad-cli/Cargo.toml | 1 | ||||
| -rw-r--r-- | mullvad-cli/src/cmds/relay.rs | 10 |
3 files changed, 22 insertions, 3 deletions
diff --git a/Cargo.lock b/Cargo.lock index 9601349809..17328f4e9a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -977,6 +977,15 @@ dependencies = [ ] [[package]] +name = "itertools" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37d572918e350e82412fe766d24b15e6682fb2ed2bbe018280caa810397cb319" +dependencies = [ + "either", +] + +[[package]] name = "itoa" version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1231,6 +1240,7 @@ dependencies = [ "env_logger 0.8.2", "err-derive 0.3.0", "futures", + "itertools 0.10.0", "mullvad-management-interface", "mullvad-paths", "mullvad-types", @@ -1952,7 +1962,7 @@ checksum = "02b10678c913ecbd69350e8535c3aef91a8676c0773fc1d7b95cdd196d7f2f26" dependencies = [ "bytes 0.5.6", "heck", - "itertools", + "itertools 0.8.2", "log 0.4.14", "multimap", "petgraph", @@ -1969,7 +1979,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "537aa19b95acde10a12fec4301466386f757403de4cd4e5b4fa78fb5ecb18f72" dependencies = [ "anyhow", - "itertools", + "itertools 0.8.2", "proc-macro2", "quote", "syn", diff --git a/mullvad-cli/Cargo.toml b/mullvad-cli/Cargo.toml index 2090fd5796..603197fa32 100644 --- a/mullvad-cli/Cargo.toml +++ b/mullvad-cli/Cargo.toml @@ -20,6 +20,7 @@ env_logger = "0.8.2" futures = "0.3" natord = "1.0.9" serde = "1.0" +itertools = "0.10" mullvad-types = { path = "../mullvad-types" } mullvad-paths = { path = "../mullvad-paths" } diff --git a/mullvad-cli/src/cmds/relay.rs b/mullvad-cli/src/cmds/relay.rs index 0a7d152995..eb1492258a 100644 --- a/mullvad-cli/src/cmds/relay.rs +++ b/mullvad-cli/src/cmds/relay.rs @@ -1,5 +1,6 @@ use crate::{location, new_rpc_client, Command, Error, Result}; use clap::{value_t, values_t}; +use itertools::Itertools; use std::{ io::{self, BufRead}, net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr}, @@ -643,9 +644,16 @@ impl Relay { (false, true) => "WireGuard", _ => unreachable!("Bug in relay filtering earlier on"), }; + let mut addresses = vec![&relay.ipv4_addr_in]; + if !relay.ipv6_addr_in.is_empty() { + addresses.push(&relay.ipv6_addr_in); + } println!( "\t\t{} ({}) - {}, hosted by {}", - relay.hostname, relay.ipv4_addr_in, support_msg, relay.provider + relay.hostname, + addresses.iter().join(", "), + support_msg, + relay.provider ); } } |