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

Merge "Update record receipt time on records updated"

Browse Source
This commit is contained in:
Treehugger Robot
2023-06-06 08:34:39 +00:00
committed by Gerrit Code Review
parent 5f921c4292 86f674187f
commit 1667bfea04
6 changed files with 130 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -344,7 +344,7 @@ public class MdnsResponseDecoderTests {
final Network network = mock(Network.class);
responses = decoder.augmentResponses(parsedPacket,
/* existingResponses= */ Collections.emptyList(),
/* interfaceIndex= */ 10, network /* expireOnExit= */);
/* interfaceIndex= */ 10, network /* expireOnExit= */).first;
assertEquals(responses.size(), 1);
assertEquals(responses.valueAt(0).getInterfaceIndex(), 10);
@@ -593,6 +593,6 @@ public class MdnsResponseDecoderTests {
return decoder.augmentResponses(parsedPacket,
existingResponses,
MdnsSocket.INTERFACE_INDEX_UNSPECIFIED, mock(Network.class));
MdnsSocket.INTERFACE_INDEX_UNSPECIFIED, mock(Network.class)).first;
}
}

60
tests/unit/java/com/android/server/connectivity/mdns/MdnsResponseTests.java
View File

@@ -95,24 +95,24 @@ public class MdnsResponseTests {
}
}
private MdnsResponse makeCompleteResponse(int recordsTtlMillis) {
private MdnsResponse makeCompleteResponse(int recordsTtlMillis, int receiptTimeMillis) {
final String[] hostname = new String[] { "MyHostname" };
final String[] serviceName = new String[] { "MyService", "_type", "_tcp", "local" };
final String[] serviceType = new String[] { "_type", "_tcp", "local" };
final MdnsResponse response = new MdnsResponse(/* now= */ 0, serviceName, INTERFACE_INDEX,
mNetwork);
response.addPointerRecord(new MdnsPointerRecord(serviceType, 0L /* receiptTimeMillis */,
response.addPointerRecord(new MdnsPointerRecord(serviceType, receiptTimeMillis,
false /* cacheFlush */, recordsTtlMillis, serviceName));
response.setServiceRecord(new MdnsServiceRecord(serviceName, 0L /* receiptTimeMillis */,
response.setServiceRecord(new MdnsServiceRecord(serviceName, receiptTimeMillis,
true /* cacheFlush */, recordsTtlMillis, 0 /* servicePriority */,
0 /* serviceWeight */, 0 /* servicePort */, hostname));
response.setTextRecord(new MdnsTextRecord(serviceName, 0L /* receiptTimeMillis */,
response.setTextRecord(new MdnsTextRecord(serviceName, receiptTimeMillis,
true /* cacheFlush */, recordsTtlMillis, emptyList() /* entries */));
response.addInet4AddressRecord(new MdnsInetAddressRecord(
hostname, 0L /* receiptTimeMillis */, true /* cacheFlush */,
hostname, receiptTimeMillis, true /* cacheFlush */,
recordsTtlMillis, parseNumericAddress("192.0.2.123")));
response.addInet6AddressRecord(new MdnsInetAddressRecord(
hostname, 0L /* receiptTimeMillis */, true /* cacheFlush */,
hostname, receiptTimeMillis, true /* cacheFlush */,
recordsTtlMillis, parseNumericAddress("2001:db8::123")));
return response;
}
@@ -210,7 +210,7 @@ public class MdnsResponseTests {
@Test
public void copyConstructor() {
final MdnsResponse response = makeCompleteResponse(TEST_TTL_MS);
final MdnsResponse response = makeCompleteResponse(TEST_TTL_MS, 0 /* receiptTimeMillis */);
final MdnsResponse copy = new MdnsResponse(response);
assertEquals(response.getInet6AddressRecord(), copy.getInet6AddressRecord());
@@ -225,7 +225,7 @@ public class MdnsResponseTests {
@Test
public void addRecords_noChange() {
final MdnsResponse response = makeCompleteResponse(TEST_TTL_MS);
final MdnsResponse response = makeCompleteResponse(TEST_TTL_MS, 0 /* receiptTimeMillis */);
assertFalse(response.addPointerRecord(response.getPointerRecords().get(0)));
final String[] serviceName = new String[] { "MYSERVICE", "_TYPE", "_tcp", "local" };
@@ -242,8 +242,8 @@ public class MdnsResponseTests {
@Test
public void addRecords_ttlChange() {
final MdnsResponse response = makeCompleteResponse(TEST_TTL_MS);
final MdnsResponse ttlZeroResponse = makeCompleteResponse(0);
final MdnsResponse response = makeCompleteResponse(TEST_TTL_MS, 0 /* receiptTimeMillis */);
final MdnsResponse ttlZeroResponse = makeCompleteResponse(0, 0 /* receiptTimeMillis */);
assertTrue(response.addPointerRecord(ttlZeroResponse.getPointerRecords().get(0)));
assertEquals(1, response.getPointerRecords().size());
@@ -277,6 +277,46 @@ public class MdnsResponseTests {
assertEquals(ttlZeroResponse.getRecords().size(), response.getRecords().size());
}
@Test
public void addRecords_receiptTimeChange() {
final MdnsResponse response = makeCompleteResponse(TEST_TTL_MS, 0 /* receiptTimeMillis */);
final MdnsResponse receiptTimeChangedResponse = makeCompleteResponse(TEST_TTL_MS,
1 /* receiptTimeMillis */);
assertFalse(
response.addPointerRecord(receiptTimeChangedResponse.getPointerRecords().get(0)));
assertEquals(1, response.getPointerRecords().get(0).getReceiptTime());
assertTrue(response.getRecords().stream().anyMatch(r ->
r == response.getPointerRecords().get(0)));
assertFalse(
response.addInet6AddressRecord(receiptTimeChangedResponse.getInet6AddressRecord()));
assertEquals(1, response.getInet6AddressRecords().size());
assertEquals(1, response.getInet6AddressRecord().getReceiptTime());
assertTrue(response.getRecords().stream().anyMatch(r ->
r == response.getInet6AddressRecord()));
assertFalse(
response.addInet4AddressRecord(receiptTimeChangedResponse.getInet4AddressRecord()));
assertEquals(1, response.getInet4AddressRecords().size());
assertEquals(1, response.getInet4AddressRecord().getReceiptTime());
assertTrue(response.getRecords().stream().anyMatch(r ->
r == response.getInet4AddressRecord()));
assertFalse(response.setServiceRecord(receiptTimeChangedResponse.getServiceRecord()));
assertEquals(1, response.getServiceRecord().getReceiptTime());
assertTrue(response.getRecords().stream().anyMatch(r ->
r == response.getServiceRecord()));
assertFalse(response.setTextRecord(receiptTimeChangedResponse.getTextRecord()));
assertEquals(1, response.getTextRecord().getReceiptTime());
assertTrue(response.getRecords().stream().anyMatch(r ->
r == response.getTextRecord()));
// All records were replaced, not added
assertEquals(receiptTimeChangedResponse.getRecords().size(), response.getRecords().size());
}
@Test
public void dropUnmatchedAddressRecords_caseInsensitive() {

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

@@ -25,6 +25,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
@@ -1065,10 +1066,43 @@ public class MdnsServiceTypeClientTests {
// Second and later sends are sent as "expect multicast response" queries
inOrder.verify(mockSocketClient, times(2)).sendMulticastPacket(renewalQueryCaptor.capture(),
eq(mockNetwork));
inOrder.verify(mockListenerOne).onDiscoveryQuerySent(any(), anyInt());
final MdnsPacket renewalPacket = MdnsPacket.parse(
new MdnsPacketReader(renewalQueryCaptor.getValue()));
assertTrue(hasQuestion(renewalPacket, MdnsRecord.TYPE_SRV, serviceName));
assertTrue(hasQuestion(renewalPacket, MdnsRecord.TYPE_TXT, serviceName));
inOrder.verifyNoMoreInteractions();
long updatedReceiptTime = TEST_ELAPSED_REALTIME + TEST_TTL;
final MdnsPacket refreshedSrvTxtResponse = new MdnsPacket(
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 */,
0 /* serviceWeight */, 1234 /* servicePort */, hostname),
new MdnsTextRecord(serviceName, updatedReceiptTime,
false /* cacheFlush */, TEST_TTL,
Collections.emptyList() /* entries */),
new MdnsInetAddressRecord(hostname, updatedReceiptTime,
false /* cacheFlush */, TEST_TTL,
InetAddresses.parseNumericAddress(ipV4Address)),
new MdnsInetAddressRecord(hostname, updatedReceiptTime,
false /* cacheFlush */, TEST_TTL,
InetAddresses.parseNumericAddress(ipV6Address))),
Collections.emptyList() /* authorityRecords */,
Collections.emptyList() /* additionalRecords */);
client.processResponse(refreshedSrvTxtResponse, INTERFACE_INDEX, mockNetwork);
// Advance time to updatedReceiptTime + 1, expected no refresh query because the cache
// should contain the record that have update last receipt time.
doReturn(updatedReceiptTime + 1).when(mockDecoderClock).elapsedRealtime();
currentThreadExecutor.getAndClearLastScheduledRunnable().run();
inOrder.verifyNoMoreInteractions();
}
@Test