Don't handshake if there is no key yet; first start on Ethereal

24a6d87c · Maran · 4c7bd75c · 24a6d87c
Commit 24a6d87c authored May 26, 2014 by Maran
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 5 deletions

peer.go peer.go +8 -5

No files found.
--- a/peer.go
+++ b/peer.go
@@ -531,13 +531,16 @@ func (p *Peer) Stop() {
 }
 func (p *Peer) pushHandshake() error {
-	pubkey := ethutil.GetKeyRing().Get(0).PublicKey
+	keyRing := ethutil.GetKeyRing().Get(0)
+	if keyRing != nil {
+		pubkey := keyRing.PublicKey
-	msg := ethwire.NewMessage(ethwire.MsgHandshakeTy, []interface{}{
+		msg := ethwire.NewMessage(ethwire.MsgHandshakeTy, []interface{}{
-		uint32(ProtocolVersion), uint32(0), p.Version, byte(p.caps), p.port, pubkey[1:],
+			uint32(ProtocolVersion), uint32(0), p.Version, byte(p.caps), p.port, pubkey[1:],
-	})
+		})
-	p.QueueMessage(msg)
+		p.QueueMessage(msg)
+	}
 	return nil
 }