Merge pull request #135 from swhitty/remove-AnySocketAddress

remove AnySocketAddress
swhitty · Nov 23, 2024 · 13778ca · 13778ca
2 parents 5653d61 + 08267e0
commit 13778ca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/FlyingSocks/Sources/AsyncSocket.swift b/FlyingSocks/Sources/AsyncSocket.swift
@@ -231,7 +231,7 @@ public struct AsyncSocket: Sendable {
         message: [UInt8],
         to peerAddress: some SocketAddress,
         interfaceIndex: UInt32? = nil,
-        from localAddress: (some SocketAddress)? = nil
+        from localAddress: (any SocketAddress)? = nil
     ) async throws {
         let sent = try await pool.loopUntilReady(for: .write, on: socket) {
             try socket.send(message: message, to: peerAddress, interfaceIndex: interfaceIndex, from: localAddress)
@@ -251,19 +251,11 @@ public struct AsyncSocket: Sendable {
     }
 
     public func send(message: Message) async throws {
-        let localAddress: AnySocketAddress?
-
-        if let unwrappedLocalAddress = message.localAddress {
-            localAddress = AnySocketAddress(unwrappedLocalAddress)
-        } else {
-            localAddress = nil
-        }
-
         try await send(
             message: message.bytes,
             to: AnySocketAddress(message.peerAddress),
             interfaceIndex: message.interfaceIndex,
-            from: localAddress
+            from: message.localAddress
         )
     }
 #endif

diff --git a/FlyingSocks/Sources/Socket.swift b/FlyingSocks/Sources/Socket.swift
@@ -397,7 +397,7 @@ public struct Socket: Sendable, Hashable {
         message: [UInt8],
         to peerAddress: some SocketAddress,
         interfaceIndex: UInt32? = nil,
-        from localAddress: (some SocketAddress)? = nil
+        from localAddress: (any SocketAddress)? = nil
     ) throws -> Int {
         try message.withUnsafeBytes { buffer in
             try send(
@@ -417,7 +417,7 @@ public struct Socket: Sendable, Hashable {
         flags: Int32,
         to peerAddress: some SocketAddress,
         interfaceIndex: UInt32? = nil,
-        from localAddress: (some SocketAddress)? = nil
+        from localAddress: (any SocketAddress)? = nil
     ) throws -> Int {
         var iov = iovec()
         var msg = msghdr()
@@ -685,7 +685,7 @@ fileprivate extension Socket {
     static func withPacketInfoControl<T>(
         family: sa_family_t,
         interfaceIndex: UInt32?,
-        address: (some SocketAddress)?,
+        address: (any SocketAddress)?,
         _ body: (UnsafePointer<cmsghdr>?, ControlMessageHeaderLengthType) -> T
     ) -> T {
         switch Int32(family) {