Version 0.5 #12
Merged
Version 0.5 #12
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
dr-orlovsky
force-pushed
the
v0.5
branch
3 times, most recently
from
76105da to
cb1d671
Compare
Optimize error handling in other states
dr-orlovsky
commented
May 4, 2024
There was a problem hiding this comment.
@cloudhead I marked specific fixes required to make Socks5 client working to separate them from other chore and maintanence changes
Comment on lines
+113
to
+117
| if input[0] != 0x05 { | ||
| *self = Socks5::Failed(Error::VersionNotSupported(input[0])); | ||
| return Err(Error::VersionNotSupported(input[0])); | ||
| } | ||
| if input[1] != 0x00 { |
There was a problem hiding this comment.
This is the first fix which was required
socks5-client/src/lib.rs
Outdated
| let err = ServerError::from(input[1]); | ||
| *self = Socks5::Rejected(err); | ||
| return Err(Error::Closed); | ||
| } | ||
| *self = Socks5::Reading(input[1], input[2]); | ||
| *self = Socks5::Reading(input[3], input[4]); |
socks5-client/src/lib.rs
Outdated
Comment on lines
143
to
146
| Socks5::Awaiting => 5, | ||
| Socks5::Reading(ty, _) if *ty == IPV4 => 5, | ||
| Socks5::Reading(ty, _) if *ty == IPV6 => 17, | ||
| Socks5::Reading(ty, len) if *ty == DOMAIN => *len as usize + 1, |
There was a problem hiding this comment.
And this is the third
dr-orlovsky
commented
May 5, 2024
| @@ -116,10 +116,10 @@ impl Socks5 { | |||
| } | |||
| if input[1] != 0x00 { | |||
| let err = ServerError::from(input[1]); | |||
| *self = Socks5::Rejected(err); | |||
| return Err(Error::Closed); | |||
| *self = Socks5::Rejected(err, input[3], input[4]); | |||
There was a problem hiding this comment.
previously if Socks5 proxy failed, we were leaving some unread data in a buffer. Not important, since the connection is useless anyway, but better to clean up!
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.
No description provided.