Skip to content

network: use TCP_KEEPALIVE instead of TCP_KEEPIDLE in OSX #9574

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

Merged
edsiper merged 1 commit into from
Nov 11, 2024
Merged

network: use TCP_KEEPALIVE instead of TCP_KEEPIDLE in OSX #9574

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions src/flb_network.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,9 +324,12 @@ int flb_net_socket_tcp_keepalive(flb_sockfd_t fd, struct flb_net_setup *net)
(const void *) &enabled, sizeof(enabled));

if (ret == 0 && time >= 0) {
ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE,
(const void *) &time, sizeof(time));
}
#ifdef __APPLE__
ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPALIVE,
#else
ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE,
#endif
(const void *) &time, sizeof(time)); }

if (ret == 0 && interval >= 0) {
ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL,
Expand Down