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

Merge "Disable cache flush bit in existing announcement" into main

Browse Source
This commit is contained in:
Paul Hu
2023-09-08 12:48:05 +00:00
committed by Gerrit Code Review
parent dad74776b8 88239ccb0a
commit af511b5abe
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
service-t/src/com/android/server/connectivity/mdns/MdnsRecordRepository.java
View File

@@ -399,7 +399,9 @@ public class MdnsRecordRepository {
r -> new MdnsPointerRecord( r -> new MdnsPointerRecord(
r.record.getName(), r.record.getName(),
0L /* receiptTimeMillis */, 0L /* receiptTimeMillis */,
true /* cacheFlush */, // RFC6762#10.1, the cache flush bit should be false for existing
// announcement. Otherwise, the record will be deleted immediately.
false /* cacheFlush */,
0L /* ttlMillis */, 0L /* ttlMillis */,
r.record.getPointer())); r.record.getPointer()));

6
tests/unit/java/com/android/server/connectivity/mdns/MdnsRecordRepositoryTest.kt
View File

@@ -182,7 +182,7 @@ class MdnsRecordRepositoryTest {
MdnsPointerRecord( MdnsPointerRecord(
arrayOf("_testservice", "_tcp", "local"), arrayOf("_testservice", "_tcp", "local"),
0L /* receiptTimeMillis */, 0L /* receiptTimeMillis */,
true /* cacheFlush */, false /* cacheFlush */,
0L /* ttlMillis */, 0L /* ttlMillis */,
arrayOf("MyTestService", "_testservice", "_tcp", "local")) arrayOf("MyTestService", "_testservice", "_tcp", "local"))
), packet.answers) ), packet.answers)
@@ -211,13 +211,13 @@ class MdnsRecordRepositoryTest {
MdnsPointerRecord( MdnsPointerRecord(
arrayOf("_testservice", "_tcp", "local"), arrayOf("_testservice", "_tcp", "local"),
0L /* receiptTimeMillis */, 0L /* receiptTimeMillis */,
true /* cacheFlush */, false /* cacheFlush */,
0L /* ttlMillis */, 0L /* ttlMillis */,
arrayOf("MyTestService", "_testservice", "_tcp", "local")), arrayOf("MyTestService", "_testservice", "_tcp", "local")),
MdnsPointerRecord( MdnsPointerRecord(
arrayOf("_subtype", "_sub", "_testservice", "_tcp", "local"), arrayOf("_subtype", "_sub", "_testservice", "_tcp", "local"),
0L /* receiptTimeMillis */, 0L /* receiptTimeMillis */,
true /* cacheFlush */, false /* cacheFlush */,
0L /* ttlMillis */, 0L /* ttlMillis */,
arrayOf("MyTestService", "_testservice", "_tcp", "local")), arrayOf("MyTestService", "_testservice", "_tcp", "local")),
), packet.answers) ), packet.answers)