diff options
| author | Emīls <emils@mullvad.net> | 2023-08-28 13:04:28 +0200 |
|---|---|---|
| committer | Emīls <emils@mullvad.net> | 2023-08-28 16:14:32 +0200 |
| commit | fbecf69350f41c585b372cc92cd8d4f37de569f2 (patch) | |
| tree | c4f769ab3b6447175d1938172b6c9be139c35d9f /ios | |
| parent | 8ae1bfbfae9406a353ad540b8119c144d916b38f (diff) | |
| download | mullvadvpn-fbecf69350f41c585b372cc92cd8d4f37de569f2.tar.xz mullvadvpn-fbecf69350f41c585b372cc92cd8d4f37de569f2.zip | |
Update shadowsocks to 1.16
Diffstat (limited to 'ios')
| -rw-r--r-- | ios/MullvadTransport/shadowsocks-proxy/Cargo.toml | 4 | ||||
| -rw-r--r-- | ios/MullvadTransport/shadowsocks-proxy/src/lib.rs | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/ios/MullvadTransport/shadowsocks-proxy/Cargo.toml b/ios/MullvadTransport/shadowsocks-proxy/Cargo.toml index 46162c7c78..d4f4623c8b 100644 --- a/ios/MullvadTransport/shadowsocks-proxy/Cargo.toml +++ b/ios/MullvadTransport/shadowsocks-proxy/Cargo.toml @@ -12,9 +12,7 @@ crate-type = [ "rlib", "staticlib" ] bench = false [dependencies] -shadowsocks-service.git = "https://github.com/mullvad/shadowsocks-rust" -shadowsocks-service.rev = "c45980bb22d0d50ac888813c59a1edf0cff14a36" -shadowsocks-service.features = [ "local", "stream-cipher", "local-http", "local-tunnel" ] +shadowsocks-service = { workspace = true, features = [ "local", "stream-cipher", "local-http", "local-tunnel" ] } tokio = { workspace = true } log = "0.4" diff --git a/ios/MullvadTransport/shadowsocks-proxy/src/lib.rs b/ios/MullvadTransport/shadowsocks-proxy/src/lib.rs index 3388280782..5b32627d5c 100644 --- a/ios/MullvadTransport/shadowsocks-proxy/src/lib.rs +++ b/ios/MullvadTransport/shadowsocks-proxy/src/lib.rs @@ -108,10 +108,10 @@ impl ShadowsocksRuntime { std::thread::spawn(move || { runtime.spawn(async move { - match Server::create(config).await { + match Server::new(config).await { Ok(server) => { let _ = startup_done_tx.send(Ok(())); - let _ = server.wait_until_exit().await; + let _ = server.run().await; } Err(err) => { let _ = startup_done_tx.send(Err(err)); |
