Remove destination from sendmsg

Author: mehnazyunus

dc/s2n-quic-dc/src/stream/server/tokio/tcp/worker.rs

@@ -814,15 +814,11 @@ where
             );
 
             let sender = uds::sender::Sender::new(&self.dest_path)?;
-            let dest_path = self.dest_path.clone();
             let tcp_stream = socket.into_std()?;
 
             // FIXME make this a manual Future impl instead of Box
-            let send_future = Box::pin(async move {
-                sender
-                    .send_msg(&buffer, &dest_path, tcp_stream.as_fd())
-                    .await
-            });
+            let send_future =
+                Box::pin(async move { sender.send_msg(&buffer, tcp_stream.as_fd()).await });
 
             let event_data = SocketEventData {
                 credential_id: credentials.id.to_vec(),

dc/s2n-quic-dc/src/uds/receiver.rs

@@ -43,7 +43,7 @@ impl Receiver {
     pub async fn receive_msg(&self) -> Result<(Vec<u8>, OwnedFd), std::io::Error> {
         let res = self
             .socket_fd
-            .async_io(Interest::WRITABLE, |_inner| self.try_receive_nonblocking())
+            .async_io(Interest::READABLE, |_inner| self.try_receive_nonblocking())
             .await?;
         Ok(res)
     }
@@ -133,7 +133,7 @@ mod tests {
                     .await
                     .unwrap()
             },
-            sender.send_msg(packet_data, receiver_path, fd_to_send)
+            sender.send_msg(packet_data, fd_to_send)
         );
 
         match result {

dc/s2n-quic-dc/src/uds/sender.rs

@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-use nix::sys::socket::{sendmsg, ControlMessage, MsgFlags, UnixAddr};
+use nix::sys::socket::{sendmsg, ControlMessage, MsgFlags};
 use std::{
     os::{
         fd::{BorrowedFd, OwnedFd},
@@ -31,12 +31,11 @@ impl Sender {
     pub async fn send_msg(
         &self,
         packet: &[u8],
-        dest_path: &Path,
         fd_to_send: BorrowedFd<'_>,
     ) -> Result<(), std::io::Error> {
         self.socket_fd
             .async_io(Interest::WRITABLE, |_inner| {
-                self.try_send_nonblocking(packet, dest_path, fd_to_send)
+                self.try_send_nonblocking(packet, fd_to_send)
             })
             .await?;
         Ok(())
@@ -45,25 +44,23 @@ impl Sender {
     fn try_send_nonblocking(
         &self,
         packet: &[u8],
-        dest_path: &Path,
         fd_to_send: BorrowedFd,
     ) -> Result<(), std::io::Error> {
         let fds = [fd_to_send.as_raw_fd()];
         let cmsg = ControlMessage::ScmRights(&fds);
-        let dest_addr = UnixAddr::new(dest_path)?;
 
         #[cfg(target_os = "linux")]
         let send_flags = MsgFlags::MSG_NOSIGNAL;
 
         #[cfg(not(target_os = "linux"))]
         let send_flags = MsgFlags::empty();
 
-        sendmsg::<UnixAddr>(
+        sendmsg::<()>(
             self.socket_fd.as_raw_fd(),
             &[std::io::IoSlice::new(packet)],
             &[cmsg],
             send_flags,
-            Some(&dest_addr),
+            None,
         )?;
 
         Ok(())