Various UDP fixes/improvements #61
Merged
Conversation
This file contains hidden or 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
Actually implement the whole "A UDP association terminates when the TCP connection that the UDP ASSOCIATE request arrived on terminates" thing, instead of leaking resources (oops!) Let's be strict and error out when garbage is written to the controlling TCP connection.
We're not supposed to stop upon encountering an error, we're supposed to drop the packet and go on. Let's split the inner parts of the loops into functions that return Result and match on that to just debug log. While here, reduce ridiculous 64K buffer sizes and simplify some silly code.
To avoid the need to copy-paste the bind-and-reply-success code, allow reusing it with a custom transport function.
dizda
reviewed
Feb 12, 2025
src/server.rs
Outdated
| .ok_or(SocksServerError::Bug("no socket addrs"))?; | ||
|
|
||
| target_addr.set_ip(match target_addr.ip() { | ||
| std::net::IpAddr::V4(v4) => std::net::IpAddr::V6(v4.to_ipv6_mapped()), |
There was a problem hiding this comment.
what's the advantage to use to_ipv6_mapped here?
There was a problem hiding this comment.
That's not new; UDP support was initially added here using dual-stack sockets (which are v6 sockets that use mapped v4 addresses to reach v4 destinations). Actually, we do need to check about handling the case when v6 is completely unavailable…
|
Can you help review this PR @yuguorui |
a8e4cd9 to
4c12963
Compare
Yes, please give me a few days. |
At least hev-socks5-tunnel as a client does not expect v6-mapped ones in response to v4 requests.
Helpful for writing custom UDP transports
4c12963 to
c06b067
Compare
|
Thanks @valpackett about the last commits, I'll test it then release a RC |
|
Dear all, FYI v1.0.0-rc.0 has been released https://github.com/dizda/fast-socks5/releases/tag/v1.0.0-rc.0 |
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.
Most importantly: not stopping the whole UDP proxy if something goes wrong with one packet.
Includes #60