From e67500aa15a2f51a96f0ae91ab3af898b81d82f2 Mon Sep 17 00:00:00 2001
From: Zsolt Felfoldi <zsfelfoldi@gmail.com>
Date: Tue, 29 Nov 2016 23:55:35 +0100
Subject: [PATCH] les: fixed light fetcher request ID matching
---
les/fetcher.go | 14 ++++++++++----
les/handler.go | 2 +-
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/les/fetcher.go b/les/fetcher.go
index ae9bf8474..24cf51839 100644
--- a/les/fetcher.go
+++ b/les/fetcher.go
@@ -53,6 +53,7 @@ type fetchRequest struct {
type fetchResponse struct {
reqID uint64
headers []*types.Header
+ peer *peer
}
func newLightFetcher(pm *ProtocolManager) *lightFetcher {
@@ -148,8 +149,8 @@ func (f *lightFetcher) nextRequest() (*peer, *announceData) {
return bestPeer, res
}
-func (f *lightFetcher) deliverHeaders(reqID uint64, headers []*types.Header) {
- f.deliverChn <- fetchResponse{reqID: reqID, headers: headers}
+func (f *lightFetcher) deliverHeaders(peer *peer, reqID uint64, headers []*types.Header) {
+ f.deliverChn <- fetchResponse{reqID: reqID, headers: headers, peer: peer}
}
func (f *lightFetcher) requestedID(reqID uint64) bool {
@@ -280,11 +281,16 @@ func (f *lightFetcher) syncLoop() {
//fmt.Println("<-f.deliverChn", f.syncing)
f.reqMu.Lock()
req, ok := f.requested[resp.reqID]
- delete(f.requested, resp.reqID)
+ if ok && req.peer != resp.peer {
+ ok = false
+ }
+ if ok {
+ delete(f.requested, resp.reqID)
+ }
f.reqMu.Unlock()
if !ok || !(f.syncing || f.processResponse(req, resp)) {
//fmt.Println("processResponse fail")
- f.pm.removePeer(req.peer.id)
+ f.pm.removePeer(resp.peer.id)
}
case <-f.syncDone:
//fmt.Println("<-f.syncDone", f.syncing)
diff --git a/les/handler.go b/les/handler.go
index 2e6952d2f..f1a8bc62c 100644
--- a/les/handler.go
+++ b/les/handler.go
@@ -559,7 +559,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
}
p.fcServer.GotReply(resp.ReqID, resp.BV)
if pm.fetcher.requestedID(resp.ReqID) {
- pm.fetcher.deliverHeaders(resp.ReqID, resp.Headers)
+ pm.fetcher.deliverHeaders(p, resp.ReqID, resp.Headers)
} else {
err := pm.downloader.DeliverHeaders(p.id, resp.Headers)
if err != nil {
--
GitLab