X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=jbsockets.c;h=5691988d71473c3a973c03682f7db1b026ee291a;hp=103a2b97b6590ec6c227618272f80ce9a5a41240;hb=a36a2c91c4b34c27041e725676f25888031c2571;hpb=9bf8d4c93f81eefe159d17d42232dcd3fa2a86f4

diff --git a/jbsockets.c b/jbsockets.c
index 103a2b97..5691988d 100644
--- a/jbsockets.c
+++ b/jbsockets.c
@@ -1,4 +1,4 @@
-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.95 2011/03/27 14:03:25 fabiankeil Exp $";
+const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.101 2011/05/03 09:55:35 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
@@ -157,14 +157,19 @@ jb_socket connect_to(const char *host, int portnum, struct client_state *csp)
 #else
       fd = no_rfc2553_connect_to(host, portnum, csp);
 #endif
-      if ((fd != JB_INVALID_SOCKET) || (errno != EINVAL))
+      if ((fd != JB_INVALID_SOCKET) || (errno == EINVAL)
+         || (csp->fwd == NULL)
+         || ((csp->fwd->forward_host == NULL) && (csp->fwd->type == SOCKS_NONE)))
       {
          break;
       }
       forwarded_connect_retries++;
-      log_error(LOG_LEVEL_ERROR,
-         "Attempt %d of %d to connect to %s failed. Trying again.",
-         forwarded_connect_retries, csp->config->forwarded_connect_retries, host);
+      if (csp->config->forwarded_connect_retries != 0)
+      {
+         log_error(LOG_LEVEL_ERROR,
+            "Attempt %d of %d to connect to %s failed. Trying again.",
+            forwarded_connect_retries, csp->config->forwarded_connect_retries, host);
+      }
 
    } while (forwarded_connect_retries < csp->config->forwarded_connect_retries);
 
@@ -232,6 +237,7 @@ static jb_socket rfc2553_connect_to(const char *host, int portnum, struct client
    csp->http->host_ip_addr_str = malloc(NI_MAXHOST);
    if (NULL == csp->http->host_ip_addr_str)
    {
+      freeaddrinfo(result);
       log_error(LOG_LEVEL_ERROR,
          "Out of memory while getting the server IP address.");
       return JB_INVALID_SOCKET;
@@ -332,7 +338,7 @@ static jb_socket rfc2553_connect_to(const char *host, int portnum, struct client
       memset(&timeout, 0, sizeof(timeout));
       timeout.tv_sec  = 30;
 
-      /* MS Windows uses int, not SOCKET, for the 1st arg of select(). Wierd! */
+      /* MS Windows uses int, not SOCKET, for the 1st arg of select(). Weird! */
       if ((select((int)fd + 1, NULL, &wfds, NULL, &timeout) > 0)
          && FD_ISSET(fd, &wfds))
       {
@@ -344,8 +350,17 @@ static jb_socket rfc2553_connect_to(const char *host, int portnum, struct client
                /* Connection established, no need to try other addresses. */
                break;
             }
-            log_error(LOG_LEVEL_CONNECT, "Could not connect to [%s]:%s: %s.",
-               csp->http->host_ip_addr_str, service, strerror(socket_error));
+            if (rp->ai_next != NULL)
+            {
+               /*
+                * There's another address we can try, so log that this
+                * one didn't work out. If the last one fails, too,
+                * it will get logged outside the loop body so we don't
+                * have to mention it here.
+                */
+               log_error(LOG_LEVEL_CONNECT, "Could not connect to [%s]:%s: %s.",
+                  csp->http->host_ip_addr_str, service, strerror(socket_error));
+            }
          }
          else
          {
@@ -500,7 +515,7 @@ static jb_socket no_rfc2553_connect_to(const char *host, int portnum, struct cli
    tv->tv_sec  = 30;
    tv->tv_usec = 0;
 
-   /* MS Windows uses int, not SOCKET, for the 1st arg of select(). Wierd! */
+   /* MS Windows uses int, not SOCKET, for the 1st arg of select(). Weird! */
    if (select((int)fd + 1, NULL, &wfds, NULL, tv) <= 0)
    {
       close_socket(fd);
@@ -765,7 +780,7 @@ int bind_port(const char *hostnam, int portnum, jb_socket *pfd)
 #ifdef AI_ADDRCONFIG
    hints.ai_flags |= AI_ADDRCONFIG;
 #endif
-   hints.ai_protocol = 0; /* Realy any stream protocol or TCP only */
+   hints.ai_protocol = 0; /* Really any stream protocol or TCP only */
    hints.ai_canonname = NULL;
    hints.ai_addr = NULL;
    hints.ai_next = NULL;
@@ -1150,7 +1165,7 @@ int accept_connection(struct client_state * csp, jb_socket fd)
  * Parameters  :
  *          1  :  host = hostname to resolve
  *
- * Returns     :  INADDR_NONE => failure, INADDR_ANY or tcp/ip address if succesful.
+ * Returns     :  INADDR_NONE => failure, INADDR_ANY or tcp/ip address if successful.
  *
  *********************************************************************/
 unsigned long resolve_hostname_to_ip(const char *host)