Winapi unions are a mess

Author: faern

src/sys/windows/tcp.rs

@@ -7,7 +7,7 @@ use std::os::windows::io::FromRawSocket;
 use std::os::windows::raw::SOCKET as StdSocket; // winapi uses usize, stdlib uses u32/u64.
 
 use winapi::ctypes::{c_char, c_int, c_ushort};
-use winapi::shared::ws2def::{SOCKADDR_STORAGE, AF_INET, SOCKADDR_IN};
+use winapi::shared::ws2def::{SOCKADDR_STORAGE, AF_INET, AF_INET6, SOCKADDR_IN};
 use winapi::shared::ws2ipdef::SOCKADDR_IN6;
 
 use winapi::shared::minwindef::{BOOL, TRUE, FALSE};
@@ -109,7 +109,7 @@ pub(crate) fn get_reuseaddr(socket: TcpSocket) -> io::Result<bool> {
 
 pub(crate) fn get_localaddr(socket: TcpSocket) -> io::Result<SocketAddr> {
     let mut storage: SOCKADDR_STORAGE = unsafe { std::mem::zeroed() };
-    let mut length = std::mem::size_of_val(&addr) as c_int;
+    let mut length = std::mem::size_of_val(&storage) as c_int;
 
     match unsafe { getsockname(
         socket,
@@ -120,12 +120,13 @@ pub(crate) fn get_localaddr(socket: TcpSocket) -> io::Result<SocketAddr> {
         _ => {
             if storage.ss_family as c_int == AF_INET {
                 let addr: &SOCKADDR_IN = &*(&storage as *const _ as *const SOCKADDR_IN);
-                let ip = Ipv4Addr::from(addr.sin_addr.s_addr.to_ne_bytes());
+                let ip_bytes = unsafe { addr.sin_addr.S_un.S_un_b() };
+                let ip = Ipv4Addr::from([ip_bytes.s_b1, ip_bytes.s_b2, ip_bytes.s_b3, ip_bytes.s_b4]);
                 let port = u16::from_be(addr.sin_port);
                 Ok(SocketAddr::V4(SocketAddrV4::new(ip, port)))
             } else if storage.ss_family as c_int == AF_INET6 {
                 let addr: &SOCKADDR_IN6 = &*(storage as *const _ as *const SOCKADDR_IN6);
-                let ip = Ipv6Addr::from(addr.sin6_addr.s6_addr);
+                let ip = Ipv6Addr::from(*unsafe { addr.sin6_addr.u.Byte() });
                 let port = u16::from_be(addr.sin6_port);
                 let scope_id = unsafe { *addr.u.sin6_scope_id() };
                 Ok(SocketAddr::V6(SocketAddrV6::new(ip, port, addr.sin6_flowinfo, scope_id)))