make ChannelCloseOnDrop async

Author: Eugeny

russh/src/channels/channel_stream.rs

@@ -10,15 +10,15 @@ use super::{ChannelId, ChannelMsg};
 /// AsyncRead/AsyncWrite wrapper for SSH Channels
 pub struct ChannelStream<S>
 where
-    S: From<(ChannelId, ChannelMsg)> + 'static,
+    S: From<(ChannelId, ChannelMsg)> + Send + 'static,
 {
     tx: ChannelTx<S>,
     rx: ChannelRx<ChannelCloseOnDrop<S>>,
 }
 
 impl<S> ChannelStream<S>
 where
-    S: From<(ChannelId, ChannelMsg)>,
+    S: From<(ChannelId, ChannelMsg)> + Send,
 {
     pub(super) fn new(tx: ChannelTx<S>, rx: ChannelRx<ChannelCloseOnDrop<S>>) -> Self {
         Self { tx, rx }
@@ -27,7 +27,7 @@ where
 
 impl<S> AsyncRead for ChannelStream<S>
 where
-    S: From<(ChannelId, ChannelMsg)>,
+    S: From<(ChannelId, ChannelMsg)> + Send,
 {
     fn poll_read(
         mut self: Pin<&mut Self>,

russh/src/channels/io/mod.rs

@@ -9,23 +9,30 @@ pub use tx::ChannelTx;
 use crate::{Channel, ChannelId, ChannelMsg, ChannelReadHalf};
 
 #[derive(Debug)]
-pub struct ChannelCloseOnDrop<S: From<(ChannelId, ChannelMsg)>>(pub Channel<S>);
-impl<S: From<(ChannelId, ChannelMsg)>> Borrow<ChannelReadHalf> for ChannelCloseOnDrop<S> {
+pub struct ChannelCloseOnDrop<S: From<(ChannelId, ChannelMsg)> + Send + 'static>(pub Channel<S>);
+
+impl<S: From<(ChannelId, ChannelMsg)> + Send + 'static> Borrow<ChannelReadHalf>
+    for ChannelCloseOnDrop<S>
+{
     fn borrow(&self) -> &ChannelReadHalf {
         &self.0.read_half
     }
 }
-impl<S: From<(ChannelId, ChannelMsg)>> BorrowMut<ChannelReadHalf> for ChannelCloseOnDrop<S> {
+
+impl<S: From<(ChannelId, ChannelMsg)> + Send + 'static> BorrowMut<ChannelReadHalf>
+    for ChannelCloseOnDrop<S>
+{
     fn borrow_mut(&mut self) -> &mut ChannelReadHalf {
         &mut self.0.read_half
     }
 }
-impl<S: From<(ChannelId, ChannelMsg)>> Drop for ChannelCloseOnDrop<S> {
+
+impl<S: From<(ChannelId, ChannelMsg)> + Send + 'static> Drop for ChannelCloseOnDrop<S> {
     fn drop(&mut self) {
-        let Self(channel) = self;
-        let _ = channel
-            .write_half
-            .sender
-            .try_send((channel.write_half.id, ChannelMsg::Close).into());
+        let id = self.0.write_half.id;
+        let sender = self.0.write_half.sender.clone();
+        tokio::spawn(async move {
+            let _ = sender.send((id, ChannelMsg::Close).into()).await;
+        });
     }
 }