From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 1 Aug 2011 17:49:40 +0000 (-0700)
Subject: Merge branch 'maint' into ef/ipv4-connect-error-report
X-Git-Tag: v1.7.7-rc0~40^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9353e09afa21b24fa356f960300e1c0a1567aa72?ds=inline;hp=-c

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

* maint:
connect: correctly number ipv6 network adapter
---

9353e09afa21b24fa356f960300e1c0a1567aa72
diff --combined connect.c
index 844107e295,b3585aba22..d2ce57f850
--- a/connect.c
+++ b/connect.c
@@@ -192,8 -192,7 +192,8 @@@ static const char *ai_name(const struc
   */
  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);
  	struct addrinfo hints, *ai0, *ai;
  	int gai;
@@@ -217,15 -216,21 +217,15 @@@
  	if (flags & CONNECT_VERBOSE)
  		fprintf(stderr, "done.\nConnecting to %s (port %s) ... ", host, port);
  
- 	for (ai0 = ai; ai; ai = ai->ai_next) {
+ 	for (ai0 = ai; ai; ai = ai->ai_next, cnt++) {
  		sockfd = socket(ai->ai_family,
  				ai->ai_socktype, ai->ai_protocol);
 -		if (sockfd < 0) {
 -			saved_errno = errno;
 -			continue;
 -		}
 -		if (connect(sockfd, ai->ai_addr, ai->ai_addrlen) < 0) {
 -			saved_errno = errno;
 -			fprintf(stderr, "%s[%d: %s]: errno=%s\n",
 -				host,
 -				cnt,
 -				ai_name(ai),
 -				strerror(saved_errno));
 -			close(sockfd);
 +		if ((sockfd < 0) ||
 +		    (connect(sockfd, ai->ai_addr, ai->ai_addrlen) < 0)) {
 +			strbuf_addf(&error_message, "%s[%d: %s]: errno=%s\n",
 +				    host, cnt, ai_name(ai), strerror(errno));
 +			if (0 <= sockfd)
 +				close(sockfd);
  			sockfd = -1;
  			continue;
  		}
@@@ -237,13 -242,11 +237,13 @@@
  	freeaddrinfo(ai0);
  
  	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)
  		fprintf(stderr, "done.\n");
  
 +	strbuf_release(&error_message);
 +
  	return sockfd;
  }