cerc-io/plugeth
18
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hotfix/0.7.11' into develop

Browse Source
This commit is contained in:
obscuren 2014-12-24 11:31:08 +01:00
commit 9d429180f9
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/ethereum/main.go
View File

@ -30,7 +30,7 @@ import (
const ( const (
ClientIdentifier = "Ethereum(G)" ClientIdentifier = "Ethereum(G)"
Version = "0.7.10" Version = "0.7.11"
) )
var clilogger = logger.NewLogger("CLI") var clilogger = logger.NewLogger("CLI")

2
cmd/mist/main.go
View File

@ -31,7 +31,7 @@ import (
const ( const (
ClientIdentifier = "Mist" ClientIdentifier = "Mist"
Version = "0.7.10" Version = "0.7.11"
) )
var ethereum *eth.Ethereum var ethereum *eth.Ethereum

6
peer.go
View File

@ -412,6 +412,12 @@ func (p *Peer) HandleInbound() {
//} //}
case wire.MsgDiscTy: case wire.MsgDiscTy:
blockPool := p.ethereum.blockPool
if blockPool.peer == p {
blockPool.peer = nil
blockPool.td = ethutil.Big0
}
p.Stop() p.Stop()
peerlogger.Infoln("Disconnect peer: ", DiscReason(msg.Data.Get(0).Uint())) peerlogger.Infoln("Disconnect peer: ", DiscReason(msg.Data.Get(0).Uint()))
case wire.MsgPingTy: case wire.MsgPingTy: