Skip to content

Commit 1260208

Browse files
committed
update for more FlyingSocks UDP-related changes
1 parent 4394c65 commit 1260208

File tree

2 files changed

+9
-19
lines changed

2 files changed

+9
-19
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,15 @@ actor Ocp1FlyingSocksDatagramController: Ocp1ControllerInternal {
6868
let peerAddress = AnySocketAddress(peerAddress)
6969
let localAddress = localAddress != nil ? AnySocketAddress(localAddress!) : nil
7070

71-
try await sendOcp1EncodedMessage((peerAddress, data, interfaceIndex, localAddress))
71+
try await sendOcp1EncodedMessage(AsyncSocket.Message(
72+
peerAddress: peerAddress,
73+
bytes: Array(data),
74+
interfaceIndex: interfaceIndex,
75+
localAddress: localAddress
76+
))
7277
}
7378

74-
func sendOcp1EncodedMessage(_ messagePdu: (
75-
some SocketAddress,
76-
Data,
77-
UInt32?,
78-
(some SocketAddress)?
79-
)) async throws {
79+
func sendOcp1EncodedMessage(_ messagePdu: AsyncSocket.Message) async throws {
8080
try await endpoint?.sendOcp1EncodedMessage(messagePdu)
8181
}
8282

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

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -236,21 +236,11 @@ public final class Ocp1FlyingSocksDatagramDeviceEndpoint: OcaDeviceEndpointPriva
236236
#endif
237237
}
238238

239-
func sendOcp1EncodedMessage(_ message: (
240-
some SocketAddress,
241-
Data,
242-
UInt32?,
243-
(some SocketAddress)?
244-
)) async throws {
239+
func sendOcp1EncodedMessage(_ messagePdu: AsyncSocket.Message) async throws {
245240
guard let asyncSocket else {
246241
throw Ocp1Error.notConnected
247242
}
248-
try await asyncSocket.send(
249-
message: message.1,
250-
to: message.0,
251-
interfaceIndex: message.2,
252-
from: message.3
253-
)
243+
try await asyncSocket.send(message: messagePdu)
254244
}
255245

256246
public nonisolated var serviceType: OcaDeviceEndpointRegistrar.ServiceType {

0 commit comments

Comments
 (0)