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
Original file line number Diff line number Diff line change
Expand Up @@ -753,6 +753,7 @@ public struct QUICConnectionProtocol: NetworkProtocol {
public var applicationErrorReason: String?

public var activeConnectionIDLimit: Int = 0
public var remoteMaxDatagramFrameSize: UInt16 = 0
#if NETWORK_PRIVATE
var privateStorage = QUICConnectionMetadataPrivateStorage()
#endif
Expand Down
2 changes: 2 additions & 0 deletions Sources/SwiftNetwork/QUIC/QUICConnection.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4246,13 +4246,15 @@ public final class QUICConnection: ManyToManyApplicationStreamProtocol,
}
guard let remoteTPMaxDatagramFrameSize else {
self.remoteMaxDatagramFrameSize = 0
self.connectionMetadata.remoteMaxDatagramFrameSize = 0
return
}
if remoteTPMaxDatagramFrameSize > TransportParameters.maxDatagramFrameSize {
self.remoteMaxDatagramFrameSize = Int(TransportParameters.maxDatagramFrameSize)
} else {
self.remoteMaxDatagramFrameSize = remoteTPMaxDatagramFrameSize
}
self.connectionMetadata.remoteMaxDatagramFrameSize = UInt16(truncatingIfNeeded: remoteMaxDatagramFrameSize)
}

private func discardKeys(keyState: PacketKeyState, discardRecoveryState: Bool = true) {
Expand Down
30 changes: 30 additions & 0 deletions Tests/SwiftNetworkTests/SwiftNetworkQUICHarnessTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -653,6 +653,36 @@ final class SwiftNetworkQUICHarnessTests: NetTestCase {
QUICTestHarness().runQUICTest(datagram: true, blockSize: 1000, blockCount: 10)
}

func testQUICDatagramRemoteMaxDatagramFrameSize() {
QUICTestHarness().runQUICTest(
datagram: true,
blockSize: 1000,
blockCount: 1,
afterData: { harness in
let expectation = XCTestExpectation(description: "Wait for remote datagram frame size to be fetched")
harness.context.async {
let clientMetadata: ProtocolMetadata<QUICProtocol>? = harness.state?.clientHarness.getMetadata()
XCTAssertNotNil(clientMetadata)
if let clientMetadata {
let clientRemoteSize = clientMetadata.connectionMetadata?.remoteMaxDatagramFrameSize
XCTAssertNotNil(clientRemoteSize)
XCTAssertEqual(clientRemoteSize, 65535)
}
let serverMetadata: ProtocolMetadata<QUICProtocol>? = harness.state?.serverHarness.getMetadata()
XCTAssertNotNil(serverMetadata)
if let serverMetadata {
let serverRemoteSize = serverMetadata.connectionMetadata?.remoteMaxDatagramFrameSize
XCTAssertNotNil(serverRemoteSize)
XCTAssertEqual(serverRemoteSize, 65535)
}
expectation.fulfill()
}
let waitResult = XCTWaiter.wait(for: [expectation], timeout: 2.0)
XCTAssertEqual(waitResult, .completed, "Remote datagram frame size fetch should complete")
}
)
}

// MARK: Unidirectional tests

func testQUICHelloWorldUnidirectional() {
Expand Down
Loading