Do not exit the server loop on obfs4 connection errors #901
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
|
@ginuerzh any thoughts on this? |
|
If an unrecoverable error occurred (such as closing the listener), then it will loop forever. |
obfs4Listener.Accept() returns an error when obfs4 handshake fails, which in practice happens routinely when someone scans a machine that has an open listening port. Currently the accept loop in server.go exits on first such error, which makes further connections to the same port impossible. This change wraps obfs4 handshake errors into a custom error type that satisfies net.Error and presents itself as temporary, which will prevent such errors from aborting the server.
knyar
changed the title
|
Thanks @ginuerzh – I have spent a bit more time digging into obfs.go and have an alternative fix now that does not modify the generic accept loop and instead makes obfs4 handshake errors retryable. PTAL? |
|
Any other feedback on this? |
|
Well done, thanks! |
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.
obfs4Listener.Accept()returns an error when obfs4 handshake fails, which in practice happens routinely when someone scans a machine that has an open listening port.Currently the accept loop in server.go exits on first such error, which makes further connections to the same port impossible.
This change wraps obfs4 handshake errors into a custom error type that satisfies net.Error and presents itself as temporary, which will prevent such errors from aborting the server.
I think this is what was causing #243.