roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

eth: limit number of sent blocks based on message size

Browse Source 
If blocks get larger, sending 256 at once can make messages large
enough to exceed the low-level write timeout.
This commit is contained in:
Felix Lange 2015-06-09 12:00:41 +02:00
parent 7aefe123e9
commit 41b2008a66
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
eth/handler.go
View File

@ -18,6 +18,11 @@ import (
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
) )
// This is the target maximum size of returned blocks for the
// getBlocks message. The reply message may exceed it
// if a single block is larger than the limit.
const maxBlockRespSize = 2 * 1024 * 1024
func errResp(code errCode, format string, v ...interface{}) error { func errResp(code errCode, format string, v ...interface{}) error {
return fmt.Errorf("%v - %v", code, fmt.Sprintf(format, v...)) return fmt.Errorf("%v - %v", code, fmt.Sprintf(format, v...))
} }
@ -246,7 +251,10 @@ func (self *ProtocolManager) handleMsg(p *peer) error {
if _, err := msgStream.List(); err != nil { if _, err := msgStream.List(); err != nil {
return err return err
} }
var i int var (
i int
totalsize common.StorageSize
)
for { for {
i++ i++
var hash common.Hash var hash common.Hash
@ -260,8 +268,9 @@ func (self *ProtocolManager) handleMsg(p *peer) error {
block := self.chainman.GetBlock(hash) block := self.chainman.GetBlock(hash)
if block != nil { if block != nil {
blocks = append(blocks, block) blocks = append(blocks, block)
totalsize += block.Size()
} }
if i == downloader.MaxBlockFetch { if i == downloader.MaxBlockFetch || totalsize > maxBlockRespSize {
break break
} }
} }