Revert back to winapi dependency

As noted in <rust-lang#308>, switching
from winapi to windows-sys was a breaking change as we expose some of
the winapi types that are different in windows-sys.

This reverts the following commits:
 * "Relax windows-sys dependency version" 81056b9.
 * "Support Socket::(set_)recv_tos on Windows" 242e087.
 * "Replace winapi with windows-sys" aeb6c2d.

We'll make this switch in v0.5 instead.

Author: Thomasdezeeuw

Cargo.toml

@@ -35,14 +35,8 @@ features = ["all"]
 [target."cfg(unix)".dependencies]
 libc = "0.2.124"
 
-[target.'cfg(windows)'.dependencies.windows-sys]
-version = "0.36"
-features = [
-  "Win32_Foundation",
-  "Win32_Networking_WinSock",
-  "Win32_System_IO",
-  "Win32_System_WindowsProgramming",
-]
+[target."cfg(windows)".dependencies]
+winapi = { version = "0.3.9", features = ["handleapi", "ws2ipdef", "ws2tcpip"] }
 
 [features]
 # Enable all API, even ones not available on all OSs.

src/lib.rs

@@ -78,7 +78,7 @@ macro_rules! impl_debug {
             $(#[$target: meta])*
             // The flag(s) to check.
             // Need to specific the libc crate because Windows doesn't use
-            // `libc` but `windows_sys`.
+            // `libc` but `winapi`.
             $libc: ident :: $flag: ident
         ),+ $(,)*
     ) => {

src/sockaddr.rs

@@ -2,13 +2,12 @@ use std::mem::{self, size_of, MaybeUninit};
 use std::net::{SocketAddr, SocketAddrV4, SocketAddrV6};
 use std::{fmt, io};
 
-#[cfg(windows)]
-use windows_sys::Win32::Networking::WinSock::SOCKADDR_IN6_0;
-
 use crate::sys::{
     sa_family_t, sockaddr, sockaddr_in, sockaddr_in6, sockaddr_storage, socklen_t, AF_INET,
     AF_INET6,
 };
+#[cfg(windows)]
+use winapi::shared::ws2ipdef::SOCKADDR_IN6_LH_u;
 
 /// The address of a socket.
 ///
@@ -185,7 +184,7 @@ impl SockAddr {
                 addr.sin6_scope_id,
                 #[cfg(windows)]
                 unsafe {
-                    addr.Anonymous.sin6_scope_id
+                    *addr.u.sin6_scope_id()
                 },
             )))
         } else {
@@ -251,6 +250,13 @@ impl From<SocketAddrV4> for SockAddr {
 
 impl From<SocketAddrV6> for SockAddr {
     fn from(addr: SocketAddrV6) -> SockAddr {
+        #[cfg(windows)]
+        let u = unsafe {
+            let mut u = mem::zeroed::<SOCKADDR_IN6_LH_u>();
+            *u.sin6_scope_id_mut() = addr.scope_id();
+            u
+        };
+
         let sockaddr_in6 = sockaddr_in6 {
             sin6_family: AF_INET6 as sa_family_t,
             sin6_port: addr.port().to_be(),
@@ -259,9 +265,7 @@ impl From<SocketAddrV6> for SockAddr {
             #[cfg(unix)]
             sin6_scope_id: addr.scope_id(),
             #[cfg(windows)]
-            Anonymous: SOCKADDR_IN6_0 {
-                sin6_scope_id: addr.scope_id(),
-            },
+            u,
             #[cfg(any(
                 target_os = "dragonfly",
                 target_os = "freebsd",

src/socket.rs

@@ -1401,6 +1401,7 @@ impl Socket {
         target_os = "openbsd",
         target_os = "redox",
         target_os = "solaris",
+        target_os = "windows",
     )))]
     pub fn set_recv_tos(&self, recv_tos: bool) -> io::Result<()> {
         let recv_tos = if recv_tos { 1 } else { 0 };
@@ -1427,6 +1428,7 @@ impl Socket {
         target_os = "openbsd",
         target_os = "redox",
         target_os = "solaris",
+        target_os = "windows",
     )))]
     pub fn recv_tos(&self) -> io::Result<bool> {
         unsafe {

src/sockref.rs

@@ -128,7 +128,7 @@ where
     /// See the `From<&impl AsRawFd>` implementation.
     fn from(socket: &'s S) -> Self {
         let socket = socket.as_raw_socket();
-        assert!(socket != windows_sys::Win32::Networking::WinSock::INVALID_SOCKET as _);
+        assert!(socket != winapi::um::winsock2::INVALID_SOCKET as _);
         SockRef {
             socket: ManuallyDrop::new(unsafe { Socket::from_raw_socket(socket) }),
             _lifetime: PhantomData,

src/sys/unix.rs

@@ -175,7 +175,7 @@ macro_rules! syscall {
 
 /// Maximum size of a buffer passed to system call like `recv` and `send`.
 #[cfg(not(target_vendor = "apple"))]
-const MAX_BUF_LEN: usize = ssize_t::MAX as usize;
+const MAX_BUF_LEN: usize = <ssize_t>::max_value() as usize;
 
 // The maximum read limit on most posix-like systems is `SSIZE_MAX`, with the
 // man page quoting that if the count of bytes to read is greater than
@@ -186,7 +186,7 @@ const MAX_BUF_LEN: usize = ssize_t::MAX as usize;
 // than or equal to INT_MAX. To handle both of these the read size is capped on
 // both platforms.
 #[cfg(target_vendor = "apple")]
-const MAX_BUF_LEN: usize = c_int::MAX as usize - 1;
+const MAX_BUF_LEN: usize = <c_int>::max_value() as usize - 1;
 
 #[cfg(any(
     all(
@@ -623,7 +623,7 @@ pub(crate) fn poll_connect(socket: &crate::Socket, timeout: Duration) -> io::Res
         }
 
         let timeout = (timeout - elapsed).as_millis();
-        let timeout = clamp(timeout, 1, c_int::MAX as u128) as c_int;
+        let timeout = clamp(timeout, 1, c_int::max_value() as u128) as c_int;
 
         match syscall!(poll(&mut pollfd, 1, timeout)) {
             Ok(0) => return Err(io::ErrorKind::TimedOut.into()),
@@ -879,7 +879,7 @@ fn into_timeval(duration: Option<Duration>) -> libc::timeval {
         // https://github.com/rust-lang/libc/issues/1848
         #[cfg_attr(target_env = "musl", allow(deprecated))]
         Some(duration) => libc::timeval {
-            tv_sec: min(duration.as_secs(), libc::time_t::MAX as u64) as libc::time_t,
+            tv_sec: min(duration.as_secs(), libc::time_t::max_value() as u64) as libc::time_t,
             tv_usec: duration.subsec_micros() as libc::suseconds_t,
         },
         None => libc::timeval {
@@ -932,7 +932,7 @@ pub(crate) fn set_tcp_keepalive(fd: Socket, keepalive: &TcpKeepalive) -> io::Res
 
 #[cfg(not(any(target_os = "haiku", target_os = "openbsd")))]
 fn into_secs(duration: Duration) -> c_int {
-    min(duration.as_secs(), c_int::MAX as u64) as c_int
+    min(duration.as_secs(), c_int::max_value() as u64) as c_int
 }
 
 /// Add `flag` to the current set flags of `F_GETFD`.