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

Sanitize invalid TCP_KEEPINTVL and simplify TCP_KEEPALIVE_ABORT_THRESHOLD on Solaris #13142

Open
wants to merge 2 commits into
base: unstable
Choose a base branch
from
Open

Sanitize invalid TCP_KEEPINTVL and simplify TCP_KEEPALIVE_ABORT_THRESHOLD on Solaris #13142

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
104e3d6
Sanitize invalid TCP_KEEPINTVL and simplify TCP_KEEPALIVE_ABORT_THRES…
panjf2000 Mar 2, 2024
b44bafc
Use multi-line comment style instead
panjf2000 Mar 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/anet.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ int anetKeepAlive(char *err, int fd, int interval)
}

intvl = idle/3;
if (intvl < 10) intvl = 10; /* kernel expects at least 10 seconds */
panjf2000 marked this conversation as resolved.
Show resolved Hide resolved
if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &intvl, sizeof(intvl))) {
anetSetError(err, "setsockopt TCP_KEEPINTVL: %s\n", strerror(errno));
return ANET_ERR;
Expand All @@ -216,9 +217,7 @@ int anetKeepAlive(char *err, int fd, int interval)

/* Note that the consequent probes will not be sent at equal intervals on Solaris,
* but will be sent using the exponential backoff algorithm. */
intvl = idle/3;
cnt = 3;
int time_to_abort = intvl * cnt;
int time_to_abort = idle;
if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPALIVE_ABORT_THRESHOLD, &time_to_abort, sizeof(time_to_abort))) {
anetSetError(err, "setsockopt TCP_KEEPCNT: %s\n", strerror(errno));
return ANET_ERR;
Expand Down
Loading