mirror of
https://github.com/ipfs/kubo.git
synced 2026-03-03 23:38:07 +08:00
c84a714b16
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
95 lines
2.0 KiB
Go
95 lines
2.0 KiB
Go
package network
|
|
|
|
import (
|
|
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
|
|
|
|
bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message"
|
|
inet "github.com/jbenet/go-ipfs/net"
|
|
peer "github.com/jbenet/go-ipfs/peer"
|
|
util "github.com/jbenet/go-ipfs/util"
|
|
)
|
|
|
|
var log = util.Logger("bitswap_network")
|
|
|
|
// NewFromIpfsNetwork returns a BitSwapNetwork supported by underlying IPFS
|
|
// Dialer & Service
|
|
func NewFromIpfsNetwork(n inet.Network) BitSwapNetwork {
|
|
bitswapNetwork := impl{
|
|
network: n,
|
|
}
|
|
n.SetHandler(inet.ProtocolBitswap, bitswapNetwork.handleNewStream)
|
|
return &bitswapNetwork
|
|
}
|
|
|
|
// impl transforms the ipfs network interface, which sends and receives
|
|
// NetMessage objects, into the bitswap network interface.
|
|
type impl struct {
|
|
network inet.Network
|
|
|
|
// inbound messages from the network are forwarded to the receiver
|
|
receiver Receiver
|
|
}
|
|
|
|
// handleNewStream receives a new stream from the network.
|
|
func (bsnet *impl) handleNewStream(s inet.Stream) {
|
|
|
|
if bsnet.receiver == nil {
|
|
return
|
|
}
|
|
|
|
go func() {
|
|
defer s.Close()
|
|
|
|
received, err := bsmsg.FromNet(s)
|
|
if err != nil {
|
|
go bsnet.receiver.ReceiveError(err)
|
|
return
|
|
}
|
|
|
|
p := s.Conn().RemotePeer()
|
|
ctx := context.Background()
|
|
bsnet.receiver.ReceiveMessage(ctx, p, received)
|
|
}()
|
|
|
|
}
|
|
|
|
func (bsnet *impl) DialPeer(ctx context.Context, p peer.ID) error {
|
|
return bsnet.network.DialPeer(ctx, p)
|
|
}
|
|
|
|
func (bsnet *impl) SendMessage(
|
|
ctx context.Context,
|
|
p peer.ID,
|
|
outgoing bsmsg.BitSwapMessage) error {
|
|
|
|
s, err := bsnet.network.NewStream(inet.ProtocolBitswap, p)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer s.Close()
|
|
|
|
return outgoing.ToNet(s)
|
|
}
|
|
|
|
func (bsnet *impl) SendRequest(
|
|
ctx context.Context,
|
|
p peer.ID,
|
|
outgoing bsmsg.BitSwapMessage) (bsmsg.BitSwapMessage, error) {
|
|
|
|
s, err := bsnet.network.NewStream(inet.ProtocolBitswap, p)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer s.Close()
|
|
|
|
if err := outgoing.ToNet(s); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return bsmsg.FromNet(s)
|
|
}
|
|
|
|
func (bsnet *impl) SetDelegate(r Receiver) {
|
|
bsnet.receiver = r
|
|
}
|