🐛 http dialer add socket config; sockopt.mark use uint32 #1264
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
xiaokangwang
approved these changes
Sep 10, 2021
Codecov Report
@@ Coverage Diff @@
## master #1264 +/- ##
==========================================
+ Coverage 44.76% 44.86% +0.10%
==========================================
Files 485 485
Lines 29539 29539
==========================================
+ Hits 13222 13252 +30
+ Misses 14912 14891 -21
+ Partials 1405 1396 -9
Continue to review full report at Codecov.
|
kslr
changed the title
xiaokangwang
pushed a commit
that referenced
this pull request
Sep 27, 2021
(cherry picked from commit 4d155bc)
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.
This PR fixes two problems related to sockopt:
1.
sockopt.markconfig should acceptuint32instead ofint32Since some router (asus)'s iptables rule set the mark to be
0x80000000(a negative number toint32), specifying2147483648in v2ray json config will result in error with loadingSocketConfig.Mark.2. HTTP Dialer should accept socket config when dialing
Ever since 5279296, all other dialers except http dialer accepts socket config (http dialer only provides a
niltoDialSystem). It means outbounds with a http dialer will not set the socket mark even if specified in json config.This is a shocking behavior that will lead to quite a lot unaccountable issues when configuring transparent proxy with v2ray http/http2 outbound.