Merge branch 'ew/keepalive'
* ew/keepalive: enable SO_KEEPALIVE for connected TCP sockets
This commit is contained in:
commit
85878dd0c9
13
connect.c
13
connect.c
@ -151,6 +151,15 @@ static void get_host_and_port(char **host, const char **port)
|
||||
}
|
||||
}
|
||||
|
||||
static void enable_keepalive(int sockfd)
|
||||
{
|
||||
int ka = 1;
|
||||
|
||||
if (setsockopt(sockfd, SOL_SOCKET, SO_KEEPALIVE, &ka, sizeof(ka)) < 0)
|
||||
fprintf(stderr, "unable to set SO_KEEPALIVE on socket: %s\n",
|
||||
strerror(errno));
|
||||
}
|
||||
|
||||
#ifndef NO_IPV6
|
||||
|
||||
static const char *ai_name(const struct addrinfo *ai)
|
||||
@ -215,6 +224,8 @@ static int git_tcp_connect_sock(char *host, int flags)
|
||||
if (sockfd < 0)
|
||||
die("unable to connect to %s:\n%s", host, error_message.buf);
|
||||
|
||||
enable_keepalive(sockfd);
|
||||
|
||||
if (flags & CONNECT_VERBOSE)
|
||||
fprintf(stderr, "done.\n");
|
||||
|
||||
@ -288,6 +299,8 @@ static int git_tcp_connect_sock(char *host, int flags)
|
||||
if (sockfd < 0)
|
||||
die("unable to connect to %s:\n%s", host, error_message.buf);
|
||||
|
||||
enable_keepalive(sockfd);
|
||||
|
||||
if (flags & CONNECT_VERBOSE)
|
||||
fprintf(stderr, "done.\n");
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user