-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.97 2011/03/27 14:04:10 fabiankeil Exp $";
+const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.118 2012/10/21 12:44:58 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
* Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
- * by and Copyright (C) 1997 Anonymous Coders and
+ * by and Copyright (C) 1997 Anonymous Coders and
* Junkbusters Corporation. http://www.junkbusters.com
*
- * This program is free software; you can redistribute it
+ * This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
* Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at
#endif
-#ifdef FEATURE_CONNECTION_KEEP_ALIVE
#ifdef HAVE_POLL
#ifdef __GLIBC__
#include <sys/poll.h>
#include <poll.h>
#endif /* def __GLIBC__ */
#endif /* HAVE_POLL */
-#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
#include "project.h"
fd = no_rfc2553_connect_to(host, portnum, csp);
#endif
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 + 1, host);
+ }
} while (forwarded_connect_retries < csp->config->forwarded_connect_retries);
if (errno != EINTR)
{
+ socket_error = errno;
close_socket(fd);
connect_failed = 1;
break;
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))
{
/* 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
{
{
#ifdef _WIN32
if (errno == WSAEINPROGRESS)
-#elif __OS2__
+#elif __OS2__
if (sock_errno() == EINPROGRESS)
#else /* ifndef _WIN32 */
if (errno == EINPROGRESS)
break;
}
-#ifdef __OS2__
+#ifdef __OS2__
if (sock_errno() != EINTR)
#else
if (errno != EINTR)
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)
#if defined(_WIN32) || defined(__BEOS__)
closesocket(fd);
#elif defined(AMIGA)
- CloseSocket(fd);
+ CloseSocket(fd);
#elif defined(__OS2__)
soclose(fd);
#else
close(fd);
#endif
+}
+
+
+/*********************************************************************
+ *
+ * Function : drain_and_close_socket
+ *
+ * Description : Closes a TCP/IP socket after draining unread data
+ *
+ * Parameters :
+ * 1 : fd = file descriptor of the socket to be closed
+ *
+ * Returns : void
+ *
+ *********************************************************************/
+void drain_and_close_socket(jb_socket fd)
+{
+#ifdef FEATURE_CONNECTION_KEEP_ALIVE
+ if (socket_is_still_alive(fd))
+#endif
+ {
+ int bytes_drained_total = 0;
+ int bytes_drained;
+
+#ifdef HAVE_SHUTDOWN
+/* Apparently Windows has shutdown() but not SHUT_WR. */
+#ifndef SHUT_WR
+#define SHUT_WR 1
+#endif
+ if (0 != shutdown(fd, SHUT_WR))
+ {
+ log_error(LOG_LEVEL_CONNECT, "Failed to shutdown socket %d: %E", fd);
+ }
+#endif
+#define ARBITRARY_DRAIN_LIMIT 10000
+ do
+ {
+ char drainage[500];
+
+ bytes_drained = read_socket(fd, drainage, sizeof(drainage));
+ if (bytes_drained < 0)
+ {
+ log_error(LOG_LEVEL_CONNECT, "Failed to drain socket %d: %E", fd);
+ }
+ else if (bytes_drained > 0)
+ {
+ bytes_drained_total += bytes_drained;
+ if (bytes_drained_total > ARBITRARY_DRAIN_LIMIT)
+ {
+ log_error(LOG_LEVEL_CONNECT, "Giving up draining socket %d", fd);
+ break;
+ }
+ }
+ } while (bytes_drained > 0);
+ if (bytes_drained_total != 0)
+ {
+ log_error(LOG_LEVEL_CONNECT,
+ "Drained %d bytes before closing socket %d", bytes_drained_total, fd);
+ }
+ }
+
+ close_socket(fd);
}
}
hints.ai_socktype = SOCK_STREAM;
hints.ai_flags = AI_PASSIVE;
-#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;
* 1 : afd = File descriptor returned from accept().
* 2 : ip_address = Pointer to return the pointer to
* the ip address string.
- * 3 : hostname = Pointer to return the pointer to
+ * 3 : port = Pointer to return the pointer to
+ * the TCP port string.
+ * 4 : hostname = Pointer to return the pointer to
* the hostname or NULL if the caller
* isn't interested in it.
*
* Returns : void.
*
*********************************************************************/
-void get_host_information(jb_socket afd, char **ip_address, char **hostname)
+void get_host_information(jb_socket afd, char **ip_address, char **port,
+ char **hostname)
{
#ifdef HAVE_RFC2553
struct sockaddr_storage server;
*hostname = NULL;
}
*ip_address = NULL;
+ *port = NULL;
if (!getsockname(afd, (struct sockaddr *) &server, &s_length))
{
log_error(LOG_LEVEL_ERROR, "getsockname() truncated server address");
return;
}
+/*
+ * XXX: Workaround for missing header on Windows when
+ * configured with --disable-ipv6-support.
+ * The proper fix is to not use NI_MAXSERV in
+ * that case. It works by accident on other platforms
+ * as <netdb.h> in included unconditionally there.
+ */
+#ifndef NI_MAXSERV
+#define NI_MAXSERV 32
+#endif
+ *port = malloc(NI_MAXSERV);
+ if (NULL == *port)
+ {
+ log_error(LOG_LEVEL_ERROR,
+ "Out of memory while getting the client's port.");
+ return;
+ }
#ifdef HAVE_RFC2553
*ip_address = malloc(NI_MAXHOST);
if (NULL == *ip_address)
{
log_error(LOG_LEVEL_ERROR,
"Out of memory while getting the client's IP address.");
+ freez(*port);
return;
}
retval = getnameinfo((struct sockaddr *) &server, s_length,
- *ip_address, NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
+ *ip_address, NI_MAXHOST, *port, NI_MAXSERV,
+ NI_NUMERICHOST|NI_NUMERICSERV);
if (retval)
{
log_error(LOG_LEVEL_ERROR,
"Unable to print my own IP address: %s", gai_strerror(retval));
freez(*ip_address);
+ freez(*port);
return;
}
#else
*ip_address = strdup(inet_ntoa(server.sin_addr));
+ snprintf(*port, NI_MAXSERV, "%hu", ntohs(server.sin_port));
#endif /* HAVE_RFC2553 */
if (NULL == hostname)
{
}
#elif defined(MUTEX_LOCKS_AVAILABLE)
privoxy_mutex_lock(&resolver_mutex);
- host = gethostbyaddr((const char *)&server.sin_addr,
+ host = gethostbyaddr((const char *)&server.sin_addr,
sizeof(server.sin_addr), AF_INET);
privoxy_mutex_unlock(&resolver_mutex);
#else
- host = gethostbyaddr((const char *)&server.sin_addr,
+ host = gethostbyaddr((const char *)&server.sin_addr,
sizeof(server.sin_addr), AF_INET);
#endif
if (host == NULL)
*
* Function : accept_connection
*
- * Description : Accepts a connection on a socket. Socket must have
- * been created using bind_port().
+ * Description : Accepts a connection on one of possibly multiple
+ * sockets. The socket(s) to check must have been
+ * created using bind_port().
*
* Parameters :
- * 1 : csp = Client state, cfd, ip_addr_str, and
- * ip_addr_long will be set by this routine.
- * 2 : fd = file descriptor returned from bind_port
+ * 1 : csp = Client state, cfd, ip_addr_str, and
+ * ip_addr_long will be set by this routine.
+ * 2 : fds = File descriptors returned from bind_port
*
* Returns : when a connection is accepted, it returns 1 (TRUE).
* On an error it returns 0 (FALSE).
*
*********************************************************************/
-int accept_connection(struct client_state * csp, jb_socket fd)
+int accept_connection(struct client_state * csp, jb_socket fds[])
{
#ifdef HAVE_RFC2553
/* XXX: client is stored directly into csp->tcp_addr */
#define client (csp->tcp_addr)
- int retval;
#else
struct sockaddr_in client;
#endif
#else
socklen_t c_length;
#endif
+ int retval;
+ int i;
+ int max_selected_socket;
+ fd_set selected_fds;
+ jb_socket fd;
c_length = sizeof(client);
+ /*
+ * Wait for a connection on any socket.
+ * Return immediately if no socket is listening.
+ * XXX: Why not treat this as fatal error?
+ */
+ FD_ZERO(&selected_fds);
+ max_selected_socket = 0;
+ for (i = 0; i < MAX_LISTENING_SOCKETS; i++)
+ {
+ if (JB_INVALID_SOCKET != fds[i])
+ {
+ FD_SET(fds[i], &selected_fds);
+ if (max_selected_socket < fds[i] + 1)
+ {
+ max_selected_socket = fds[i] + 1;
+ }
+ }
+ }
+ if (0 == max_selected_socket)
+ {
+ return 0;
+ }
+ do
+ {
+ retval = select(max_selected_socket, &selected_fds, NULL, NULL, NULL);
+ } while (retval < 0 && errno == EINTR);
+ if (retval <= 0)
+ {
+ if (0 == retval)
+ {
+ log_error(LOG_LEVEL_ERROR,
+ "Waiting on new client failed because select(2) returned 0."
+ " This should not happen.");
+ }
+ else
+ {
+ log_error(LOG_LEVEL_ERROR,
+ "Waiting on new client failed because of problems in select(2): "
+ "%s.", strerror(errno));
+ }
+ return 0;
+ }
+ for (i = 0; i < MAX_LISTENING_SOCKETS && !FD_ISSET(fds[i], &selected_fds);
+ i++);
+ if (i >= MAX_LISTENING_SOCKETS)
+ {
+ log_error(LOG_LEVEL_ERROR,
+ "select(2) reported connected clients (number = %u, "
+ "descriptor boundary = %u), but none found.",
+ retval, max_selected_socket);
+ return 0;
+ }
+ fd = fds[i];
+
+ /* Accept selected connection */
#ifdef _WIN32
afd = accept (fd, (struct sockaddr *) &client, &c_length);
if (afd == JB_INVALID_SOCKET)
}
#endif
+#ifdef SO_LINGER
+ {
+ struct linger linger_options;
+ linger_options.l_onoff = 1;
+ linger_options.l_linger = 5;
+ if (0 != setsockopt(fd, SOL_SOCKET, SO_LINGER, &linger_options, sizeof(linger_options)))
+ {
+ log_error(LOG_LEVEL_ERROR, "Setting SO_LINGER on socket %d failed.", afd);
+ }
+ }
+#endif
+
csp->cfd = afd;
#ifdef HAVE_RFC2553
csp->ip_addr_str = malloc(NI_MAXHOST);
if (!csp->ip_addr_str || retval)
{
log_error(LOG_LEVEL_ERROR, "Can not save csp->ip_addr_str: %s",
- (csp->ip_addr_str) ? gai_strerror(retval) : "Insuffcient memory");
+ (csp->ip_addr_str) ? gai_strerror(retval) : "Insuffcient memory");
freez(csp->ip_addr_str);
}
#undef client
* 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)
while (gethostbyname_r(host, &result, hbuf,
HOSTENT_BUFFER_SIZE, &hostp, &thd_err)
&& (thd_err == TRY_AGAIN) && (dns_retries++ < MAX_DNS_RETRIES))
- {
+ {
log_error(LOG_LEVEL_ERROR,
"Timeout #%u while trying to resolve %s. Trying again.",
dns_retries, host);
while (NULL == (hostp = gethostbyname_r(host, &result,
hbuf, HOSTENT_BUFFER_SIZE, &thd_err))
&& (thd_err == TRY_AGAIN) && (dns_retries++ < MAX_DNS_RETRIES))
- {
+ {
log_error(LOG_LEVEL_ERROR,
"Timeout #%u while trying to resolve %s. Trying again.",
dns_retries, host);
privoxy_mutex_lock(&resolver_mutex);
while (NULL == (hostp = gethostbyname(host))
&& (h_errno == TRY_AGAIN) && (dns_retries++ < MAX_DNS_RETRIES))
- {
+ {
log_error(LOG_LEVEL_ERROR,
"Timeout #%u while trying to resolve %s. Trying again.",
dns_retries, host);
errno = WSAEPROTOTYPE;
#else
errno = EPROTOTYPE;
-#endif
+#endif
log_error(LOG_LEVEL_ERROR, "hostname %s resolves to unknown address type.", host);
return(INADDR_NONE);
}
- memcpy(
- (char *) &inaddr.sin_addr,
- (char *) hostp->h_addr,
- sizeof(inaddr.sin_addr)
- );
+ memcpy((char *)&inaddr.sin_addr, (char *)hostp->h_addr, sizeof(inaddr.sin_addr));
}
return(inaddr.sin_addr.s_addr);
}
-#ifdef FEATURE_CONNECTION_KEEP_ALIVE
/*********************************************************************
*
* Function : socket_is_still_alive
return (no_data_waiting || (1 == recv(sfd, buf, 1, MSG_PEEK)));
}
-#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
/*