Skip to content

Commit 27cf3a2

Browse files
committed
fix: remove upnp address resolver
1 parent 69ff904 commit 27cf3a2

File tree

2 files changed

+0
-87
lines changed

2 files changed

+0
-87
lines changed

pkg/p2p/libp2p/libp2p.go

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -474,15 +474,6 @@ func New(ctx context.Context, signer beecrypto.Signer, networkID uint64, overlay
474474
return nil, fmt.Errorf("autonat: %w", err)
475475
}
476476

477-
// Use UPNP resovler as default for the handshake protocol address resolving.
478-
upnpResolver := &UpnpAddressResolver{host: h}
479-
if tcpResolver == nil {
480-
tcpResolver = upnpResolver
481-
}
482-
if wssResolver == nil {
483-
wssResolver = upnpResolver
484-
}
485-
486477
handshakeService, err := handshake.New(signer, newCompositeAddressResolver(tcpResolver, wssResolver), overlay, networkID, o.FullNode, o.Nonce, newHostAddresser(h), o.WelcomeMessage, o.ValidateOverlay, h.ID(), logger)
487478
if err != nil {
488479
return nil, fmt.Errorf("handshake service: %w", err)
@@ -957,16 +948,6 @@ func buildHostAddress(peerID libp2ppeer.ID) (ma.Multiaddr, error) {
957948
return ma.NewMultiaddr(fmt.Sprintf("/p2p/%s", peerID.String()))
958949
}
959950

960-
func buildUnderlayAddress(addr ma.Multiaddr, peerID libp2ppeer.ID) (ma.Multiaddr, error) {
961-
// Build host multiaddress
962-
hostAddr, err := buildHostAddress(peerID)
963-
if err != nil {
964-
return nil, err
965-
}
966-
967-
return addr.Encapsulate(hostAddr), nil
968-
}
969-
970951
func (s *Service) Connect(ctx context.Context, addrs []ma.Multiaddr) (address *bzz.Address, err error) {
971952
loggerV1 := s.logger.V(1).Register()
972953

pkg/p2p/libp2p/upnp.go

Lines changed: 0 additions & 68 deletions
This file was deleted.

0 commit comments

Comments
 (0)