Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ let package = Package(
.package(url: "https://github.com/apple/swift-certificates.git", from: "1.19.3"),
.package(url: "https://github.com/apple/swift-log.git", from: "1.14.0"),
.package(url: "https://github.com/apple/swift-nio.git", from: "2.103.0"),
.package(url: "https://github.com/apple/swift-nio-quic.git", .upToNextMinor(from: "0.4.0")),
.package(url: "https://github.com/apple/swift-nio-quic.git", .upToNextMinor(from: "0.6.0")),
.package(url: "https://github.com/apple/swift-nio-quic-helpers.git", .upToNextMinor(from: "0.1.0")),
.package(url: "https://github.com/apple/swift-nio-http3.git", .upToNextMinor(from: "0.3.0")),
.package(url: "https://github.com/apple/swift-nio-ssl.git", from: "2.37.0"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,13 +207,11 @@ extension NIOHTTPServerConfiguration.HTTP3 {
}

@available(anyAppleOS 27.0, *)
extension NIOQUIC.QUICConfiguration.QLogConfiguration {
extension NIOQUIC.QLogConfiguration {
fileprivate init(_ configuration: NIOHTTPServerConfiguration.HTTP3.QUICConfiguration.QLogConfiguration) {
self.init(
path: configuration.path,
topic: configuration.topic,
description: configuration.description
)
self.init(path: configuration.path)
self.topic = configuration.topic
self.description = configuration.description
}
}

Expand Down Expand Up @@ -268,25 +266,25 @@ extension NIOQUIC.QUICConfiguration {
_ config: NIOHTTPServerConfiguration.HTTP3.QUICConfiguration,
authenticationConfiguration: NIOQUIC.AuthenticationConfiguration
) {
self = .server(
self = .forServer(
// SwiftTLS currently just ignores the `serverName` sent in the ClientHello. See
// https://github.com/apple/swift-nio-quic/issues/4.
serverName: config.serverName,
authenticationConfiguration: authenticationConfiguration,
keyExchangeGroup: .init(config.keyExchangeGroup),
applicationProtocols: ["h3"],
maxIdleTimeout: config.maxIdleTimeout,
initialMaxData: config.initialMaxData,
initialMaxStreamDataBidiLocal: config.initialMaxStreamDataBidirectionalLocal,
initialMaxStreamDataBidiRemote: config.initialMaxStreamDataBidirectionalRemote,
initialMaxStreamDataUni: config.initialMaxStreamDataUnidirectional,
initialMaxStreamsBidi: config.initialMaxStreamsBidirectional,
initialMaxStreamsUni: config.initialMaxStreamsUnidirectional,
keepAliveInterval: config.keepAliveInterval,
sendRetry: config.sendRetry,
keyLogPath: config.keyLogPath,
qLogConfiguration: config.qLogConfiguration.map { .init($0) }
applicationProtocols: ["h3"]
)
self.keyExchangeGroup = .init(config.keyExchangeGroup)
self.maxIdleTimeout = config.maxIdleTimeout
self.initialMaxData = config.initialMaxData
self.initialMaxStreamDataBidiLocal = config.initialMaxStreamDataBidirectionalLocal
self.initialMaxStreamDataBidiRemote = config.initialMaxStreamDataBidirectionalRemote
self.initialMaxStreamDataUni = config.initialMaxStreamDataUnidirectional
self.initialMaxStreamsBidi = config.initialMaxStreamsBidirectional
self.initialMaxStreamsUni = config.initialMaxStreamsUnidirectional
self.keepAliveInterval = config.keepAliveInterval
self.sendRetry = config.sendRetry
self.keyLogPath = config.keyLogPath
self.qLogConfiguration = config.qLogConfiguration.map { .init($0) }
}

#if UnstableHTTPDatagrams
Expand Down
8 changes: 5 additions & 3 deletions Tests/NIOHTTPServerTests/Utilities/Helpers.swift
Original file line number Diff line number Diff line change
Expand Up @@ -135,11 +135,13 @@ extension QUICConfiguration {
caPath: String?,
maxDatagramFrameSize: Int = 65535
) -> QUICConfiguration {
QUICConfiguration.client(
var configuration = QUICConfiguration.forClient(
verificationConfiguration: .x509Certificates(trustRootsFilePath: caPath),
applicationProtocols: [NIOHTTPServer.HTTPVersion.http3.alpnIdentifier],
maxDatagramFrameSize: maxDatagramFrameSize
applicationProtocols: [NIOHTTPServer.HTTPVersion.http3.alpnIdentifier]
)
configuration.maxDatagramFrameSize = maxDatagramFrameSize

return configuration
}
}
#endif
Expand Down
Loading