update for FlyingSocks UDP branch multihoming changes

Author: lhoward

Sources/SwiftOCA/OCP.1/Backend/Ocp1FlyingSocksConnection.swift

@@ -48,25 +48,6 @@ fileprivate extension SocketError {
   }
 }
 
-package extension SocketAddress {
-  func makeStorage() -> sockaddr_storage {
-    var storage = sockaddr_storage()
-    var addr = self
-    let addrSize = MemoryLayout<Self>.size
-    let storageSize = MemoryLayout<sockaddr_storage>.size
-
-    withUnsafePointer(to: &addr) { addrPtr in
-      let addrRawPtr = UnsafeRawPointer(addrPtr)
-      withUnsafeMutablePointer(to: &storage) { storagePtr in
-        let storageRawPtr = UnsafeMutableRawPointer(storagePtr)
-        let copySize = min(addrSize, storageSize)
-        storageRawPtr.copyMemory(from: addrRawPtr, byteCount: copySize)
-      }
-    }
-    return storage
-  }
-}
-
 #if os(Linux)
 extension sockaddr_in: SocketAddress {}
 extension sockaddr_in6: SocketAddress {}

Sources/SwiftOCADevice/OCP.1/Backend/FlyingSocks/Ocp1FlyingSocksDatagramController.swift

@@ -29,6 +29,8 @@ actor Ocp1FlyingSocksDatagramController: Ocp1ControllerInternal {
 
   var subscriptions = [OcaONo: Set<OcaSubscriptionManagerSubscription>]()
   let peerAddress: sockaddr_storage
+  let interfaceIndex: UInt32?
+  let localAddress: sockaddr_storage?
   var keepAliveTask: Task<(), Error>?
   var lastMessageReceivedTime = ContinuousClock.now
   var lastMessageSentTime = ContinuousClock.now
@@ -42,10 +44,14 @@ actor Ocp1FlyingSocksDatagramController: Ocp1ControllerInternal {
 
   init(
     endpoint: Ocp1FlyingSocksDatagramDeviceEndpoint,
-    peerAddress: SocketAddress
+    peerAddress: sockaddr_storage,
+    interfaceIndex: UInt32?,
+    localAddress: sockaddr_storage?
   ) async throws {
     self.endpoint = endpoint
-    self.peerAddress = peerAddress.makeStorage()
+    self.peerAddress = peerAddress
+    self.interfaceIndex = interfaceIndex
+    self.localAddress = localAddress
   }
 
   func onConnectionBecomingStale() async throws {
@@ -59,10 +65,15 @@ actor Ocp1FlyingSocksDatagramController: Ocp1ControllerInternal {
   }
 
   func sendOcp1EncodedData(_ data: Data) async throws {
-    try await sendOcp1EncodedMessage((peerAddress, data))
+    try await sendOcp1EncodedMessage((peerAddress, data, interfaceIndex, localAddress))
   }
 
-  func sendOcp1EncodedMessage(_ messagePdu: (some SocketAddress, Data)) async throws {
+  func sendOcp1EncodedMessage(_ messagePdu: (
+    some SocketAddress,
+    Data,
+    UInt32?,
+    (some SocketAddress)?
+  )) async throws {
     try await endpoint?.sendOcp1EncodedMessage(messagePdu)
   }
 

Sources/SwiftOCADevice/OCP.1/Backend/FlyingSocks/Ocp1FlyingSocksDatagramDeviceEndpoint.swift

@@ -117,14 +117,20 @@ public final class Ocp1FlyingSocksDatagramDeviceEndpoint: OcaDeviceEndpointPriva
     }
   }
 
-  func controller(for controllerAddress: SocketAddress) async throws -> ControllerType {
+  func controller(
+    for controllerAddress: sockaddr_storage,
+    interfaceIndex: UInt32?,
+    localAddress: sockaddr_storage?
+  ) async throws -> ControllerType {
     var controller: ControllerType!
 
     controller = _controllers.first(where: { $0.matchesPeer(address: controllerAddress) })
     if controller == nil {
       controller = try await Ocp1FlyingSocksDatagramController(
         endpoint: self,
-        peerAddress: controllerAddress
+        peerAddress: controllerAddress,
+        interfaceIndex: interfaceIndex,
+        localAddress: localAddress
       )
       logger.info("datagram controller added", controller: controller)
       _controllers.insert(controller)
@@ -185,10 +191,16 @@ public final class Ocp1FlyingSocksDatagramDeviceEndpoint: OcaDeviceEndpointPriva
 
     repeat {
       do {
-        for try await messagePdu in asyncSocket!.messages(maxMessageLength: Ocp1MaximumDatagramPduSize) {
-          let controller = try await controller(for: messagePdu.0)
+        for try await messagePdu in asyncSocket!
+          .messages(maxMessageLength: Ocp1MaximumDatagramPduSize)
+        {
+          let controller = try await controller(
+            for: messagePdu.peerAddress,
+            interfaceIndex: messagePdu.interfaceIndex,
+            localAddress: messagePdu.localAddress
+          )
           do {
-            let messages = try await controller.decodeMessages(from: messagePdu.1)
+            let messages = try await controller.decodeMessages(from: messagePdu.bytes)
             for (message, rrq) in messages {
               try await controller.handle(for: self, message: message, rrq: rrq)
             }
@@ -224,11 +236,21 @@ public final class Ocp1FlyingSocksDatagramDeviceEndpoint: OcaDeviceEndpointPriva
     #endif
   }
 
-  func sendOcp1EncodedMessage(_ message: (some SocketAddress, Data)) async throws {
+  func sendOcp1EncodedMessage(_ message: (
+    some SocketAddress,
+    Data,
+    UInt32?,
+    (some SocketAddress)?
+  )) async throws {
     guard let asyncSocket else {
       throw Ocp1Error.notConnected
     }
-    try await asyncSocket.send(message.1, to: message.0)
+    try await asyncSocket.send(
+      message: message.1,
+      to: message.0,
+      interfaceIndex: message.2,
+      from: message.3
+    )
   }
 
   public nonisolated var serviceType: OcaDeviceEndpointRegistrar.ServiceType {