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

Merge branch 'release/0.6.5' into develop

Browse Source
This commit is contained in:
obscuren 2014-09-22 19:34:49 +02:00
commit df30588eb6
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ethereum.go
View File

@ -25,7 +25,7 @@ import (
const ( const (
seedTextFileUri string = "http://www.ethereum.org/servers.poc3.txt" seedTextFileUri string = "http://www.ethereum.org/servers.poc3.txt"
seedNodeAddress = "54.76.56.74:30303" seedNodeAddress = "poc-6.ethdev.com:30303"
) )
var ethlogger = ethlog.NewLogger("SERV") var ethlogger = ethlog.NewLogger("SERV")

2
ethwire/messaging.go
View File

@ -111,7 +111,7 @@ func ReadMessages(conn net.Conn) (msgs []*Msg, err error) {
if n == 0 && len(buff) == 0 { if n == 0 && len(buff) == 0 {
// If there's nothing on the wire wait for a bit // If there's nothing on the wire wait for a bit
time.Sleep(200) time.Sleep(200 * time.Millisecond)
continue continue
} }

26
peer.go
View File

@ -362,22 +362,24 @@ clean:
} }
func formatMessage(msg *ethwire.Msg) (ret string) { func formatMessage(msg *ethwire.Msg) (ret string) {
ret = fmt.Sprintf("%v ", msg.Type) ret = fmt.Sprintf("%v %v", msg.Type, msg.Data)
/* /*
XXX Commented out because I need the log level here to determine XXX Commented out because I need the log level here to determine
if i should or shouldn't generate this message if i should or shouldn't generate this message
*/ */
switch msg.Type { /*
case ethwire.MsgPeersTy: switch msg.Type {
ret += fmt.Sprintf("(%d entries)", msg.Data.Len()) case ethwire.MsgPeersTy:
case ethwire.MsgBlockTy: ret += fmt.Sprintf("(%d entries)", msg.Data.Len())
b1, b2 := ethchain.NewBlockFromRlpValue(msg.Data.Get(0)), ethchain.NewBlockFromRlpValue(msg.Data.Get(msg.Data.Len()-1)) case ethwire.MsgBlockTy:
ret += fmt.Sprintf("(%d entries) %x - %x", msg.Data.Len(), b1.Hash()[0:4], b2.Hash()[0:4]) b1, b2 := ethchain.NewBlockFromRlpValue(msg.Data.Get(0)), ethchain.NewBlockFromRlpValue(msg.Data.Get(msg.Data.Len()-1))
case ethwire.MsgBlockHashesTy: ret += fmt.Sprintf("(%d entries) %x - %x", msg.Data.Len(), b1.Hash()[0:4], b2.Hash()[0:4])
h1, h2 := msg.Data.Get(0).Bytes(), msg.Data.Get(msg.Data.Len()-1).Bytes() case ethwire.MsgBlockHashesTy:
ret += fmt.Sprintf("(%d entries) %x - %x", msg.Data.Len(), h1[0:4], h2[0:4]) h1, h2 := msg.Data.Get(0).Bytes(), msg.Data.Get(msg.Data.Len()-1).Bytes()
} ret += fmt.Sprintf("(%d entries) %x - %x", msg.Data.Len(), h1, h2)
}
*/
return return
} }
@ -512,7 +514,7 @@ func (p *Peer) HandleInbound() {
p.lastBlockReceived = time.Now() p.lastBlockReceived = time.Now()
} }
if foundCommonHash { if foundCommonHash || msg.Data.Len() == 0 {
p.FetchBlocks() p.FetchBlocks()
} else { } else {
p.FetchHashes() p.FetchHashes()