Skip to content

Add PeerMaximumMessageLength option for SSH child channels. #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Lukasa merged 3 commits into from
Nov 22, 2021
Merged

Add PeerMaximumMessageLength option for SSH child channels. #101

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a615a75
Add `PeerMaximumMessageLength` option for SSH child channels. Fixes #99
gwynne Nov 18, 2021
eb24beb
Apply formatting fixes from soundness check
gwynne Nov 22, 2021
21f495b
Merge branch 'main' into maxmessagesize-child-channel-option
gwynne Nov 22, 2021
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
Prev Previous commit
Next Next commit
Apply formatting fixes from soundness check
  • Loading branch information
@gwynne
gwynne committed Nov 22, 2021
commit eb24beb09086c3972fe92354c65885170f1b361d
6 changes: 3 additions & 3 deletions Sources/NIOSSH/Child Channels/ChildChannelOptions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public struct SSHChildChannelOptions {

/// - seealso: `SSHChannelTypeOption`.
public static let sshChannelType: SSHChildChannelOptions.Types.SSHChannelTypeOption = .init()

/// - seealso: `PeerMaximumMessageLengthOption`.
public static let peerMaximumMessageLength: SSHChildChannelOptions.Types.PeerMaximumMessageLengthOption = .init()
}
Expand Down Expand Up @@ -56,11 +56,11 @@ extension SSHChildChannelOptions.Types {

public init() {}
}

/// `PeerMaximumMessageLengthOption` allows users to query the maximum packet size value reported by the remote peer for a given channel.
public struct PeerMaximumMessageLengthOption: ChannelOption {
public typealias Value = UInt32

public init() {}
}
}
2 changes: 1 addition & 1 deletion Tests/NIOSSHTests/ChildChannelMultiplexerTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1751,7 +1751,7 @@ final class ChildChannelMultiplexerTests: XCTestCase {
let channelID = self.assertChannelOpen(harness.flushedMessages.first)
XCTAssertNoThrow(try harness.multiplexer.receiveMessage(self.openConfirmation(originalChannelID: channelID!, peerChannelID: 1, initialWindowSize: 5, maxPacketSize: 4247)))
XCTAssertTrue(channel.isWritable)

XCTAssertEqual(try channel.getOption(SSHChildChannelOptions.peerMaximumMessageLength).wait(), 4247)
}
}
Expand Down