Fix ipv6 only mdns and fix adding mdns handler from java

Peergos · May 22, 2024 · a0710d5 · a0710d5
1 parent 640cc5d
commit a0710d5
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/libp2p/src/main/kotlin/io/libp2p/discovery/MDnsDiscovery.kt b/libp2p/src/main/kotlin/io/libp2p/discovery/MDnsDiscovery.kt
@@ -61,6 +61,10 @@ class MDnsDiscovery(
         newPeerFoundListeners.forEach { it(peerInfo) }
     }
 
+    fun addHandler(h: PeerListener) {
+        newPeerFoundListeners += h
+    }
+
     private fun ipfsDiscoveryInfo(): ServiceInfo {
         return ServiceInfo.create(
             serviceTag,
@@ -112,7 +116,7 @@ class MDnsDiscovery(
                 val aRecords = answers.filter { DNSRecordType.TYPE_A.equals(it.recordType) }
                 val aaaaRecords = answers.filter { DNSRecordType.TYPE_AAAA.equals(it.recordType) }
 
-                if (txtRecord == null || srvRecord == null || aRecords.isEmpty()) {
+                if (txtRecord == null || srvRecord == null || (aRecords.isEmpty() && aaaaRecords.isEmpty())) {
                     return // incomplete answers
                 }
 

diff --git a/libp2p/src/test/kotlin/io/libp2p/discovery/MDnsDiscoveryTest.kt b/libp2p/src/test/kotlin/io/libp2p/discovery/MDnsDiscoveryTest.kt
@@ -90,6 +90,28 @@ class MDnsDiscoveryTest {
         assertEquals(host.listenAddresses().size, peerInfo?.addresses?.size)
     }
 
+    @Test
+    fun `start discovery and listen for self ipv6`() {
+        var peerInfo: PeerInfo? = null
+        val discoverer = MDnsDiscovery(hostIpv6, testServiceTag)
+
+        discoverer.newPeerFoundListeners += {
+            peerInfo = it
+        }
+
+        discoverer.start().get(1, TimeUnit.SECONDS)
+        for (i in 0..50) {
+            if (peerInfo != null) {
+                break
+            }
+            TimeUnit.MILLISECONDS.sleep(100)
+        }
+        discoverer.stop().get(5, TimeUnit.SECONDS)
+
+        assertEquals(hostIpv6.peerId, peerInfo?.peerId)
+        assertEquals(hostIpv6.listenAddresses().size, peerInfo?.addresses?.size)
+    }
+
     @Test
     fun `start discovery and listen for other`() {
         var peerInfo: PeerInfo? = null