Print out relay hostnames in CLI relay/bridge list command

2 files changed, 17 insertions, 0 deletions

diff --git a/mullvad-cli/src/cmds/bridge.rs b/mullvad-cli/src/cmds/bridge.rs
index 5986e413d7..3d41cbc307 100644
--- a/mullvad-cli/src/cmds/bridge.rs
+++ b/mullvad-cli/src/cmds/bridge.rs
@@ -353,6 +353,9 @@ impl Bridge {
                     "\t{} ({}) @ {:.5}°N, {:.5}°W",
                     city.name, city.code, city.latitude, city.longitude
                 );
+                for relay in &city.relays {
+                    println!("\t\t{} ({})", relay.hostname, relay.ipv4_addr_in);
+                }
             }
             println!();
         }
diff --git a/mullvad-cli/src/cmds/relay.rs b/mullvad-cli/src/cmds/relay.rs
index 272e2e6193..7834164d0b 100644
--- a/mullvad-cli/src/cmds/relay.rs
+++ b/mullvad-cli/src/cmds/relay.rs
@@ -354,6 +354,20 @@ impl Relay {
                     "\t{} ({}) @ {:.5}°N, {:.5}°W",
                     city.name, city.code, city.latitude, city.longitude
                 );
+                for relay in &city.relays {
+                    let supports_openvpn = !relay.tunnels.openvpn.is_empty();
+                    let supports_wireguard = !relay.tunnels.wireguard.is_empty();
+                    let support_msg = match (supports_openvpn, supports_wireguard) {
+                        (true, true) => "OpenVPN and WireGuard",
+                        (true, false) => "OpenVPN",
+                        (false, true) => "WireGuard",
+                        _ => unreachable!("Bug in relay filtering earlier on"),
+                    };
+                    println!(
+                        "\t\t{} ({}) - {}",
+                        relay.hostname, relay.ipv4_addr_in, support_msg
+                    );
+                }
             }
             println!();
         }