forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 02:12:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 854e219f6e into 546d42179e

Browse source
This commit is contained in:
gary rong 2018-06-12 11:01:55 +00:00 committed by GitHub
commit 307d557928
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
les/retrieve.go
View file

@ -71,6 +71,7 @@ type sentReq struct {
reqQueued bool // a request has been queued but not sent reqQueued bool // a request has been queued but not sent
reqSent bool // a request has been sent but not timed out reqSent bool // a request has been sent but not timed out
delivered bool // requested data has passed the validation and cached
reqSrtoCount int // number of requests that reached soft (but not hard) timeout reqSrtoCount int // number of requests that reached soft (but not hard) timeout
} }
@ -363,7 +364,15 @@ func (r *sentReq) deliver(peer distPeer, msg *Msg) error {
if !ok || s.delivered { if !ok || s.delivered {
return errResp(ErrUnexpectedResponse, "reqID = %v", msg.ReqID) return errResp(ErrUnexpectedResponse, "reqID = %v", msg.ReqID)
} }
valid := r.validate(peer, msg) == nil valid := false
if r.delivered {
valid = true
} else {
valid = r.validate(peer, msg) == nil
if valid {
r.delivered = true
}
}
r.sentTo[peer] = sentReqToPeer{true, s.valid} r.sentTo[peer] = sentReqToPeer{true, s.valid}
s.valid <- valid s.valid <- valid
if !valid { if !valid {