Merge branch 'hotfix/0.7.11'

Bump
Reset peer during download on disc
2014-12-24 11:30:13 +01:00 · 2014-12-24 11:30:04 +01:00 · 2014-12-24 11:29:58 +01:00 · 2014-12-21 15:13:45 +01:00 · 2014-12-20 02:34:12 +01:00
3 changed files with 8 additions and 2 deletions
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@ -30,7 +30,7 @@ import (

 const (
 	ClientIdentifier = "Ethereum(G)"
-	Version          = "0.7.10"
+	Version          = "0.7.11"
 )

 var clilogger = logger.NewLogger("CLI")
--- a/cmd/mist/main.go
+++ b/cmd/mist/main.go
@ -31,7 +31,7 @@ import (

 const (
 	ClientIdentifier = "Mist"
-	Version          = "0.7.10"
+	Version          = "0.7.11"
 )

 var ethereum *eth.Ethereum
--- a/peer.go
+++ b/peer.go
@ -412,6 +412,12 @@ func (p *Peer) HandleInbound() {
 				//}

 			case wire.MsgDiscTy:
+				blockPool := p.ethereum.blockPool
+				if blockPool.peer == p {
+					blockPool.peer = nil
+					blockPool.td = ethutil.Big0
+				}
+
 				p.Stop()
 				peerlogger.Infoln("Disconnect peer: ", DiscReason(msg.Data.Get(0).Uint()))
 			case wire.MsgPingTy:
Author	SHA1	Message	Date
obscuren	771bfe9e78	Merge branch 'hotfix/0.7.11'	2014-12-24 11:30:13 +01:00
obscuren	c9f963a77e	Bump	2014-12-24 11:30:04 +01:00
obscuren	7ba9fe4d5d	Reset peer during download on disc	2014-12-24 11:29:58 +01:00
obscuren	25d16f358a	Merge branch 'develop'	2014-12-21 15:13:45 +01:00
obscuren	3983dd2428	Merge branch 'release/v0.7.10'	2014-12-20 02:34:12 +01:00