commit 70770a8b572c2ebbaf5075bdbb74308a093665e6
author Hansen Kurli <hkurli@google.com> Thu Aug 24 16:38:36 2023 +0800
committer Hansen Kurli <hkurli@google.com> Thu Nov 02 20:57:29 2023 +0800
tree 3bbe02bc37bb0a5fd5e6a7cb6ed1fdd58adde2c6
parent 4fa38a5caa69fa0bf8b8e81d3e177fa7ed451e5e

Remove findIPv4DefaultRoute

Remove unused findIPv4DefaultRoute. This allows startLegacyVpnPrivileged
to run on IPv6 and removes the "Unable to find IPv4 default gateway"
exception.

Bug: 161776767
Test: Test updated in ConnectivityServiceTest: atest FrameworksNetTests
Change-Id: Ie3e3dfdce8051dc70df704502d056645ea030245

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

diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java
index a44c678..783839d 100644
--- a/services/core/java/com/android/server/connectivity/Vpn.java
+++ b/services/core/java/com/android/server/connectivity/Vpn.java
@@ -2542,17 +2542,6 @@
     private native boolean jniAddAddress(String interfaze, String address, int prefixLen);
     private native boolean jniDelAddress(String interfaze, String address, int prefixLen);
 
-    private static RouteInfo findIPv4DefaultRoute(LinkProperties prop) {
-        for (RouteInfo route : prop.getAllRoutes()) {
-            // Currently legacy VPN only works on IPv4.
-            if (route.isDefaultRoute() && route.getGateway() instanceof Inet4Address) {
-                return route;
-            }
-        }
-
-        throw new IllegalStateException("Unable to find IPv4 default gateway");
-    }
-
     private void enforceNotRestrictedUser() {
         final long token = Binder.clearCallingIdentity();
         try {
@@ -2651,10 +2640,6 @@
             throw new SecurityException("Restricted users cannot establish VPNs");
         }
 
-        final RouteInfo ipv4DefaultRoute = findIPv4DefaultRoute(egress);
-        final String gateway = ipv4DefaultRoute.getGateway().getHostAddress();
-        final String iface = ipv4DefaultRoute.getInterface();
-
         // Load certificates.
         String privateKey = "";
         String userCert = "";