Merge branch 'dz/connect-error-report' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 12 Sep 2011 04:53:47 +0000 (21:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 12 Sep 2011 04:53:47 +0000 (21:53 -0700)
* dz/connect-error-report:
  Do not log unless all connect() attempts fail

1  2 
connect.c

diff --cc connect.c
+++ b/connect.c
@@@ -216,21 -217,15 +217,15 @@@ static int git_tcp_connect_sock(char *h
        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;
                }