Initialize state machine on handlerAdded #43
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Can one of the admins verify this patch? |
3 similar comments
|
Can one of the admins verify this patch? |
|
Can one of the admins verify this patch? |
|
Can one of the admins verify this patch? |
Lukasa
added
the
patch-version-bump-only
Lukasa
reviewed
Aug 28, 2020
Sources/NIOSSH/NIOSSHHandler.swift
Outdated
| @@ -48,6 +48,9 @@ public final class NIOSSHHandler { | |||
| // Whether we're expecting a channelReadComplete. | |||
| private var expectingChannelReadComplete: Bool = false | |||
|
|
|||
| // Whether the state machine execution started. | |||
| private var initialized: Bool = false | |||
There was a problem hiding this comment.
I don't think we need this: we can just remove the crash from SSHConnectionStateMachine.start() and have that method return nil instead.
Lukasa
reviewed
Aug 28, 2020
Motivation: Sometimes we already have an established channel, for example, one returned by establishing a tunneled connection. If this is the case, then we cannot use it to start key exchange, since it's only started when channel becomes active. In order to support more use cases we should handle starting key exchange when handler is added as well. Modifications: 1. Extract key exchange initialization to separate function 2. Call it from handlerAdded if channel is active 3. Guard againts calling it twice Result: Fixes #42
|
@Lukasa done, btw, could you whitelist me so I can start tests? |
|
@swift-server-bot add to whitelist |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation:
Sometimes we already have an established channel, for example,
one returned by establishing a tunneled connection. If this
is the case, then we cannot use it to start key exchange, since
it's only started when channel becomes active. In order to
support more use cases we should handle starting key exchange
when handler is added as well.
Modifications:
Result:
Fixes #42