Rework sendrecv

Author: Gleb Pomykalov

test/sys/test_socket.rs

@@ -169,8 +169,10 @@ mod recvfrom {
 
     const MSG: &'static [u8] = b"Hello, World!";
 
-    fn sendrecv<F>(rsock: RawFd, ssock: RawFd, max_recv_once: Option<usize>, f: F) -> Option<SockAddr>
-        where F: Fn(RawFd, &[u8], MsgFlags) -> Result<usize> + Send + 'static
+    fn sendrecv<Fs, Fr>(rsock: RawFd, ssock: RawFd, f_send: Fs, f_recv: Fr) -> Option<SockAddr>
+        where
+            Fs: Fn(RawFd, &[u8], MsgFlags) -> Result<usize> + Send + 'static,
+            Fr: Fn(usize, Option<SockAddr>),
     {
         let mut buf: [u8; 13] = [0u8; 13];
         let mut l = 0;
@@ -179,15 +181,13 @@ mod recvfrom {
         let send_thread = thread::spawn(move || {
             let mut l = 0;
             while l < std::mem::size_of_val(MSG) {
-                l += f(ssock, &MSG[l..], MsgFlags::empty()).unwrap();
+                l += f_send(ssock, &MSG[l..], MsgFlags::empty()).unwrap();
             }
         });
 
         while l < std::mem::size_of_val(MSG) {
             let (len, from_) = recvfrom(rsock, &mut buf[l..]).unwrap();
-            if let Some(max) = max_recv_once {
-                assert!(len <= max);
-            }
+            f_recv(len, from_);
             from = from_;
             l += len;
         }
@@ -201,9 +201,9 @@ mod recvfrom {
         let (fd2, fd1) = socketpair(AddressFamily::Unix, SockType::Stream,
                                     None, SockFlag::empty()).unwrap();
         // Ignore from for stream sockets
-        let _ = sendrecv(fd1, fd2, None, |s, m, flags| {
+        let _ = sendrecv(fd1, fd2, |s, m, flags| {
             send(s, m, flags)
-        });
+        }, |_, _| {});
     }
 
     #[test]
@@ -223,9 +223,9 @@ mod recvfrom {
             SockFlag::empty(),
             None,
         ).expect("send socket failed");
-        let from = sendrecv(rsock, ssock, None, move |s, m, flags| {
+        let from = sendrecv(rsock, ssock, move |s, m, flags| {
             sendto(s, m, &sock_addr, flags)
-        });
+        },|_, _| {});
         // UDP sockets should set the from address
         assert_eq!(AddressFamily::Inet, from.unwrap().family());
     }
@@ -261,10 +261,12 @@ mod recvfrom {
                 None,
             ).expect("send socket failed");
 
-            let from = sendrecv(rsock, ssock, Some(segment_size), move |s, m, flags| {
+            let from = sendrecv(rsock, ssock, move |s, m, flags| {
                 let iov = [IoVec::from_slice(m)];
                 let cmsg = ControlMessage::UdpGsoSegments(&2);
                 sendmsg(s, &iov, &[cmsg], flags, Some(&sock_addr))
+            }, |len, _| {
+                assert!(len <= segment_size as usize);
             });
             // UDP sockets should set the from address
             assert_eq!(AddressFamily::Inet, from.unwrap().family());
@@ -293,11 +295,11 @@ mod recvfrom {
                 None,
             ).expect("send socket failed");
 
-            let from = sendrecv(rsock, ssock, None, move |s, m, flags| {
+            let from = sendrecv(rsock, ssock, move |s, m, flags| {
                 let iov = [IoVec::from_slice(m)];
                 let cmsg = ControlMessage::UdpGsoSegments(&2);
                 sendmsg(s, &iov, &[cmsg], flags, Some(&sock_addr))
-            });
+            }, |_, _| {});
 
             // UDP sockets should set the from address
             assert_eq!(AddressFamily::Inet, from.unwrap().family());