From adcec9ebbe11360588ec3cf0beeee144de6fa680 Mon Sep 17 00:00:00 2001 From: Chalard Jean Date: Fri, 29 Oct 2021 15:57:22 +0900 Subject: [PATCH] Move to f/l/n instead of RouteUtils Test: TetheringTests Change-Id: I35b36538463a7fc2f02e142719c898d1694b2d6b --- Tethering/src/android/net/ip/IpServer.java | 7 +++---- .../src/android/net/ip/RouterAdvertisementDaemonTest.java | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Tethering/src/android/net/ip/IpServer.java b/Tethering/src/android/net/ip/IpServer.java index cf49683acb..bee928dfc4 100644 --- a/Tethering/src/android/net/ip/IpServer.java +++ b/Tethering/src/android/net/ip/IpServer.java @@ -46,8 +46,6 @@ import android.net.dhcp.IDhcpEventCallbacks; import android.net.dhcp.IDhcpServer; import android.net.ip.IpNeighborMonitor.NeighborEvent; import android.net.ip.RouterAdvertisementDaemon.RaParams; -import android.net.shared.NetdUtils; -import android.net.shared.RouteUtils; import android.net.util.InterfaceParams; import android.net.util.InterfaceSet; import android.net.util.PrefixUtils; @@ -67,6 +65,7 @@ import com.android.internal.util.MessageUtils; import com.android.internal.util.State; import com.android.internal.util.StateMachine; import com.android.modules.utils.build.SdkLevel; +import com.android.net.module.util.NetdUtils; import com.android.networkstack.tethering.BpfCoordinator; import com.android.networkstack.tethering.BpfCoordinator.ClientInfo; import com.android.networkstack.tethering.BpfCoordinator.Ipv6ForwardingRule; @@ -767,7 +766,7 @@ public class IpServer extends StateMachine { } private void removeRoutesFromLocalNetwork(@NonNull final List toBeRemoved) { - final int removalFailures = RouteUtils.removeRoutesFromLocalNetwork( + final int removalFailures = NetdUtils.removeRoutesFromLocalNetwork( mNetd, toBeRemoved); if (removalFailures > 0) { mLog.e(String.format("Failed to remove %d IPv6 routes from local table.", @@ -785,7 +784,7 @@ public class IpServer extends StateMachine { try { // Add routes from local network. Note that adding routes that // already exist does not cause an error (EEXIST is silently ignored). - RouteUtils.addRoutesToLocalNetwork(mNetd, mIfaceName, toBeAdded); + NetdUtils.addRoutesToLocalNetwork(mNetd, mIfaceName, toBeAdded); } catch (IllegalStateException e) { mLog.e("Failed to add IPv4/v6 routes to local table: " + e); return; diff --git a/Tethering/tests/privileged/src/android/net/ip/RouterAdvertisementDaemonTest.java b/Tethering/tests/privileged/src/android/net/ip/RouterAdvertisementDaemonTest.java index 1d942146e1..34f3e0edaa 100644 --- a/Tethering/tests/privileged/src/android/net/ip/RouterAdvertisementDaemonTest.java +++ b/Tethering/tests/privileged/src/android/net/ip/RouterAdvertisementDaemonTest.java @@ -44,7 +44,6 @@ import android.net.IpPrefix; import android.net.MacAddress; import android.net.RouteInfo; import android.net.ip.RouterAdvertisementDaemon.RaParams; -import android.net.shared.RouteUtils; import android.net.util.InterfaceParams; import android.os.Handler; import android.os.HandlerThread; @@ -56,6 +55,7 @@ import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; import com.android.net.module.util.Ipv6Utils; +import com.android.net.module.util.NetdUtils; import com.android.net.module.util.Struct; import com.android.net.module.util.structs.EthernetHeader; import com.android.net.module.util.structs.Icmpv6Header; @@ -335,7 +335,7 @@ public final class RouterAdvertisementDaemonTest { final String iface = mTetheredParams.name; final RouteInfo linkLocalRoute = new RouteInfo(new IpPrefix("fe80::/64"), null, iface, RTN_UNICAST); - RouteUtils.addRoutesToLocalNetwork(sNetd, iface, List.of(linkLocalRoute)); + NetdUtils.addRoutesToLocalNetwork(sNetd, iface, List.of(linkLocalRoute)); final ByteBuffer rs = createRsPacket("fe80::1122:3344:5566:7788"); mTetheredPacketReader.sendResponse(rs);