Clarify advertising logs
Adjust log messages to provide a clearer trace of sending replies
and receiving queries.
Before:
[MdnsAdvertiser.wlan0.MdnsReplySender/serviceDiscovery] VERBOSE Sending {MdnsReplyInfo: /[fe80::285e:44ff:fe0e:b59c%wlan0]:5353 to /[fe80::285e:44ff:fe0e:b59c%wlan0]:5353, answers: 1, additionalAnswers: 8, knownAnswers: 0, sendDelayMs 64}
[MdnsAdvertiser.wlan0.MdnsReplySender/serviceDiscovery] VERBOSE Scheduling {MdnsReplyInfo: /[fe80::285e:44ff:fe0e:b59c%wlan0]:5353 to /[fe80::285e:44ff:fe0e:b59c%wlan0]:5353, answers: 1, additionalAnswers: 8, knownAnswers: 0, sendDelayMs 64}
[MdnsAdvertiser.wlan0] VERBOSE Parsed packet with 1 questions, 0 answers, 0 authority, 0 additional from /[fe80::285e:44ff:fe0e:b59c%wlan0]:5353
After:
[MdnsAdvertiser.wlan0.MdnsReplySender/serviceDiscovery] Sending {MdnsReplyInfo: /[fe80::c8ce:2aff:fe97:87b%wlan0]:5353 to /[fe80::c8ce:2aff:fe97:87b%wlan0]:5353, answers: 1, additionalAnswers: 8, knownAnswers: 0, sendDelayMs 32}
[MdnsAdvertiser.wlan0.MdnsReplySender/serviceDiscovery] VERBOSE Scheduling {MdnsReplyInfo: /[fe80::c8ce:2aff:fe97:87b%wlan0]:5353 to /[fe80::c8ce:2aff:fe97:87b%wlan0]:5353, answers: 1, additionalAnswers: 8, knownAnswers: 0, sendDelayMs 32}
[MdnsAdvertiser.wlan0] VERBOSE Parsed packet with transactionId(1): 1 questions, 0 answers, 0 authority, 0 additional from /192.168.1.110:5353
Test: m & adb shell dumpsys servicediscovery
Change-Id: Icba8ddecc364624162f564a60f1f15a61ca7710d
diff --git a/service-t/src/com/android/server/connectivity/mdns/MdnsInterfaceAdvertiser.java b/service-t/src/com/android/server/connectivity/mdns/MdnsInterfaceAdvertiser.java
index 0b2003f..58defa9 100644
--- a/service-t/src/com/android/server/connectivity/mdns/MdnsInterfaceAdvertiser.java
+++ b/service-t/src/com/android/server/connectivity/mdns/MdnsInterfaceAdvertiser.java
@@ -416,13 +416,6 @@
// recvbuf and src are reused after this returns; ensure references to src are not kept.
final InetSocketAddress srcCopy = new InetSocketAddress(src.getAddress(), src.getPort());
- if (DBG) {
- mSharedLog.v("Parsed packet with " + packet.questions.size() + " questions, "
- + packet.answers.size() + " answers, "
- + packet.authorityRecords.size() + " authority, "
- + packet.additionalRecords.size() + " additional from " + srcCopy);
- }
-
Map<Integer, Integer> conflictingServices =
mRecordRepository.getConflictingServices(packet);
@@ -440,7 +433,14 @@
// answer. One exception is simultaneous probe tiebreaking (rfc6762 8.2), in which case the
// conflicting service is still probing and won't reply either.
final MdnsReplyInfo answers = mRecordRepository.getReply(packet, srcCopy);
-
+ // Dump the query packet.
+ if (DBG || answers != null) {
+ mSharedLog.v("Parsed packet with transactionId(" + packet.transactionId + "): "
+ + packet.questions.size() + " questions, "
+ + packet.answers.size() + " answers, "
+ + packet.authorityRecords.size() + " authority, "
+ + packet.additionalRecords.size() + " additional from " + srcCopy);
+ }
if (answers == null) return;
mReplySender.queueReply(answers);
}
diff --git a/service-t/src/com/android/server/connectivity/mdns/MdnsReplySender.java b/service-t/src/com/android/server/connectivity/mdns/MdnsReplySender.java
index a89b004..4708cb6 100644
--- a/service-t/src/com/android/server/connectivity/mdns/MdnsReplySender.java
+++ b/service-t/src/com/android/server/connectivity/mdns/MdnsReplySender.java
@@ -245,7 +245,7 @@
return;
}
- if (mEnableDebugLog) mSharedLog.v("Sending " + replyInfo);
+ mSharedLog.log("Sending " + replyInfo);
final int flags = 0x8400; // Response, authoritative (rfc6762 18.4)
final MdnsPacket packet = new MdnsPacket(flags,