-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.62 2009/06/10 22:36:01 david__schmidt Exp $";
+const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.78 2010/07/26 11:28:11 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-2009 the
+ * Copyright : Written by and Copyright (C) 2001-2010 the
* Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
#include "jbsockets.h"
#include "filters.h"
#include "errlog.h"
-#include "miscutil.h"
/* Mac OSX doesn't define AI_NUMERICSESRV */
#ifndef AI_NUMERICSERV
jb_socket fd;
fd_set wfds;
struct timeval tv[1];
-#if !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA)
+#if !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) && !defined(__OS2__)
int flags;
-#endif /* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) */
+#endif
int connect_failed;
#ifdef FEATURE_ACL
memset((char *)&hints, 0, sizeof(hints));
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = SOCK_STREAM;
- hints.ai_flags = AI_ADDRCONFIG | AI_NUMERICSERV; /* avoid service look-up */
+ hints.ai_flags = AI_NUMERICSERV; /* avoid service look-up */
+#ifdef AI_ADDRCONFIG
+ hints.ai_flags |= AI_ADDRCONFIG;
+#endif
if ((retval = getaddrinfo(host, service, &hints, &result)))
{
log_error(LOG_LEVEL_INFO,
"Can not resolve %s: %s", host, gai_strerror(retval));
+ /* XXX: Should find a better way to propagate this error. */
+ errno = EINVAL;
csp->http->host_ip_addr_str = strdup("unknown");
return(JB_INVALID_SOCKET);
}
{
log_error(LOG_LEVEL_ERROR,
"Out of memory while getting the server IP address.");
- return;
+ return JB_INVALID_SOCKET;
}
retval = getnameinfo(rp->ai_addr, rp->ai_addrlen,
csp->http->host_ip_addr_str, NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
unsigned int addr;
fd_set wfds;
struct timeval tv[1];
-#if !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA)
+#if !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) && !defined(__OS2__)
int flags;
-#endif /* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) */
+#endif
#ifdef FEATURE_ACL
struct access_control_addr dst[1];
return 1;
}
- log_error(LOG_LEVEL_LOG, "%N", 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);
*/
#define SOCKET_SEND_MAX 65000
{
- int write_len = 0, send_len, send_rc = 0, i = 0;
+ int send_len, send_rc = 0, i = 0;
while ((i < len) && (send_rc != -1))
{
if ((i + SOCKET_SEND_MAX) > len)
*********************************************************************/
int read_socket(jb_socket fd, char *buf, int len)
{
+ int ret;
+
if (len <= 0)
{
return(0);
}
#if defined(_WIN32)
- return(recv(fd, buf, len, 0));
+ ret = recv(fd, buf, len, 0);
#elif defined(__BEOS__) || defined(AMIGA) || defined(__OS2__)
- return(recv(fd, buf, (size_t)len, 0));
+ ret = recv(fd, buf, (size_t)len, 0);
#else
- return(read(fd, buf, (size_t)len));
+ ret = (int)read(fd, buf, (size_t)len);
#endif
+
+ if (ret > 0)
+ {
+ log_error(LOG_LEVEL_RECEIVED, "from socket %d: %N", fd, ret, buf);
+ }
+
+ return ret;
}
*********************************************************************/
int data_is_available(jb_socket fd, int seconds_to_wait)
{
+ char buf[10];
fd_set rfds;
struct timeval timeout;
int n;
/*
* XXX: Do we care about the different error conditions?
*/
- return (n == 1);
+ return ((n == 1) && (1 == recv(fd, buf, 1, MSG_PEEK)));
}
}
memset(&hints, 0, sizeof(struct addrinfo));
- if ((hostnam == NULL) || !strcmpic(hostnam, "localhost"))
+ if (hostnam == NULL)
{
/*
* XXX: This is a hack. The right thing to do
hints.ai_family = AF_UNSPEC;
}
hints.ai_socktype = SOCK_STREAM;
- hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG;
+ 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_canonname = NULL;
hints.ai_addr = NULL;
#else
do
{
+#if defined(FEATURE_ACCEPT_FILTER) && defined(SO_ACCEPTFILTER)
+ struct accept_filter_arg af_options;
+ bzero(&af_options, sizeof(af_options));
+ strlcpy(af_options.af_name, "httpready", sizeof(af_options.af_name));
+ setsockopt(fd, SOL_SOCKET, SO_ACCEPTFILTER, &af_options, sizeof(af_options));
+#endif
afd = accept (fd, (struct sockaddr *) &client, &c_length);
} while (afd < 1 && errno == EINTR);
if (afd < 0)
{
struct sockaddr_in inaddr;
struct hostent *hostp;
- unsigned int dns_retries = 0;
#if defined(HAVE_GETHOSTBYNAME_R_6_ARGS) || defined(HAVE_GETHOSTBYNAME_R_5_ARGS) || defined(HAVE_GETHOSTBYNAME_R_3_ARGS)
struct hostent result;
#if defined(HAVE_GETHOSTBYNAME_R_6_ARGS) || defined(HAVE_GETHOSTBYNAME_R_5_ARGS)
if ((inaddr.sin_addr.s_addr = inet_addr(host)) == -1)
{
+ unsigned int dns_retries = 0;
#if defined(HAVE_GETHOSTBYNAME_R_6_ARGS)
while (gethostbyname_r(host, &result, hbuf,
HOSTENT_BUFFER_SIZE, &hostp, &thd_err)
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
/*********************************************************************
*
- * Function : socket_is_still_usable
+ * Function : socket_is_still_alive
*
- * Description : Decides whether or not an open socket is still usable.
+ * Description : Figures out whether or not a socket is still alive.
*
* Parameters :
* 1 : sfd = The socket to check.
* Returns : TRUE for yes, otherwise FALSE.
*
*********************************************************************/
-int socket_is_still_usable(jb_socket sfd)
+int socket_is_still_alive(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 */