forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-21 12:16:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'bzz' of github.com:ethersphere/go-ethereum into bzz

Browse source
This commit is contained in:
zelig 2015-02-12 17:52:29 +01:00
commit 64633e0b0c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bzz/protocol.go
View file

@ -209,8 +209,8 @@ func (self *bzzProtocol) handle() error {
return self.protoError(ErrDecode, "->msg %v: %v", msg, err)
}
dpaLogger.Warnf("Request message: %#v", req)
if req.Key == nil {
return self.protoError(ErrDecode, "protocol handler: req.Key == nil")
if req.Key == nil || req.Timeout == nil {
return self.protoError(ErrDecode, "protocol handler: req.Key == nil || req.Timeout == nil")
}
req.peer = peer{bzzProtocol: self}
self.netStore.addRetrieveRequest(&req)