mirror of
https://github.com/fluencelabs/go-libp2p-kad-dht
synced 2025-04-25 06:42:13 +00:00
3b37c43171
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
126 lines
3.0 KiB
Go
126 lines
3.0 KiB
Go
package dht
|
|
|
|
import (
|
|
"errors"
|
|
"time"
|
|
|
|
inet "github.com/jbenet/go-ipfs/net"
|
|
peer "github.com/jbenet/go-ipfs/peer"
|
|
pb "github.com/jbenet/go-ipfs/routing/dht/pb"
|
|
|
|
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
|
|
ggio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/io"
|
|
)
|
|
|
|
// handleNewStream implements the inet.StreamHandler
|
|
func (dht *IpfsDHT) handleNewStream(s inet.Stream) {
|
|
go dht.handleNewMessage(s)
|
|
}
|
|
|
|
func (dht *IpfsDHT) handleNewMessage(s inet.Stream) {
|
|
defer s.Close()
|
|
|
|
ctx := dht.Context()
|
|
r := ggio.NewDelimitedReader(s, inet.MessageSizeMax)
|
|
w := ggio.NewDelimitedWriter(s)
|
|
mPeer := s.Conn().RemotePeer()
|
|
|
|
// receive msg
|
|
pmes := new(pb.Message)
|
|
if err := r.ReadMsg(pmes); err != nil {
|
|
log.Error("Error unmarshaling data")
|
|
return
|
|
}
|
|
// update the peer (on valid msgs only)
|
|
dht.Update(ctx, mPeer)
|
|
|
|
log.Event(ctx, "foo", dht.self, mPeer, pmes)
|
|
|
|
// get handler for this msg type.
|
|
handler := dht.handlerForMsgType(pmes.GetType())
|
|
if handler == nil {
|
|
log.Error("got back nil handler from handlerForMsgType")
|
|
return
|
|
}
|
|
|
|
// dispatch handler.
|
|
rpmes, err := handler(ctx, mPeer, pmes)
|
|
if err != nil {
|
|
log.Errorf("handle message error: %s", err)
|
|
return
|
|
}
|
|
|
|
// if nil response, return it before serializing
|
|
if rpmes == nil {
|
|
log.Warning("Got back nil response from request.")
|
|
return
|
|
}
|
|
|
|
// send out response msg
|
|
if err := w.WriteMsg(rpmes); err != nil {
|
|
log.Errorf("send response error: %s", err)
|
|
return
|
|
}
|
|
|
|
return
|
|
}
|
|
|
|
// sendRequest sends out a request, but also makes sure to
|
|
// measure the RTT for latency measurements.
|
|
func (dht *IpfsDHT) sendRequest(ctx context.Context, p peer.ID, pmes *pb.Message) (*pb.Message, error) {
|
|
|
|
log.Debugf("%s dht starting stream", dht.self)
|
|
s, err := dht.network.NewStream(inet.ProtocolDHT, p)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer s.Close()
|
|
|
|
r := ggio.NewDelimitedReader(s, inet.MessageSizeMax)
|
|
w := ggio.NewDelimitedWriter(s)
|
|
|
|
start := time.Now()
|
|
|
|
log.Debugf("%s writing", dht.self)
|
|
if err := w.WriteMsg(pmes); err != nil {
|
|
return nil, err
|
|
}
|
|
log.Event(ctx, "dhtSentMessage", dht.self, p, pmes)
|
|
|
|
log.Debugf("%s reading", dht.self)
|
|
defer log.Debugf("%s done", dht.self)
|
|
|
|
rpmes := new(pb.Message)
|
|
if err := r.ReadMsg(rpmes); err != nil {
|
|
return nil, err
|
|
}
|
|
if rpmes == nil {
|
|
return nil, errors.New("no response to request")
|
|
}
|
|
|
|
dht.peerstore.RecordLatency(p, time.Since(start))
|
|
log.Event(ctx, "dhtReceivedMessage", dht.self, p, rpmes)
|
|
return rpmes, nil
|
|
}
|
|
|
|
// sendMessage sends out a message
|
|
func (dht *IpfsDHT) sendMessage(ctx context.Context, p peer.ID, pmes *pb.Message) error {
|
|
|
|
log.Debugf("%s dht starting stream", dht.self)
|
|
s, err := dht.network.NewStream(inet.ProtocolDHT, p)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer s.Close()
|
|
|
|
w := ggio.NewDelimitedWriter(s)
|
|
|
|
log.Debugf("%s writing", dht.self)
|
|
if err := w.WriteMsg(pmes); err != nil {
|
|
return err
|
|
}
|
|
log.Event(ctx, "dhtSentMessage", dht.self, p, pmes)
|
|
log.Debugf("%s done", dht.self)
|
|
return nil
|
|
}
|