aboutsummaryrefslogtreecommitdiffstats
path: root/p2p/server.go
diff options
context:
space:
mode:
authorFelix Lange <fjl@twurst.com>2015-05-08 21:54:35 +0800
committerFelix Lange <fjl@twurst.com>2015-05-08 22:09:54 +0800
commit914e57e49bea0617515e1935972c5990a222cd7b (patch)
tree5b3f05c7b3b72e1d35f8fb3900ba49c2491383fa /p2p/server.go
parent23454dcfcb75b9e421d0c3bfe67d33ab49633c5c (diff)
downloadgo-tangerine-914e57e49bea0617515e1935972c5990a222cd7b.tar
go-tangerine-914e57e49bea0617515e1935972c5990a222cd7b.tar.gz
go-tangerine-914e57e49bea0617515e1935972c5990a222cd7b.tar.bz2
go-tangerine-914e57e49bea0617515e1935972c5990a222cd7b.tar.lz
go-tangerine-914e57e49bea0617515e1935972c5990a222cd7b.tar.xz
go-tangerine-914e57e49bea0617515e1935972c5990a222cd7b.tar.zst
go-tangerine-914e57e49bea0617515e1935972c5990a222cd7b.zip
p2p: fix disconnect at capacity
With the introduction of static/trusted nodes, the peer count can go above MaxPeers. Update the capacity check to handle this. While here, decouple the trusted nodes check from the handshake by passing a function instead.
Diffstat (limited to 'p2p/server.go')
-rw-r--r--p2p/server.go29
1 files changed, 17 insertions, 12 deletions
diff --git a/p2p/server.go b/p2p/server.go
index 77f66f167..0598547e4 100644
--- a/p2p/server.go
+++ b/p2p/server.go
@@ -126,7 +126,7 @@ type Server struct {
peerWG sync.WaitGroup // active peer goroutines
}
-type setupFunc func(net.Conn, *ecdsa.PrivateKey, *protoHandshake, *discover.Node, bool, map[discover.NodeID]bool) (*conn, error)
+type setupFunc func(net.Conn, *ecdsa.PrivateKey, *protoHandshake, *discover.Node, func(discover.NodeID) bool) (*conn, error)
type newPeerHook func(*Peer)
// Peers returns all connected peers.
@@ -506,17 +506,7 @@ func (srv *Server) startPeer(fd net.Conn, dest *discover.Node) {
// the callers of startPeer added the peer to the wait group already.
fd.SetDeadline(time.Now().Add(handshakeTimeout))
- // Check capacity, but override for static nodes
- srv.lock.RLock()
- atcap := len(srv.peers) == srv.MaxPeers
- if dest != nil {
- if _, ok := srv.staticNodes[dest.ID]; ok {
- atcap = false
- }
- }
- srv.lock.RUnlock()
-
- conn, err := srv.setupFunc(fd, srv.PrivateKey, srv.ourHandshake, dest, atcap, srv.trustedNodes)
+ conn, err := srv.setupFunc(fd, srv.PrivateKey, srv.ourHandshake, dest, srv.keepconn)
if err != nil {
fd.Close()
glog.V(logger.Debug).Infof("Handshake with %v failed: %v", fd.RemoteAddr(), err)
@@ -539,6 +529,21 @@ func (srv *Server) startPeer(fd net.Conn, dest *discover.Node) {
go srv.runPeer(p)
}
+// preflight checks whether a connection should be kept. it runs
+// after the encryption handshake, as soon as the remote identity is
+// known.
+func (srv *Server) keepconn(id discover.NodeID) bool {
+ srv.lock.RLock()
+ defer srv.lock.RUnlock()
+ if _, ok := srv.staticNodes[id]; ok {
+ return true // static nodes are always allowed
+ }
+ if _, ok := srv.trustedNodes[id]; ok {
+ return true // trusted nodes are always allowed
+ }
+ return len(srv.peers) < srv.MaxPeers
+}
+
func (srv *Server) runPeer(p *Peer) {
glog.V(logger.Debug).Infof("Added %v\n", p)
srvjslog.LogJson(&logger.P2PConnected{