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

Fix cache flush always causing response change

Browse Source 
When the cache flush bit is set on host address records in a response,
known records are cleared and replaced with the contents of the packet.
However even if the response contains the same records as before, this
caused it to be marked as modified, and response modified callbacks are
sent for every incoming packet.

Instead, ensure that the response is only marked as modified if a
previously unknown address record is added, or if a previously known
address record is removed.

The issue wasn't found by the existing testDecodeWithNoChange test,
because it used a service record for testhost2 instead of testhost1, so
the address records were ignored.

Bug: 285997766
Bug: 285084489
Test: atest CtsNetTest FrameworksNetTests

Change-Id: Ic0f19adf5d9bde7cdab766e49cf677b319a2219b
This commit is contained in:
Remi NGUYEN VAN
2023-06-08 13:27:14 +09:00
committed by Yuyang Huang
parent 00dc4ade93
commit 98a44bcb29
4 changed files with 90 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
tests/unit/java/com/android/server/connectivity/mdns/MdnsResponseDecoderTests.java
View File

@@ -28,6 +28,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import android.net.Network;
@@ -417,6 +418,31 @@ public class MdnsResponseDecoderTests {
response.getInet4AddressRecord().getInet4Address());
}
@Test
public void testDecodeWithIpv4AddressRemove() throws IOException {
MdnsResponse response = makeMdnsResponse(0, DATAIN_SERVICE_NAME_1, List.of(
new PacketAndRecordClass(DATAIN_PTR_1,
MdnsPointerRecord.class),
new PacketAndRecordClass(DATAIN_SERVICE_1,
MdnsServiceRecord.class),
new PacketAndRecordClass(DATAIN_IPV4_1,
MdnsInet4AddressRecord.class),
new PacketAndRecordClass(DATAIN_IPV4_2,
MdnsInet4AddressRecord.class)));
// Now update the response removing the second v4 address
final MdnsResponseDecoder decoder = new MdnsResponseDecoder(mClock, null);
final byte[] removedAddrResponse = makeResponsePacket(
List.of(DATAIN_PTR_1, DATAIN_SERVICE_1, DATAIN_IPV4_1));
final ArraySet<MdnsResponse> changes = decode(
decoder, removedAddrResponse, List.of(response));
assertEquals(1, changes.size());
assertEquals(1, changes.valueAt(0).getInet4AddressRecords().size());
assertEquals(parseNumericAddress("10.1.2.3"),
changes.valueAt(0).getInet4AddressRecords().get(0).getInet4Address());
}
@Test
public void testDecodeWithIpv6AddressChange() throws IOException {
MdnsResponse response = makeMdnsResponse(0, DATAIN_SERVICE_NAME_1, List.of(
@@ -437,6 +463,29 @@ public class MdnsResponseDecoderTests {
response.getInet6AddressRecord().getInet6Address());
}
@Test
public void testDecodeWithIpv6AddressRemoved() throws IOException {
MdnsResponse response = makeMdnsResponse(0, DATAIN_SERVICE_NAME_1, List.of(
new PacketAndRecordClass(DATAIN_PTR_1,
MdnsPointerRecord.class),
new PacketAndRecordClass(DATAIN_SERVICE_1,
MdnsServiceRecord.class),
new PacketAndRecordClass(DATAIN_IPV6_1,
MdnsInet6AddressRecord.class),
new PacketAndRecordClass(DATAIN_IPV6_2,
MdnsInet6AddressRecord.class)));
// Now update the response adding an address
final MdnsResponseDecoder decoder = new MdnsResponseDecoder(mClock, null);
final byte[] removedAddrResponse = makeResponsePacket(
List.of(DATAIN_PTR_1, DATAIN_SERVICE_1, DATAIN_IPV6_1));
final ArraySet<MdnsResponse> updatedResponses = decode(
decoder, removedAddrResponse, List.of(response));
assertEquals(1, updatedResponses.size());
assertEquals(1, updatedResponses.valueAt(0).getInet6AddressRecords().size());
assertEquals(parseNumericAddress("aabb:ccdd:1122:3344:a0b0:c0d0:1020:3040"),
updatedResponses.valueAt(0).getInet6AddressRecords().get(0).getInet6Address());
}
@Test
public void testDecodeWithChangeOnText() throws IOException {
MdnsResponse response = makeMdnsResponse(0, DATAIN_SERVICE_NAME_1, List.of(
@@ -504,11 +553,12 @@ public class MdnsResponseDecoderTests {
new PacketAndRecordClass(DATAIN_IPV4_1, MdnsInet4AddressRecord.class),
new PacketAndRecordClass(DATAIN_IPV6_1, MdnsInet6AddressRecord.class),
new PacketAndRecordClass(DATAIN_PTR_1, MdnsPointerRecord.class),
new PacketAndRecordClass(DATAIN_SERVICE_2, MdnsServiceRecord.class),
new PacketAndRecordClass(DATAIN_SERVICE_1, MdnsServiceRecord.class),
new PacketAndRecordClass(DATAIN_TEXT_1, MdnsTextRecord.class));
// Create a two identical responses.
MdnsResponse response = makeMdnsResponse(0, DATAIN_SERVICE_NAME_1, recordList);
MdnsResponse response = makeMdnsResponse(12L /* time */, DATAIN_SERVICE_NAME_1, recordList);
doReturn(34L).when(mClock).elapsedRealtime();
final MdnsResponseDecoder decoder = new MdnsResponseDecoder(mClock, null);
final byte[] identicalResponse = makeResponsePacket(
recordList.stream().map(p -> p.packetData).collect(Collectors.toList()));

12
tests/unit/java/com/android/server/connectivity/mdns/MdnsServiceTypeClientTests.java
View File

@@ -1078,21 +1078,17 @@ public class MdnsServiceTypeClientTests {
0 /* flags */,
Collections.emptyList() /* questions */,
List.of(
// TODO: cacheFlush will cause addresses to be cleared and re-added every
// time, which is considered a change and triggers extra
// onServiceChanged callbacks. Sets cacheFlush bit to false until the
// issue is fixed.
new MdnsServiceRecord(serviceName, updatedReceiptTime,
false /* cacheFlush */, TEST_TTL, 0 /* servicePriority */,
true /* cacheFlush */, TEST_TTL, 0 /* servicePriority */,
0 /* serviceWeight */, 1234 /* servicePort */, hostname),
new MdnsTextRecord(serviceName, updatedReceiptTime,
false /* cacheFlush */, TEST_TTL,
true /* cacheFlush */, TEST_TTL,
Collections.emptyList() /* entries */),
new MdnsInetAddressRecord(hostname, updatedReceiptTime,
false /* cacheFlush */, TEST_TTL,
true /* cacheFlush */, TEST_TTL,
InetAddresses.parseNumericAddress(ipV4Address)),
new MdnsInetAddressRecord(hostname, updatedReceiptTime,
false /* cacheFlush */, TEST_TTL,
true /* cacheFlush */, TEST_TTL,
InetAddresses.parseNumericAddress(ipV6Address))),
Collections.emptyList() /* authorityRecords */,
Collections.emptyList() /* additionalRecords */);