Add the ability for the behaviour to disconnect a peer

protocols/gossipsub/src/behaviour.rs

@@ -3202,6 +3202,9 @@ where
                 NetworkBehaviourAction::ReportObservedAddr { address, score } => {
                     NetworkBehaviourAction::ReportObservedAddr { address, score }
                 }
+                NetworkBehaviourAction::DisconnectPeer { peer_id, handler } => {
+                    NetworkBehaviourAction::DisconnectPeer { peer_id, handler }
+                }
             });
         }
 

protocols/request-response/src/throttled.rs

@@ -657,7 +657,9 @@ where
                 | NetworkBehaviourAction::NotifyHandler { peer_id, handler, event } =>
                     NetworkBehaviourAction::NotifyHandler { peer_id, handler, event },
                 | NetworkBehaviourAction::ReportObservedAddr { address, score } =>
-                    NetworkBehaviourAction::ReportObservedAddr { address, score }
+                    NetworkBehaviourAction::ReportObservedAddr { address, score },
+                | NetworkBehaviourAction::DisconnectPeer { peer_id, handler } =>
+                    NetworkBehaviourAction::DisconnectPeer { peer_id, handler }
             };
 
             return Poll::Ready(event)

swarm-derive/src/lib.rs

@@ -479,6 +479,9 @@ fn build_struct(ast: &DeriveInput, data_struct: &DataStruct) -> TokenStream {
                     std::task::Poll::Ready(#network_behaviour_action::ReportObservedAddr { address, score }) => {
                         return std::task::Poll::Ready(#network_behaviour_action::ReportObservedAddr { address, score });
                     }
+                    std::task::Poll::Ready(#network_behaviour_action::DisconnectPeer { peer_id, handler }) => {
+                        return std::task::Poll::Ready(#network_behaviour_action::DisconnectPeer { peer_id, handler });
+                    }
                     std::task::Poll::Pending => break,
                 }
             }

swarm/src/behaviour.rs

@@ -293,6 +293,15 @@ pub enum NetworkBehaviourAction<TInEvent, TOutEvent> {
         /// relative to other observed addresses.
         score: AddressScore,
     },
+
+    /// Instructs the `Swarm` to initiate a graceful close of the connection
+    /// with a peer.
+    DisconnectPeer {
+        /// The peer to disconnect.
+        peer_id: PeerId,
+        /// The ID of the connection whose `ProtocolsHandler` to disconnect.
+        handler: DisconnectPeerHandler,
+    }
 }
 
 impl<TInEvent, TOutEvent> NetworkBehaviourAction<TInEvent, TOutEvent> {
@@ -312,7 +321,10 @@ impl<TInEvent, TOutEvent> NetworkBehaviourAction<TInEvent, TOutEvent> {
                     event: f(event)
                 },
             NetworkBehaviourAction::ReportObservedAddr { address, score } =>
-                NetworkBehaviourAction::ReportObservedAddr { address, score }
+                NetworkBehaviourAction::ReportObservedAddr { address, score },
+            NetworkBehaviourAction::DisconnectPeer { peer_id, handler } => {
+                NetworkBehaviourAction::DisconnectPeer { peer_id, handler }
+            }
         }
     }
 
@@ -328,7 +340,9 @@ impl<TInEvent, TOutEvent> NetworkBehaviourAction<TInEvent, TOutEvent> {
             NetworkBehaviourAction::NotifyHandler { peer_id, handler, event } =>
                 NetworkBehaviourAction::NotifyHandler { peer_id, handler, event },
             NetworkBehaviourAction::ReportObservedAddr { address, score } =>
-                NetworkBehaviourAction::ReportObservedAddr { address, score }
+                NetworkBehaviourAction::ReportObservedAddr { address, score },
+            NetworkBehaviourAction::DisconnectPeer { peer_id, handler } =>
+                NetworkBehaviourAction::DisconnectPeer { peer_id, handler }
         }
     }
 }
@@ -373,3 +387,18 @@ impl Default for DialPeerCondition {
         DialPeerCondition::Disconnected
     }
 }
+
+/// The options which connection handlers to disconnect.
+#[derive(Debug, Clone)]
+pub enum DisconnectPeerHandler {
+    /// Disconnect a particular connection handler.
+    One(ConnectionId),
+    /// Disconnect all connection handlers.
+    All,
+}
+
+impl Default for DisconnectPeerHandler {
+    fn default() -> Self {
+        DisconnectPeerHandler::All
+    }
+}