-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.85 2011/03/27 13:54:52 fabiankeil Exp $";
+const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.98 2011/03/27 14:08:35 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->forward_host == NULL) && (csp->fwd->type == SOCKS_NONE)))
{
break;
}
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;
+ /*
+ * 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];
#endif /* def FEATURE_ACL */
+ /* Don't leak memory when retrying. */
+ freez(csp->error_message);
+ freez(csp->http->host_ip_addr_str);
+
retval = snprintf(service, sizeof(service), "%d", portnum);
if ((-1 == retval) || (sizeof(service) <= retval))
{
log_error(LOG_LEVEL_ERROR,
"Port number (%d) ASCII decimal representation doesn't fit into 6 bytes",
portnum);
+ csp->error_message = strdup("Invalid port number");
csp->http->host_ip_addr_str = strdup("unknown");
return(JB_INVALID_SOCKET);
}
"Can not resolve %s: %s", host, gai_strerror(retval));
/* XXX: Should find a better way to propagate this error. */
errno = EINVAL;
+ csp->error_message = strdup(gai_strerror(retval));
csp->http->host_ip_addr_str = strdup("unknown");
return(JB_INVALID_SOCKET);
}
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 (block_acl(dst, csp))
{
#ifdef __OS2__
- errno = SOCEPERM;
+ socket_error = errno = SOCEPERM;
#else
- errno = EPERM;
+ socket_error = errno = EPERM;
#endif
continue;
}
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;
connect_failed = 0;
while (connect(fd, rp->ai_addr, rp->ai_addrlen) == JB_INVALID_SOCKET)
{
+#ifdef __OS2__
+ errno = sock_errno();
+#endif /* __OS2__ */
+
#ifdef _WIN32
if (errno == WSAEINPROGRESS)
-#elif __OS2__
- if (sock_errno() == EINPROGRESS)
#else /* ifndef _WIN32 */
if (errno == EINPROGRESS)
#endif /* ndef _WIN32 || __OS2__ */
break;
}
-#ifdef __OS2__
- if (sock_errno() != EINTR)
-#else
if (errno != EINTR)
-#endif /* __OS2__ */
{
close_socket(fd);
connect_failed = 1;
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);
}
else
{
+ socket_error = errno;
log_error(LOG_LEVEL_ERROR, "Could not get the state of "
"the connection to [%s]:%s: %s; dropping connection.",
csp->http->host_ip_addr_str, service, strerror(errno));
freeaddrinfo(result);
if (!rp)
{
- log_error(LOG_LEVEL_CONNECT, "Could not connect to [%s]:%s.",
- host, service);
+ log_error(LOG_LEVEL_CONNECT, "Could not connect to [%s]:%s: %s.",
+ host, service, strerror(socket_error));
+ csp->error_message = strdup(strerror(socket_error));
return(JB_INVALID_SOCKET);
}
log_error(LOG_LEVEL_CONNECT, "Connected to %s[%s]:%s.",
struct access_control_addr dst[1];
#endif /* def FEATURE_ACL */
+ /* Don't leak memory when retrying. */
+ freez(csp->http->host_ip_addr_str);
+
memset((char *)&inaddr, 0, sizeof inaddr);
if ((addr = resolve_hostname_to_ip(host)) == INADDR_NONE)
}
#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);
#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)
projects / privoxy.git / blobdiff