mirror of
https://github.com/fluencelabs/go-libp2p-kad-dht
synced 2025-04-25 06:42:13 +00:00
this is a major refactor of the entire codebase it changes the monolithic peer.Peer into using a peer.ID and a peer.Peerstore. Other changes: - removed handshake3. - testutil vastly simplified peer - secio bugfix + debugging logs - testutil: RandKeyPair - backpressure bugfix: w.o.w. - peer: added hex enc/dec - peer: added a PeerInfo struct PeerInfo is a small struct used to pass around a peer with a set of addresses and keys. This is not meant to be a complete view of the system, but rather to model updates to the peerstore. It is used by things like the routing system. - updated peer/queue + peerset - latency metrics - testutil: use crand for PeerID gen RandPeerID generates random "valid" peer IDs. it does not NEED to generate keys because it is as if we lost the key right away. fine to read some randomness and hash it. to generate proper keys and an ID, use: sk, pk, _ := testutil.RandKeyPair() id, _ := peer.IDFromPublicKey(pk) Also added RandPeerIDFatal helper - removed old spipe - updated seccat - core: cleanup initIdentity - removed old getFromPeerList
155 lines
4.2 KiB
Go
155 lines
4.2 KiB
Go
package dht_pb
|
|
|
|
import (
|
|
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
|
|
|
|
inet "github.com/jbenet/go-ipfs/net"
|
|
peer "github.com/jbenet/go-ipfs/peer"
|
|
eventlog "github.com/jbenet/go-ipfs/util/eventlog"
|
|
)
|
|
|
|
var log = eventlog.Logger("dht.pb")
|
|
|
|
// NewMessage constructs a new dht message with given type, key, and level
|
|
func NewMessage(typ Message_MessageType, key string, level int) *Message {
|
|
m := &Message{
|
|
Type: &typ,
|
|
Key: &key,
|
|
}
|
|
m.SetClusterLevel(level)
|
|
return m
|
|
}
|
|
|
|
func peerInfoToPBPeer(p peer.PeerInfo) *Message_Peer {
|
|
pbp := new(Message_Peer)
|
|
|
|
pbp.Addrs = make([][]byte, len(p.Addrs))
|
|
for i, maddr := range p.Addrs {
|
|
pbp.Addrs[i] = maddr.Bytes() // Bytes, not String. Compressed.
|
|
}
|
|
s := string(p.ID)
|
|
pbp.Id = &s
|
|
return pbp
|
|
}
|
|
|
|
// PBPeerToPeer turns a *Message_Peer into its peer.PeerInfo counterpart
|
|
func PBPeerToPeerInfo(pbp *Message_Peer) peer.PeerInfo {
|
|
return peer.PeerInfo{
|
|
ID: peer.ID(pbp.GetId()),
|
|
Addrs: pbp.Addresses(),
|
|
}
|
|
}
|
|
|
|
// RawPeerInfosToPBPeers converts a slice of Peers into a slice of *Message_Peers,
|
|
// ready to go out on the wire.
|
|
func RawPeerInfosToPBPeers(peers []peer.PeerInfo) []*Message_Peer {
|
|
pbpeers := make([]*Message_Peer, len(peers))
|
|
for i, p := range peers {
|
|
pbpeers[i] = peerInfoToPBPeer(p)
|
|
}
|
|
return pbpeers
|
|
}
|
|
|
|
// PeersToPBPeers converts given []peer.Peer into a set of []*Message_Peer,
|
|
// which can be written to a message and sent out. the key thing this function
|
|
// does (in addition to PeersToPBPeers) is set the ConnectionType with
|
|
// information from the given inet.Network.
|
|
func PeerInfosToPBPeers(n inet.Network, peers []peer.PeerInfo) []*Message_Peer {
|
|
pbps := RawPeerInfosToPBPeers(peers)
|
|
for i, pbp := range pbps {
|
|
c := ConnectionType(n.Connectedness(peers[i].ID))
|
|
pbp.Connection = &c
|
|
}
|
|
return pbps
|
|
}
|
|
|
|
// PBPeersToPeerInfos converts given []*Message_Peer into []peer.PeerInfo
|
|
// Invalid addresses will be silently omitted.
|
|
func PBPeersToPeerInfos(pbps []*Message_Peer) []peer.PeerInfo {
|
|
peers := make([]peer.PeerInfo, 0, len(pbps))
|
|
for _, pbp := range pbps {
|
|
peers = append(peers, PBPeerToPeerInfo(pbp))
|
|
}
|
|
return peers
|
|
}
|
|
|
|
// Addresses returns a multiaddr associated with the Message_Peer entry
|
|
func (m *Message_Peer) Addresses() []ma.Multiaddr {
|
|
if m == nil {
|
|
return nil
|
|
}
|
|
|
|
var err error
|
|
maddrs := make([]ma.Multiaddr, len(m.Addrs))
|
|
for i, addr := range m.Addrs {
|
|
maddrs[i], err = ma.NewMultiaddrBytes(addr)
|
|
if err != nil {
|
|
log.Error("error decoding Multiaddr for peer: %s", m.GetId())
|
|
continue
|
|
}
|
|
}
|
|
return maddrs
|
|
}
|
|
|
|
// GetClusterLevel gets and adjusts the cluster level on the message.
|
|
// a +/- 1 adjustment is needed to distinguish a valid first level (1) and
|
|
// default "no value" protobuf behavior (0)
|
|
func (m *Message) GetClusterLevel() int {
|
|
level := m.GetClusterLevelRaw() - 1
|
|
if level < 0 {
|
|
return 0
|
|
}
|
|
return int(level)
|
|
}
|
|
|
|
// SetClusterLevel adjusts and sets the cluster level on the message.
|
|
// a +/- 1 adjustment is needed to distinguish a valid first level (1) and
|
|
// default "no value" protobuf behavior (0)
|
|
func (m *Message) SetClusterLevel(level int) {
|
|
lvl := int32(level)
|
|
m.ClusterLevelRaw = &lvl
|
|
}
|
|
|
|
// Loggable turns a Message into machine-readable log output
|
|
func (m *Message) Loggable() map[string]interface{} {
|
|
return map[string]interface{}{
|
|
"message": map[string]string{
|
|
"type": m.Type.String(),
|
|
},
|
|
}
|
|
}
|
|
|
|
// ConnectionType returns a Message_ConnectionType associated with the
|
|
// inet.Connectedness.
|
|
func ConnectionType(c inet.Connectedness) Message_ConnectionType {
|
|
switch c {
|
|
default:
|
|
return Message_NOT_CONNECTED
|
|
case inet.NotConnected:
|
|
return Message_NOT_CONNECTED
|
|
case inet.Connected:
|
|
return Message_CONNECTED
|
|
case inet.CanConnect:
|
|
return Message_CAN_CONNECT
|
|
case inet.CannotConnect:
|
|
return Message_CANNOT_CONNECT
|
|
}
|
|
}
|
|
|
|
// Connectedness returns an inet.Connectedness associated with the
|
|
// Message_ConnectionType.
|
|
func Connectedness(c Message_ConnectionType) inet.Connectedness {
|
|
switch c {
|
|
default:
|
|
return inet.NotConnected
|
|
case Message_NOT_CONNECTED:
|
|
return inet.NotConnected
|
|
case Message_CONNECTED:
|
|
return inet.Connected
|
|
case Message_CAN_CONNECT:
|
|
return inet.CanConnect
|
|
case Message_CANNOT_CONNECT:
|
|
return inet.CannotConnect
|
|
}
|
|
}
|