summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSebastian Holmin <sebastian.holmin@mullvad.net>2024-11-05 09:59:56 +0100
committerSebastian Holmin <sebastian.holmin@mullvad.net>2024-11-05 09:59:56 +0100
commit9f885878b9064036600ee96275e17608b7708449 (patch)
tree8508cfbc84da5a4250e090ab8f135c8cd8043d3c
parent88dae3d352bf4530aaf1e29e12cfcb578bb13574 (diff)
downloadmullvadvpn-9f885878b9064036600ee96275e17608b7708449.tar.xz
mullvadvpn-9f885878b9064036600ee96275e17608b7708449.zip
Remove unnecessary result in return type
-rw-r--r--tunnel-obfuscation/src/shadowsocks.rs14
1 files changed, 3 insertions, 11 deletions
diff --git a/tunnel-obfuscation/src/shadowsocks.rs b/tunnel-obfuscation/src/shadowsocks.rs
index b1452a332d..f838f96e6e 100644
--- a/tunnel-obfuscation/src/shadowsocks.rs
+++ b/tunnel-obfuscation/src/shadowsocks.rs
@@ -123,7 +123,7 @@ async fn run_forwarding(
.await
.map_err(Error::WaitForUdpClient)?;
- let shadowsocks = connect_shadowsocks(remote_socket, shadowsocks_endpoint)?;
+ let shadowsocks = connect_shadowsocks(remote_socket, shadowsocks_endpoint);
let shadowsocks = Arc::new(shadowsocks);
let local_udp = Arc::new(local_udp_socket);
@@ -157,22 +157,14 @@ async fn run_forwarding(
Ok(())
}
-fn connect_shadowsocks(
- remote_socket: UdpSocket,
- shadowsocks_endpoint: SocketAddr,
-) -> std::result::Result<ProxySocket, Error> {
+fn connect_shadowsocks(remote_socket: UdpSocket, shadowsocks_endpoint: SocketAddr) -> ProxySocket {
let ss_context = Context::new_shared(ServerType::Local);
let ss_config: ServerConfig = ServerConfig::new(
shadowsocks_endpoint,
SHADOWSOCKS_PASSWORD,
SHADOWSOCKS_CIPHER,
);
- Ok(ProxySocket::from_socket(
- UdpSocketType::Client,
- ss_context,
- &ss_config,
- remote_socket,
- ))
+ ProxySocket::from_socket(UdpSocketType::Client, ss_context, &ss_config, remote_socket)
}
async fn create_shadowsocks_socket(