Fix #2004: Do not pre-resolve node_multiaddress
I cannot remember the reason this was done this way. It seems stupid now. Hopefully it was stupid.
This commit is contained in:
parent
af89f73c2e
commit
51c0c8c23b
|
@ -27,7 +27,6 @@ import (
|
||||||
logging "github.com/ipfs/go-log/v2"
|
logging "github.com/ipfs/go-log/v2"
|
||||||
rpc "github.com/libp2p/go-libp2p-gorpc"
|
rpc "github.com/libp2p/go-libp2p-gorpc"
|
||||||
peer "github.com/libp2p/go-libp2p/core/peer"
|
peer "github.com/libp2p/go-libp2p/core/peer"
|
||||||
madns "github.com/multiformats/go-multiaddr-dns"
|
|
||||||
manet "github.com/multiformats/go-multiaddr/net"
|
manet "github.com/multiformats/go-multiaddr/net"
|
||||||
"github.com/multiformats/go-multicodec"
|
"github.com/multiformats/go-multicodec"
|
||||||
multihash "github.com/multiformats/go-multihash"
|
multihash "github.com/multiformats/go-multihash"
|
||||||
|
@ -141,20 +140,7 @@ func NewConnector(cfg *Config) (*Connector, error) {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
nodeMAddr := cfg.NodeAddr
|
nodeNetwork, nodeAddr, err := manet.DialArgs(cfg.NodeAddr)
|
||||||
// dns multiaddresses need to be resolved first
|
|
||||||
if madns.Matches(nodeMAddr) {
|
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), DNSTimeout)
|
|
||||||
defer cancel()
|
|
||||||
resolvedAddrs, err := madns.Resolve(ctx, cfg.NodeAddr)
|
|
||||||
if err != nil {
|
|
||||||
logger.Error(err)
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
nodeMAddr = resolvedAddrs[0]
|
|
||||||
}
|
|
||||||
|
|
||||||
nodeNetwork, nodeAddr, err := manet.DialArgs(nodeMAddr)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user