summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAlbin <albin@mullvad.net>2023-05-12 11:02:04 +0200
committerAlbin <albin@mullvad.net>2023-05-12 11:02:04 +0200
commitc575cbb013a9531f77c8455ed8aa97036b6cf495 (patch)
tree34a6cde7f5faf1e9789da606777435c01b901cb6
parent4942703df9a56f798fea6aec6847c3107016daae (diff)
parent995e623d2d8eb266734ec4f816270fe10e042aff (diff)
downloadmullvadvpn-c575cbb013a9531f77c8455ed8aa97036b6cf495.tar.xz
mullvadvpn-c575cbb013a9531f77c8455ed8aa97036b6cf495.zip
Merge pull request #4645 from t-m-w/fully-routed
Do not replace default routes on Android
-rw-r--r--CHANGELOG.md2
-rw-r--r--talpid-wireguard/src/lib.rs4
2 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc2a8a4f7d..2ca928ab5f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,8 @@ Line wrap the file at 100 chars. Th
#### Android
- Add DNS content blockers.
- Add UDP-over-TCP
+- Prevent incoming connections from outside the VPN in Android 11+ when Local Network Sharing
+ is turned off.
### Changed
- In the CLI, update the `tunnel` subcommand to resemble `relay` more. For example, by adding a
diff --git a/talpid-wireguard/src/lib.rs b/talpid-wireguard/src/lib.rs
index cdaaf4cfc0..da70b63bfc 100644
--- a/talpid-wireguard/src/lib.rs
+++ b/talpid-wireguard/src/lib.rs
@@ -914,7 +914,7 @@ impl WireguardMonitor {
/// Replace default (0-prefix) routes with more specific routes.
fn replace_default_prefixes(network: ipnetwork::IpNetwork) -> Vec<ipnetwork::IpNetwork> {
- #[cfg(not(target_os = "linux"))]
+ #[cfg(not(any(target_os = "linux", target_os = "android")))]
if network.prefix() == 0 {
if network.is_ipv4() {
vec!["0.0.0.0/1".parse().unwrap(), "128.0.0.0/1".parse().unwrap()]
@@ -925,7 +925,7 @@ impl WireguardMonitor {
vec![network]
}
- #[cfg(target_os = "linux")]
+ #[cfg(any(target_os = "linux", target_os = "android"))]
vec![network]
}