dht: changed msgs, include multiple addrs + conn type

See #153 (comment)

routing/dht/dht.go

@@ -517,11 +517,14 @@ func (dht *IpfsDHT) peerFromInfo(pbp *pb.Message_Peer) (peer.Peer, error) {
  return nil, err
  }
 
- maddr, err := pbp.Address()
+ // add addresses we've just discovered
+ maddrs, err := pbp.Addresses()
  if err != nil {
  return nil, err
  }
- p.AddAddress(maddr)
+ for _, maddr := range maddrs {
+ p.AddAddress(maddr)
+ }
  return p, nil
 }
 

routing/dht/handlers.go

@@ -210,14 +210,16 @@ func (dht *IpfsDHT) handleAddProvider(ctx context.Context, p peer.Peer, pmes *pb
  pid := peer.ID(pb.GetId())
  if pid.Equal(p.ID()) {
 
- addr, err := pb.Address()
+ maddrs, err := pb.Addresses()
  if err != nil {
- log.Errorf("provider %s error with address %s", p, *pb.Addr)
+ log.Errorf("provider %s error with addresses %s", p, pb.Addrs)
  continue
  }
 
- log.Infof("received provider %s %s for %s", p, addr, key)
- p.AddAddress(addr)
+ log.Infof("received provider %s %s for %s", p, maddrs, key)
+ for _, maddr := range maddrs {
+ p.AddAddress(maddr)
+ }
  dht.providers.AddProvider(key, p)
 
  } else {

routing/dht/pb/dht.proto

@@ -12,9 +12,30 @@ message Message {
  PING = 5;
  }
 
+ enum ConnectionType {
+ // sender does not have a connection to peer, and no extra information (default)
+ NOT_CONNECTED = 0;
+
+ // sender has a live connection to peer
+ CONNECTED = 1;
+
+ // sender recently connected to peer
+ CAN_CONNECT = 2;
+
+ // sender recently tried to connect to peer repeatedly but failed to connect
+ // ("try" here is loose, but this should signal "made strong effort, failed")
+ CANNOT_CONNECT = 3;
+ }
+
  message Peer {
+ // ID of a given peer.
  optional string id = 1;
- optional string addr = 2;
+
+ // multiaddrs for a given peer
+ repeated string addrs = 2;
+
+ // used to signal the sender's connection capabilities to the peer
+ optional ConnectionType connection = 3;
  }
 
  // defines what type of message it is.

routing/dht/pb/message.go

@@ -3,7 +3,6 @@ package dht_pb
 import (
  "errors"
 
- "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
  ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
  peer "github.com/jbenet/go-ipfs/peer"
 )
@@ -19,12 +18,11 @@ func NewMessage(typ Message_MessageType, key string, level int) *Message {
 
 func peerToPBPeer(p peer.Peer) *Message_Peer {
  pbp := new(Message_Peer)
- addrs := p.Addresses()
- if len(addrs) == 0 || addrs[0] == nil {
- pbp.Addr = proto.String("")
- } else {
- addr := addrs[0].String()
- pbp.Addr = &addr
+
+ maddrs := p.Addresses()
+ pbp.Addrs = make([]string, len(maddrs))
+ for i, maddr := range maddrs {
+ pbp.Addrs[i] = maddr.String()
  }
  pid := string(p.ID())
  pbp.Id = &pid
@@ -41,12 +39,21 @@ func PeersToPBPeers(peers []peer.Peer) []*Message_Peer {
  return pbpeers
 }
 
-// Address returns a multiaddr associated with the Message_Peer entry
-func (m *Message_Peer) Address() (ma.Multiaddr, error) {
+// Addresses returns a multiaddr associated with the Message_Peer entry
+func (m *Message_Peer) Addresses() ([]ma.Multiaddr, error) {
  if m == nil {
  return nil, errors.New("MessagePeer is nil")
  }
- return ma.NewMultiaddr(*m.Addr)
+
+ var err error
+ maddrs := make([]ma.Multiaddr, len(m.Addrs))
+ for i, addr := range m.Addrs {
+ maddrs[i], err = ma.NewMultiaddr(addr)
+ if err != nil {
+ return nil, err
+ }
+ }
+ return maddrs, nil
 }
 
 // GetClusterLevel gets and adjusts the cluster level on the message.

routing/dht/routing.go

@@ -241,12 +241,17 @@ func (dht *IpfsDHT) FindPeer(ctx context.Context, id peer.ID) (peer.Peer, error)
  log.Warningf("Received invalid peer from query: %v", err)
  continue
  }
- ma, err := pbp.Address()
+
+ // add addresses
+ maddrs, err := pbp.Addresses()
  if err != nil {
- log.Warning("Received peer with bad or missing address.")
+ log.Warning("Received peer with bad or missing addresses: %s", pbp.Addrs)
  continue
  }
- np.AddAddress(ma)
+ for _, maddr := range maddrs {
+ np.AddAddress(maddr)
+ }
+
  if pbp.GetId() == string(id) {
  return &dhtQueryResult{
  peer: np,