Use TCP_KEEPALIVE only if TCP_KEEPIDLE is not defined #8539
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
|
I think a better approach would be to change this #ifdef section to use #elif so that in the end, only a single keepalive method is used. There's no reason any environment should need to set keepalive more than once, even if more than one method is available. |
|
I thought the same but I'm not familiar with Apple systems. Does it have TCP_KEEPIDLE defined? Won't #ifdef cause a malfunction on these systems? |
|
I'm with @dfandrich and I would prefer the change to be something like this: diff --git a/lib/connect.c b/lib/connect.c
index 64f951118..dd5277940 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -135,28 +135,27 @@ tcpkeepalive(struct Curl_easy *data,
KEEPALIVE_FACTOR(optval);
if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPIDLE,
(void *)&optval, sizeof(optval)) < 0) {
infof(data, "Failed to set TCP_KEEPIDLE on fd %d", sockfd);
}
+#elif 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
#ifdef TCP_KEEPINTVL
optval = curlx_sltosi(data->set.tcp_keepintvl);
KEEPALIVE_FACTOR(optval);
if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPINTVL,
(void *)&optval, sizeof(optval)) < 0) {
infof(data, "Failed to set TCP_KEEPINTVL on fd %d", sockfd);
}
#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
}
}
static CURLcode |
MAntoniak
changed the title
|
So let's do this way. |
bagder
approved these changes
Mar 5, 2022
|
Thanks! |
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.
The change based on a comment for TCP_KEEPALIVE.
I try using a CURLOPT_TCP_KEEPALIVE option. For TCP connections my application use lwIP library. The library defines both TCP_KEEPALIVE and TCP_KEEPIDLE. Both are responsible for the same thing, but TCP_KEEPALIVE is in milliseconds and TCP_KEEPIDLE is in seconds. After set TCP_KEEPIDLE correctly, TCP_KEEPALIVE overwrites changes. In the end, the application does not work as intended.