TCP Keep Alive Control #1395
Merged
TCP Keep Alive Control #1395
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
Codecov Report
@@ Coverage Diff @@
## master #1395 +/- ##
==========================================
- Coverage 39.62% 39.58% -0.04%
==========================================
Files 598 598
Lines 35029 35064 +35
==========================================
+ Hits 13879 13881 +2
- Misses 19633 19660 +27
- Partials 1517 1523 +6
Continue to review full report at Codecov.
|
transport/internet/sockopt_darwin.go
Outdated
| @@ -10,7 +10,8 @@ const ( | |||
| // TCP_FASTOPEN_SERVER is the value to enable TCP fast open on darwin for server connections. | |||
| TCP_FASTOPEN_SERVER = 0x01 // nolint: golint,stylecheck | |||
| // TCP_FASTOPEN_CLIENT is the value to enable TCP fast open on darwin for client connections. | |||
| TCP_FASTOPEN_CLIENT = 0x02 // nolint: golint,stylecheck | |||
| TCP_FASTOPEN_CLIENT = 0x02 // nolint: golint,stylecheck | |||
| TCP_KEEPINTVL = 0x101 // nolint: golint,stylecheck | |||
There was a problem hiding this comment.
This is not necessary, see https://pkg.go.dev/golang.org/x/sys/unix?GOOS=darwin.
|
The
|
|
Okay, I will rewrite these code to use unix instead of syscall. |
xiaokangwang
added a commit
that referenced
this pull request
Nov 28, 2021
Suggestion from: #1395 (comment)
xiaokangwang
added a commit
that referenced
this pull request
Nov 28, 2021
Suggestion from: #1395 (comment)
Suggestion from: #1395 (comment)
Suggestion from: #1395 (comment)
xiaokangwang
force-pushed
the
dev-tcpkarev2
branch
from
66ed928
to
aa2b82e
Compare
xiaokangwang
added a commit
that referenced
this pull request
Nov 28, 2021
Suggestion from: #1395 (comment)
|
Unfortunately this patchset does not handle keep-alive on |
|
Oh wait, the patch hasn't been backported to v4. |
xiaokangwang
added a commit
that referenced
this pull request
Apr 28, 2022
Suggestion from: #1395 (comment)
xiaokangwang
added a commit
that referenced
this pull request
Apr 28, 2022
Suggestion from: #1395 (comment)
yuhan6665
pushed a commit
to yuhan6665/Xray-core
that referenced
this pull request
Jul 30, 2022
Suggestion from: v2fly/v2ray-core#1395 (comment)
yuhan6665
pushed a commit
to yuhan6665/Xray-core
that referenced
this pull request
Jul 30, 2022
Suggestion from: v2fly/v2ray-core#1395 (comment)
yuhan6665
added a commit
to XTLS/Xray-core
that referenced
this pull request
Jul 31, 2022
* Add TCP keep alive idle setting * Add TCP keep alive idle setting: auto generated * Add TCP keep alive support in Linux * Add TCP keep alive support in MacOS, FreeBSD * Add TCP keep alive support in Windows * fix bug introduced in adding tcp keep alive adjustment * embed macOS const to avoid platform inconsistency * embed macOS const to avoid platform inconsistency(again) * add TCP Keep Alive support in config * use sys/unix instead of syscall Suggestion from: v2fly/v2ray-core#1395 (comment) * use sys/unix instead of syscall Suggestion from: v2fly/v2ray-core#1395 (comment) * Separate TcpKeepAliveIdle and TcpKeepAliveInterval check logic * Disable tcp keepAlive when TcpKeepAliveIdle < 0 and TcpKeepAliveInterval <= 0 Co-authored-by: xqzr <34030394+xqzr@users.noreply.github.com> Co-authored-by: ValdikSS <iam@valdikss.org.ru> Co-authored-by: Shelikhoo <xiaokangwang@outlook.com> Co-authored-by: xqzr <34030394+xqzr@users.noreply.github.com>
mwhorse46
added a commit
to mwhorse46/Xray-core
that referenced
this pull request
Feb 19, 2023
* Add TCP keep alive idle setting * Add TCP keep alive idle setting: auto generated * Add TCP keep alive support in Linux * Add TCP keep alive support in MacOS, FreeBSD * Add TCP keep alive support in Windows * fix bug introduced in adding tcp keep alive adjustment * embed macOS const to avoid platform inconsistency * embed macOS const to avoid platform inconsistency(again) * add TCP Keep Alive support in config * use sys/unix instead of syscall Suggestion from: v2fly/v2ray-core#1395 (comment) * use sys/unix instead of syscall Suggestion from: v2fly/v2ray-core#1395 (comment) * Separate TcpKeepAliveIdle and TcpKeepAliveInterval check logic * Disable tcp keepAlive when TcpKeepAliveIdle < 0 and TcpKeepAliveInterval <= 0 Co-authored-by: xqzr <34030394+xqzr@users.noreply.github.com> Co-authored-by: ValdikSS <iam@valdikss.org.ru> Co-authored-by: Shelikhoo <xiaokangwang@outlook.com> Co-authored-by: xqzr <34030394+xqzr@users.noreply.github.com>
rampagekiller0725
added a commit
to rampagekiller0725/wox
that referenced
this pull request
Jun 29, 2023
* Add TCP keep alive idle setting * Add TCP keep alive idle setting: auto generated * Add TCP keep alive support in Linux * Add TCP keep alive support in MacOS, FreeBSD * Add TCP keep alive support in Windows * fix bug introduced in adding tcp keep alive adjustment * embed macOS const to avoid platform inconsistency * embed macOS const to avoid platform inconsistency(again) * add TCP Keep Alive support in config * use sys/unix instead of syscall Suggestion from: v2fly/v2ray-core#1395 (comment) * use sys/unix instead of syscall Suggestion from: v2fly/v2ray-core#1395 (comment) * Separate TcpKeepAliveIdle and TcpKeepAliveInterval check logic * Disable tcp keepAlive when TcpKeepAliveIdle < 0 and TcpKeepAliveInterval <= 0 Co-authored-by: xqzr <34030394+xqzr@users.noreply.github.com> Co-authored-by: ValdikSS <iam@valdikss.org.ru> Co-authored-by: Shelikhoo <xiaokangwang@outlook.com> Co-authored-by: xqzr <34030394+xqzr@users.noreply.github.com>
Autumn216
added a commit
to Autumn216/wox
that referenced
this pull request
Oct 31, 2023
* Add TCP keep alive idle setting * Add TCP keep alive idle setting: auto generated * Add TCP keep alive support in Linux * Add TCP keep alive support in MacOS, FreeBSD * Add TCP keep alive support in Windows * fix bug introduced in adding tcp keep alive adjustment * embed macOS const to avoid platform inconsistency * embed macOS const to avoid platform inconsistency(again) * add TCP Keep Alive support in config * use sys/unix instead of syscall Suggestion from: v2fly/v2ray-core#1395 (comment) * use sys/unix instead of syscall Suggestion from: v2fly/v2ray-core#1395 (comment) * Separate TcpKeepAliveIdle and TcpKeepAliveInterval check logic * Disable tcp keepAlive when TcpKeepAliveIdle < 0 and TcpKeepAliveInterval <= 0 Co-authored-by: xqzr <34030394+xqzr@users.noreply.github.com> Co-authored-by: ValdikSS <iam@valdikss.org.ru> Co-authored-by: Shelikhoo <xiaokangwang@outlook.com> Co-authored-by: xqzr <34030394+xqzr@users.noreply.github.com>
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 is a reworked PR of #1276.