diff options
| author | David Lönnhager <david.l@mullvad.net> | 2020-11-13 14:25:48 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2020-11-13 14:25:48 +0100 |
| commit | c9a5a5f87a466848755415ce15a49b21934f4386 (patch) | |
| tree | 40f4b2513556bdde890076543be05906fcd6252d | |
| parent | 617b000c684b995e126be3d97b0067acffbb1a72 (diff) | |
| parent | 6b560e556af8787becc28509611b30bac7518bfb (diff) | |
| download | mullvadvpn-c9a5a5f87a466848755415ce15a49b21934f4386.tar.xz mullvadvpn-c9a5a5f87a466848755415ce15a49b21934f4386.zip | |
Merge branch 'android-fix-compilation'
| -rw-r--r-- | talpid-core/src/routing/android.rs | 12 | ||||
| -rw-r--r-- | talpid-core/src/tunnel/wireguard/mod.rs | 1 |
2 files changed, 9 insertions, 4 deletions
diff --git a/talpid-core/src/routing/android.rs b/talpid-core/src/routing/android.rs index cfacbe3474..6fa199a417 100644 --- a/talpid-core/src/routing/android.rs +++ b/talpid-core/src/routing/android.rs @@ -23,9 +23,15 @@ impl RouteManagerImpl { ) -> Result<(), Error> { let mut manage_rx = manage_rx.fuse(); while let Some(command) = manage_rx.next().await { - if let RouteManagerCommand::Shutdown(tx) = command { - tx.send(()).map_err(|()| Error)?; - break; + match command { + RouteManagerCommand::Shutdown(tx) => { + tx.send(()).map_err(|()| Error)?; + break; + } + RouteManagerCommand::AddRoutes(_routes, tx) => { + let _ = tx.send(Ok(())); + } + RouteManagerCommand::ClearRoutes => (), } } Ok(()) diff --git a/talpid-core/src/tunnel/wireguard/mod.rs b/talpid-core/src/tunnel/wireguard/mod.rs index 0d03a80c6a..852e5b0996 100644 --- a/talpid-core/src/tunnel/wireguard/mod.rs +++ b/talpid-core/src/tunnel/wireguard/mod.rs @@ -88,7 +88,6 @@ impl WireguardMonitor { .set_tunnel_link(&iface_name) .map_err(Error::SetupRoutingError)?; - #[cfg(not(target_os = "android"))] route_manager .add_routes(Self::get_routes(&iface_name, &config)) .map_err(Error::SetupRoutingError)?; |