Merge pull request libp2p#990 from fouge/feat/mdns-ipv6

Added parsing of IPv6 addresses for incoming mDNS requests
dustinxie · Aug 20, 2020 · b95d6ae · b95d6ae
2 parents c24d028 + 16d314c
commit b95d6ae
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/p2p/discovery/mdns.go b/p2p/discovery/mdns.go
@@ -157,7 +157,7 @@ func (m *mdnsService) pollForEntries(ctx context.Context) {
 }
 
 func (m *mdnsService) handleEntry(e *mdns.ServiceEntry) {
-	log.Debugf("Handling MDNS entry: %s:%d %s", e.AddrV4, e.Port, e.Info)
+	log.Debugf("Handling MDNS entry: [IPv4 %s][IPv6 %s]:%d %s", e.AddrV4, e.AddrV6, e.Port, e.Info)
 	mpeer, err := peer.IDB58Decode(e.Info)
 	if err != nil {
 		log.Warning("Error parsing peer ID from mdns entry: ", err)
@@ -169,8 +169,18 @@ func (m *mdnsService) handleEntry(e *mdns.ServiceEntry) {
 		return
 	}
 
+	var addr net.IP
+	if e.AddrV4 != nil {
+		addr = e.AddrV4
+	} else if e.AddrV6 != nil {
+		addr = e.AddrV6
+	} else {
+		log.Warning("Error parsing multiaddr from mdns entry: no IP address found")
+		return
+	}
+
 	maddr, err := manet.FromNetAddr(&net.TCPAddr{
-		IP:   e.AddrV4,
+		IP:   addr,
 		Port: e.Port,
 	})
 	if err != nil {