diff options
| author | David Lönnhager <david.l@mullvad.net> | 2023-10-18 10:47:40 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2023-10-18 10:47:40 +0200 |
| commit | 85bb4b194ea64cc076a1f2593ed99d92aa6b2abf (patch) | |
| tree | 9d44f9f6100cad7abdcd1f149a92fa56fc3ab378 | |
| parent | 7b5edd448be2ff4c316edb6e1f15ce1692b7ec7e (diff) | |
| parent | 6055ce6927c35077603e840138b5a750f6f868bc (diff) | |
| download | mullvadvpn-85bb4b194ea64cc076a1f2593ed99d92aa6b2abf.tar.xz mullvadvpn-85bb4b194ea64cc076a1f2593ed99d92aa6b2abf.zip | |
Merge branch 'cli-fix-custom-endpoint-output-des-394' into main
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | mullvad-types/src/custom_tunnel.rs | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index d7884eebfa..867ffeae3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -54,6 +54,8 @@ Line wrap the file at 100 chars. Th - Remove wireguard-go (userspace WireGuard) support. ### Fixed +- Show correct endpoint in CLI for custom relays. + #### Windows - Correctly detect whether OS is Windows Server (primarily for logging in daemon.log). diff --git a/mullvad-types/src/custom_tunnel.rs b/mullvad-types/src/custom_tunnel.rs index a3f8c0b264..4fe3e54111 100644 --- a/mullvad-types/src/custom_tunnel.rs +++ b/mullvad-types/src/custom_tunnel.rs @@ -82,8 +82,10 @@ impl fmt::Display for CustomTunnelEndpoint { ), ConnectionConfig::Wireguard(connection) => write!( f, - "WireGuard relay - {} with public key {}", - connection.peer.endpoint, connection.peer.public_key + "WireGuard relay - {}:{} with public key {}", + self.host, + connection.peer.endpoint.port(), + connection.peer.public_key ), } } |