diff options
| author | Janos Guljas <janos@resenje.org> | 2018-09-27 15:43:00 +0800 |
|---|---|---|
| committer | Janos Guljas <janos@resenje.org> | 2018-09-27 15:43:00 +0800 |
| commit | a5e6bf7eefbe6f56cf688b3542fe373c4670cb65 (patch) | |
| tree | 8b712ef8fb72b354346c7b1092261c469ebd7d8a /swarm/network/stream/messages.go | |
| parent | 0d5e1e7bc9ad4044a679ab5429d118b2a0e8afe7 (diff) | |
| parent | e39a9b3480af0ac8044294f46e0e9e4c3948d23c (diff) | |
| download | dexon-a5e6bf7eefbe6f56cf688b3542fe373c4670cb65.tar dexon-a5e6bf7eefbe6f56cf688b3542fe373c4670cb65.tar.gz dexon-a5e6bf7eefbe6f56cf688b3542fe373c4670cb65.tar.bz2 dexon-a5e6bf7eefbe6f56cf688b3542fe373c4670cb65.tar.lz dexon-a5e6bf7eefbe6f56cf688b3542fe373c4670cb65.tar.xz dexon-a5e6bf7eefbe6f56cf688b3542fe373c4670cb65.tar.zst dexon-a5e6bf7eefbe6f56cf688b3542fe373c4670cb65.zip | |
Merge branch 'master' into max-stream-peer-servers
Diffstat (limited to 'swarm/network/stream/messages.go')
| -rw-r--r-- | swarm/network/stream/messages.go | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/swarm/network/stream/messages.go b/swarm/network/stream/messages.go index 1e47b7cf9..74c785d58 100644 --- a/swarm/network/stream/messages.go +++ b/swarm/network/stream/messages.go @@ -26,7 +26,7 @@ import ( bv "github.com/ethereum/go-ethereum/swarm/network/bitvector" "github.com/ethereum/go-ethereum/swarm/spancontext" "github.com/ethereum/go-ethereum/swarm/storage" - opentracing "github.com/opentracing/opentracing-go" + "github.com/opentracing/opentracing-go" ) var syncBatchTimeout = 30 * time.Second @@ -197,10 +197,16 @@ func (p *Peer) handleOfferedHashesMsg(ctx context.Context, req *OfferedHashesMsg if err != nil { return err } + hashes := req.Hashes - want, err := bv.New(len(hashes) / HashSize) + lenHashes := len(hashes) + if lenHashes%HashSize != 0 { + return fmt.Errorf("error invalid hashes length (len: %v)", lenHashes) + } + + want, err := bv.New(lenHashes / HashSize) if err != nil { - return fmt.Errorf("error initiaising bitvector of length %v: %v", len(hashes)/HashSize, err) + return fmt.Errorf("error initiaising bitvector of length %v: %v", lenHashes/HashSize, err) } ctr := 0 @@ -208,7 +214,7 @@ func (p *Peer) handleOfferedHashesMsg(ctx context.Context, req *OfferedHashesMsg ctx, cancel := context.WithTimeout(ctx, syncBatchTimeout) ctx = context.WithValue(ctx, "source", p.ID().String()) - for i := 0; i < len(hashes); i += HashSize { + for i := 0; i < lenHashes; i += HashSize { hash := hashes[i : i+HashSize] if wait := c.NeedData(ctx, hash); wait != nil { |