-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.77 2010/07/26 11:26:26 fabiankeil Exp $";
+const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.89 2011/03/27 13:56:48 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
#define MAX_LISTEN_BACKLOG 128
+#ifdef HAVE_RFC2553
+static jb_socket rfc2553_connect_to(const char *host, int portnum, struct client_state *csp);
+#else
+static jb_socket no_rfc2553_connect_to(const char *host, int portnum, struct client_state *csp);
+#endif
/*********************************************************************
*
* 1 : host = hostname to connect to
* 2 : portnum = port to connent on (XXX: should be unsigned)
* 3 : csp = Current client state (buffers, headers, etc...)
- * Not modified, only used for source IP and ACL.
*
* Returns : JB_INVALID_SOCKET => failure, else it is the socket
* file descriptor.
*
*********************************************************************/
+jb_socket connect_to(const char *host, int portnum, struct client_state *csp)
+{
+ jb_socket fd;
+ int forwarded_connect_retries = 0;
+
+ do
+ {
+#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))
+ {
+ 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);
+
+ } while (forwarded_connect_retries < csp->config->forwarded_connect_retries);
+
+ return fd;
+}
+
#ifdef HAVE_RFC2553
/* Getaddrinfo implementation */
-jb_socket connect_to(const char *host, int portnum, struct client_state *csp)
+static jb_socket rfc2553_connect_to(const char *host, int portnum, struct client_state *csp)
{
struct addrinfo hints, *result, *rp;
char service[6];
int flags;
#endif
int connect_failed;
+ int socket_error;
#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)
+ {
+ log_error(LOG_LEVEL_ERROR,
+ "Out of memory while getting the server IP address.");
+ return JB_INVALID_SOCKET;
+ }
+
for (rp = result; rp != NULL; rp = rp->ai_next)
{
if (block_acl(dst, csp))
{
#ifdef __OS2__
- errno = SOCEPERM;
+ socket_error = errno = SOCEPERM;
#else
- errno = EPERM;
+ socket_error = errno = EPERM;
#endif
continue;
}
#endif /* def FEATURE_ACL */
- csp->http->host_ip_addr_str = malloc(NI_MAXHOST);
- if (NULL == csp->http->host_ip_addr_str)
- {
- log_error(LOG_LEVEL_ERROR,
- "Out of memory while getting the server IP address.");
- return JB_INVALID_SOCKET;
- }
retval = getnameinfo(rp->ai_addr, rp->ai_addrlen,
csp->http->host_ip_addr_str, NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
- if (!csp->http->host_ip_addr_str || retval)
+ if (retval)
{
log_error(LOG_LEVEL_ERROR,
"Can not save csp->http->host_ip_addr_str: %s",
- (csp->http->host_ip_addr_str) ?
- gai_strerror(retval) : "Insufficient memory");
- freez(csp->http->host_ip_addr_str);
+ gai_strerror(retval));
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;
if ((select((int)fd + 1, NULL, &wfds, NULL, tv) > 0)
&& FD_ISSET(fd, &wfds))
{
- /*
- * See Linux connect(2) man page for more info
- * about connecting on non-blocking socket.
- */
- int socket_in_error;
- socklen_t optlen = sizeof(socket_in_error);
- if (!getsockopt(fd, SOL_SOCKET, SO_ERROR, &socket_in_error, &optlen))
+ socklen_t optlen = sizeof(socket_error);
+ if (!getsockopt(fd, SOL_SOCKET, SO_ERROR, &socket_error, &optlen))
{
- if (!socket_in_error)
+ if (!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_in_error));
+ csp->http->host_ip_addr_str, service, strerror(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.",
#else /* ndef HAVE_RFC2553 */
/* Pre-getaddrinfo implementation */
-jb_socket connect_to(const char *host, int portnum, struct client_state *csp)
+static jb_socket no_rfc2553_connect_to(const char *host, int portnum, struct client_state *csp)
{
struct sockaddr_in inaddr;
jb_socket fd;
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)
return 1;
}
- log_error(LOG_LEVEL_LOG, "to socket %d: %N", fd, len, buf);
+ log_error(LOG_LEVEL_WRITING, "to socket %d: %N", fd, len, buf);
#if defined(_WIN32)
return (send(fd, buf, (int)len, 0) != (int)len);
projects / privoxy.git / blobdiff