diff options
| author | Jonathan <jonathan@mullvad.net> | 2023-03-14 11:57:36 +0100 |
|---|---|---|
| committer | Jonathan <jonathan@mullvad.net> | 2023-03-14 11:57:36 +0100 |
| commit | f3b9cdce26a9e5fdce0156aa687da88a7e7ee1d4 (patch) | |
| tree | f3c71fbc7eb091b1faa9a9bd8f12f50ac379b97b | |
| parent | 884f8d8c52bc9ed063abeb09295d8bd7483ea8dc (diff) | |
| parent | a3707aeb7fcce00b9f446e28decaf15816102985 (diff) | |
| download | mullvadvpn-f3b9cdce26a9e5fdce0156aa687da88a7e7ee1d4.tar.xz mullvadvpn-f3b9cdce26a9e5fdce0156aa687da88a7e7ee1d4.zip | |
Merge branch 'mh-pq-macos-mtu-bug'
| -rw-r--r-- | talpid-wireguard/src/lib.rs | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/talpid-wireguard/src/lib.rs b/talpid-wireguard/src/lib.rs index e81d7bf4b6..cdac2b8a51 100644 --- a/talpid-wireguard/src/lib.rs +++ b/talpid-wireguard/src/lib.rs @@ -252,6 +252,25 @@ impl WireguardMonitor { close_obfs_sender.clone(), ))?; + // TODO: Currently MH + PQ on MacOS has connection issues during the handshake. This seems + // be be due to packet fragmentation happening and PF blocking fragmented packets during + // the handshake due to them sometimes not having a port. Lowering the MTU for the initial + // tunnel which connects to the exit during PSK + MH negotiation causes less fragmentation + // and should be a hacky fix for the problem. In the longer term this should be fixed by + // allowing the handshake to work even if there is fragmentation and/or setting the MTU + // properly so fragmentation does not happen. + #[cfg(not(target_os = "android"))] + let init_tunnel_config = if cfg!(target_os = "macos") { + let mut init_tunnel_config = config.clone(); + if psk_negotiation && config.peers.len() > 1 { + const MH_PQ_HANDSHAKE_MTU: u16 = 1280; + init_tunnel_config.mtu = MH_PQ_HANDSHAKE_MTU; + } + init_tunnel_config + } else { + config.clone() + }; + #[cfg(target_os = "windows")] let (setup_done_tx, setup_done_rx) = mpsc::channel(0); let tunnel = Self::open_tunnel( @@ -259,7 +278,7 @@ impl WireguardMonitor { #[cfg(target_os = "android")] &Self::patch_allowed_ips(&config, psk_negotiation), #[cfg(not(target_os = "android"))] - &config, + &init_tunnel_config, log_path, args.resource_dir, args.tun_provider.clone(), |