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

Rename mTapPacketReader to mDowntreamReader

Browse Source 
Test: atest EthernetTetheringTest
Change-Id: I2905aba449a2625caf6a82b27b9e43b06191da9f
This commit is contained in:
markchien
2021-09-11 15:50:17 +08:00
committed by Mark Chien
parent 473d864d20
commit 0bd10760a8
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Tethering/tests/integration/src/android/net/EthernetTetheringTest.java
View File

@@ -118,7 +118,7 @@ public class EthernetTetheringTest {
private TestNetworkInterface mDownstreamIface; private TestNetworkInterface mDownstreamIface;
private HandlerThread mHandlerThread; private HandlerThread mHandlerThread;
private Handler mHandler; private Handler mHandler;
private TapPacketReader mTapPacketReader; private TapPacketReader mDownstreamReader;
private TetheredInterfaceRequester mTetheredInterfaceRequester; private TetheredInterfaceRequester mTetheredInterfaceRequester;
private MyTetheringEventCallback mTetheringEventCallback; private MyTetheringEventCallback mTetheringEventCallback;
@@ -161,10 +161,10 @@ public class EthernetTetheringTest {
mTetheringEventCallback.unregister(); mTetheringEventCallback.unregister();
mTetheringEventCallback = null; mTetheringEventCallback = null;
} }
if (mTapPacketReader != null) { if (mDownstreamReader != null) {
TapPacketReader reader = mTapPacketReader; TapPacketReader reader = mDownstreamReader;
mHandler.post(() -> reader.stop()); mHandler.post(() -> reader.stop());
mTapPacketReader = null; mDownstreamReader = null;
} }
mHandlerThread.quitSafely(); mHandlerThread.quitSafely();
mTetheredInterfaceRequester.release(); mTetheredInterfaceRequester.release();
@@ -253,7 +253,7 @@ public class EthernetTetheringTest {
byte[] client2 = MacAddress.fromString("a:b:c:d:e:f").toByteArray(); byte[] client2 = MacAddress.fromString("a:b:c:d:e:f").toByteArray();
FileDescriptor fd = mDownstreamIface.getFileDescriptor().getFileDescriptor(); FileDescriptor fd = mDownstreamIface.getFileDescriptor().getFileDescriptor();
mTapPacketReader = makePacketReader(fd, getMTU(mDownstreamIface)); mDownstreamReader = makePacketReader(fd, getMTU(mDownstreamIface));
DhcpResults dhcpResults = runDhcp(fd, client1); DhcpResults dhcpResults = runDhcp(fd, client1);
assertEquals(new LinkAddress(clientAddr), dhcpResults.ipAddress); assertEquals(new LinkAddress(clientAddr), dhcpResults.ipAddress);
@@ -333,9 +333,9 @@ public class EthernetTetheringTest {
// does not have an IP address, and unprivileged apps cannot see interfaces without IP // does not have an IP address, and unprivileged apps cannot see interfaces without IP
// addresses. This shouldn't be flaky because the TAP interface will buffer all packets even // addresses. This shouldn't be flaky because the TAP interface will buffer all packets even
// before the reader is started. // before the reader is started.
mTapPacketReader = makePacketReader(mDownstreamIface); mDownstreamReader = makePacketReader(mDownstreamIface);
expectRouterAdvertisement(mTapPacketReader, iface, 2000 /* timeoutMs */); expectRouterAdvertisement(mDownstreamReader, iface, 2000 /* timeoutMs */);
expectLocalOnlyAddresses(iface); expectLocalOnlyAddresses(iface);
} }
@@ -556,7 +556,7 @@ public class EthernetTetheringTest {
private void checkVirtualEthernet(TestNetworkInterface iface, int mtu) throws Exception { private void checkVirtualEthernet(TestNetworkInterface iface, int mtu) throws Exception {
FileDescriptor fd = iface.getFileDescriptor().getFileDescriptor(); FileDescriptor fd = iface.getFileDescriptor().getFileDescriptor();
mTapPacketReader = makePacketReader(fd, mtu); mDownstreamReader = makePacketReader(fd, mtu);
mTetheringEventCallback = enableEthernetTethering(iface.getInterfaceName()); mTetheringEventCallback = enableEthernetTethering(iface.getInterfaceName());
checkTetheredClientCallbacks(fd); checkTetheredClientCallbacks(fd);
} }
@@ -617,7 +617,7 @@ public class EthernetTetheringTest {
private DhcpPacket getNextDhcpPacket() throws ParseException { private DhcpPacket getNextDhcpPacket() throws ParseException {
byte[] packet; byte[] packet;
while ((packet = mTapPacketReader.popPacket(PACKET_READ_TIMEOUT_MS)) != null) { while ((packet = mDownstreamReader.popPacket(PACKET_READ_TIMEOUT_MS)) != null) {
try { try {
return DhcpPacket.decodeFullPacket(packet, packet.length, DhcpPacket.ENCAP_L2); return DhcpPacket.decodeFullPacket(packet, packet.length, DhcpPacket.ENCAP_L2);
} catch (DhcpPacket.ParseException e) { } catch (DhcpPacket.ParseException e) {
@@ -774,7 +774,7 @@ public class EthernetTetheringTest {
assertEquals("onUpstreamChanged for unexpected network", mUpstreamTracker.getNetwork(), assertEquals("onUpstreamChanged for unexpected network", mUpstreamTracker.getNetwork(),
mTetheringEventCallback.awaitFirstUpstreamConnected()); mTetheringEventCallback.awaitFirstUpstreamConnected());
mTapPacketReader = makePacketReader(mDownstreamIface); mDownstreamReader = makePacketReader(mDownstreamIface);
// TODO: do basic forwarding test here. // TODO: do basic forwarding test here.
} }