Peer reaping and fake network

3 files changed, 45 insertions, 13 deletions

diff --git a/ethereum.go b/ethereum.go
index f38de1872..055c1a5ad 100644
--- a/ethereum.go
+++ b/ethereum.go
@@ -72,14 +72,6 @@ func main() {
 
 		server.Start()
 
-		err = server.ConnectToPeer("localhost:12345")
-		if err != nil {
-			log.Println("Error starting server", err)
-
-			server.Stop()
-
-			return
-		}
 
 		// Wait for shutdown
 		server.WaitForShutdown()
diff --git a/peer.go b/peer.go
index e6f752022..16bb22286 100644
--- a/peer.go
+++ b/peer.go
@@ -28,7 +28,11 @@ type Peer struct {
 	// Flag for checking the peer's connectivity state
 	connected int32
 	disconnect int32
+	// Last known message send
 	lastSend time.Time
+	// Indicated whether a verack has been send or not
+	// This flag is used by writeMessage to check if messages are allowed
+	// to be send or not. If no version is known all messages are ignored.
 	versionKnown bool
 }
 
diff --git a/server.go b/server.go
index bc398dd92..e34bc6f20 100644
--- a/server.go
+++ b/server.go
@@ -8,13 +8,14 @@ import (
 	"log"
 	"net"
 	"time"
+	"sync/atomic"
 )
 
-func eachPeer(peers *list.List, callback func(*Peer)) {
+func eachPeer(peers *list.List, callback func(*Peer, *list.Element)) {
 	// Loop thru the peers and close them (if we had them)
 	for e := peers.Front(); e != nil; e = e.Next() {
 		if peer, ok := e.Value.(*Peer); ok {
-			callback(peer)
+			callback(peer, e)
 		}
 	}
 }
@@ -75,19 +76,54 @@ func (s *Server) ConnectToPeer(addr string) error {
 }
 
 func (s *Server) Broadcast(msgType string, data []byte) {
-	eachPeer(s.peers, func(p *Peer) {
+	eachPeer(s.peers, func(p *Peer, e *list.Element) {
 		p.QueueMessage(ethwire.NewMessage(msgType, 0, data))
 	})
 }
 
+const (
+	processReapingTimeout            = 10 // TODO increase
+)
+
+func (s *Server) ReapDeadPeers() {
+	for {
+		eachPeer(s.peers, func(p *Peer, e *list.Element) {
+			if atomic.LoadInt32(&p.disconnect) == 1 {
+				log.Println("Dead peer found .. reaping")
+
+				s.peers.Remove(e)
+			}
+		})
+
+		time.Sleep(processReapingTimeout * time.Second)
+	}
+}
+
 // Start the server
 func (s *Server) Start() {
 	// For now this function just blocks the main thread
 	ln, err := net.Listen("tcp", ":12345")
 	if err != nil {
-		log.Fatal(err)
+		// This is mainly for testing to create a "network"
+		if Debug {
+			log.Println("Connection listening disabled. Acting as client")
+
+			err = s.ConnectToPeer("localhost:12345")
+			if err != nil {
+				log.Println("Error starting server", err)
+
+				s.Stop()
+			}
+
+			return
+		} else {
+			log.Fatal(err)
+		}
 	}
 
+	// Start the reaping processes
+	go s.ReapDeadPeers()
+
 	go func() {
 		for {
 			conn, err := ln.Accept()
@@ -117,7 +153,7 @@ func (s *Server) Stop() {
 	// Close the database
 	defer s.db.Close()
 
-	eachPeer(s.peers, func(p *Peer) {
+	eachPeer(s.peers, func(p *Peer, e *list.Element) {
 			p.Stop()
 	})