Skip to content
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

Jump to bottom

refactor: move IP validation to the PacketListener #229

Open
wants to merge 84 commits into
base: master
Choose a base branch
from
Open

refactor: move IP validation to the PacketListener #229

wants to merge 84 commits into from

Conversation

sbruens
Copy link

@sbruens sbruens commented Jan 22, 2025

No description provided.

sbruens added 30 commits November 19, 2024 11:49
@sbruens
refactor: split UDP serving from handling of packets
b2aa859 
This will allow us to re-use the handling of packets in the Caddy
server where serving is handled separately.
@sbruens
Use a read channel.
c0c0e9f
@sbruens
Rename wrappedPacketConn to just packetConn.
8d95309
@sbruens
Update shadowsocks_handler.
51d5c88
@sbruens
Change the HandlePacket API to not require the pkt.
422542b
@sbruens
Remove the NAT map from the Handle() function.
c10176f 
Instead, make the connection an association by wrapping it with the
client address and pass that to the `Handle()` function. Each connection
will call `Handle()` only once.
@sbruens
Rework the metrics now that the NAT is no longer done by the handler.
004c6c3
@sbruens
Move the metrics AddClosed() call to after the timedCopy returns.
a91d55b
@sbruens
Remove the explicit targetConn.Close() and let it expire on its own.
1d7200b
@sbruens
Add the NAT metrics back in at the server level.
4b8eeae
@sbruens
Use buffer pool on packetHandler instead of global.
1e89e85
@sbruens
Revert wrapping the clientConn with shadowsocks encryption/decryption.
b4e7dbb
@sbruens
Rename packet to association.
63c2cff
@sbruens
Fix tests.
1eeb4d6
@sbruens
Update the docstring for PacketServe.
08e8bba
@sbruens
Fix comment to refer to "associations".
34a01d7
@sbruens
Fix metrics test.
033ba9d
@sbruens
Use slicepool.
87a9d23
@sbruens
Let the assocation handler provide the buffer.
50feaa2
@sbruens
Remove the packetConnWrapper and move the logic into natconn inst…
b7a4a3c 
…ead.
@sbruens
Fix close while reading of natconn.
f80294c
@sbruens
Simplify the natmap a little.
36d4b27
@sbruens
Refactor PacketServe to use events (close and read).
f5d9ac3
@sbruens
Use correct logger.
e0547f2
@sbruens
Keep readCh and closeCh unbuffered.
3dc12d1
@sbruens
Catch panics in the ReadFrom go routine.
afb9cd1
@sbruens
Close the readCh instead of sending the error on the readCh.
5d2acc6
@sbruens
Wrap a logger with the association's client address so we can simplif…
7cd0f1f 
…y the `timedCopy()` signature.
@sbruens
Reference GitHub issue for supporting multiple IPs.
078032c
@sbruens
Simplify packet handling with a new association struct.
2b3f746
@sbruens sbruens marked this pull request as ready for review January 22, 2025 22:23
@sbruens sbruens requested a review from a team as a code owner January 22, 2025 22:23
@sbruens sbruens requested a review from fortuna January 22, 2025 22:23
This was referenced Jan 22, 2025
Open
Merged
fortuna
fortuna reviewed Jan 23, 2025
View reviewed changes
internal/integration_test/integration_test.go Outdated Show resolved Hide resolved
service/udp.go Show resolved Hide resolved
service/udp.go Show resolved Hide resolved
service/udp.go Outdated Show resolved Hide resolved
@sbruens sbruens requested a review from fortuna January 24, 2025 19:42
Base automatically changed from sbruens/udp-split-serving to master January 24, 2025 22:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fortuna fortuna Awaiting requested review from fortuna

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@sbruens @fortuna