Skip to content

Commit ecb0db4

Browse files
committed
swarm: remove localhost udp ports check
1 parent 6f27081 commit ecb0db4

File tree

1 file changed

+0
-25
lines changed

1 file changed

+0
-25
lines changed

p2p/net/swarm/swarm_dial.go

-25
Original file line numberDiff line numberDiff line change
@@ -448,20 +448,8 @@ func (s *Swarm) filterKnownUndialables(p peer.ID, addrs []ma.Multiaddr) []ma.Mul
448448
})
449449
}
450450

451-
// Make a map of udp ports we are listening on to filter peers web transport addresses
452-
ourLocalHostUDPPorts := make(map[string]bool, 2)
453-
for _, a := range ourAddrs {
454-
if !manet.IsIPLoopback(a) {
455-
continue
456-
}
457-
if p, err := a.ValueForProtocol(ma.P_UDP); err == nil {
458-
ourLocalHostUDPPorts[p] = true
459-
}
460-
}
461-
462451
return ma.FilterAddrs(addrs,
463452
func(addr ma.Multiaddr) bool { return !ma.Contains(ourAddrs, addr) },
464-
func(addr ma.Multiaddr) bool { return checkLocalHostUDPAddrs(addr, ourLocalHostUDPPorts) },
465453
s.canDial,
466454
// TODO: Consider allowing link-local addresses
467455
func(addr ma.Multiaddr) bool { return !manet.IsIP6LinkLocal(addr) },
@@ -558,16 +546,3 @@ func isRelayAddr(addr ma.Multiaddr) bool {
558546
_, err := addr.ValueForProtocol(ma.P_CIRCUIT)
559547
return err == nil
560548
}
561-
562-
// checkLocalHostUDPAddrs returns false for addresses that have the same localhost port
563-
// as the one we are listening on
564-
// This is useful for filtering out peer's localhost webtransport addresses.
565-
func checkLocalHostUDPAddrs(addr ma.Multiaddr, ourUDPPorts map[string]bool) bool {
566-
if !manet.IsIPLoopback(addr) {
567-
return true
568-
}
569-
if p, err := addr.ValueForProtocol(ma.P_UDP); err == nil {
570-
return !ourUDPPorts[p]
571-
}
572-
return true
573-
}

0 commit comments

Comments
 (0)