630 lines
16 KiB
Go
Raw Normal View History

2014-07-23 04:48:30 -07:00
package dht
import (
"bytes"
"errors"
"sync"
"time"
peer "github.com/jbenet/go-ipfs/peer"
2014-08-09 22:28:46 -07:00
kb "github.com/jbenet/go-ipfs/routing/kbucket"
swarm "github.com/jbenet/go-ipfs/swarm"
u "github.com/jbenet/go-ipfs/util"
ma "github.com/jbenet/go-multiaddr"
2014-07-30 20:16:34 -07:00
ds "github.com/jbenet/datastore.go"
"code.google.com/p/goprotobuf/proto"
)
2014-07-23 04:48:30 -07:00
// TODO. SEE https://github.com/jbenet/node-ipfs/blob/master/submodules/ipfs-dht/index.js
// IpfsDHT is an implementation of Kademlia with Coral and S/Kademlia modifications.
// It is used to implement the base IpfsRouting module.
type IpfsDHT struct {
// Array of routing tables for differently distanced nodes
// NOTE: (currently, only a single table is used)
2014-08-16 23:03:36 -07:00
routingTables []*kb.RoutingTable
network swarm.Network
netChan *swarm.Chan
2014-07-30 20:16:34 -07:00
// Local peer (yourself)
self *peer.Peer
// Local data
datastore ds.Datastore
dslock sync.Mutex
providers *ProviderManager
// Signal to shutdown dht
shutdown chan struct{}
// When this peer started up
birth time.Time
//lock to make diagnostics work better
diaglock sync.Mutex
// listener is a server to register to listen for responses to messages
2014-08-16 23:03:36 -07:00
listener *mesListener
}
2014-08-09 22:28:46 -07:00
// NewDHT creates a new DHT object with the given peer as the 'local' host
2014-08-10 21:40:17 -07:00
func NewDHT(p *peer.Peer, net swarm.Network) *IpfsDHT {
dht := new(IpfsDHT)
2014-08-10 21:40:17 -07:00
dht.network = net
dht.netChan = net.GetChannel(swarm.PBWrapper_DHT_MESSAGE)
dht.datastore = ds.NewMapDatastore()
dht.self = p
dht.providers = NewProviderManager()
2014-07-30 20:16:34 -07:00
dht.shutdown = make(chan struct{})
2014-08-16 23:03:36 -07:00
dht.routingTables = make([]*kb.RoutingTable, 3)
dht.routingTables[0] = kb.NewRoutingTable(20, kb.ConvertPeerID(p.ID), time.Millisecond*30)
dht.routingTables[1] = kb.NewRoutingTable(20, kb.ConvertPeerID(p.ID), time.Millisecond*100)
dht.routingTables[2] = kb.NewRoutingTable(20, kb.ConvertPeerID(p.ID), time.Hour)
dht.listener = newMesListener()
dht.birth = time.Now()
2014-08-10 21:40:17 -07:00
return dht
}
// Start up background goroutines needed by the DHT
func (dht *IpfsDHT) Start() {
go dht.handleMessages()
}
// 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)
npeer, err := dht.network.ConnectNew(addr)
if err != nil {
return nil, err
}
2014-08-06 10:02:53 -07:00
// Ping new peer to register in their routing table
// NOTE: this should be done better...
err = dht.Ping(npeer, time.Second*2)
2014-08-06 10:02:53 -07:00
if err != nil {
2014-08-19 19:14:52 -07:00
return nil, errors.New("failed to ping newly connected peer\n")
2014-08-06 10:02:53 -07:00
}
dht.Update(npeer)
return npeer, nil
2014-07-30 20:16:34 -07:00
}
// Read in all messages from swarm and handle them appropriately
// NOTE: this function is just a quick sketch
func (dht *IpfsDHT) handleMessages() {
2014-08-19 19:14:52 -07:00
u.DOut("Begin message handling routine\n")
errs := dht.network.GetErrChan()
for {
select {
case mes, ok := <-dht.netChan.Incoming:
if !ok {
2014-08-19 19:14:52 -07:00
u.DOut("handleMessages closing, bad recv on incoming\n")
return
}
pmes := new(PBDHTMessage)
err := proto.Unmarshal(mes.Data, pmes)
if err != nil {
u.PErr("Failed to decode protobuf message: %s\n", err)
continue
}
dht.Update(mes.Peer)
// Note: not sure if this is the correct place for this
if pmes.GetResponse() {
dht.listener.Respond(pmes.GetId(), mes)
continue
}
//
u.DOut("[peer: %s]\nGot message type: '%s' [id = %x, from = %s]\n",
2014-08-12 22:10:44 -07:00
dht.self.ID.Pretty(),
PBDHTMessage_MessageType_name[int32(pmes.GetType())],
pmes.GetId(), mes.Peer.ID.Pretty())
switch pmes.GetType() {
case PBDHTMessage_GET_VALUE:
dht.handleGetValue(mes.Peer, pmes)
case PBDHTMessage_PUT_VALUE:
2014-07-30 20:16:34 -07:00
dht.handlePutValue(mes.Peer, pmes)
case PBDHTMessage_FIND_NODE:
2014-08-05 20:31:48 -07:00
dht.handleFindPeer(mes.Peer, pmes)
case PBDHTMessage_ADD_PROVIDER:
dht.handleAddProvider(mes.Peer, pmes)
case PBDHTMessage_GET_PROVIDERS:
dht.handleGetProviders(mes.Peer, pmes)
case PBDHTMessage_PING:
dht.handlePing(mes.Peer, pmes)
case PBDHTMessage_DIAGNOSTIC:
dht.handleDiagnostic(mes.Peer, pmes)
default:
u.PErr("Recieved invalid message type")
}
case err := <-errs:
u.PErr("dht err: %s\n", err)
case <-dht.shutdown:
return
}
}
}
2014-08-09 22:28:46 -07:00
func (dht *IpfsDHT) putValueToNetwork(p *peer.Peer, key string, value []byte) error {
2014-08-16 23:03:36 -07:00
pmes := Message{
Type: PBDHTMessage_PUT_VALUE,
Key: key,
Value: value,
2014-08-16 23:03:36 -07:00
ID: GenerateMessageID(),
}
mes := swarm.NewMessage(p, pmes.ToProtobuf())
dht.netChan.Outgoing <- mes
return nil
}
func (dht *IpfsDHT) handleGetValue(p *peer.Peer, pmes *PBDHTMessage) {
u.DOut("handleGetValue for key: %s\n", pmes.GetKey())
2014-07-30 20:16:34 -07:00
dskey := ds.NewKey(pmes.GetKey())
2014-08-16 23:03:36 -07:00
resp := &Message{
2014-08-09 22:28:46 -07:00
Response: true,
2014-08-16 23:03:36 -07:00
ID: pmes.GetId(),
2014-08-09 22:28:46 -07:00
Key: pmes.GetKey(),
}
iVal, err := dht.datastore.Get(dskey)
2014-07-30 20:16:34 -07:00
if err == nil {
2014-08-19 19:14:52 -07:00
u.DOut("handleGetValue success!\n")
2014-08-09 22:28:46 -07:00
resp.Success = true
resp.Value = iVal.([]byte)
2014-07-30 20:16:34 -07:00
} else if err == ds.ErrNotFound {
2014-08-09 22:28:46 -07:00
// Check if we know any providers for the requested value
provs := dht.providers.GetProviders(u.Key(pmes.GetKey()))
if len(provs) > 0 {
u.DOut("handleGetValue returning %d provider[s]\n", len(provs))
resp.Peers = provs
2014-08-09 22:28:46 -07:00
resp.Success = true
} else {
// No providers?
// Find closest peer on given cluster to desired key and reply with that info
level := 0
if len(pmes.GetValue()) < 1 {
// TODO: maybe return an error? Defaulting isnt a good idea IMO
2014-08-19 19:14:52 -07:00
u.PErr("handleGetValue: no routing level specified, assuming 0\n")
} else {
level = int(pmes.GetValue()[0]) // Using value field to specify cluster level
}
u.DOut("handleGetValue searching level %d clusters\n", level)
2014-08-16 23:03:36 -07:00
closer := dht.routingTables[level].NearestPeer(kb.ConvertKey(u.Key(pmes.GetKey())))
2014-08-14 08:32:17 -07:00
if closer.ID.Equal(dht.self.ID) {
2014-08-19 19:14:52 -07:00
u.DOut("Attempted to return self! this shouldnt happen...\n")
2014-08-14 08:32:17 -07:00
resp.Peers = nil
goto out
}
// If this peer is closer than the one from the table, return nil
if kb.Closer(dht.self.ID, closer.ID, u.Key(pmes.GetKey())) {
resp.Peers = nil
2014-08-19 19:14:52 -07:00
u.DOut("handleGetValue could not find a closer node than myself.\n")
} else {
u.DOut("handleGetValue returning a closer peer: '%s'\n", closer.ID.Pretty())
resp.Peers = []*peer.Peer{closer}
}
}
2014-08-09 22:28:46 -07:00
} else {
//temp: what other errors can a datastore return?
2014-08-09 22:28:46 -07:00
panic(err)
}
2014-08-14 08:32:17 -07:00
out:
mes := swarm.NewMessage(p, resp.ToProtobuf())
dht.netChan.Outgoing <- mes
}
2014-08-05 20:31:48 -07:00
// Store a value in this peer local storage
func (dht *IpfsDHT) handlePutValue(p *peer.Peer, pmes *PBDHTMessage) {
dht.dslock.Lock()
defer dht.dslock.Unlock()
2014-07-30 20:16:34 -07:00
dskey := ds.NewKey(pmes.GetKey())
err := dht.datastore.Put(dskey, pmes.GetValue())
if err != nil {
// For now, just panic, handle this better later maybe
panic(err)
}
}
func (dht *IpfsDHT) handlePing(p *peer.Peer, pmes *PBDHTMessage) {
2014-08-16 23:03:36 -07:00
resp := Message{
Type: pmes.GetType(),
Response: true,
2014-08-16 23:03:36 -07:00
ID: pmes.GetId(),
}
dht.netChan.Outgoing <- swarm.NewMessage(p, resp.ToProtobuf())
}
func (dht *IpfsDHT) handleFindPeer(p *peer.Peer, pmes *PBDHTMessage) {
2014-08-16 23:03:36 -07:00
resp := Message{
Type: pmes.GetType(),
2014-08-16 23:03:36 -07:00
ID: pmes.GetId(),
Response: true,
}
defer func() {
mes := swarm.NewMessage(p, resp.ToProtobuf())
dht.netChan.Outgoing <- mes
}()
level := pmes.GetValue()[0]
u.DOut("handleFindPeer: searching for '%s'\n", peer.ID(pmes.GetKey()).Pretty())
2014-08-16 23:03:36 -07:00
closest := dht.routingTables[level].NearestPeer(kb.ConvertKey(u.Key(pmes.GetKey())))
2014-08-05 20:31:48 -07:00
if closest == nil {
2014-08-19 19:14:52 -07:00
u.PErr("handleFindPeer: could not find anything.\n")
return
2014-08-05 20:31:48 -07:00
}
if len(closest.Addresses) == 0 {
2014-08-19 19:14:52 -07:00
u.PErr("handleFindPeer: no addresses for connected peer...\n")
return
2014-08-05 20:31:48 -07:00
}
// If the found peer further away than this peer...
if kb.Closer(dht.self.ID, closest.ID, u.Key(pmes.GetKey())) {
return
2014-08-05 20:31:48 -07:00
}
u.DOut("handleFindPeer: sending back '%s'\n", closest.ID.Pretty())
resp.Peers = []*peer.Peer{closest}
resp.Success = true
}
func (dht *IpfsDHT) handleGetProviders(p *peer.Peer, pmes *PBDHTMessage) {
2014-08-16 23:03:36 -07:00
resp := Message{
Type: PBDHTMessage_GET_PROVIDERS,
Key: pmes.GetKey(),
2014-08-16 23:03:36 -07:00
ID: pmes.GetId(),
Response: true,
2014-08-05 20:31:48 -07:00
}
providers := dht.providers.GetProviders(u.Key(pmes.GetKey()))
if providers == nil || len(providers) == 0 {
2014-08-14 08:32:17 -07:00
level := 0
if len(pmes.GetValue()) > 0 {
level = int(pmes.GetValue()[0])
}
2014-08-16 23:03:36 -07:00
closer := dht.routingTables[level].NearestPeer(kb.ConvertKey(u.Key(pmes.GetKey())))
2014-08-14 08:32:17 -07:00
if kb.Closer(dht.self.ID, closer.ID, u.Key(pmes.GetKey())) {
resp.Peers = nil
} else {
resp.Peers = []*peer.Peer{closer}
}
} else {
resp.Peers = providers
resp.Success = true
}
mes := swarm.NewMessage(p, resp.ToProtobuf())
dht.netChan.Outgoing <- mes
}
type providerInfo struct {
Creation time.Time
Value *peer.Peer
}
func (dht *IpfsDHT) handleAddProvider(p *peer.Peer, pmes *PBDHTMessage) {
key := u.Key(pmes.GetKey())
dht.providers.AddProvider(key, p)
}
2014-08-16 23:03:36 -07:00
// Halt stops all communications from this peer and shut down
func (dht *IpfsDHT) Halt() {
dht.shutdown <- struct{}{}
dht.network.Close()
}
2014-08-09 22:28:46 -07:00
// NOTE: not yet finished, low priority
func (dht *IpfsDHT) handleDiagnostic(p *peer.Peer, pmes *PBDHTMessage) {
2014-08-16 23:03:36 -07:00
seq := dht.routingTables[0].NearestPeers(kb.ConvertPeerID(dht.self.ID), 10)
listenChan := dht.listener.Listen(pmes.GetId(), len(seq), time.Second*30)
for _, ps := range seq {
mes := swarm.NewMessage(ps, pmes)
dht.netChan.Outgoing <- mes
}
buf := new(bytes.Buffer)
di := dht.getDiagInfo()
buf.Write(di.Marshal())
// NOTE: this shouldnt be a hardcoded value
after := time.After(time.Second * 20)
count := len(seq)
for count > 0 {
select {
case <-after:
//Timeout, return what we have
goto out
2014-08-16 23:03:36 -07:00
case reqResp := <-listenChan:
pmesOut := new(PBDHTMessage)
err := proto.Unmarshal(reqResp.Data, pmesOut)
if err != nil {
// It broke? eh, whatever, keep going
continue
}
2014-08-16 23:03:36 -07:00
buf.Write(reqResp.Data)
count--
}
}
out:
2014-08-16 23:03:36 -07:00
resp := Message{
Type: PBDHTMessage_DIAGNOSTIC,
2014-08-16 23:03:36 -07:00
ID: pmes.GetId(),
Value: buf.Bytes(),
Response: true,
}
mes := swarm.NewMessage(p, resp.ToProtobuf())
dht.netChan.Outgoing <- mes
}
func (dht *IpfsDHT) getValueOrPeers(p *peer.Peer, key u.Key, timeout time.Duration, level int) ([]byte, []*peer.Peer, error) {
pmes, err := dht.getValueSingle(p, key, timeout, level)
if err != nil {
return nil, nil, err
}
if pmes.GetSuccess() {
if pmes.Value == nil { // We were given provider[s]
val, err := dht.getFromPeerList(key, timeout, pmes.GetPeers(), level)
if err != nil {
return nil, nil, err
}
return val, nil, nil
}
// Success! We were given the value
return pmes.GetValue(), nil, nil
2014-08-16 23:03:36 -07:00
}
2014-08-16 23:03:36 -07:00
// We were given a closer node
var peers []*peer.Peer
for _, pb := range pmes.GetPeers() {
if peer.ID(pb.GetId()).Equal(dht.self.ID) {
continue
}
addr, err := ma.NewMultiaddr(pb.GetAddr())
if err != nil {
u.PErr("%v\n", err.Error())
2014-08-16 23:03:36 -07:00
continue
}
2014-08-16 23:03:36 -07:00
np, err := dht.network.GetConnection(peer.ID(pb.GetId()), addr)
if err != nil {
u.PErr("%v\n", err.Error())
2014-08-16 23:03:36 -07:00
continue
}
2014-08-16 23:03:36 -07:00
peers = append(peers, np)
}
2014-08-16 23:03:36 -07:00
return nil, peers, nil
}
// getValueSingle simply performs the get value RPC with the given parameters
func (dht *IpfsDHT) getValueSingle(p *peer.Peer, key u.Key, timeout time.Duration, level int) (*PBDHTMessage, error) {
2014-08-16 23:03:36 -07:00
pmes := Message{
Type: PBDHTMessage_GET_VALUE,
Key: string(key),
Value: []byte{byte(level)},
2014-08-16 23:03:36 -07:00
ID: GenerateMessageID(),
2014-08-09 22:28:46 -07:00
}
2014-08-16 23:03:36 -07:00
responseChan := dht.listener.Listen(pmes.ID, 1, time.Minute)
2014-08-09 22:28:46 -07:00
mes := swarm.NewMessage(p, pmes.ToProtobuf())
t := time.Now()
dht.netChan.Outgoing <- mes
2014-08-09 22:28:46 -07:00
// Wait for either the response or a timeout
timeup := time.After(timeout)
select {
case <-timeup:
2014-08-16 23:03:36 -07:00
dht.listener.Unlisten(pmes.ID)
2014-08-09 22:28:46 -07:00
return nil, u.ErrTimeout
2014-08-16 23:03:36 -07:00
case resp, ok := <-responseChan:
2014-08-09 22:28:46 -07:00
if !ok {
2014-08-19 19:14:52 -07:00
u.PErr("response channel closed before timeout, please investigate.\n")
2014-08-09 22:28:46 -07:00
return nil, u.ErrTimeout
}
roundtrip := time.Since(t)
resp.Peer.SetLatency(roundtrip)
2014-08-16 23:03:36 -07:00
pmesOut := new(PBDHTMessage)
err := proto.Unmarshal(resp.Data, pmesOut)
2014-08-09 22:28:46 -07:00
if err != nil {
return nil, err
}
2014-08-16 23:03:36 -07:00
return pmesOut, nil
2014-08-09 22:28:46 -07:00
}
}
// TODO: Im not certain on this implementation, we get a list of peers/providers
// from someone what do we do with it? Connect to each of them? randomly pick
// one to get the value from? Or just connect to one at a time until we get a
// successful connection and request the value from it?
func (dht *IpfsDHT) getFromPeerList(key u.Key, timeout time.Duration,
peerlist []*PBDHTMessage_PBPeer, level int) ([]byte, error) {
for _, pinfo := range peerlist {
p, _ := dht.Find(peer.ID(pinfo.GetId()))
if p == nil {
maddr, err := ma.NewMultiaddr(pinfo.GetAddr())
2014-08-09 22:28:46 -07:00
if err != nil {
u.PErr("getValue error: %s\n", err)
2014-08-09 22:28:46 -07:00
continue
}
p, err = dht.network.GetConnection(peer.ID(pinfo.GetId()), maddr)
2014-08-09 22:28:46 -07:00
if err != nil {
u.PErr("getValue error: %s\n", err)
2014-08-09 22:28:46 -07:00
continue
}
}
pmes, err := dht.getValueSingle(p, key, timeout, level)
2014-08-09 22:28:46 -07:00
if err != nil {
u.DErr("getFromPeers error: %s\n", err)
2014-08-09 22:28:46 -07:00
continue
}
dht.providers.AddProvider(key, p)
2014-08-09 22:28:46 -07:00
// Make sure it was a successful get
if pmes.GetSuccess() && pmes.Value != nil {
return pmes.GetValue(), nil
}
2014-08-09 22:28:46 -07:00
}
return nil, u.ErrNotFound
}
2014-08-16 23:03:36 -07:00
func (dht *IpfsDHT) getLocal(key u.Key) ([]byte, error) {
dht.dslock.Lock()
defer dht.dslock.Unlock()
v, err := dht.datastore.Get(ds.NewKey(string(key)))
if err != nil {
return nil, err
}
return v.([]byte), nil
}
2014-08-16 23:03:36 -07:00
func (dht *IpfsDHT) putLocal(key u.Key, value []byte) error {
return dht.datastore.Put(ds.NewKey(string(key)), value)
}
2014-08-16 23:03:36 -07:00
// Update TODO(chas) Document this function
func (dht *IpfsDHT) Update(p *peer.Peer) {
2014-08-16 23:03:36 -07:00
for _, route := range dht.routingTables {
removed := route.Update(p)
// Only drop the connection if no tables refer to this peer
if removed != nil {
found := false
2014-08-16 23:03:36 -07:00
for _, r := range dht.routingTables {
if r.Find(removed.ID) != nil {
found = true
break
}
}
if !found {
dht.network.Drop(removed)
}
}
}
}
2014-08-09 22:28:46 -07:00
2014-08-16 23:03:36 -07:00
// Find looks for a peer with a given ID connected to this dht and returns the peer and the table it was found in.
2014-08-09 22:28:46 -07:00
func (dht *IpfsDHT) Find(id peer.ID) (*peer.Peer, *kb.RoutingTable) {
2014-08-16 23:03:36 -07:00
for _, table := range dht.routingTables {
2014-08-09 22:28:46 -07:00
p := table.Find(id)
if p != nil {
return p, table
}
}
return nil, nil
}
func (dht *IpfsDHT) findPeerSingle(p *peer.Peer, id peer.ID, timeout time.Duration, level int) (*PBDHTMessage, error) {
2014-08-16 23:03:36 -07:00
pmes := Message{
Type: PBDHTMessage_FIND_NODE,
Key: string(id),
2014-08-16 23:03:36 -07:00
ID: GenerateMessageID(),
Value: []byte{byte(level)},
}
mes := swarm.NewMessage(p, pmes.ToProtobuf())
2014-08-16 23:03:36 -07:00
listenChan := dht.listener.Listen(pmes.ID, 1, time.Minute)
t := time.Now()
dht.netChan.Outgoing <- mes
after := time.After(timeout)
select {
case <-after:
2014-08-16 23:03:36 -07:00
dht.listener.Unlisten(pmes.ID)
return nil, u.ErrTimeout
case resp := <-listenChan:
roundtrip := time.Since(t)
resp.Peer.SetLatency(roundtrip)
2014-08-16 23:03:36 -07:00
pmesOut := new(PBDHTMessage)
err := proto.Unmarshal(resp.Data, pmesOut)
if err != nil {
return nil, err
}
2014-08-16 23:03:36 -07:00
return pmesOut, nil
}
}
2014-08-16 23:03:36 -07:00
func (dht *IpfsDHT) printTables() {
for _, route := range dht.routingTables {
route.Print()
}
}
2014-08-14 08:32:17 -07:00
func (dht *IpfsDHT) findProvidersSingle(p *peer.Peer, key u.Key, level int, timeout time.Duration) (*PBDHTMessage, error) {
2014-08-16 23:03:36 -07:00
pmes := Message{
2014-08-14 08:32:17 -07:00
Type: PBDHTMessage_GET_PROVIDERS,
Key: string(key),
2014-08-16 23:03:36 -07:00
ID: GenerateMessageID(),
2014-08-14 08:32:17 -07:00
Value: []byte{byte(level)},
}
mes := swarm.NewMessage(p, pmes.ToProtobuf())
2014-08-16 23:03:36 -07:00
listenChan := dht.listener.Listen(pmes.ID, 1, time.Minute)
dht.netChan.Outgoing <- mes
2014-08-14 08:32:17 -07:00
after := time.After(timeout)
select {
case <-after:
2014-08-16 23:03:36 -07:00
dht.listener.Unlisten(pmes.ID)
2014-08-14 08:32:17 -07:00
return nil, u.ErrTimeout
case resp := <-listenChan:
2014-08-19 19:14:52 -07:00
u.DOut("FindProviders: got response.\n")
2014-08-16 23:03:36 -07:00
pmesOut := new(PBDHTMessage)
err := proto.Unmarshal(resp.Data, pmesOut)
2014-08-14 08:32:17 -07:00
if err != nil {
return nil, err
}
2014-08-16 23:03:36 -07:00
return pmesOut, nil
2014-08-14 08:32:17 -07:00
}
}
func (dht *IpfsDHT) addPeerList(key u.Key, peers []*PBDHTMessage_PBPeer) []*peer.Peer {
2014-08-16 23:03:36 -07:00
var provArr []*peer.Peer
2014-08-14 08:32:17 -07:00
for _, prov := range peers {
// Dont add outselves to the list
if peer.ID(prov.GetId()).Equal(dht.self.ID) {
continue
}
// Dont add someone who is already on the list
p := dht.network.Find(u.Key(prov.GetId()))
if p == nil {
u.DOut("given provider %s was not in our network already.\n", peer.ID(prov.GetId()).Pretty())
2014-08-14 08:32:17 -07:00
maddr, err := ma.NewMultiaddr(prov.GetAddr())
if err != nil {
u.PErr("error connecting to new peer: %s\n", err)
2014-08-14 08:32:17 -07:00
continue
}
p, err = dht.network.GetConnection(peer.ID(prov.GetId()), maddr)
if err != nil {
u.PErr("error connecting to new peer: %s\n", err)
2014-08-14 08:32:17 -07:00
continue
}
}
dht.providers.AddProvider(key, p)
2014-08-16 23:03:36 -07:00
provArr = append(provArr, p)
2014-08-14 08:32:17 -07:00
}
2014-08-16 23:03:36 -07:00
return provArr
2014-08-14 08:32:17 -07:00
}