Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72432ab0 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

Merge "Speculatively fix L2TP keepalive issues by reducing mtu" am: 392b52f4... 

Merge "Speculatively fix L2TP keepalive issues by reducing mtu" am: 392b52f4 am: 926d1ee8 am: 649c2bbb

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399646

Change-Id: I5b11411b87069687d32dede7194f9cd8a232c963
parents fda201b7 649c2bbb

services/core/java/com/android/server/connectivity/Vpn.java

+7 −3
Original line number Diff line number Diff line
@@ -2152,7 +2152,11 @@ public class Vpn { 
                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;

        switch (profile.type) {

            case VpnProfile.TYPE_PPTP:
@@ -2160,7 +2164,7 @@ public class Vpn { 
                    iface, "pptp", profile.server, "1723",

                    "name", profile.username, "password", profile.password,

                    "linkname", "vpn", "refuse-eap", "nodefaultroute",

                    "usepeerdns", "idle", "1800", "mtu", "1400", "mru", "1400",

                    "usepeerdns", "idle", "1800", "mtu", "1270", "mru", "1270",

                    (profile.mppe ? "+mppe" : "nomppe"),

                };

                break;
@@ -2170,7 +2174,7 @@ public class Vpn { 
                    iface, "l2tp", profile.server, "1701", profile.l2tpSecret,

                    "name", profile.username, "password", profile.password,

                    "linkname", "vpn", "refuse-eap", "nodefaultroute",

                    "usepeerdns", "idle", "1800", "mtu", "1400", "mru", "1400",

                    "usepeerdns", "idle", "1800", "mtu", "1270", "mru", "1270",

                };

                break;

        }

tests/net/java/com/android/server/connectivity/VpnTest.java

+1 −1
Original line number Diff line number Diff line
@@ -1155,7 +1155,7 @@ public class VpnTest { 
                    new String[] { EGRESS_IFACE, "l2tp", expectedAddr, "1701", profile.l2tpSecret,

                            "name", profile.username, "password", profile.password,

                            "linkname", "vpn", "refuse-eap", "nodefaultroute", "usepeerdns",

                            "idle", "1800", "mtu", "1400", "mru", "1400" },

                            "idle", "1800", "mtu", "1270", "mru", "1270" },

                    deps.mtpdArgs.get(10, TimeUnit.SECONDS));

            // Now wait for the runner to be ready before testing for the route.

            legacyRunnerReady.block(10_000);