2018-06-20 15:06:27 +03:00
|
|
|
// Copyright 2018 The go-ethereum Authors
|
|
|
|
// This file is part of the go-ethereum library.
|
|
|
|
//
|
|
|
|
// The go-ethereum library is free software: you can redistribute it and/or modify
|
|
|
|
// it under the terms of the GNU Lesser General Public License as published by
|
|
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
|
|
// (at your option) any later version.
|
|
|
|
//
|
|
|
|
// The go-ethereum library is distributed in the hope that it will be useful,
|
|
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
// GNU Lesser General Public License for more details.
|
|
|
|
//
|
|
|
|
// You should have received a copy of the GNU Lesser General Public License
|
|
|
|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
package stream
|
|
|
|
|
|
|
|
import (
|
2018-07-13 18:40:28 +03:00
|
|
|
"context"
|
2018-06-20 15:06:27 +03:00
|
|
|
"fmt"
|
|
|
|
"time"
|
|
|
|
|
|
|
|
"github.com/ethereum/go-ethereum/metrics"
|
|
|
|
"github.com/ethereum/go-ethereum/swarm/log"
|
|
|
|
bv "github.com/ethereum/go-ethereum/swarm/network/bitvector"
|
2018-07-13 18:40:28 +03:00
|
|
|
"github.com/ethereum/go-ethereum/swarm/spancontext"
|
2018-06-20 15:06:27 +03:00
|
|
|
"github.com/ethereum/go-ethereum/swarm/storage"
|
2018-09-21 13:56:43 +03:00
|
|
|
"github.com/opentracing/opentracing-go"
|
2018-06-20 15:06:27 +03:00
|
|
|
)
|
|
|
|
|
2018-09-13 12:42:19 +03:00
|
|
|
var syncBatchTimeout = 30 * time.Second
|
|
|
|
|
2018-06-20 15:06:27 +03:00
|
|
|
// Stream defines a unique stream identifier.
|
|
|
|
type Stream struct {
|
|
|
|
// Name is used for Client and Server functions identification.
|
|
|
|
Name string
|
|
|
|
// Key is the name of specific stream data.
|
|
|
|
Key string
|
|
|
|
// Live defines whether the stream delivers only new data
|
|
|
|
// for the specific stream.
|
|
|
|
Live bool
|
|
|
|
}
|
|
|
|
|
|
|
|
func NewStream(name string, key string, live bool) Stream {
|
|
|
|
return Stream{
|
|
|
|
Name: name,
|
|
|
|
Key: key,
|
|
|
|
Live: live,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// String return a stream id based on all Stream fields.
|
|
|
|
func (s Stream) String() string {
|
|
|
|
t := "h"
|
|
|
|
if s.Live {
|
|
|
|
t = "l"
|
|
|
|
}
|
|
|
|
return fmt.Sprintf("%s|%s|%s", s.Name, s.Key, t)
|
|
|
|
}
|
|
|
|
|
|
|
|
// SubcribeMsg is the protocol msg for requesting a stream(section)
|
|
|
|
type SubscribeMsg struct {
|
|
|
|
Stream Stream
|
|
|
|
History *Range `rlp:"nil"`
|
|
|
|
Priority uint8 // delivered on priority channel
|
|
|
|
}
|
|
|
|
|
|
|
|
// RequestSubscriptionMsg is the protocol msg for a node to request subscription to a
|
|
|
|
// specific stream
|
|
|
|
type RequestSubscriptionMsg struct {
|
|
|
|
Stream Stream
|
|
|
|
History *Range `rlp:"nil"`
|
|
|
|
Priority uint8 // delivered on priority channel
|
|
|
|
}
|
|
|
|
|
2018-07-13 18:40:28 +03:00
|
|
|
func (p *Peer) handleRequestSubscription(ctx context.Context, req *RequestSubscriptionMsg) (err error) {
|
all: new p2p node representation (#17643)
Package p2p/enode provides a generalized representation of p2p nodes
which can contain arbitrary information in key/value pairs. It is also
the new home for the node database. The "v4" identity scheme is also
moved here from p2p/enr to remove the dependency on Ethereum crypto from
that package.
Record signature handling is changed significantly. The identity scheme
registry is removed and acceptable schemes must be passed to any method
that needs identity. This means records must now be validated explicitly
after decoding.
The enode API is designed to make signature handling easy and safe: most
APIs around the codebase work with enode.Node, which is a wrapper around
a valid record. Going from enr.Record to enode.Node requires a valid
signature.
* p2p/discover: port to p2p/enode
This ports the discovery code to the new node representation in
p2p/enode. The wire protocol is unchanged, this can be considered a
refactoring change. The Kademlia table can now deal with nodes using an
arbitrary identity scheme. This requires a few incompatible API changes:
- Table.Lookup is not available anymore. It used to take a public key
as argument because v4 protocol requires one. Its replacement is
LookupRandom.
- Table.Resolve takes *enode.Node instead of NodeID. This is also for
v4 protocol compatibility because nodes cannot be looked up by ID
alone.
- Types Node and NodeID are gone. Further commits in the series will be
fixes all over the the codebase to deal with those removals.
* p2p: port to p2p/enode and discovery changes
This adapts package p2p to the changes in p2p/discover. All uses of
discover.Node and discover.NodeID are replaced by their equivalents from
p2p/enode.
New API is added to retrieve the enode.Node instance of a peer. The
behavior of Server.Self with discovery disabled is improved. It now
tries much harder to report a working IP address, falling back to
127.0.0.1 if no suitable address can be determined through other means.
These changes were needed for tests of other packages later in the
series.
* p2p/simulations, p2p/testing: port to p2p/enode
No surprises here, mostly replacements of discover.Node, discover.NodeID
with their new equivalents. The 'interesting' API changes are:
- testing.ProtocolSession tracks complete nodes, not just their IDs.
- adapters.NodeConfig has a new method to create a complete node.
These changes were needed to make swarm tests work.
Note that the NodeID change makes the code incompatible with old
simulation snapshots.
* whisper/whisperv5, whisper/whisperv6: port to p2p/enode
This port was easy because whisper uses []byte for node IDs and
URL strings in the API.
* eth: port to p2p/enode
Again, easy to port because eth uses strings for node IDs and doesn't
care about node information in any way.
* les: port to p2p/enode
Apart from replacing discover.NodeID with enode.ID, most changes are in
the server pool code. It now deals with complete nodes instead
of (Pubkey, IP, Port) triples. The database format is unchanged for now,
but we should probably change it to use the node database later.
* node: port to p2p/enode
This change simply replaces discover.Node and discover.NodeID with their
new equivalents.
* swarm/network: port to p2p/enode
Swarm has its own node address representation, BzzAddr, containing both
an overlay address (the hash of a secp256k1 public key) and an underlay
address (enode:// URL).
There are no changes to the BzzAddr format in this commit, but certain
operations such as creating a BzzAddr from a node ID are now impossible
because node IDs aren't public keys anymore.
Most swarm-related changes in the series remove uses of
NewAddrFromNodeID, replacing it with NewAddr which takes a complete node
as argument. ToOverlayAddr is removed because we can just use the node
ID directly.
2018-09-25 01:59:00 +03:00
|
|
|
log.Debug(fmt.Sprintf("handleRequestSubscription: streamer %s to subscribe to %s with stream %s", p.streamer.addr, p.ID(), req.Stream))
|
2018-10-17 20:22:37 +03:00
|
|
|
if err = p.streamer.Subscribe(p.ID(), req.Stream, req.History, req.Priority); err != nil {
|
|
|
|
// The error will be sent as a subscribe error message
|
|
|
|
// and will not be returned as it will prevent any new message
|
|
|
|
// exchange between peers over p2p. Instead, error will be returned
|
|
|
|
// only if there is one from sending subscribe error message.
|
|
|
|
err = p.Send(ctx, SubscribeErrorMsg{
|
|
|
|
Error: err.Error(),
|
|
|
|
})
|
|
|
|
}
|
|
|
|
return err
|
2018-06-20 15:06:27 +03:00
|
|
|
}
|
|
|
|
|
2018-07-13 18:40:28 +03:00
|
|
|
func (p *Peer) handleSubscribeMsg(ctx context.Context, req *SubscribeMsg) (err error) {
|
2018-06-20 15:06:27 +03:00
|
|
|
metrics.GetOrRegisterCounter("peer.handlesubscribemsg", nil).Inc(1)
|
|
|
|
|
|
|
|
defer func() {
|
|
|
|
if err != nil {
|
2018-09-24 18:40:22 +03:00
|
|
|
// The error will be sent as a subscribe error message
|
|
|
|
// and will not be returned as it will prevent any new message
|
|
|
|
// exchange between peers over p2p. Instead, error will be returned
|
|
|
|
// only if there is one from sending subscribe error message.
|
|
|
|
err = p.Send(context.TODO(), SubscribeErrorMsg{
|
2018-06-20 15:06:27 +03:00
|
|
|
Error: err.Error(),
|
2018-09-24 18:40:22 +03:00
|
|
|
})
|
2018-06-20 15:06:27 +03:00
|
|
|
}
|
|
|
|
}()
|
|
|
|
|
all: new p2p node representation (#17643)
Package p2p/enode provides a generalized representation of p2p nodes
which can contain arbitrary information in key/value pairs. It is also
the new home for the node database. The "v4" identity scheme is also
moved here from p2p/enr to remove the dependency on Ethereum crypto from
that package.
Record signature handling is changed significantly. The identity scheme
registry is removed and acceptable schemes must be passed to any method
that needs identity. This means records must now be validated explicitly
after decoding.
The enode API is designed to make signature handling easy and safe: most
APIs around the codebase work with enode.Node, which is a wrapper around
a valid record. Going from enr.Record to enode.Node requires a valid
signature.
* p2p/discover: port to p2p/enode
This ports the discovery code to the new node representation in
p2p/enode. The wire protocol is unchanged, this can be considered a
refactoring change. The Kademlia table can now deal with nodes using an
arbitrary identity scheme. This requires a few incompatible API changes:
- Table.Lookup is not available anymore. It used to take a public key
as argument because v4 protocol requires one. Its replacement is
LookupRandom.
- Table.Resolve takes *enode.Node instead of NodeID. This is also for
v4 protocol compatibility because nodes cannot be looked up by ID
alone.
- Types Node and NodeID are gone. Further commits in the series will be
fixes all over the the codebase to deal with those removals.
* p2p: port to p2p/enode and discovery changes
This adapts package p2p to the changes in p2p/discover. All uses of
discover.Node and discover.NodeID are replaced by their equivalents from
p2p/enode.
New API is added to retrieve the enode.Node instance of a peer. The
behavior of Server.Self with discovery disabled is improved. It now
tries much harder to report a working IP address, falling back to
127.0.0.1 if no suitable address can be determined through other means.
These changes were needed for tests of other packages later in the
series.
* p2p/simulations, p2p/testing: port to p2p/enode
No surprises here, mostly replacements of discover.Node, discover.NodeID
with their new equivalents. The 'interesting' API changes are:
- testing.ProtocolSession tracks complete nodes, not just their IDs.
- adapters.NodeConfig has a new method to create a complete node.
These changes were needed to make swarm tests work.
Note that the NodeID change makes the code incompatible with old
simulation snapshots.
* whisper/whisperv5, whisper/whisperv6: port to p2p/enode
This port was easy because whisper uses []byte for node IDs and
URL strings in the API.
* eth: port to p2p/enode
Again, easy to port because eth uses strings for node IDs and doesn't
care about node information in any way.
* les: port to p2p/enode
Apart from replacing discover.NodeID with enode.ID, most changes are in
the server pool code. It now deals with complete nodes instead
of (Pubkey, IP, Port) triples. The database format is unchanged for now,
but we should probably change it to use the node database later.
* node: port to p2p/enode
This change simply replaces discover.Node and discover.NodeID with their
new equivalents.
* swarm/network: port to p2p/enode
Swarm has its own node address representation, BzzAddr, containing both
an overlay address (the hash of a secp256k1 public key) and an underlay
address (enode:// URL).
There are no changes to the BzzAddr format in this commit, but certain
operations such as creating a BzzAddr from a node ID are now impossible
because node IDs aren't public keys anymore.
Most swarm-related changes in the series remove uses of
NewAddrFromNodeID, replacing it with NewAddr which takes a complete node
as argument. ToOverlayAddr is removed because we can just use the node
ID directly.
2018-09-25 01:59:00 +03:00
|
|
|
log.Debug("received subscription", "from", p.streamer.addr, "peer", p.ID(), "stream", req.Stream, "history", req.History)
|
2018-06-20 15:06:27 +03:00
|
|
|
|
|
|
|
f, err := p.streamer.GetServerFunc(req.Stream.Name)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
s, err := f(p, req.Stream.Key, req.Stream.Live)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
os, err := p.setServer(req.Stream, s, req.Priority)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
var from uint64
|
|
|
|
var to uint64
|
|
|
|
if !req.Stream.Live && req.History != nil {
|
|
|
|
from = req.History.From
|
|
|
|
to = req.History.To
|
|
|
|
}
|
|
|
|
|
|
|
|
go func() {
|
|
|
|
if err := p.SendOfferedHashes(os, from, to); err != nil {
|
2018-09-13 12:42:19 +03:00
|
|
|
log.Warn("SendOfferedHashes error", "peer", p.ID().TerminalString(), "err", err)
|
2018-06-20 15:06:27 +03:00
|
|
|
}
|
|
|
|
}()
|
|
|
|
|
|
|
|
if req.Stream.Live && req.History != nil {
|
|
|
|
// subscribe to the history stream
|
|
|
|
s, err := f(p, req.Stream.Key, false)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
os, err := p.setServer(getHistoryStream(req.Stream), s, getHistoryPriority(req.Priority))
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
go func() {
|
|
|
|
if err := p.SendOfferedHashes(os, req.History.From, req.History.To); err != nil {
|
2018-09-13 12:42:19 +03:00
|
|
|
log.Warn("SendOfferedHashes error", "peer", p.ID().TerminalString(), "err", err)
|
2018-06-20 15:06:27 +03:00
|
|
|
}
|
|
|
|
}()
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
type SubscribeErrorMsg struct {
|
|
|
|
Error string
|
|
|
|
}
|
|
|
|
|
|
|
|
func (p *Peer) handleSubscribeErrorMsg(req *SubscribeErrorMsg) (err error) {
|
2018-10-19 11:50:25 +03:00
|
|
|
//TODO the error should be channeled to whoever calls the subscribe
|
2018-06-20 15:06:27 +03:00
|
|
|
return fmt.Errorf("subscribe to peer %s: %v", p.ID(), req.Error)
|
|
|
|
}
|
|
|
|
|
|
|
|
type UnsubscribeMsg struct {
|
|
|
|
Stream Stream
|
|
|
|
}
|
|
|
|
|
|
|
|
func (p *Peer) handleUnsubscribeMsg(req *UnsubscribeMsg) error {
|
|
|
|
return p.removeServer(req.Stream)
|
|
|
|
}
|
|
|
|
|
|
|
|
type QuitMsg struct {
|
|
|
|
Stream Stream
|
|
|
|
}
|
|
|
|
|
|
|
|
func (p *Peer) handleQuitMsg(req *QuitMsg) error {
|
|
|
|
return p.removeClient(req.Stream)
|
|
|
|
}
|
|
|
|
|
|
|
|
// OfferedHashesMsg is the protocol msg for offering to hand over a
|
|
|
|
// stream section
|
|
|
|
type OfferedHashesMsg struct {
|
|
|
|
Stream Stream // name of Stream
|
|
|
|
From, To uint64 // peer and db-specific entry count
|
|
|
|
Hashes []byte // stream of hashes (128)
|
|
|
|
*HandoverProof // HandoverProof
|
|
|
|
}
|
|
|
|
|
|
|
|
// String pretty prints OfferedHashesMsg
|
|
|
|
func (m OfferedHashesMsg) String() string {
|
|
|
|
return fmt.Sprintf("Stream '%v' [%v-%v] (%v)", m.Stream, m.From, m.To, len(m.Hashes)/HashSize)
|
|
|
|
}
|
|
|
|
|
|
|
|
// handleOfferedHashesMsg protocol msg handler calls the incoming streamer interface
|
|
|
|
// Filter method
|
2018-07-13 18:40:28 +03:00
|
|
|
func (p *Peer) handleOfferedHashesMsg(ctx context.Context, req *OfferedHashesMsg) error {
|
2018-06-20 15:06:27 +03:00
|
|
|
metrics.GetOrRegisterCounter("peer.handleofferedhashes", nil).Inc(1)
|
|
|
|
|
2018-07-13 18:40:28 +03:00
|
|
|
var sp opentracing.Span
|
|
|
|
ctx, sp = spancontext.StartSpan(
|
|
|
|
ctx,
|
|
|
|
"handle.offered.hashes")
|
|
|
|
defer sp.Finish()
|
|
|
|
|
2018-06-20 15:06:27 +03:00
|
|
|
c, _, err := p.getOrSetClient(req.Stream, req.From, req.To)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2018-09-21 13:56:43 +03:00
|
|
|
|
2018-06-20 15:06:27 +03:00
|
|
|
hashes := req.Hashes
|
2018-09-21 13:56:43 +03:00
|
|
|
lenHashes := len(hashes)
|
|
|
|
if lenHashes%HashSize != 0 {
|
|
|
|
return fmt.Errorf("error invalid hashes length (len: %v)", lenHashes)
|
|
|
|
}
|
|
|
|
|
|
|
|
want, err := bv.New(lenHashes / HashSize)
|
2018-06-20 15:06:27 +03:00
|
|
|
if err != nil {
|
2018-09-21 13:56:43 +03:00
|
|
|
return fmt.Errorf("error initiaising bitvector of length %v: %v", lenHashes/HashSize, err)
|
2018-06-20 15:06:27 +03:00
|
|
|
}
|
2018-09-13 12:42:19 +03:00
|
|
|
|
|
|
|
ctr := 0
|
|
|
|
errC := make(chan error)
|
|
|
|
ctx, cancel := context.WithTimeout(ctx, syncBatchTimeout)
|
|
|
|
|
|
|
|
ctx = context.WithValue(ctx, "source", p.ID().String())
|
2018-09-21 13:56:43 +03:00
|
|
|
for i := 0; i < lenHashes; i += HashSize {
|
2018-06-20 15:06:27 +03:00
|
|
|
hash := hashes[i : i+HashSize]
|
|
|
|
|
2018-07-13 18:40:28 +03:00
|
|
|
if wait := c.NeedData(ctx, hash); wait != nil {
|
2018-09-13 12:42:19 +03:00
|
|
|
ctr++
|
2018-06-20 15:06:27 +03:00
|
|
|
want.Set(i/HashSize, true)
|
|
|
|
// create request and wait until the chunk data arrives and is stored
|
2018-09-13 12:42:19 +03:00
|
|
|
go func(w func(context.Context) error) {
|
|
|
|
select {
|
|
|
|
case errC <- w(ctx):
|
|
|
|
case <-ctx.Done():
|
|
|
|
}
|
2018-06-20 15:06:27 +03:00
|
|
|
}(wait)
|
|
|
|
}
|
|
|
|
}
|
2018-09-13 12:42:19 +03:00
|
|
|
|
2018-06-20 15:06:27 +03:00
|
|
|
go func() {
|
2018-09-13 12:42:19 +03:00
|
|
|
defer cancel()
|
|
|
|
for i := 0; i < ctr; i++ {
|
|
|
|
select {
|
|
|
|
case err := <-errC:
|
|
|
|
if err != nil {
|
|
|
|
log.Debug("client.handleOfferedHashesMsg() error waiting for chunk, dropping peer", "peer", p.ID(), "err", err)
|
|
|
|
p.Drop(err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
case <-ctx.Done():
|
|
|
|
log.Debug("client.handleOfferedHashesMsg() context done", "ctx.Err()", ctx.Err())
|
|
|
|
return
|
|
|
|
case <-c.quit:
|
|
|
|
log.Debug("client.handleOfferedHashesMsg() quit")
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
2018-06-20 15:06:27 +03:00
|
|
|
select {
|
|
|
|
case c.next <- c.batchDone(p, req, hashes):
|
|
|
|
case <-c.quit:
|
2018-09-13 12:42:19 +03:00
|
|
|
log.Debug("client.handleOfferedHashesMsg() quit")
|
|
|
|
case <-ctx.Done():
|
|
|
|
log.Debug("client.handleOfferedHashesMsg() context done", "ctx.Err()", ctx.Err())
|
2018-06-20 15:06:27 +03:00
|
|
|
}
|
|
|
|
}()
|
|
|
|
// only send wantedKeysMsg if all missing chunks of the previous batch arrived
|
|
|
|
// except
|
|
|
|
if c.stream.Live {
|
|
|
|
c.sessionAt = req.From
|
|
|
|
}
|
|
|
|
from, to := c.nextBatch(req.To + 1)
|
all: new p2p node representation (#17643)
Package p2p/enode provides a generalized representation of p2p nodes
which can contain arbitrary information in key/value pairs. It is also
the new home for the node database. The "v4" identity scheme is also
moved here from p2p/enr to remove the dependency on Ethereum crypto from
that package.
Record signature handling is changed significantly. The identity scheme
registry is removed and acceptable schemes must be passed to any method
that needs identity. This means records must now be validated explicitly
after decoding.
The enode API is designed to make signature handling easy and safe: most
APIs around the codebase work with enode.Node, which is a wrapper around
a valid record. Going from enr.Record to enode.Node requires a valid
signature.
* p2p/discover: port to p2p/enode
This ports the discovery code to the new node representation in
p2p/enode. The wire protocol is unchanged, this can be considered a
refactoring change. The Kademlia table can now deal with nodes using an
arbitrary identity scheme. This requires a few incompatible API changes:
- Table.Lookup is not available anymore. It used to take a public key
as argument because v4 protocol requires one. Its replacement is
LookupRandom.
- Table.Resolve takes *enode.Node instead of NodeID. This is also for
v4 protocol compatibility because nodes cannot be looked up by ID
alone.
- Types Node and NodeID are gone. Further commits in the series will be
fixes all over the the codebase to deal with those removals.
* p2p: port to p2p/enode and discovery changes
This adapts package p2p to the changes in p2p/discover. All uses of
discover.Node and discover.NodeID are replaced by their equivalents from
p2p/enode.
New API is added to retrieve the enode.Node instance of a peer. The
behavior of Server.Self with discovery disabled is improved. It now
tries much harder to report a working IP address, falling back to
127.0.0.1 if no suitable address can be determined through other means.
These changes were needed for tests of other packages later in the
series.
* p2p/simulations, p2p/testing: port to p2p/enode
No surprises here, mostly replacements of discover.Node, discover.NodeID
with their new equivalents. The 'interesting' API changes are:
- testing.ProtocolSession tracks complete nodes, not just their IDs.
- adapters.NodeConfig has a new method to create a complete node.
These changes were needed to make swarm tests work.
Note that the NodeID change makes the code incompatible with old
simulation snapshots.
* whisper/whisperv5, whisper/whisperv6: port to p2p/enode
This port was easy because whisper uses []byte for node IDs and
URL strings in the API.
* eth: port to p2p/enode
Again, easy to port because eth uses strings for node IDs and doesn't
care about node information in any way.
* les: port to p2p/enode
Apart from replacing discover.NodeID with enode.ID, most changes are in
the server pool code. It now deals with complete nodes instead
of (Pubkey, IP, Port) triples. The database format is unchanged for now,
but we should probably change it to use the node database later.
* node: port to p2p/enode
This change simply replaces discover.Node and discover.NodeID with their
new equivalents.
* swarm/network: port to p2p/enode
Swarm has its own node address representation, BzzAddr, containing both
an overlay address (the hash of a secp256k1 public key) and an underlay
address (enode:// URL).
There are no changes to the BzzAddr format in this commit, but certain
operations such as creating a BzzAddr from a node ID are now impossible
because node IDs aren't public keys anymore.
Most swarm-related changes in the series remove uses of
NewAddrFromNodeID, replacing it with NewAddr which takes a complete node
as argument. ToOverlayAddr is removed because we can just use the node
ID directly.
2018-09-25 01:59:00 +03:00
|
|
|
log.Trace("set next batch", "peer", p.ID(), "stream", req.Stream, "from", req.From, "to", req.To, "addr", p.streamer.addr)
|
2018-06-20 15:06:27 +03:00
|
|
|
if from == to {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
msg := &WantedHashesMsg{
|
|
|
|
Stream: req.Stream,
|
|
|
|
Want: want.Bytes(),
|
|
|
|
From: from,
|
|
|
|
To: to,
|
|
|
|
}
|
|
|
|
go func() {
|
2018-09-13 12:42:19 +03:00
|
|
|
log.Trace("sending want batch", "peer", p.ID(), "stream", msg.Stream, "from", msg.From, "to", msg.To)
|
2018-06-20 15:06:27 +03:00
|
|
|
select {
|
|
|
|
case err := <-c.next:
|
|
|
|
if err != nil {
|
2018-09-13 12:42:19 +03:00
|
|
|
log.Warn("c.next error dropping peer", "err", err)
|
2018-06-20 15:06:27 +03:00
|
|
|
p.Drop(err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
case <-c.quit:
|
2018-09-13 12:42:19 +03:00
|
|
|
log.Debug("client.handleOfferedHashesMsg() quit")
|
|
|
|
return
|
|
|
|
case <-ctx.Done():
|
|
|
|
log.Debug("client.handleOfferedHashesMsg() context done", "ctx.Err()", ctx.Err())
|
2018-06-20 15:06:27 +03:00
|
|
|
return
|
|
|
|
}
|
|
|
|
log.Trace("sending want batch", "peer", p.ID(), "stream", msg.Stream, "from", msg.From, "to", msg.To)
|
2018-07-13 18:40:28 +03:00
|
|
|
err := p.SendPriority(ctx, msg, c.priority)
|
2018-06-20 15:06:27 +03:00
|
|
|
if err != nil {
|
2018-09-13 12:42:19 +03:00
|
|
|
log.Warn("SendPriority error", "err", err)
|
2018-06-20 15:06:27 +03:00
|
|
|
}
|
|
|
|
}()
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// WantedHashesMsg is the protocol msg data for signaling which hashes
|
|
|
|
// offered in OfferedHashesMsg downstream peer actually wants sent over
|
|
|
|
type WantedHashesMsg struct {
|
|
|
|
Stream Stream
|
|
|
|
Want []byte // bitvector indicating which keys of the batch needed
|
|
|
|
From, To uint64 // next interval offset - empty if not to be continued
|
|
|
|
}
|
|
|
|
|
|
|
|
// String pretty prints WantedHashesMsg
|
|
|
|
func (m WantedHashesMsg) String() string {
|
|
|
|
return fmt.Sprintf("Stream '%v', Want: %x, Next: [%v-%v]", m.Stream, m.Want, m.From, m.To)
|
|
|
|
}
|
|
|
|
|
|
|
|
// handleWantedHashesMsg protocol msg handler
|
|
|
|
// * sends the next batch of unsynced keys
|
|
|
|
// * sends the actual data chunks as per WantedHashesMsg
|
2018-07-13 18:40:28 +03:00
|
|
|
func (p *Peer) handleWantedHashesMsg(ctx context.Context, req *WantedHashesMsg) error {
|
2018-06-20 15:06:27 +03:00
|
|
|
metrics.GetOrRegisterCounter("peer.handlewantedhashesmsg", nil).Inc(1)
|
|
|
|
|
|
|
|
log.Trace("received wanted batch", "peer", p.ID(), "stream", req.Stream, "from", req.From, "to", req.To)
|
|
|
|
s, err := p.getServer(req.Stream)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
hashes := s.currentBatch
|
|
|
|
// launch in go routine since GetBatch blocks until new hashes arrive
|
|
|
|
go func() {
|
|
|
|
if err := p.SendOfferedHashes(s, req.From, req.To); err != nil {
|
2018-09-13 12:42:19 +03:00
|
|
|
log.Warn("SendOfferedHashes error", "err", err)
|
2018-06-20 15:06:27 +03:00
|
|
|
}
|
|
|
|
}()
|
|
|
|
// go p.SendOfferedHashes(s, req.From, req.To)
|
|
|
|
l := len(hashes) / HashSize
|
|
|
|
|
|
|
|
log.Trace("wanted batch length", "peer", p.ID(), "stream", req.Stream, "from", req.From, "to", req.To, "lenhashes", len(hashes), "l", l)
|
|
|
|
want, err := bv.NewFromBytes(req.Want, l)
|
|
|
|
if err != nil {
|
|
|
|
return fmt.Errorf("error initiaising bitvector of length %v: %v", l, err)
|
|
|
|
}
|
|
|
|
for i := 0; i < l; i++ {
|
|
|
|
if want.Get(i) {
|
|
|
|
metrics.GetOrRegisterCounter("peer.handlewantedhashesmsg.actualget", nil).Inc(1)
|
|
|
|
|
|
|
|
hash := hashes[i*HashSize : (i+1)*HashSize]
|
2018-07-13 18:40:28 +03:00
|
|
|
data, err := s.GetData(ctx, hash)
|
2018-06-20 15:06:27 +03:00
|
|
|
if err != nil {
|
|
|
|
return fmt.Errorf("handleWantedHashesMsg get data %x: %v", hash, err)
|
|
|
|
}
|
2018-09-13 12:42:19 +03:00
|
|
|
chunk := storage.NewChunk(hash, data)
|
2018-07-13 18:40:28 +03:00
|
|
|
if err := p.Deliver(ctx, chunk, s.priority); err != nil {
|
2018-06-20 15:06:27 +03:00
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Handover represents a statement that the upstream peer hands over the stream section
|
|
|
|
type Handover struct {
|
|
|
|
Stream Stream // name of stream
|
|
|
|
Start, End uint64 // index of hashes
|
|
|
|
Root []byte // Root hash for indexed segment inclusion proofs
|
|
|
|
}
|
|
|
|
|
|
|
|
// HandoverProof represents a signed statement that the upstream peer handed over the stream section
|
|
|
|
type HandoverProof struct {
|
|
|
|
Sig []byte // Sign(Hash(Serialisation(Handover)))
|
|
|
|
*Handover
|
|
|
|
}
|
|
|
|
|
|
|
|
// Takeover represents a statement that downstream peer took over (stored all data)
|
|
|
|
// handed over
|
|
|
|
type Takeover Handover
|
|
|
|
|
|
|
|
// TakeoverProof represents a signed statement that the downstream peer took over
|
|
|
|
// the stream section
|
|
|
|
type TakeoverProof struct {
|
|
|
|
Sig []byte // Sign(Hash(Serialisation(Takeover)))
|
|
|
|
*Takeover
|
|
|
|
}
|
|
|
|
|
|
|
|
// TakeoverProofMsg is the protocol msg sent by downstream peer
|
|
|
|
type TakeoverProofMsg TakeoverProof
|
|
|
|
|
|
|
|
// String pretty prints TakeoverProofMsg
|
|
|
|
func (m TakeoverProofMsg) String() string {
|
|
|
|
return fmt.Sprintf("Stream: '%v' [%v-%v], Root: %x, Sig: %x", m.Stream, m.Start, m.End, m.Root, m.Sig)
|
|
|
|
}
|
|
|
|
|
2018-07-13 18:40:28 +03:00
|
|
|
func (p *Peer) handleTakeoverProofMsg(ctx context.Context, req *TakeoverProofMsg) error {
|
2018-06-20 15:06:27 +03:00
|
|
|
_, err := p.getServer(req.Stream)
|
|
|
|
// store the strongest takeoverproof for the stream in streamer
|
|
|
|
return err
|
|
|
|
}
|