this shouldn't connect quite yet.
Juan Batiz-Benet committed
Oct 21, 2014 at 01:18 UTC
6f8d23cbc1a7dae4a7256858acf76dc3712316aa
1 file changed
+3
-23
routing/dht/dht.go
+3
-23
@@ -16,7 +16,6 @@ import (
16
17
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
18
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
19
- ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
19
20
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
21
)
@@ -272,7 +271,7 @@ func (dht *IpfsDHT) getValueOrPeers(ctx context.Context, p peer.Peer,
271
// Perhaps we were given closer peers
272
var peers []peer.Peer
273
for _, pb := range pmes.GetCloserPeers() {
275
- pr, err := dht.ensureConnectedToPeer(pb)
274
+ pr, err := dht.peerFromInfo(pb)
275
if err != nil {
276
log.Error("%s", err)
277
continue
@@ -289,26 +288,6 @@ func (dht *IpfsDHT) getValueOrPeers(ctx context.Context, p peer.Peer,
288
return nil, nil, u.ErrNotFound
289
}
290
292
-func (dht *IpfsDHT) addPeer(pb *Message_Peer) (peer.Peer, error) {
293
- if peer.ID(pb.GetId()).Equal(dht.self.ID()) {
294
- return nil, errors.New("cannot add self as peer")
295
- }
296
-
297
- addr, err := ma.NewMultiaddr(pb.GetAddr())
298
- if err != nil {
299
- return nil, err
300
- }
301
-
302
- // check if we already have this peer.
303
- pr, err := dht.getPeer(peer.ID(pb.GetId()))
304
- if err != nil {
305
- return nil, err
306
- }
307
- pr.AddAddress(addr) // idempotent
308
-
309
- return pr, nil
310
-}
311
-
291
// getValueSingle simply performs the get value RPC with the given parameters
292
func (dht *IpfsDHT) getValueSingle(ctx context.Context, p peer.Peer,
293
key u.Key, level int) (*Message, error) {
@@ -494,7 +473,8 @@ func (dht *IpfsDHT) peerFromInfo(pbp *Message_Peer) (peer.Peer, error) {
473
474
id := peer.ID(pbp.GetId())
475
497
- // continue if it's ourselves
476
+ // bail out if it's ourselves
477
+ //TODO(jbenet) not sure this should be an error _here_
478
if id.Equal(dht.self.ID()) {
479
return nil, errors.New("found self")
480
}