Merge d597722cca into 3d21b85af4

NWParameters is a class, so we don't need it to be inout when passing it to the configurator closure

.github/workflows/main.yml

@@ -14,6 +14,7 @@ jobs:
             linux_5_9_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
             linux_5_10_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
             linux_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
+            linux_6_1_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
             linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
             linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
 

.github/workflows/pull_request.yml

@@ -17,6 +17,7 @@ jobs:
             linux_5_9_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
             linux_5_10_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
             linux_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
+            linux_6_1_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
             linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
             linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
 

Sources/NIOTransportServices/Datagram/NIOTSDatagramChannel.swift

@@ -140,7 +140,7 @@ internal final class NIOTSDatagramChannel: StateManagedNWConnectionChannel {
     internal var allowLocalEndpointReuse = false
     internal var multipathServiceType: NWParameters.MultipathServiceType = .disabled
 
-    private let nwParametersConfigurator: (@Sendable (NWParameters) -> Void)?
+    internal let nwParametersConfigurator: (@Sendable (NWParameters) -> Void)?
 
     var parameters: NWParameters {
         let parameters = NWParameters(dtls: self.tlsOptions, udp: self.udpOptions)

Sources/NIOTransportServices/NIOTSConnectionChannel.swift

@@ -164,7 +164,7 @@ internal final class NIOTSConnectionChannel: StateManagedNWConnectionChannel {
     /// An `EventLoopPromise` that will be succeeded or failed when a connection attempt succeeds or fails.
     internal var connectPromise: EventLoopPromise<Void>?
 
-    private let nwParametersConfigurator: (@Sendable (NWParameters) -> Void)?
+    internal let nwParametersConfigurator: (@Sendable (NWParameters) -> Void)?
 
     internal var parameters: NWParameters {
         let parameters = NWParameters(tls: self.tlsOptions, tcp: self.tcpOptions)

Sources/NIOTransportServices/StateManagedNWConnectionChannel.swift

@@ -83,6 +83,8 @@ internal protocol StateManagedNWConnectionChannel: StateManagedChannel where Act
 
     var multipathServiceType: NWParameters.MultipathServiceType { get }
 
+    var nwParametersConfigurator: (@Sendable (NWParameters) -> Void)? { get }
+
     func setChannelSpecificOption0<Option: ChannelOption>(option: Option, value: Option.Value) throws
 
     func getChannelSpecificOption0<Option: ChannelOption>(option: Option) throws -> Option.Value
@@ -242,6 +244,7 @@ extension StateManagedNWConnectionChannel {
         connection.betterPathUpdateHandler = self.betterPathHandler
         connection.viabilityUpdateHandler = self.viabilityUpdateHandler
         connection.pathUpdateHandler = self.pathChangedHandler(newPath:)
+        self.nwParametersConfigurator?(connection.parameters)
         connection.start(queue: self.connectionQueue)
     }
 

Tests/NIOTransportServicesTests/NIOTSBootstrapTests.swift

@@ -18,7 +18,7 @@ import XCTest
 import Network
 import NIOCore
 import NIOEmbedded
-import NIOTransportServices
+@testable import NIOTransportServices
 import NIOConcurrencyHelpers
 import Foundation
 
@@ -372,34 +372,58 @@ final class NIOTSBootstrapTests: XCTestCase {
         XCTAssertEqual(try connectionChannel.getOption(NIOTSChannelOptions.multipathServiceType).wait(), .handover)
     }
 
-    func testNWParametersConfigurator() throws {
-        let group = NIOTSEventLoopGroup()
-        defer {
-            try! group.syncShutdownGracefully()
+    func testNWParametersConfigurator() async throws {
+        final class WaitForConnectionHandler: ChannelInboundHandler, Sendable {
+            typealias InboundIn = Never
+
+            let connectionPromise: EventLoopPromise<Void>
+
+            init(connectionPromise: EventLoopPromise<Void>) {
+                self.connectionPromise = connectionPromise
+            }
+
+            func channelActive(context: ChannelHandlerContext) {
+                self.connectionPromise.succeed()
+            }
         }
 
+        let group = NIOTSEventLoopGroup(loopCount: 1)
+
         let configuratorListenerCounter = NIOLockedValueBox(0)
         let configuratorConnectionCounter = NIOLockedValueBox(0)
+        let waitForConnectionHandler = WaitForConnectionHandler(
+            connectionPromise: group.next().makePromise()
+        )
 
-        let listenerChannel = try NIOTSListenerBootstrap(group: group)
+        let listenerChannel = try await NIOTSListenerBootstrap(group: group)
+            .childChannelInitializer { connectionChannel in
+                connectionChannel.eventLoop.makeCompletedFuture {
+                    try connectionChannel.pipeline.syncOperations.addHandler(waitForConnectionHandler)
+                }
+            }
             .configureNWParameters { _ in
                 configuratorListenerCounter.withLockedValue { $0 += 1 }
             }
             .bind(host: "localhost", port: 0)
-            .wait()
+            .get()
 
-        let connectionChannel: Channel = try NIOTSConnectionBootstrap(group: group)
+        let connectionChannel: Channel = try await NIOTSConnectionBootstrap(group: group)
             .configureNWParameters { _ in
                 configuratorConnectionCounter.withLockedValue { $0 += 1 }
             }
             .connect(to: listenerChannel.localAddress!)
-            .wait()
+            .get()
 
-        try listenerChannel.close().wait()
-        try connectionChannel.close().wait()
+        // Wait for the server to activate the connection channel to the client.
+        try await waitForConnectionHandler.connectionPromise.futureResult.get()
 
-        XCTAssertEqual(1, configuratorListenerCounter.withLockedValue { $0 })
+        try await listenerChannel.close().get()
+        try await connectionChannel.close().get()
+
+        XCTAssertEqual(2, configuratorListenerCounter.withLockedValue { $0 })
         XCTAssertEqual(1, configuratorConnectionCounter.withLockedValue { $0 })
+
+        try await group.shutdownGracefully()
     }
 }
 

Tests/NIOTransportServicesTests/NIOTSDatagramConnectionChannelTests.swift

@@ -233,34 +233,63 @@ final class NIOTSDatagramConnectionChannelTests: XCTestCase {
         XCTAssertNoThrow(try connection.close().wait())
     }
 
-    func testNWParametersConfigurator() throws {
-        let group = NIOTSEventLoopGroup()
-        defer {
-            try! group.syncShutdownGracefully()
+    func testNWParametersConfigurator() async throws {
+        final class WaitForConnectionHandler: ChannelInboundHandler, Sendable {
+            typealias InboundIn = Never
+
+            let connectionPromise: EventLoopPromise<Void>
+
+            init(connectionPromise: EventLoopPromise<Void>) {
+                self.connectionPromise = connectionPromise
+            }
+
+            func channelActive(context: ChannelHandlerContext) {
+                self.connectionPromise.succeed()
+            }
         }
 
+        let group = NIOTSEventLoopGroup(loopCount: 1)
+
         let configuratorListenerCounter = NIOLockedValueBox(0)
         let configuratorConnectionCounter = NIOLockedValueBox(0)
+        let waitForConnectionHandler = WaitForConnectionHandler(
+            connectionPromise: group.next().makePromise()
+        )
 
-        let listenerChannel = try NIOTSDatagramListenerBootstrap(group: group)
+        let listenerChannel = try await NIOTSDatagramListenerBootstrap(group: group)
+            .childChannelInitializer { connectionChannel in
+                connectionChannel.eventLoop.makeCompletedFuture {
+                    try connectionChannel.pipeline.syncOperations.addHandler(waitForConnectionHandler)
+                }
+            }
             .configureNWParameters { _ in
                 configuratorListenerCounter.withLockedValue { $0 += 1 }
             }
             .bind(host: "localhost", port: 0)
-            .wait()
+            .get()
 
-        let connectionChannel: Channel = try NIOTSDatagramBootstrap(group: group)
+        let connectionChannel: Channel = try await NIOTSDatagramBootstrap(group: group)
             .configureNWParameters { _ in
                 configuratorConnectionCounter.withLockedValue { $0 += 1 }
             }
             .connect(to: listenerChannel.localAddress!)
-            .wait()
+            .get()
 
-        try listenerChannel.close().wait()
-        try connectionChannel.close().wait()
+        // Need to write something so the server can activate the connection channel: this is UDP,
+        // so there is no handshaking that happens and thus the server cannot know that the
+        // connection has been established and the channel can be activated.
+        try await connectionChannel.writeAndFlush(ByteBuffer(bytes: [42]))
 
-        XCTAssertEqual(1, configuratorListenerCounter.withLockedValue { $0 })
+        // Wait for the server to activate the connection channel to the client.
+        try await waitForConnectionHandler.connectionPromise.futureResult.get()
+
+        try await listenerChannel.close().get()
+        try await connectionChannel.close().get()
+
+        XCTAssertEqual(2, configuratorListenerCounter.withLockedValue { $0 })
         XCTAssertEqual(1, configuratorConnectionCounter.withLockedValue { $0 })
+
+        try await group.shutdownGracefully()
     }
 
     func testCanExtractTheConnection() throws {