socket: change accept to take an AsFd

Author: cgzones

changelog/2780.changed.md

@@ -1 +1,2 @@
 Change `sys::socket::accept` and `sys::socket::accept4` to return `OwnedFd` instead of `RawFd`.
+Change `sys::socket::accept` and `sys::socket::accept4` to take `AsFd` instead of `RawFd`.

src/sys/socket/mod.rs

@@ -2340,8 +2340,8 @@ pub fn bind(fd: RawFd, addr: &dyn SockaddrLike) -> Result<()> {
 /// Accept a connection on a socket
 ///
 /// [Further reading](https://pubs.opengroup.org/onlinepubs/9699919799/functions/accept.html)
-pub fn accept(sockfd: RawFd) -> Result<OwnedFd> {
-    let res = unsafe { libc::accept(sockfd, ptr::null_mut(), ptr::null_mut()) };
+pub fn accept<Fd: AsFd>(sockfd: Fd) -> Result<OwnedFd> {
+    let res = unsafe { libc::accept(sockfd.as_fd().as_raw_fd(), ptr::null_mut(), ptr::null_mut()) };
 
     Errno::result(res).map(|fd| unsafe { OwnedFd::from_raw_fd(fd) })
 }
@@ -2365,9 +2365,9 @@ pub fn accept(sockfd: RawFd) -> Result<OwnedFd> {
     solarish,
     target_os = "linux",
 ))]
-pub fn accept4(sockfd: RawFd, flags: SockFlag) -> Result<OwnedFd> {
+pub fn accept4<Fd: AsFd>(sockfd: Fd, flags: SockFlag) -> Result<OwnedFd> {
     let res = unsafe {
-        libc::accept4(sockfd, ptr::null_mut(), ptr::null_mut(), flags.bits())
+        libc::accept4(sockfd.as_fd().as_raw_fd(), ptr::null_mut(), ptr::null_mut(), flags.bits())
     };
 
     Errno::result(res).map(|fd| unsafe { OwnedFd::from_raw_fd(fd) })

test/sys/test_socket.rs

@@ -974,7 +974,7 @@ pub fn test_af_alg_cipher() {
     assert_eq!(sockaddr.alg_type().to_string_lossy(), alg_type);
 
     setsockopt(&sock, AlgSetKey::default(), &key).expect("setsockopt");
-    let session_socket = accept(sock.as_raw_fd()).expect("accept failed");
+    let session_socket = accept(sock).expect("accept failed");
 
     let msgs = [
         ControlMessage::AlgSetOp(&libc::ALG_OP_ENCRYPT),
@@ -1083,7 +1083,7 @@ pub fn test_af_alg_aead() {
         .expect("setsockopt AlgSetAeadAuthSize");
     setsockopt(&sock, AlgSetKey::default(), &key)
         .expect("setsockopt AlgSetKey");
-    let session_socket = accept(sock.as_raw_fd()).expect("accept failed");
+    let session_socket = accept(&sock).expect("accept failed");
 
     let msgs = [
         ControlMessage::AlgSetOp(&ALG_OP_ENCRYPT),
@@ -1116,7 +1116,7 @@ pub fn test_af_alg_aead() {
 
     let iv = vec![1u8; iv_len];
 
-    let session_socket = accept(sock.as_raw_fd()).expect("accept failed");
+    let session_socket = accept(sock).expect("accept failed");
 
     let msgs = [
         ControlMessage::AlgSetOp(&ALG_OP_DECRYPT),
@@ -1680,7 +1680,7 @@ pub fn test_named_unixdomain() {
         write(&s2, b"hello").expect("write failed");
     });
 
-    let s3 = accept(s1.as_raw_fd()).expect("accept failed");
+    let s3 = accept(s1).expect("accept failed");
 
     let mut buf = [0; 5];
     read(s3, &mut buf).unwrap();

test/sys/test_sockopt.rs

@@ -205,7 +205,7 @@ fn test_so_tcp_maxseg() {
 
     connect(ssock.as_raw_fd(), &sock_addr).unwrap();
 
-    let rsess = accept(rsock.as_raw_fd()).unwrap();
+    let rsess = accept(rsock).unwrap();
 
     cfg_if! {
         if #[cfg(apple_targets)] {
@@ -904,7 +904,7 @@ fn test_ktls() {
     .unwrap();
     connect(ssock.as_raw_fd(), &sock_addr).unwrap();
 
-    let _rsess = accept(rsock.as_raw_fd()).unwrap();
+    let _rsess = accept(rsock).unwrap();
 
     match setsockopt(&ssock, sockopt::TcpUlp::default(), b"tls") {
         Ok(()) => (),