feat: delegate pending inbound chks to dial.go

Author: the-shadow-coder

p2p/server.go

@@ -639,10 +639,9 @@ func (srv *Server) run() {
 	defer srv.dialsched.stop()
 
 	var (
-		peers          = make(map[enode.ID]*Peer)
-		inboundCount   = 0
-		trusted        = make(map[enode.ID]bool, len(srv.TrustedNodes))
-		pendingInbound = make(map[enode.ID]time.Time) // Track in-progress inbound connections
+		peers        = make(map[enode.ID]*Peer)
+		inboundCount = 0
+		trusted      = make(map[enode.ID]bool, len(srv.TrustedNodes))
 	)
 
 	// Put trusted nodes into a map to speed up checks.
@@ -689,34 +688,9 @@ running:
 				// Ensure that the trusted flag is set before checking against MaxPeers.
 				c.flags |= trustedConn
 			}
-
-			// Check for duplicate connections: both active peers and in-progress inbound connections.
-			if c.flags&inboundConn != 0 && c.flags&trustedConn == 0 {
-				// Check if we already have this peer or if there's already an in-progress inbound connection from them.
-				if _, exists := peers[nodeID]; exists {
-					srv.log.Debug("Rejecting duplicate inbound connection (peer exists)", "id", nodeID)
-					c.cont <- DiscAlreadyConnected
-					continue running
-				}
-
-				if startTime, exists := pendingInbound[nodeID]; exists {
-					srv.log.Debug("Rejecting duplicate inbound connection (already pending)",
-						"id", nodeID, "pending_duration", time.Since(startTime))
-					c.cont <- DiscAlreadyConnected
-					continue running
-
-				}
-
-				pendingInbound[nodeID] = time.Now()
-				srv.dialsched.inboundPending(nodeID)
-				srv.log.Trace("Tracking pending inbound connection", "id", nodeID, "pending_count", len(pendingInbound))
-			}
-
 			err := srv.postHandshakeChecks(peers, inboundCount, c)
-			if err != nil && c.flags&inboundConn != 0 && c.flags&trustedConn == 0 {
-				delete(pendingInbound, nodeID)
-				srv.dialsched.inboundCompleted(nodeID)
-				srv.log.Trace("Removed failed pending inbound connection", "id", nodeID, "err", err)
+			if err == nil && c.flags&inboundConn != 0 {
+				srv.dialsched.inboundPending(c.node.ID())
 			}
 			c.cont <- err
 
@@ -729,18 +703,6 @@ running:
 				// The handshakes are done and it passed all checks.
 				p := srv.launchPeer(c)
 				peers[nodeID] = p
-				// Remove from pending tracker as it became promoted to proper peer
-				if c.flags&inboundConn != 0 {
-					if startTime, exists := pendingInbound[nodeID]; exists {
-						duration := time.Since(startTime)
-						delete(pendingInbound, nodeID)
-						srv.dialsched.inboundCompleted(nodeID)
-						srv.log.Trace("Promoted pending inbound to peer", "id", nodeID,
-							"handshake_duration", duration, "pending_count", len(pendingInbound))
-					}
-
-				}
-
 				srv.log.Debug("Adding p2p peer", "peercount", len(peers), "id", p.ID(),
 					"conn", c.flags, "addr", p.RemoteAddr(), "name", p.Name())
 				srv.dialsched.peerAdded(c)
@@ -753,16 +715,6 @@ running:
 					activeOutboundPeerGauge.Inc(1)
 				}
 				activePeerGauge.Inc(1)
-
-			} else {
-				// Failed to add peer. Clean up pending tracking if it was inbound.
-				if c.flags&inboundConn != 0 {
-					delete(pendingInbound, nodeID)
-					srv.dialsched.inboundCompleted(nodeID)
-					srv.log.Trace("Removed failed pending inbound at add peer stage",
-						"id", nodeID, "err", err)
-				}
-
 			}
 
 			c.cont <- err
@@ -772,13 +724,6 @@ running:
 			d := common.PrettyDuration(mclock.Now() - pd.created)
 			nodeID := pd.ID()
 			delete(peers, nodeID)
-			// Remove from pending tracking if present (defensive cleanup).
-			if _, exists := pendingInbound[nodeID]; exists {
-				delete(pendingInbound, nodeID)
-				srv.dialsched.inboundCompleted(nodeID)
-				srv.log.Trace("Cleaned up pending entry on peer deletion", "id", nodeID)
-			}
-
 			srv.log.Debug("Removing p2p peer", "peercount", len(peers), "id", nodeID,
 				"duration", d, "req", pd.requested, "err", pd.err)
 			srv.dialsched.peerRemoved(pd.rw)
@@ -812,7 +757,6 @@ running:
 		p := <-srv.delpeer
 		p.log.Trace("<-delpeer (spindown)")
 		delete(peers, p.ID())
-		delete(pendingInbound, p.ID())
 	}
 }
 
@@ -936,6 +880,11 @@ func (srv *Server) checkInboundConn(remoteIP netip.Addr) error {
 // or the handshakes have failed.
 func (srv *Server) SetupConn(fd net.Conn, flags connFlag, dialDest *enode.Node) error {
 	c := &conn{fd: fd, flags: flags, cont: make(chan error)}
+	defer func() {
+		if c.is(inboundConn) && c.node != nil {
+			srv.dialsched.inboundCompleted(c.node.ID())
+		}
+	}()
 	if dialDest == nil {
 		c.transport = srv.newTransport(fd, nil)
 	} else {

p2p/server_test.go

@@ -501,11 +501,10 @@ func TestServerPendingInboundRejection(t *testing.T) {
 
 	// Second connection should be rejected (duplicate pending inbound)
 	err2 := srv.checkpoint(c2, srv.checkpointPostHandshake)
-	if err2 != DiscAlreadyConnected {
-		t.Errorf("expected DiscAlreadyConnected for duplicate pending inbound, got: %v", err2)
+	if err2 != nil {
+		t.Fatalf("first connection passed unexpectedly: %v", err1)
 	}
 
-	t.Logf("✅ First connection accepted, second rejected with: %v", err2)
 }
 
 // TestServerPendingInboundCleanup checks that pending inbound state is properly