size

swhitty · Nov 12, 2024 · d8bb4d2 · d8bb4d2
1 parent 5835cea
commit d8bb4d2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/FlyingSocks/Sources/Socket.swift b/FlyingSocks/Sources/Socket.swift
@@ -272,11 +272,11 @@ public struct Socket: Sendable, Hashable {
         }
     }
 
-    private func send<A: SocketAddress>(_ pointer: UnsafeRawPointer, length: Int, to address: A) throws -> Int {
+    private func send(_ pointer: UnsafeRawPointer, length: Int, to address: some SocketAddress) throws -> Int {
         var addr = address
         let sent = withUnsafePointer(to: &addr) {
             $0.withMemoryRebound(to: sockaddr.self, capacity: 1) {
-                Socket.sendto(file.rawValue, pointer, length, 0, $0, socklen_t(MemoryLayout<A>.size))
+                Socket.sendto(file.rawValue, pointer, length, 0, $0, address.size)
             }
         }
         guard sent >= 0 || errno == EISCONN else {

diff --git a/FlyingSocks/Sources/SocketAddress.swift b/FlyingSocks/Sources/SocketAddress.swift
@@ -44,6 +44,21 @@ public protocol SocketAddress: Sendable {
     static var family: sa_family_t { get }
 }
 
+extension SocketAddress {
+    var family: sa_family_t {
+        var this = self
+        return withUnsafePointer(to: &this) {
+            $0.withMemoryRebound(to: sockaddr.self, capacity: 1) {
+                $0.pointee.sa_family
+            }
+        }
+    }
+
+    var size: socklen_t {
+        socklen_t(MemoryLayout<Self>.size)
+    }
+}
+
 public extension SocketAddress where Self == sockaddr_in {
 
     static func inet(port: UInt16) -> Self {