romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-26 22:34:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

connect: use TCP_KEEPALIVE only if TCP_KEEPIDLE is not defined

Browse source 
Closes #8539
This commit is contained in:
MAntoniak 2022-03-02 23:36:38 +01:00 • committed by Daniel Stenberg
parent f7d9a76ca7
commit 2cd9837e02
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/connect.c
View file

@ -137,6 +137,14 @@ tcpkeepalive(struct Curl_easy *data,
(void *)&optval, sizeof(optval)) < 0) { (void *)&optval, sizeof(optval)) < 0) {
infof(data, "Failed to set TCP_KEEPIDLE on fd %d", sockfd); infof(data, "Failed to set TCP_KEEPIDLE on fd %d", sockfd);
} }
#elif defined(TCP_KEEPALIVE)
/* Mac OS X style */
optval = curlx_sltosi(data->set.tcp_keepidle);
KEEPALIVE_FACTOR(optval);
if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPALIVE,
(void *)&optval, sizeof(optval)) < 0) {
infof(data, "Failed to set TCP_KEEPALIVE on fd %d", sockfd);
}
#endif #endif
#ifdef TCP_KEEPINTVL #ifdef TCP_KEEPINTVL
optval = curlx_sltosi(data->set.tcp_keepintvl); optval = curlx_sltosi(data->set.tcp_keepintvl);
@ -146,15 +154,6 @@ tcpkeepalive(struct Curl_easy *data,
infof(data, "Failed to set TCP_KEEPINTVL on fd %d", sockfd); infof(data, "Failed to set TCP_KEEPINTVL on fd %d", sockfd);
} }
#endif #endif
#ifdef TCP_KEEPALIVE
/* Mac OS X style */
optval = curlx_sltosi(data->set.tcp_keepidle);
KEEPALIVE_FACTOR(optval);
if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPALIVE,
(void *)&optval, sizeof(optval)) < 0) {
infof(data, "Failed to set TCP_KEEPALIVE on fd %d", sockfd);
}
#endif
#endif #endif
} }
} }