From de7af506b192b295782508c325c345fe72f705cd Mon Sep 17 00:00:00 2001
From: Juan Batiz-Benet <juan@benet.ai>
Date: Fri, 19 Sep 2014 05:01:25 -0700
Subject: [PATCH] dht.Connect(Peer)
---
routing/dht/dht.go | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/routing/dht/dht.go b/routing/dht/dht.go
index d1b610c5..8a8d8215 100644
--- a/routing/dht/dht.go
+++ b/routing/dht/dht.go
@@ -72,9 +72,8 @@ func NewDHT(p *peer.Peer, ps peer.Peerstore, net inet.Network, sender inet.Sende
}
// Connect to a new peer at the given address, ping and add to the routing table
-func (dht *IpfsDHT) Connect(addr *ma.Multiaddr) (*peer.Peer, error) {
- maddrstr, _ := addr.String()
- u.DOut("Connect to new peer: %s\n", maddrstr)
+func (dht *IpfsDHT) Connect(npeer *peer.Peer) (*peer.Peer, error) {
+ u.DOut("Connect to new peer: %s\n", npeer.ID.Pretty())
// TODO(jbenet,whyrusleeping)
//
@@ -85,8 +84,6 @@ func (dht *IpfsDHT) Connect(addr *ma.Multiaddr) (*peer.Peer, error) {
//
// /ip4/10.20.30.40/tcp/1234/ipfs/Qxhxxchxzcncxnzcnxzcxzm
//
- npeer := &peer.Peer{}
- npeer.AddAddress(addr)
err := dht.network.DialPeer(npeer)
if err != nil {
return nil, err
--
GitLab