forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-22 04:36:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

eth: fix message decoding for working EncodeMsg

Browse source
This commit is contained in:
Felix Lange 2015-01-04 00:21:14 +01:00 committed by zelig
parent a7c9534512
commit 362189f85d
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
eth/protocol.go
View file

@ -3,6 +3,7 @@ package eth
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"io"
"math/big" "math/big"
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
@ -139,11 +140,11 @@ func (self *ethProtocol) handle() error {
self.txPool.AddTransactions(txs) self.txPool.AddTransactions(txs)
case GetBlockHashesMsg: case GetBlockHashesMsg:
var request [1]getBlockHashesMsgData var request getBlockHashesMsgData
if err := msg.Decode(&request); err != nil { if err := msg.Decode(&request); err != nil {
return self.protoError(ErrDecode, "->msg %v: %v", msg, err) return self.protoError(ErrDecode, "->msg %v: %v", msg, err)
} }
hashes := self.chainManager.GetBlockHashesFromHash(request[0].Hash, request[0].Amount) hashes := self.chainManager.GetBlockHashesFromHash(request.Hash, request.Amount)
protologger.Debugf("hashes length %v", len(hashes)) protologger.Debugf("hashes length %v", len(hashes))
return self.rw.EncodeMsg(BlockHashesMsg, ethutil.ByteSliceToInterface(hashes)...) return self.rw.EncodeMsg(BlockHashesMsg, ethutil.ByteSliceToInterface(hashes)...)
@ -151,7 +152,6 @@ func (self *ethProtocol) handle() error {
// TODO: redo using lazy decode , this way very inefficient on known chains // TODO: redo using lazy decode , this way very inefficient on known chains
protologger.Debugf("payload size %v", msg.Size) protologger.Debugf("payload size %v", msg.Size)
msgStream := rlp.NewStream(msg.Payload) msgStream := rlp.NewStream(msg.Payload)
msgStream.List()
var err error var err error
var i int var i int
@ -161,7 +161,7 @@ func (self *ethProtocol) handle() error {
i++ i++
ok = true ok = true
} else { } else {
if err != rlp.EOL { if err != io.EOF {
self.protoError(ErrDecode, "msg %v: after %v hashes : %v", msg, i, err) self.protoError(ErrDecode, "msg %v: after %v hashes : %v", msg, i, err)
} }
} }
@ -172,14 +172,13 @@ func (self *ethProtocol) handle() error {
case GetBlocksMsg: case GetBlocksMsg:
msgStream := rlp.NewStream(msg.Payload) msgStream := rlp.NewStream(msg.Payload)
msgStream.List()
var blocks []interface{} var blocks []interface{}
var i int var i int
for { for {
i++ i++
var hash []byte var hash []byte
if err := msgStream.Decode(&hash); err != nil { if err := msgStream.Decode(&hash); err != nil {
if err == rlp.EOL { if err == io.EOF {
break break
} else { } else {
return self.protoError(ErrDecode, "msg %v: %v", msg, err) return self.protoError(ErrDecode, "msg %v: %v", msg, err)
@ -197,11 +196,10 @@ func (self *ethProtocol) handle() error {
case BlocksMsg: case BlocksMsg:
msgStream := rlp.NewStream(msg.Payload) msgStream := rlp.NewStream(msg.Payload)
msgStream.List()
for { for {
var block types.Block var block types.Block
if err := msgStream.Decode(&block); err != nil { if err := msgStream.Decode(&block); err != nil {
if err == rlp.EOL { if err == io.EOF {
break break
} else { } else {
return self.protoError(ErrDecode, "msg %v: %v", msg, err) return self.protoError(ErrDecode, "msg %v: %v", msg, err)
@ -211,15 +209,15 @@ func (self *ethProtocol) handle() error {
} }
case NewBlockMsg: case NewBlockMsg:
var request [1]newBlockMsgData var request newBlockMsgData
if err := msg.Decode(&request); err != nil { if err := msg.Decode(&request); err != nil {
return self.protoError(ErrDecode, "msg %v: %v", msg, err) return self.protoError(ErrDecode, "msg %v: %v", msg, err)
} }
hash := request[0].Block.Hash() hash := request.Block.Hash()
// to simplify backend interface adding a new block // to simplify backend interface adding a new block
// uses AddPeer followed by AddHashes, AddBlock only if peer is the best peer // uses AddPeer followed by AddHashes, AddBlock only if peer is the best peer
// (or selected as new best peer) // (or selected as new best peer)
if self.blockPool.AddPeer(request[0].TD, hash, self.id, self.requestBlockHashes, self.requestBlocks, self.protoErrorDisconnect) { if self.blockPool.AddPeer(request.TD, hash, self.id, self.requestBlockHashes, self.requestBlocks, self.protoErrorDisconnect) {
called := true called := true
iter := func() (hash []byte, ok bool) { iter := func() (hash []byte, ok bool) {
if called { if called {
@ -230,7 +228,7 @@ func (self *ethProtocol) handle() error {
} }
} }
self.blockPool.AddBlockHashes(iter, self.id) self.blockPool.AddBlockHashes(iter, self.id)
self.blockPool.AddBlock(request[0].Block, self.id) self.blockPool.AddBlock(request.Block, self.id)
} }
default: default: