Add Send

NLnetLabs · Aug 10, 2023 · 2119f2d · 2119f2d
1 parent a647108
commit 2119f2d
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 25 deletions.
diff --git a/src/net/client/multi_stream.rs b/src/net/client/multi_stream.rs
@@ -531,7 +531,7 @@ impl<Octs: Clone + Composer + Debug + OctetsBuilder + Send + 'static>
         query_msg: &'a mut MessageBuilder<
             StaticCompressor<StreamTarget<Octs>>,
         >,
-    ) -> Pin<Box<dyn Future<Output = Result<Query<Octs>, Error>> + '_>> {
+    ) -> Pin<Box<dyn Future<Output = Result<Query<Octs>, Error>> + Send + '_>> {
         return Box::pin(self.query_impl(query_msg));
     }
 }
@@ -680,7 +680,7 @@ impl<
 {
     fn get_result(
         &mut self,
-    ) -> Pin<Box<dyn Future<Output = Result<Message<Bytes>, Error>> + '_>>
+    ) -> Pin<Box<dyn Future<Output = Result<Message<Bytes>, Error>> + Send + '_>>
     {
         Box::pin(self.get_result_impl())
     }

diff --git a/src/net/client/octet_stream.rs b/src/net/client/octet_stream.rs
@@ -769,7 +769,7 @@ impl<Octs: AsMut<[u8]> + Clone + Composer + Debug + OctetsBuilder>
 }
 
 impl<
-        Octs: AsMut<[u8]> + AsRef<[u8]> + Clone + Composer + Debug + OctetsBuilder,
+        Octs: AsMut<[u8]> + AsRef<[u8]> + Clone + Composer + Debug + OctetsBuilder + Send,
     > Connection<Octs>
 {
     /// Constructor for [Connection].
@@ -822,15 +822,15 @@ impl<
 }
 
 impl<
-        Octs: AsMut<[u8]> + AsRef<[u8]> + Clone + Composer + Debug + OctetsBuilder,
+        Octs: AsMut<[u8]> + AsRef<[u8]> + Clone + Composer + Debug + OctetsBuilder + Send,
     > QueryMessage<Query, Octs> for Connection<Octs>
 {
     fn query<'a>(
         &'a self,
         query_msg: &'a mut MessageBuilder<
             StaticCompressor<StreamTarget<Octs>>,
         >,
-    ) -> Pin<Box<dyn Future<Output = Result<Query, Error>> + '_>> {
+    ) -> Pin<Box<dyn Future<Output = Result<Query, Error>> + Send + '_>> {
         return Box::pin(self.query_impl(query_msg));
     }
 }
@@ -891,7 +891,7 @@ impl Query {
 impl GetResult for Query {
     fn get_result(
         &mut self,
-    ) -> Pin<Box<dyn Future<Output = Result<Message<Bytes>, Error>> + '_>>
+    ) -> Pin<Box<dyn Future<Output = Result<Message<Bytes>, Error>> + Send + '_>>
     {
         Box::pin(self.get_result_impl())
     }

diff --git a/src/net/client/query.rs b/src/net/client/query.rs
@@ -22,7 +22,7 @@ pub trait QueryMessage<GR: GetResult, Octs> {
         query_msg: &'a mut MessageBuilder<
             StaticCompressor<StreamTarget<Octs>>,
         >,
-    ) -> Pin<Box<dyn Future<Output = Result<GR, Error>> + '_>>;
+    ) -> Pin<Box<dyn Future<Output = Result<GR, Error>> + Send + '_>>;
 }
 
 /// Trait for getting the result of a DNS query.
@@ -32,5 +32,5 @@ pub trait GetResult {
     /// This function is intended to be cancel safe.
     fn get_result(
         &mut self,
-    ) -> Pin<Box<dyn Future<Output = Result<Message<Bytes>, Error>> + '_>>;
+    ) -> Pin<Box<dyn Future<Output = Result<Message<Bytes>, Error>> + Send + '_>>;
 }
diff --git a/src/net/client/udp.rs b/src/net/client/udp.rs
@@ -52,7 +52,7 @@ impl Connection {
     }
 
     /// Start a new DNS query.
-    async fn query_impl<Octs: AsRef<[u8]> + Clone>(
+    async fn query_impl<Octs: AsRef<[u8]> + Clone + Send>(
         &self,
         query_msg: &mut MessageBuilder<StaticCompressor<StreamTarget<Octs>>>,
     ) -> Result<Query<Octs>, Error> {
@@ -65,15 +65,15 @@ impl Connection {
     }
 }
 
-impl<Octs: AsRef<[u8]> + Clone> QueryMessage<Query<Octs>, Octs>
+impl<Octs: AsRef<[u8]> + Clone + Send> QueryMessage<Query<Octs>, Octs>
     for Connection
 {
     fn query<'a>(
         &'a self,
         query_msg: &'a mut MessageBuilder<
             StaticCompressor<StreamTarget<Octs>>,
         >,
-    ) -> Pin<Box<dyn Future<Output = Result<Query<Octs>, Error>> + '_>> {
+    ) -> Pin<Box<dyn Future<Output = Result<Query<Octs>, Error>> + Send + '_>> {
         return Box::pin(self.query_impl(query_msg));
     }
 }
@@ -117,7 +117,7 @@ pub struct Query<Octs> {
     state: QueryState,
 }
 
-impl<Octs: AsRef<[u8]> + Clone> Query<Octs> {
+impl<Octs: AsRef<[u8]> + Clone + Send> Query<Octs> {
     /// Create new Query object.
     fn new(
         query_msg: &mut MessageBuilder<StaticCompressor<StreamTarget<Octs>>>,
@@ -168,16 +168,12 @@ impl<Octs: AsRef<[u8]> + Clone> Query<Octs> {
                     continue;
                 }
                 QueryState::Send => {
+		    let dgram = self.query_msg .as_target() .as_target() .as_dgram_slice();
                     let sent = self
                         .sock
                         .as_ref()
                         .expect("socket should be present")
-                        .send(
-                            self.query_msg
-                                .as_target()
-                                .as_target()
-                                .as_dgram_slice(),
-                        )
+                        .send( dgram)
                         .await
                         .map_err(|e| Error::UdpSend(Arc::new(e)))?;
                     if sent
@@ -265,10 +261,10 @@ impl<Octs: AsRef<[u8]> + Clone> Query<Octs> {
     }
 }
 
-impl<Octs: AsRef<[u8]> + Clone> GetResult for Query<Octs> {
+impl<Octs: AsRef<[u8]> + Clone + Send> GetResult for Query<Octs> {
     fn get_result(
         &mut self,
-    ) -> Pin<Box<dyn Future<Output = Result<Message<Bytes>, Error>> + '_>>
+    ) -> Pin<Box<dyn Future<Output = Result<Message<Bytes>, Error>> + Send + '_>>
     {
         Box::pin(self.get_result_impl())
     }
@@ -293,7 +289,7 @@ impl InnerConnection {
     }
 
     /// Return a Query object that contains the query state.
-    async fn query<Octs: AsRef<[u8]> + Clone>(
+    async fn query<Octs: AsRef<[u8]> + Clone + Send>(
         &self,
         query_msg: &mut MessageBuilder<StaticCompressor<StreamTarget<Octs>>>,
         conn: Connection,

diff --git a/src/net/client/udp_tcp.rs b/src/net/client/udp_tcp.rs
@@ -65,7 +65,7 @@ impl<Octs: Clone + Composer + Debug + OctetsBuilder + Send + 'static>
         query_msg: &'a mut MessageBuilder<
             StaticCompressor<StreamTarget<Octs>>,
         >,
-    ) -> Pin<Box<dyn Future<Output = Result<Query<Octs>, Error>> + '_>> {
+    ) -> Pin<Box<dyn Future<Output = Result<Query<Octs>, Error>> + Send + '_>> {
         return Box::pin(self.query_impl(query_msg));
     }
 }
@@ -134,9 +134,10 @@ impl<
         loop {
             match &mut self.state {
                 QueryState::StartUdpQuery => {
+		    let mut msg = self.query_msg.clone();
                     let query = self
                         .udp_conn
-                        .query(&mut self.query_msg.clone())
+                        .query(&mut msg)
                         .await?;
                     self.state = QueryState::GetUdpResult(query);
                     continue;
@@ -150,9 +151,10 @@ impl<
                     return Ok(reply);
                 }
                 QueryState::StartTcpQuery => {
+		    let mut msg = self.query_msg.clone();
                     let query = self
                         .tcp_conn
-                        .query(&mut self.query_msg.clone())
+                        .query(&mut msg)
                         .await?;
                     self.state = QueryState::GetTcpResult(query);
                     continue;
@@ -179,7 +181,7 @@ impl<
 {
     fn get_result(
         &mut self,
-    ) -> Pin<Box<dyn Future<Output = Result<Message<Bytes>, Error>> + '_>>
+    ) -> Pin<Box<dyn Future<Output = Result<Message<Bytes>, Error>> + Send + '_>>
     {
         Box::pin(self.get_result_impl())
     }