From 6c672a55c0622dfb133b67280fc593a0212eae76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Tue, 26 Jul 2016 12:26:41 +0300 Subject: [PATCH] [release/1.4.11] eth, eth/downloader: don't forward the DAO challenge header (cherry picked from commit 071af57bcf516d92a0b56c5bb119d9576d32b5cb) --- eth/downloader/downloader.go | 2 +- eth/handler.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/eth/downloader/downloader.go b/eth/downloader/downloader.go index 1f9ef598cd..2aea30b397 100644 --- a/eth/downloader/downloader.go +++ b/eth/downloader/downloader.go @@ -542,7 +542,7 @@ func (d *Downloader) fetchHeight(p *peer) (*types.Header, error) { // In the rare scenario when we ended up on a long reorganisation (i.e. none of // the head links match), we do a binary search to find the common ancestor. func (d *Downloader) findAncestor(p *peer, height uint64) (uint64, error) { - glog.V(logger.Debug).Infof("%v: looking for common ancestor", p) + glog.V(logger.Debug).Infof("%v: looking for common ancestor (remote height %d)", p, height) // Figure out the valid ancestor range to prevent rewrite attacks floor, ceil := int64(-1), d.headHeader().Number.Uint64() diff --git a/eth/handler.go b/eth/handler.go index e16f2c4d5f..3fa47c2690 100644 --- a/eth/handler.go +++ b/eth/handler.go @@ -434,6 +434,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error { return err } glog.V(logger.Debug).Infof("%v: verified to be on the same side of the DAO fork", p) + return nil } // Irrelevant of the fork checks, send the header to the fetcher just in case headers = pm.fetcher.FilterHeaders(headers, time.Now())