Merge branch 'cli-show-missing-tcp-port'

2 files changed, 5 insertions, 3 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c97a183399..bf275d9014 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -59,6 +59,7 @@ Line wrap the file at 100 chars.                                              Th
 - Enable reconnect in blocked state in desktop app.
 - Fix error handling during device removal in the desktop app.
 - Enable interface settings when app is logged out
+- Fix 'mullvad status -v' to include the port of the endpoint when connecting over TCP.
 
 #### Windows
 - Only use the most recent list of apps to split when resuming from hibernation/sleep if applying
diff --git a/mullvad-cli/src/format.rs b/mullvad-cli/src/format.rs
index 808852eb6d..0e0f24c8dd 100644
--- a/mullvad-cli/src/format.rs
+++ b/mullvad-cli/src/format.rs
@@ -9,6 +9,7 @@ use mullvad_management_interface::types::{
     TunnelType,
 };
 use mullvad_types::auth_failed::AuthFailed;
+use std::borrow::Cow;
 
 pub fn print_state(state: &TunnelState, verbose: bool) {
     match state.state.as_ref().unwrap() {
@@ -39,12 +40,12 @@ fn format_relay_connection(relay_info: &TunnelStateRelayInfo, verbose: bool) ->
     let mut obfuscator_overlaps = false;
 
     let exit_endpoint = {
-        let mut address = endpoint.address.as_str();
+        let mut address = Cow::Borrowed(endpoint.address.as_str());
         let mut protocol = endpoint.protocol;
         if let Some(obfuscator) = endpoint.obfuscation.as_ref() {
             if location.hostname == location.obfuscator_hostname {
                 obfuscator_overlaps = true;
-                address = &obfuscator.address;
+                address = Cow::Owned(format!("{}:{}", obfuscator.address, obfuscator.port));
                 protocol = obfuscator.protocol;
             }
         };
@@ -52,7 +53,7 @@ fn format_relay_connection(relay_info: &TunnelStateRelayInfo, verbose: bool) ->
         let exit = format_endpoint(
             &location.hostname,
             protocol,
-            Some(address).filter(|_| verbose),
+            Some(address).filter(|_| verbose).as_deref(),
         );
         format!("{exit} in {}, {}", &location.city, &location.country)
     };