Expose Shadowsocks fd on Android

[dlon]

This updates shadowsocks-rust to 1.20.3. Unblocks #6672.

---

This change is 

[Serock3]

Reviewed 5 of 5 files at r1, all commit messages.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @dlon)

---

Cargo.lock line 1624 at r1 (raw file):

[[package]]
name = "icu_collections"

Wow, that's a lot of new dependencies from just bumping the version. Oh well.

---

tunnel-obfuscation/src/shadowsocks.rs line 111 at r1 (raw file):

    #[cfg(target_os = "android")]
    let _ = outbound_fd_tx.send(shadowsocks.as_raw_fd());

It's unfortunate that we need to use a oneshot to send the return value. Could we not run create_shadowsocks_client outside this function and have access to the file descriptor directly?

---

tunnel-obfuscation/src/shadowsocks.rs line 138 at r1 (raw file):

    client.abort();
    server.abort();

Unrelated to the PR, but this could be simplified to

    tokio::select! {
        _ = shutdown_rx => {
            log::trace!("Stopping shadowsocks obfuscation");
        }
        _result = handle_outgoing(
            shadowsocks.clone(),
            local_udp.clone(),
            wg_addr.clone(),
        ) => log::trace!("Shadowsocks client closed"),
        _result = handle_incoming(shadowsocks, local_udp, wg_addr) => log::trace!("Local UDP client closed"),
    }

Code quote:

    let mut client = tokio::spawn(handle_outgoing(
        shadowsocks.clone(),
        local_udp.clone(),
        wg_addr.clone(),
    ));
    let mut server = tokio::spawn(handle_incoming(shadowsocks, local_udp, wg_addr));

    tokio::select! {
        _ = shutdown_rx => {
            log::trace!("Stopping shadowsocks obfuscation");
        }
        _result = &mut server => log::trace!("Shadowsocks client closed"),
        _result = &mut client => log::trace!("Local UDP client closed"),
    }

    client.abort();
    server.abort();

[dlon]

Reviewable status: 4 of 5 files reviewed, all discussions resolved (waiting on @Serock3)

---

tunnel-obfuscation/src/shadowsocks.rs line 111 at r1 (raw file):

Previously, Serock3 (Sebastian Holmin) wrote…

It's unfortunate that we need to use a oneshot to send the return value. Could we not run create_shadowsocks_client outside this function and have access to the file descriptor directly?

Done.

[Serock3]

Reviewed 1 of 1 files at r3, all commit messages.
Reviewable status: complete! all files reviewed, all discussions resolved