diff options
| author | Markus Pettersson <markus.pettersson@mullvad.net> | 2023-10-26 11:20:09 +0200 |
|---|---|---|
| committer | Markus Pettersson <markus.pettersson@mullvad.net> | 2023-11-06 09:01:28 +0100 |
| commit | 7c34fa4e1ac211f04f403b1dd90e8085cb711a52 (patch) | |
| tree | e110791df421bc62c73a84df4d789acf52959023 /mullvad-cli/src | |
| parent | 46ff968c2050b87954f645b3eafaf512da50e15a (diff) | |
| download | mullvadvpn-7c34fa4e1ac211f04f403b1dd90e8085cb711a52.tar.xz mullvadvpn-7c34fa4e1ac211f04f403b1dd90e8085cb711a52.zip | |
Prefix remote `ip` and `port` with `remote_` in Socks5Local contexts
Diffstat (limited to 'mullvad-cli/src')
| -rw-r--r-- | mullvad-cli/src/cmds/api_access.rs | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/mullvad-cli/src/cmds/api_access.rs b/mullvad-cli/src/cmds/api_access.rs index dc736c71c6..c5707a7276 100644 --- a/mullvad-cli/src/cmds/api_access.rs +++ b/mullvad-cli/src/cmds/api_access.rs @@ -116,11 +116,15 @@ impl ApiAccess { } CustomAccessMethod::Socks5(socks) => match socks { mullvad_types::access_method::Socks5::Local(local) => { - let ip = cmd.params.ip.unwrap_or(local.peer.ip()).to_string(); - let port = cmd.params.port.unwrap_or(local.peer.port()); - let local_port = cmd.params.local_port.unwrap_or(local.port); - mullvad_types::access_method::Socks5Local::from_args(ip, port, local_port) - .map(AccessMethod::from) + let remote_ip = cmd.params.ip.unwrap_or(local.remote_peer.ip()).to_string(); + let remote_port = cmd.params.port.unwrap_or(local.remote_peer.port()); + let local_port = cmd.params.local_port.unwrap_or(local.local_port); + mullvad_types::access_method::Socks5Local::from_args( + remote_ip, + remote_port, + local_port, + ) + .map(AccessMethod::from) } mullvad_types::access_method::Socks5::Remote(remote) => { let ip = cmd.params.ip.unwrap_or(remote.peer.ip()).to_string(); @@ -223,9 +227,8 @@ impl ApiAccess { rpc.set_access_method(previous_access_method.get_id()) .await?; return Err(anyhow!( - "Could not reach the Mullvad API using access method \"{}\". Rolling back to \"{}\"", + "Could not reach the Mullvad API using access method \"{}\"", new_access_method.get_name(), - previous_access_method.get_name() )); } }; @@ -586,8 +589,8 @@ mod pp { } writeln!(f)?; print_option!("Protocol", "Socks5 (local)"); - print_option!("Peer", local.peer); - print_option!("Local port", local.port); + print_option!("Peer", local.remote_peer); + print_option!("Local port", local.local_port); Ok(()) } }, |