diff options
| author | David Lönnhager <david.l@mullvad.net> | 2022-03-24 12:57:53 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2022-03-24 12:57:53 +0100 |
| commit | a4e1c265840ae6d254f26f70f5ea316b46a25074 (patch) | |
| tree | 078baf76c1175229c4a1777e0b62c6212a00f59a | |
| parent | 06129304887cd87add9ef742ae95353226513859 (diff) | |
| parent | e10ac093b2e57dc97527ddd3cde3612cdc527a2d (diff) | |
| download | mullvadvpn-a4e1c265840ae6d254f26f70f5ea316b46a25074.tar.xz mullvadvpn-a4e1c265840ae6d254f26f70f5ea316b46a25074.zip | |
Merge branch 'bump-udp2tcp'
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | Cargo.lock | 5 | ||||
| -rw-r--r-- | tunnel-obfuscation/Cargo.toml | 2 | ||||
| -rw-r--r-- | tunnel-obfuscation/src/udp2tcp.rs | 7 |
4 files changed, 7 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 137be0e6d7..6779cb27eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -51,6 +51,8 @@ Line wrap the file at 100 chars. Th - Fix scrollbar no longer responsive and usable when covered by other elements. - Improve tunnel bypass for the API sometimes not working in the connecting state. - Fix resource leak caused by location check. +- Fix issue where sockets didn't close after disconnecting from WireGuard servers over TCP + by updating `udp-over-tcp` to 0.2. #### Windows - Fix "Open Mullvad VPN" tray context menu item not working after toggling unpinned window setting. diff --git a/Cargo.lock b/Cargo.lock index 2b11029e7d..ec81510c51 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3643,10 +3643,9 @@ checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" [[package]] name = "udp-over-tcp" -version = "0.1.0" -source = "git+https://github.com/mullvad/udp-over-tcp?rev=27b9519b63244736b6f3c7c4af60976c88dc6b95#27b9519b63244736b6f3c7c4af60976c88dc6b95" +version = "0.2.0" +source = "git+https://github.com/mullvad/udp-over-tcp?rev=572827e69debc80d281ae1e184050feeee458792#572827e69debc80d281ae1e184050feeee458792" dependencies = [ - "env_logger 0.8.4", "err-context", "futures", "lazy_static", diff --git a/tunnel-obfuscation/Cargo.toml b/tunnel-obfuscation/Cargo.toml index 02b7f9370e..14af93682d 100644 --- a/tunnel-obfuscation/Cargo.toml +++ b/tunnel-obfuscation/Cargo.toml @@ -12,4 +12,4 @@ async-trait = "0.1" err-derive = "0.3.0" futures = "0.3.5" tokio = { version = "1.8", features = ["rt-multi-thread", "macros", "net", "io-util"] } -udp-over-tcp = { git = "https://github.com/mullvad/udp-over-tcp", rev = "27b9519b63244736b6f3c7c4af60976c88dc6b95" } +udp-over-tcp = { git = "https://github.com/mullvad/udp-over-tcp", rev = "572827e69debc80d281ae1e184050feeee458792" } diff --git a/tunnel-obfuscation/src/udp2tcp.rs b/tunnel-obfuscation/src/udp2tcp.rs index 877b53bd2f..8e676d5f0d 100644 --- a/tunnel-obfuscation/src/udp2tcp.rs +++ b/tunnel-obfuscation/src/udp2tcp.rs @@ -46,14 +46,11 @@ impl Udp2Tcp { let instance = Udp2TcpImpl::new( listen_addr, settings.peer, - #[cfg(target_os = "linux")] TcpOptions { - recv_buffer_size: None, - send_buffer_size: None, + #[cfg(target_os = "linux")] fwmark: settings.fwmark, + ..TcpOptions::default() }, - #[cfg(not(target_os = "linux"))] - TcpOptions::default(), ) .await .map_err(Error::CreateObfuscator)?; |