fix(connection): bypass gateway guard for courtesy

Author: sanity

crates/core/src/operations/connect.rs

@@ -164,7 +164,7 @@ pub(crate) trait RelayContext {
     fn self_location(&self) -> &PeerKeyLocation;
 
     /// Determine whether we should accept the joiner immediately.
-    fn should_accept(&self, joiner: &PeerKeyLocation) -> bool;
+    fn should_accept(&self, joiner: &PeerKeyLocation, courtesy: bool) -> bool;
 
     /// Choose the next hop for the request, avoiding peers already visited.
     fn select_next_hop(
@@ -215,10 +215,11 @@ impl RelayState {
             actions.observed_address = Some((self.request.origin.clone(), observed_addr));
         }
 
-        if !self.accepted_locally && ctx.should_accept(&self.request.origin) {
+        let acceptor = ctx.self_location().clone();
+        let courtesy = ctx.courtesy_hint(&acceptor, &self.request.origin);
+
+        if !self.accepted_locally && ctx.should_accept(&self.request.origin, courtesy) {
             self.accepted_locally = true;
-            let acceptor = ctx.self_location().clone();
-            let courtesy = ctx.courtesy_hint(&acceptor, &self.request.origin);
             self.courtesy_hint = courtesy;
             actions.accept_response = Some(ConnectResponse {
                 acceptor: acceptor.clone(),
@@ -282,14 +283,14 @@ impl RelayContext for RelayEnv<'_> {
         &self.self_location
     }
 
-    fn should_accept(&self, joiner: &PeerKeyLocation) -> bool {
+    fn should_accept(&self, joiner: &PeerKeyLocation, courtesy: bool) -> bool {
         let location = joiner
             .location
             .unwrap_or_else(|| Location::from_address(&joiner.peer.addr));
         self.op_manager
             .ring
             .connection_manager
-            .should_accept(location, &joiner.peer)
+            .should_accept(location, &joiner.peer, courtesy)
     }
 
     fn select_next_hop(
@@ -789,7 +790,7 @@ pub(crate) async fn join_ring_request(
     if !op_manager
         .ring
         .connection_manager
-        .should_accept(location, &gateway.peer)
+        .should_accept(location, &gateway.peer, false)
     {
         return Err(OpError::ConnError(ConnectionError::UnwantedConnection));
     }
@@ -1000,7 +1001,7 @@ mod tests {
             &self.self_loc
         }
 
-        fn should_accept(&self, _joiner: &PeerKeyLocation) -> bool {
+        fn should_accept(&self, _joiner: &PeerKeyLocation, _courtesy: bool) -> bool {
             self.accept
         }
 

crates/core/src/ring/connection_manager.rs

@@ -163,8 +163,12 @@ impl ConnectionManager {
     ///
     /// # Panic
     /// Will panic if the node checking for this condition has no location assigned.
-    pub fn should_accept(&self, location: Location, peer_id: &PeerId) -> bool {
-        tracing::info!("Checking if should accept connection");
+    pub fn should_accept(&self, location: Location, peer_id: &PeerId, courtesy: bool) -> bool {
+        let courtesy_join = courtesy && self.is_gateway;
+        tracing::info!(
+            courtesy = courtesy_join,
+            "Checking if should accept connection"
+        );
         let open = self
             .open_connections
             .load(std::sync::atomic::Ordering::SeqCst);
@@ -245,7 +249,7 @@ impl ConnectionManager {
         }
 
         const GATEWAY_DIRECT_ACCEPT_LIMIT: usize = 10;
-        if self.is_gateway {
+        if self.is_gateway && !courtesy_join {
             let direct_total = open + reserved_before;
             if direct_total >= GATEWAY_DIRECT_ACCEPT_LIMIT {
                 tracing::info!(
@@ -268,6 +272,16 @@ impl ConnectionManager {
             return true;
         }
 
+        if courtesy_join {
+            tracing::debug!(
+                %peer_id,
+                open,
+                reserved = reserved_before,
+                "should_accept: accepting courtesy connection despite topology limits"
+            );
+            return true;
+        }
+
         let accepted = if total_conn < self.min_connections {
             tracing::info!(%peer_id, total_conn, "should_accept: accepted (below min connections)");
             true