From d856afe44957f11552fc90245ff59fd0b6fff427 Mon Sep 17 00:00:00 2001
From: Gabriela Moldovan <gabi@torproject.org>
Date: Mon, 7 Aug 2023 15:41:48 +0100
Subject: [PATCH] tor-proto: Add a function for closing a stream without
 waiting for the reactor to respond.

This will be used for implementing `Drop` for `IncomingStream` (it
needs to "reject" the stream on drop).
---
 crates/tor-proto/src/circuit.rs | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/crates/tor-proto/src/circuit.rs b/crates/tor-proto/src/circuit.rs
index b37001723..08eccf27b 100644
--- a/crates/tor-proto/src/circuit.rs
+++ b/crates/tor-proto/src/circuit.rs
@@ -1086,6 +1086,25 @@ impl StreamTarget {
         Ok(())
     }
 
+    /// Like [`StreamTarget::close`], except this returns immediately instead of waiting for the
+    /// reactor to respond to the `ClosePendingStream` control message.
+    ///
+    /// See [`StreamTarget::close`] for more details.
+    #[cfg(feature = "hs-service")]
+    pub(crate) fn close_nonblocking(&self, msg: relaymsg::End) -> Result<()> {
+        let (tx, _rx) = oneshot::channel();
+
+        self.circ
+            .control
+            .unbounded_send(CtrlMsg::ClosePendingStream {
+                stream_id: self.stream_id,
+                hop_num: self.hop_num,
+                message: msg,
+                done: tx,
+            })
+            .map_err(|_| Error::CircuitClosed)
+    }
+
     /// Called when a circuit-level protocol error has occurred and the
     /// circuit needs to shut down.
     pub(crate) fn protocol_error(&mut self) {