undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ef/ipv4-connect-error-report'

Browse Source 
* ef/ipv4-connect-error-report:
  connect: only log if all attempts failed (ipv4)
This commit is contained in:
Junio C Hamano 2011-08-11 11:03:06 -07:00
commit 1c1b7eed5c
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
connect.c
View File

@ -254,7 +254,8 @@ static int git_tcp_connect_sock(char *host, int flags)
*/ */
static int git_tcp_connect_sock(char *host, int flags) static int git_tcp_connect_sock(char *host, int flags)
{ {
int sockfd = -1, saved_errno = 0; struct strbuf error_message = STRBUF_INIT;
int sockfd = -1;
const char *port = STR(DEFAULT_GIT_PORT); const char *port = STR(DEFAULT_GIT_PORT);
char *ep; char *ep;
struct hostent *he; struct hostent *he;
@ -284,24 +285,20 @@ static int git_tcp_connect_sock(char *host, int flags)
fprintf(stderr, "done.\nConnecting to %s (port %s) ... ", host, port); fprintf(stderr, "done.\nConnecting to %s (port %s) ... ", host, port);
for (cnt = 0, ap = he->h_addr_list; *ap; ap++, cnt++) { for (cnt = 0, ap = he->h_addr_list; *ap; ap++, cnt++) {
sockfd = socket(he->h_addrtype, SOCK_STREAM, 0);
if (sockfd < 0) {
saved_errno = errno;
continue;
}
memset(&sa, 0, sizeof sa); memset(&sa, 0, sizeof sa);
sa.sin_family = he->h_addrtype; sa.sin_family = he->h_addrtype;
sa.sin_port = htons(nport); sa.sin_port = htons(nport);
memcpy(&sa.sin_addr, *ap, he->h_length); memcpy(&sa.sin_addr, *ap, he->h_length);
if (connect(sockfd, (struct sockaddr *)&sa, sizeof sa) < 0) { sockfd = socket(he->h_addrtype, SOCK_STREAM, 0);
saved_errno = errno; if ((sockfd < 0) ||
fprintf(stderr, "%s[%d: %s]: errno=%s\n", connect(sockfd, (struct sockaddr *)&sa, sizeof sa) < 0) {
strbuf_addf(&error_message, "%s[%d: %s]: errno=%s\n",
host, host,
cnt, cnt,
inet_ntoa(*(struct in_addr *)&sa.sin_addr), inet_ntoa(*(struct in_addr *)&sa.sin_addr),
strerror(saved_errno)); strerror(errno));
if (0 <= sockfd)
close(sockfd); close(sockfd);
sockfd = -1; sockfd = -1;
continue; continue;
@ -313,7 +310,7 @@ static int git_tcp_connect_sock(char *host, int flags)
} }
if (sockfd < 0) if (sockfd < 0)
die("unable to connect a socket (%s)", strerror(saved_errno)); die("unable to connect to %s:\n%s", host, error_message.buf);
if (flags & CONNECT_VERBOSE) if (flags & CONNECT_VERBOSE)
fprintf(stderr, "done.\n"); fprintf(stderr, "done.\n");