zishuo/go-libp2p
1
0
Fork 0
mirror of https://github.com/libp2p/go-libp2p.git synced 2025-12-24 13:29:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

autonatv2: remove dependency on webrtc and webtransport

Browse Source
This commit is contained in:
sukun
2025-10-03 15:50:37 +05:30
committed by Marco Munizaga
parent fc35662e54
commit bfd52ef4a4
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
p2p/protocol/autonatv2/client.go
View File

@@ -14,8 +14,6 @@ import (
"github.com/libp2p/go-libp2p/core/network"
"github.com/libp2p/go-libp2p/core/peer"
"github.com/libp2p/go-libp2p/p2p/protocol/autonatv2/pb"
libp2pwebrtc "github.com/libp2p/go-libp2p/p2p/transport/webrtc"
libp2pwebtransport "github.com/libp2p/go-libp2p/p2p/transport/webtransport"
"github.com/libp2p/go-msgio/pbio"
ma "github.com/multiformats/go-multiaddr"
)
@@ -328,22 +326,22 @@ func (ac *client) handleDialBack(s network.Stream) {
}
// normalizeMultiaddr returns a multiaddr suitable for equality checks.
// If the multiaddr is a webtransport component, it removes the certhashes.
// it removes trailing certhashes.
func normalizeMultiaddr(addr ma.Multiaddr) ma.Multiaddr {
ok, n := libp2pwebtransport.IsWebtransportMultiaddr(addr)
if !ok {
ok, n = libp2pwebrtc.IsWebRTCDirectMultiaddr(addr)
}
if ok && n > 0 {
out := addr
for i := 0; i < n; i++ {
out, _ = ma.SplitLast(out)
}
return out
}
addr = removeTrailing(addr, ma.P_P2P)
addr = removeTrailing(addr, ma.P_CERTHASH)
return addr
}
func removeTrailing(addr ma.Multiaddr, protocolCode int) ma.Multiaddr {
for i := len(addr) - 1; i >= 0; i-- {
if addr[i].Code() != protocolCode {
return addr[0 : i+1]
}
}
return nil
}
func (ac *client) areAddrsConsistent(connLocalAddr, dialedAddr ma.Multiaddr) bool {
if len(connLocalAddr) == 0 || len(dialedAddr) == 0 {
return false