-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.67 2009/09/10 14:53:34 fabiankeil Exp $";
+const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.85 2011/03/27 13:54:52 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
#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];
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
{
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);
}
+ 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)
{
}
#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;
}
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
{
#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;
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((int)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;
}
}
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
#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;
projects / privoxy.git / blobdiff