-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.89 2011/03/27 13:56:48 fabiankeil Exp $";
+const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.102 2011/05/03 10:11:24 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
* OS-independent. Contains #ifdefs to make this work
* on many platforms.
*
- * Copyright : Written by and Copyright (C) 2001-2010 the
+ * Copyright : Written by and Copyright (C) 2001-2011 the
* Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
do
{
+ /*
+ * XXX: The whole errno overloading is ridiculous and should
+ * be replaced with something sane and thread safe
+ */
+ /* errno = 0;*/
#ifdef HAVE_RFC2553
fd = rfc2553_connect_to(host, portnum, 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);
int retval;
jb_socket fd;
fd_set wfds;
- struct timeval tv[1];
+ struct timeval timeout;
#if !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) && !defined(__OS2__)
int flags;
#endif
int connect_failed;
- int socket_error;
+ /*
+ * XXX: Initializeing it here is only necessary
+ * because not all situations are properly
+ * covered yet.
+ */
+ int socket_error = 0;
#ifdef FEATURE_ACL
struct access_control_addr dst[1];
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;
if (retval)
{
log_error(LOG_LEVEL_ERROR,
- "Can not save csp->http->host_ip_addr_str: %s",
+ "Failed to get the host name from the socket structure: %s",
gai_strerror(retval));
continue;
}
+ fd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
#ifdef _WIN32
- if ((fd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol)) ==
- JB_INVALID_SOCKET)
+ if (fd == JB_INVALID_SOCKET)
#else
- if ((fd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol)) < 0)
+ if (fd < 0)
#endif
{
continue;
FD_ZERO(&wfds);
FD_SET(fd, &wfds);
- tv->tv_sec = 30;
- tv->tv_usec = 0;
+ memset(&timeout, 0, sizeof(timeout));
+ timeout.tv_sec = 30;
- /* MS Windows uses int, not SOCKET, for the 1st arg of select(). Wierd! */
- if ((select((int)fd + 1, NULL, &wfds, NULL, tv) > 0)
+ /* 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))
{
socklen_t optlen = sizeof(socket_error);
/* 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
{
}
#endif /* ndef _WIN32 */
+ fd = socket(inaddr.sin_family, SOCK_STREAM, 0);
#ifdef _WIN32
- if ((fd = socket(inaddr.sin_family, SOCK_STREAM, 0)) == JB_INVALID_SOCKET)
+ if (fd == JB_INVALID_SOCKET)
#else
- if ((fd = socket(inaddr.sin_family, SOCK_STREAM, 0)) < 0)
+ if (fd < 0)
#endif
{
return(JB_INVALID_SOCKET);
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);
return 0;
}
- if (len < 0) /* constant condition - size_t isn't ever negative */
- {
- return 1;
- }
-
log_error(LOG_LEVEL_WRITING, "to socket %d: %N", fd, len, buf);
#if defined(_WIN32)
#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;
* 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)