A few more things

Signed-off-by: Peter Atashian <[email protected]>

Author: retep998

src/inaddr.rs

@@ -2,7 +2,6 @@
 // Licensed under the MIT License <LICENSE.md>
 //! IPv4 Internet address
 #[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct in_addr(pub ::ULONG);
-pub type IN_ADDR = in_addr;
-pub type PIN_ADDR = *mut in_addr;
-pub type LPIN_ADDR = *mut in_addr;
+pub struct IN_ADDR(pub ::ULONG);
+pub type PIN_ADDR = *mut IN_ADDR;
+pub type LPIN_ADDR = *mut IN_ADDR;

src/winsock2.rs

@@ -16,9 +16,7 @@ pub struct fd_set {
     pub fd_count: u_int,
     pub fd_array: [SOCKET; FD_SETSIZE],
 }
-impl Clone for fd_set {
-    fn clone(&self) -> fd_set { *self }
-}
+impl Clone for fd_set { fn clone(&self) -> fd_set { *self } }
 #[repr(C)] #[derive(Clone, Copy, Debug)]
 pub struct timeval {
     pub tv_sec: ::c_long,

src/ws2def.rs

@@ -76,13 +76,12 @@ pub const SO_PORT_SCALABILITY: ::c_int = 0x3006;
 pub const WSK_SO_BASE: ::c_int = 0x4000;
 pub const TCP_NODELAY: ::c_int = 0x0001;
 #[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct sockaddr {
+pub struct SOCKADDR {
     pub sa_family: ADDRESS_FAMILY,
     pub sa_data: [::CHAR; 14],
 }
-pub type SOCKADDR = sockaddr;
-pub type PSOCKADDR = *mut sockaddr;
-pub type LPSOCKADDR = *mut sockaddr;
+pub type PSOCKADDR = *mut SOCKADDR;
+pub type LPSOCKADDR = *mut SOCKADDR;
 #[repr(C)] #[derive(Clone, Copy, Debug)]
 pub struct SOCKET_ADDRESS {
     pub lpSockaddr: LPSOCKADDR,
@@ -105,4 +104,73 @@ pub struct CSADDR_INFO {
     pub iProtocol: ::INT,
 }
 pub type PCSADDR_INFO = *mut CSADDR_INFO;
-pub type LPCSADDR_INFO = *mut CSADDR_INFO;
+pub type LPCSADDR_INFO = *mut CSADDR_INFO;
+#[repr(C)] #[derive(Copy)]
+pub struct SOCKADDR_STORAGE_LH {
+    ss_family: ADDRESS_FAMILY,
+    __ss_pad1: [::CHAR; 6],
+    __ss_align: ::__int64,
+    __ss_pad2: [::CHAR; 112],
+}
+impl Clone for SOCKADDR_STORAGE_LH { fn clone(&self) -> SOCKADDR_STORAGE_LH { *self } }
+pub type PSOCKADDR_STORAGE_LH = *mut SOCKADDR_STORAGE_LH;
+pub type LPSOCKADDR_STORAGE_LH = *mut SOCKADDR_STORAGE_LH;
+#[repr(C)] #[derive(Copy)]
+pub struct SOCKADDR_STORAGE_XP {
+    ss_family: ::c_short,
+    __ss_pad1: [::CHAR; 6],
+    __ss_align: ::__int64,
+    __ss_pad2: [::CHAR; 112],
+}
+impl Clone for SOCKADDR_STORAGE_XP { fn clone(&self) -> SOCKADDR_STORAGE_XP { *self } }
+pub type PSOCKADDR_STORAGE_XP = *mut SOCKADDR_STORAGE_XP;
+pub type LPSOCKADDR_STORAGE_XP = *mut SOCKADDR_STORAGE_XP;
+pub type SOCKADDR_STORAGE = SOCKADDR_STORAGE_LH;
+pub type PSOCKADDR_STORAGE = *mut SOCKADDR_STORAGE;
+pub type LPSOCKADDR_STORAGE = *mut SOCKADDR_STORAGE;
+#[repr(C)] #[derive(Clone, Copy, Debug)]
+pub struct SOCKET_PROCESSOR_AFFINITY {
+    Processor: ::PROCESSOR_NUMBER,
+    NumaNodeId: ::USHORT,
+    Reserved: ::USHORT,
+}
+pub type PSOCKET_PROCESSOR_AFFINITY = *mut SOCKET_PROCESSOR_AFFINITY;
+pub const IOC_UNIX: ::DWORD = 0x00000000;
+pub const IOC_WS2: ::DWORD = 0x08000000;
+pub const IOC_PROTOCOL: ::DWORD = 0x10000000;
+pub const IOC_VENDOR: ::DWORD = 0x18000000;
+pub const IOC_WSK: ::DWORD = IOC_WS2 | 0x07000000;
+macro_rules! _WSAIO { ($x:expr, $y:expr) => { IOC_VOID | $x | $y } }
+macro_rules! _WSAIOR { ($x:expr, $y:expr) => { IOC_OUT | $x | $y } }
+macro_rules! _WSAIOW { ($x:expr, $y:expr) => { IOC_IN | $x | $y } }
+macro_rules! _WSAIORW { ($x:expr, $y:expr) => { IOC_INOUT | $x | $y } }
+pub const SIO_ASSOCIATE_HANDLE: ::DWORD = _WSAIOW!(IOC_WS2, 1);
+pub const SIO_ENABLE_CIRCULAR_QUEUEING: ::DWORD = _WSAIO!(IOC_WS2, 2);
+pub const SIO_FIND_ROUTE: ::DWORD = _WSAIOR!(IOC_WS2, 3);
+pub const SIO_FLUSH: ::DWORD = _WSAIO!(IOC_WS2, 4);
+pub const SIO_GET_BROADCAST_ADDRESS: ::DWORD = _WSAIOR!(IOC_WS2, 5);
+pub const SIO_GET_EXTENSION_FUNCTION_POINTER: ::DWORD = _WSAIORW!(IOC_WS2, 6);
+pub const SIO_GET_QOS: ::DWORD = _WSAIORW!(IOC_WS2, 7);
+pub const SIO_GET_GROUP_QOS: ::DWORD = _WSAIORW!(IOC_WS2, 8);
+pub const SIO_MULTIPOINT_LOOPBACK: ::DWORD = _WSAIOW!(IOC_WS2, 9);
+pub const SIO_MULTICAST_SCOPE: ::DWORD = _WSAIOW!(IOC_WS2, 10);
+pub const SIO_SET_QOS: ::DWORD = _WSAIOW!(IOC_WS2, 11);
+pub const SIO_SET_GROUP_QOS: ::DWORD = _WSAIOW!(IOC_WS2, 12);
+pub const SIO_TRANSLATE_HANDLE: ::DWORD = _WSAIORW!(IOC_WS2, 13);
+pub const SIO_ROUTING_INTERFACE_QUERY: ::DWORD = _WSAIORW!(IOC_WS2, 20);
+pub const SIO_ROUTING_INTERFACE_CHANGE: ::DWORD = _WSAIOW!(IOC_WS2, 21);
+pub const SIO_ADDRESS_LIST_QUERY: ::DWORD = _WSAIOR!(IOC_WS2, 22);
+pub const SIO_ADDRESS_LIST_CHANGE: ::DWORD = _WSAIO!(IOC_WS2, 23);
+pub const SIO_QUERY_TARGET_PNP_HANDLE: ::DWORD = _WSAIOR!(IOC_WS2, 24);
+pub const SIO_QUERY_RSS_PROCESSOR_INFO: ::DWORD = _WSAIOR!(IOC_WS2, 37);
+pub const SIO_ADDRESS_LIST_SORT: ::DWORD = _WSAIORW!(IOC_WS2, 25);
+pub const SIO_RESERVED_1: ::DWORD = _WSAIOW!(IOC_WS2, 26);
+pub const SIO_RESERVED_2: ::DWORD = _WSAIOW!(IOC_WS2, 33);
+pub const SIO_GET_MULTIPLE_EXTENSION_FUNCTION_POINTER: ::DWORD = _WSAIORW!(IOC_WS2, 36);
+
+//645
+pub const IOCPARM_MASK: ::DWORD = 0x7f;
+pub const IOC_VOID: ::DWORD = 0x20000000;
+pub const IOC_OUT: ::DWORD = 0x40000000;
+pub const IOC_IN: ::DWORD = 0x80000000;
+pub const IOC_INOUT: ::DWORD = IOC_IN | IOC_OUT;