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.

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

Add socks4/4a support #1269

Merged
merged 1 commit into from Sep 17, 2021
Merged

Add socks4/4a support #1269

merged 1 commit into from Sep 17, 2021

Conversation

nekohasekai
Copy link
Member

Make socks support more complete.

@codecov-commenter
Copy link

codecov-commenter commented Sep 16, 2021

Codecov Report

Merging #1269 (07bc4e2) into master (c58a372) will decrease coverage by 0.15%.
The diff coverage is 6.89%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1269      +/-   ##
==========================================
- Coverage   44.72%   44.57%   -0.16%     
==========================================
  Files         485      479       -6     
  Lines       29465    29454      -11     
==========================================
- Hits        13179    13128      -51     
- Misses      14884    14923      +39     
- Partials     1402     1403       +1     
Impacted Files Coverage Δ
proxy/socks/client.go 0.87% <0.00%> (-0.26%) ⬇️
proxy/socks/config.pb.go 22.82% <5.26%> (-2.48%) ⬇️
infra/conf/socks.go 69.23% <27.27%> (-11.26%) ⬇️
testing/servers/tcp/tcp.go 81.81% <0.00%> (-5.46%) ⬇️
transport/internet/kcp/dialer.go 80.39% <0.00%> (-3.93%) ⬇️
transport/internet/websocket/connection.go 16.51% <0.00%> (-3.67%) ⬇️
testing/scenarios/common.go 70.68% <0.00%> (-3.45%) ⬇️
transport/internet/kcp/connection.go 69.61% <0.00%> (-2.21%) ⬇️
transport/internet/kcp/receiving.go 98.65% <0.00%> (-1.35%) ⬇️
transport/internet/filelocker_windows.go
... and 8 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c58a372...07bc4e2. Read the comment docs.

@Loyalsoldier
Copy link
Contributor

Please run go generate format.go to format files.

@nekohasekai
Copy link
Member Author

Please run go generate format.go to format files.

Ok.

Copy link
Contributor

@xiaokangwang xiaokangwang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your contribution. This pull request is ready to be merged.

@xiaokangwang xiaokangwang merged commit 97ef239 into v2fly:master Sep 17, 2021
@nekohasekai nekohasekai deleted the socks4 branch October 16, 2021 14:36
This was referenced Sep 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants