LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move to f/l/n instead of RouteUtils

Browse Source 
Test: TetheringTests
Change-Id: I35b36538463a7fc2f02e142719c898d1694b2d6b
This commit is contained in:
Chalard Jean
2021-10-29 15:57:22 +09:00
parent f58a955b37
commit adcec9ebbe
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Tethering/src/android/net/ip/IpServer.java
View File

@@ -46,8 +46,6 @@ import android.net.dhcp.IDhcpEventCallbacks;
import android.net.dhcp.IDhcpServer; import android.net.dhcp.IDhcpServer;
import android.net.ip.IpNeighborMonitor.NeighborEvent; import android.net.ip.IpNeighborMonitor.NeighborEvent;
import android.net.ip.RouterAdvertisementDaemon.RaParams; 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.InterfaceParams;
import android.net.util.InterfaceSet; import android.net.util.InterfaceSet;
import android.net.util.PrefixUtils; 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.State;
import com.android.internal.util.StateMachine; import com.android.internal.util.StateMachine;
import com.android.modules.utils.build.SdkLevel; 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;
import com.android.networkstack.tethering.BpfCoordinator.ClientInfo; import com.android.networkstack.tethering.BpfCoordinator.ClientInfo;
import com.android.networkstack.tethering.BpfCoordinator.Ipv6ForwardingRule; import com.android.networkstack.tethering.BpfCoordinator.Ipv6ForwardingRule;
@@ -767,7 +766,7 @@ public class IpServer extends StateMachine {
} }
private void removeRoutesFromLocalNetwork(@NonNull final List<RouteInfo> toBeRemoved) { private void removeRoutesFromLocalNetwork(@NonNull final List<RouteInfo> toBeRemoved) {
final int removalFailures = RouteUtils.removeRoutesFromLocalNetwork( final int removalFailures = NetdUtils.removeRoutesFromLocalNetwork(
mNetd, toBeRemoved); mNetd, toBeRemoved);
if (removalFailures > 0) { if (removalFailures > 0) {
mLog.e(String.format("Failed to remove %d IPv6 routes from local table.", mLog.e(String.format("Failed to remove %d IPv6 routes from local table.",
@@ -785,7 +784,7 @@ public class IpServer extends StateMachine {
try { try {
// Add routes from local network. Note that adding routes that // Add routes from local network. Note that adding routes that
// already exist does not cause an error (EEXIST is silently ignored). // already exist does not cause an error (EEXIST is silently ignored).
RouteUtils.addRoutesToLocalNetwork(mNetd, mIfaceName, toBeAdded); NetdUtils.addRoutesToLocalNetwork(mNetd, mIfaceName, toBeAdded);
} catch (IllegalStateException e) { } catch (IllegalStateException e) {
mLog.e("Failed to add IPv4/v6 routes to local table: " + e); mLog.e("Failed to add IPv4/v6 routes to local table: " + e);
return; return;

4
Tethering/tests/privileged/src/android/net/ip/RouterAdvertisementDaemonTest.java
View File

@@ -44,7 +44,6 @@ import android.net.IpPrefix;
import android.net.MacAddress; import android.net.MacAddress;
import android.net.RouteInfo; import android.net.RouteInfo;
import android.net.ip.RouterAdvertisementDaemon.RaParams; import android.net.ip.RouterAdvertisementDaemon.RaParams;
import android.net.shared.RouteUtils;
import android.net.util.InterfaceParams; import android.net.util.InterfaceParams;
import android.os.Handler; import android.os.Handler;
import android.os.HandlerThread; import android.os.HandlerThread;
@@ -56,6 +55,7 @@ import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.android.net.module.util.Ipv6Utils; 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.Struct;
import com.android.net.module.util.structs.EthernetHeader; import com.android.net.module.util.structs.EthernetHeader;
import com.android.net.module.util.structs.Icmpv6Header; import com.android.net.module.util.structs.Icmpv6Header;
@@ -335,7 +335,7 @@ public final class RouterAdvertisementDaemonTest {
final String iface = mTetheredParams.name; final String iface = mTetheredParams.name;
final RouteInfo linkLocalRoute = final RouteInfo linkLocalRoute =
new RouteInfo(new IpPrefix("fe80::/64"), null, iface, RTN_UNICAST); 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"); final ByteBuffer rs = createRsPacket("fe80::1122:3344:5566:7788");
mTetheredPacketReader.sendResponse(rs); mTetheredPacketReader.sendResponse(rs);