Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Speculatively fix L2TP keepalive issues by reducing mtu"

Browse Source
This commit is contained in:
Lorenzo Colitti
2020-10-12 00:40:44 +00:00
committed by Gerrit Code Review
parent ccd316924d 5113da7e85
commit 392b52f49f
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/connectivity/Vpn.java
View File

@@ -2152,7 +2152,11 @@ public class Vpn {
break; break;
} }
// Prepare arguments for mtpd. // Prepare arguments for mtpd. MTU/MRU calculated conservatively. Only IPv4 supported
// because LegacyVpn.
// 1500 - 60 (Carrier-internal IPv6 + UDP + GTP) - 10 (PPP) - 16 (L2TP) - 8 (UDP)
// - 77 (IPsec w/ SHA-2 512, 256b trunc-len, AES-CBC) - 8 (UDP encap) - 20 (IPv4)
// - 28 (464xlat)
String[] mtpd = null; String[] mtpd = null;
switch (profile.type) { switch (profile.type) {
case VpnProfile.TYPE_PPTP: case VpnProfile.TYPE_PPTP:
@@ -2160,7 +2164,7 @@ public class Vpn {
iface, "pptp", profile.server, "1723", iface, "pptp", profile.server, "1723",
"name", profile.username, "password", profile.password, "name", profile.username, "password", profile.password,
"linkname", "vpn", "refuse-eap", "nodefaultroute", "linkname", "vpn", "refuse-eap", "nodefaultroute",
"usepeerdns", "idle", "1800", "mtu", "1400", "mru", "1400", "usepeerdns", "idle", "1800", "mtu", "1270", "mru", "1270",
(profile.mppe ? "+mppe" : "nomppe"), (profile.mppe ? "+mppe" : "nomppe"),
}; };
break; break;
@@ -2170,7 +2174,7 @@ public class Vpn {
iface, "l2tp", profile.server, "1701", profile.l2tpSecret, iface, "l2tp", profile.server, "1701", profile.l2tpSecret,
"name", profile.username, "password", profile.password, "name", profile.username, "password", profile.password,
"linkname", "vpn", "refuse-eap", "nodefaultroute", "linkname", "vpn", "refuse-eap", "nodefaultroute",
"usepeerdns", "idle", "1800", "mtu", "1400", "mru", "1400", "usepeerdns", "idle", "1800", "mtu", "1270", "mru", "1270",
}; };
break; break;
} }

2
tests/net/java/com/android/server/connectivity/VpnTest.java
View File

@@ -1155,7 +1155,7 @@ public class VpnTest {
new String[] { EGRESS_IFACE, "l2tp", expectedAddr, "1701", profile.l2tpSecret, new String[] { EGRESS_IFACE, "l2tp", expectedAddr, "1701", profile.l2tpSecret,
"name", profile.username, "password", profile.password, "name", profile.username, "password", profile.password,
"linkname", "vpn", "refuse-eap", "nodefaultroute", "usepeerdns", "linkname", "vpn", "refuse-eap", "nodefaultroute", "usepeerdns",
"idle", "1800", "mtu", "1400", "mru", "1400" }, "idle", "1800", "mtu", "1270", "mru", "1270" },
deps.mtpdArgs.get(10, TimeUnit.SECONDS)); deps.mtpdArgs.get(10, TimeUnit.SECONDS));
// Now wait for the runner to be ready before testing for the route. // Now wait for the runner to be ready before testing for the route.
legacyRunnerReady.block(10_000); legacyRunnerReady.block(10_000);