-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.55 2009/05/10 10:12:30 fabiankeil Exp $";
+const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.65 2009/07/22 22:27:16 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
#include "project.h"
-#ifdef FEATURE_PTHREAD
+/* For mutex semaphores only */
#include "jcc.h"
-/* jcc.h is for mutex semaphores only */
-#endif /* def FEATURE_PTHREAD */
#include "jbsockets.h"
#include "filters.h"
#include "errlog.h"
#include "miscutil.h"
+/* Mac OSX doesn't define AI_NUMERICSESRV */
+#ifndef AI_NUMERICSERV
+#define AI_NUMERICSERV 0
+#endif
+
const char jbsockets_h_rcs[] = JBSOCKETS_H_VERSION;
/*
#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)
tv->tv_usec = 0;
/* MS Windows uses int, not SOCKET, for the 1st arg of select(). Wierd! */
- if (select((int)fd + 1, NULL, &wfds, NULL, tv) <= 0)
+ if ((select((int)fd + 1, NULL, &wfds, NULL, tv) > 0)
+ && FD_ISSET(fd, &wfds))
{
- close_socket(fd);
- continue;
+ /*
+ * 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))
+ {
+ if (!socket_in_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));
+ }
+ else
+ {
+ 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));
+ }
}
- break; /* for; Connection established; don't try other addresses */
+ /* Connection failed, try next address */
+ close_socket(fd);
}
freeaddrinfo(result);
if (!rp)
{
- log_error(LOG_LEVEL_INFO,
- "Could not connect to TCP/[%s]:%s", host, service);
+ log_error(LOG_LEVEL_CONNECT, "Could not connect to [%s]:%s.",
+ host, service);
return(JB_INVALID_SOCKET);
}
- /*
- * XXX: Current connection verification (EINPROGRESS && select()
- * for writing) is not sufficient. E.g. on Linux-2.6.27 with glibc-2.6
- * select returns socket ready for writing, however subsequential
- * write(2) fails with ENOCONNECT. Read Linux connect(2) man page
- * about non-blocking sockets.
- * Thus we can't log here that the socket is connected.
- */
- /* log_error(LOG_LEVEL_INFO, "Connected to TCP/[%s]:%s", host, service); */
+ log_error(LOG_LEVEL_CONNECT, "Connected to %s[%s]:%s.",
+ host, csp->http->host_ip_addr_str, service);
return(fd);
#elif defined(__BEOS__) || defined(AMIGA) || defined(__OS2__)
return(recv(fd, buf, (size_t)len, 0));
#else
- return(read(fd, buf, (size_t)len));
+ return((int)read(fd, buf, (size_t)len));
#endif
}
}
#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.");
+ return;
+ }
retval = getnameinfo((struct sockaddr *) &server, s_length,
*ip_address, NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
if (retval)
#ifdef HAVE_RFC2553
*hostname = malloc(NI_MAXHOST);
+ if (NULL == *hostname)
+ {
+ log_error(LOG_LEVEL_ERROR,
+ "Out of memory while getting the client's hostname.");
+ return;
+ }
retval = getnameinfo((struct sockaddr *) &server, s_length,
*hostname, NI_MAXHOST, NULL, 0, NI_NAMEREQD);
if (retval)
{
host = NULL;
}
-#elif FEATURE_PTHREAD
+#elif defined(MUTEX_LOCKS_AVAILABLE)
privoxy_mutex_lock(&resolver_mutex);
host = gethostbyaddr((const char *)&server.sin_addr,
sizeof(server.sin_addr), AF_INET);
csp->cfd = afd;
#ifdef HAVE_RFC2553
csp->ip_addr_str = malloc(NI_MAXHOST);
+ if (NULL == csp->ip_addr_str)
+ {
+ log_error(LOG_LEVEL_ERROR,
+ "Out of memory while getting the client's IP address.");
+ return 0;
+ }
retval = getnameinfo((struct sockaddr *) &client, c_length,
csp->ip_addr_str, NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
if (!csp->ip_addr_str || retval)
{
hostp = NULL;
}
-#elif FEATURE_PTHREAD
+#elif defined(MUTEX_LOCKS_AVAILABLE)
privoxy_mutex_lock(&resolver_mutex);
while (NULL == (hostp = gethostbyname(host))
&& (h_errno == TRY_AGAIN) && (dns_retries++ < MAX_DNS_RETRIES))
*********************************************************************/
int socket_is_still_usable(jb_socket sfd)
{
+ char buf[10];
+ int no_data_waiting;
+
#ifdef HAVE_POLL
int poll_result;
struct pollfd poll_fd[1];
poll_result = poll(poll_fd, 1, 0);
- if (-1 != poll_result)
- {
- return !(poll_fd[0].revents & POLLIN);
- }
- else
+ if (-1 == poll_result)
{
log_error(LOG_LEVEL_CONNECT, "Polling socket %d failed.", sfd);
return FALSE;
}
+ no_data_waiting = !(poll_fd[0].revents & POLLIN);
#else
fd_set readable_fds;
struct timeval timeout;
int ret;
- int socket_is_alive = 0;
memset(&timeout, '\0', sizeof(timeout));
FD_ZERO(&readable_fds);
ret = select((int)sfd+1, &readable_fds, NULL, NULL, &timeout);
if (ret < 0)
{
- log_error(LOG_LEVEL_ERROR, "select() failed!: %E");
+ log_error(LOG_LEVEL_CONNECT, "select() on socket %d failed: %E", sfd);
+ return FALSE;
}
-
- /*
- * XXX: I'm not sure why !FD_ISSET() works,
- * but apparently it does.
- */
- socket_is_alive = !FD_ISSET(sfd, &readable_fds);
-
- return socket_is_alive;
+ no_data_waiting = !FD_ISSET(sfd, &readable_fds);
#endif /* def HAVE_POLL */
+
+ return (no_data_waiting || (1 == recv(sfd, buf, 1, MSG_PEEK)));
}
#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */