Invalid FileDescriptor

Author: swhitty

Sources/Socket/PollingSocketPool.swift

@@ -130,7 +130,7 @@ final actor PollingSocketPool: AsyncSocketPool {
             var buffer = sockets.map {
                 Socket.pollfd(fd: $0.file.rawValue, events: Int16($0.events.pollEvents.rawValue), revents: 0)
             }
-            if Socket.poll(&buffer, nfds_t(buffer.count), interval.milliseconds) > 0 {
+            if Socket.poll(&buffer, UInt32(buffer.count), interval.milliseconds) > 0 {
                 for (socket, pollfd) in zip(sockets, buffer) {
                     processPoll(socket: socket, revents: .makeRevents(pollfd.revents, for: socket.events))
                 }

Sources/Socket/Socket+Darwin.swift

@@ -32,6 +32,10 @@
 #if canImport(Darwin)
 import Darwin
 
+extension Socket.FileDescriptor {
+    static let invalid = Socket.FileDescriptor(rawValue: -1)
+}
+
 extension Socket {
 
     typealias FileDescriptorType = Int32
@@ -157,7 +161,7 @@ extension Socket {
         return Darwin.unlink(addr)
     }
 
-    static func poll(_ fds: UnsafeMutablePointer<pollfd>!, _ nfds: nfds_t, _ tmo_p: Int32) -> Int32 {
+    static func poll(_ fds: UnsafeMutablePointer<pollfd>!, _ nfds: UInt32, _ tmo_p: Int32) -> Int32 {
         Darwin.poll(fds, nfds, tmo_p)
     }
 

Sources/Socket/Socket+Glibc.swift

@@ -32,6 +32,10 @@
 #if canImport(Glibc)
 import Glibc
 
+extension Socket.FileDescriptor {
+    static let invalid = Socket.FileDescriptor(rawValue: -1)
+}
+
 extension Socket {
 
     typealias FileDescriptorType = Int32
@@ -153,8 +157,8 @@ extension Socket {
         return Glibc.unlink(addr)
     }
 
-    static func poll(_ fds: UnsafeMutablePointer<pollfd>!, _ nfds: nfds_t, _ tmo_p: Int32) -> Int32 {
-        Glibc.poll(fds, nfds, tmo_p)
+    static func poll(_ fds: UnsafeMutablePointer<pollfd>!, _ nfds: UInt32, _ tmo_p: Int32) -> Int32 {
+        Glibc.poll(fds, UInt(nfds), tmo_p)
     }
 
     static func pollfd(fd: FileDescriptorType, events: Int16, revents: Int16) -> Glibc.pollfd {

Sources/Socket/Socket.swift

@@ -29,6 +29,9 @@
 //  SOFTWARE.
 //
 
+#if canImport(WinSDK)
+import WinSDK.WinSock2
+#endif
 import Foundation
 
 struct Socket: Sendable, Hashable {
@@ -44,11 +47,11 @@ struct Socket: Sendable, Hashable {
     }
 
     init(domain: Int32, type: Int32) throws {
-        let descriptor = Socket.socket(domain, type, 0)
-        if descriptor == -1 {
+        let descriptor = FileDescriptor(rawValue: Socket.socket(domain, type, 0))
+        guard descriptor != .invalid else {
             throw SocketError.makeFailed("CreateSocket")
         }
-        self.file = FileDescriptor(rawValue: descriptor)
+        self.file = descriptor
     }
 
     var flags: Flags {
@@ -153,19 +156,19 @@ struct Socket: Sendable, Hashable {
 
         let newFile = withUnsafeMutablePointer(to: &addr) {
             $0.withMemoryRebound(to: sockaddr.self, capacity: 1) {
-                Socket.accept(file.rawValue, $0, &len)
+                FileDescriptor(rawValue: Socket.accept(file.rawValue, $0, &len))
             }
         }
 
-        guard newFile >= 0 else {
+        guard newFile != .invalid else {
             if errno == EWOULDBLOCK {
                 throw SocketError.blocked
             } else {
                 throw SocketError.makeFailed("Accept")
             }
         }
 
-        return (FileDescriptor(rawValue: newFile), addr)
+        return (newFile, addr)
     }
 
     func connect<A: SocketAddress>(to address: A) throws {