kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'ew/keepalive' 

* ew/keepalive:
  enable SO_KEEPALIVE for connected TCP sockets
maint
Junio C Hamano 2011-12-19 16:06:32 -08:00
parent 7f1068e21e e47a8583a2
commit 85878dd0c9
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
connect.c
View File

@ -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");