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

les: fixed light fetcher request ID matching

Browse Source
This commit is contained in:
Zsolt Felfoldi 2016-11-29 23:55:35 +01:00
parent a6d3bf6fc3
commit e67500aa15
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
les/fetcher.go
View File

@ -53,6 +53,7 @@ type fetchRequest struct {
type fetchResponse struct { type fetchResponse struct {
reqID uint64 reqID uint64
headers []*types.Header headers []*types.Header
peer *peer
} }
func newLightFetcher(pm *ProtocolManager) *lightFetcher { func newLightFetcher(pm *ProtocolManager) *lightFetcher {
@ -148,8 +149,8 @@ func (f *lightFetcher) nextRequest() (*peer, *announceData) {
return bestPeer, res return bestPeer, res
} }
func (f *lightFetcher) deliverHeaders(reqID uint64, headers []*types.Header) { func (f *lightFetcher) deliverHeaders(peer *peer, reqID uint64, headers []*types.Header) {
f.deliverChn <- fetchResponse{reqID: reqID, headers: headers} f.deliverChn <- fetchResponse{reqID: reqID, headers: headers, peer: peer}
} }
func (f *lightFetcher) requestedID(reqID uint64) bool { func (f *lightFetcher) requestedID(reqID uint64) bool {
@ -280,11 +281,16 @@ func (f *lightFetcher) syncLoop() {
//fmt.Println("<-f.deliverChn", f.syncing) //fmt.Println("<-f.deliverChn", f.syncing)
f.reqMu.Lock() f.reqMu.Lock()
req, ok := f.requested[resp.reqID] 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() f.reqMu.Unlock()
if !ok || !(f.syncing || f.processResponse(req, resp)) { if !ok || !(f.syncing || f.processResponse(req, resp)) {
//fmt.Println("processResponse fail") //fmt.Println("processResponse fail")
f.pm.removePeer(req.peer.id) f.pm.removePeer(resp.peer.id)
} }
case <-f.syncDone: case <-f.syncDone:
//fmt.Println("<-f.syncDone", f.syncing) //fmt.Println("<-f.syncDone", f.syncing)

2
les/handler.go
View File

@ -559,7 +559,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
} }
p.fcServer.GotReply(resp.ReqID, resp.BV) p.fcServer.GotReply(resp.ReqID, resp.BV)
if pm.fetcher.requestedID(resp.ReqID) { if pm.fetcher.requestedID(resp.ReqID) {
pm.fetcher.deliverHeaders(resp.ReqID, resp.Headers) pm.fetcher.deliverHeaders(p, resp.ReqID, resp.Headers)
} else { } else {
err := pm.downloader.DeliverHeaders(p.id, resp.Headers) err := pm.downloader.DeliverHeaders(p.id, resp.Headers)
if err != nil { if err != nil {