X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=jbsockets.c;h=2949c31e0909f6970c8e578153a01a1e6c832632;hp=58fd66c751d447f9555ef352a2813e6c07e78d0e;hb=ef38825f4c7de83bcb0f1730dbd5dd95366dc874;hpb=8ef5da22dda2406eaa4b7b97ac9a12b9a82a5056 diff --git a/jbsockets.c b/jbsockets.c index 58fd66c7..2949c31e 100644 --- a/jbsockets.c +++ b/jbsockets.c @@ -1,15 +1,15 @@ -const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.22 2002/03/04 02:08:02 david__schmidt Exp $"; +const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.46 2008/03/21 11:13:57 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $ * * Purpose : Contains wrappers for system-specific sockets code, - * so that the rest of JunkBuster can be more + * so that the rest of Junkbuster can be more * OS-independent. Contains #ifdefs to make this work * on many platforms. * - * Copyright : Written by and Copyright (C) 2001 the SourceForge - * IJBSWA team. http://ijbswa.sourceforge.net + * Copyright : Written by and Copyright (C) 2001-2007 the SourceForge + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -35,6 +35,143 @@ const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.22 2002/03/04 02:08:02 david_ * * Revisions : * $Log: jbsockets.c,v $ + * Revision 1.46 2008/03/21 11:13:57 fabiankeil + * Only gather host information if it's actually needed. + * Also move the code out of accept_connection() so it's less likely + * to delay other incoming connections if the host is misconfigured. + * + * Revision 1.45 2007/09/30 16:59:22 fabiankeil + * Set the maximum listen() backlog to 128. Apparently SOMAXCONN is + * neither high enough, nor a hard limit on mingw32. Again for BR#1795281. + * + * Revision 1.44 2007/09/15 13:01:31 fabiankeil + * Increase listen() backlog to SOMAXCONN (or 128) to decrease + * chances of dropped connections under load. Problem reported + * and fix suggested by nobody in BR#1795281. + * + * Revision 1.43 2007/06/01 18:16:36 fabiankeil + * Use the same mutex for gethostbyname() and gethostbyaddr() to prevent + * deadlocks and crashes on OpenBSD and possibly other OS with neither + * gethostbyname_r() nor gethostaddr_r(). Closes BR#1729174. + * Thanks to Ralf Horstmann for report and solution. + * + * Revision 1.42 2007/04/01 17:37:07 fabiankeil + * - Add DNS retries for Solaris and other systems + * whose gethostbyname_r version takes five arguments. + * - Move maximum number of DNS retries into a macro. + * + * Revision 1.41 2006/11/13 19:05:51 fabiankeil + * Make pthread mutex locking more generic. Instead of + * checking for OSX and OpenBSD, check for FEATURE_PTHREAD + * and use mutex locking unless there is an _r function + * available. Better safe than sorry. + * + * Fixes "./configure --disable-pthread" and should result + * in less threading-related problems on pthread-using platforms, + * but it still doesn't fix BR#1122404. + * + * Revision 1.40 2006/09/02 15:36:42 fabiankeil + * Follow the OpenBSD port's lead and protect the resolve + * functions on OpenBSD as well. + * + * Revision 1.39 2006/08/03 02:46:41 david__schmidt + * Incorporate Fabian Keil's patch work: http://www.fabiankeil.de/sourcecode/privoxy/ + * + * Revision 1.38 2006/07/18 14:48:46 david__schmidt + * Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch) + * with what was really the latest development (the v_3_0_branch branch) + * + * Revision 1.35.2.8 2006/01/21 16:16:08 david__schmidt + * Thanks to Edward Carrel for his patch to modernize OSX's pthreads support. See bug #1409623. + * + * Revision 1.35.2.7 2005/05/07 21:50:55 david__schmidt + * A few memory leaks plugged (mostly on error paths) + * + * Revision 1.35.2.6 2003/12/17 16:34:40 oes + * Cosmetics + * + * Revision 1.35.2.5 2003/04/29 11:32:54 oes + * Don't rely on h_addr being non-NULL after gethostbyname. + * Works around an oddness in Max OSX and closes bug #724796 + * + * Revision 1.35.2.4 2003/04/04 12:40:20 oes + * Made sure the errno set by bind, not close[socket] is used in + * bind_port. Probably fixes bugs #713777, #705562. + * + * Revision 1.35.2.3 2003/03/07 03:41:04 david__schmidt + * Wrapping all *_r functions (the non-_r versions of them) with mutex semaphores for OSX. Hopefully this will take care of all of those pesky crash reports. + * + * Revision 1.35.2.2 2002/11/20 14:37:24 oes + * Fixed Win32 error logging in bind_port. + * Thanks to Oliver Stoeneberg for the hint. + * + * Revision 1.35.2.1 2002/05/26 23:41:27 joergs + * AmigaOS: Fixed wrong type of len in write_socket() + * + * Revision 1.35 2002/04/26 15:50:04 joergs + * AmigaOS: No socklen_t, added AMIGA to the systems using int instead. + * + * Revision 1.34 2002/04/08 20:31:41 swa + * fixed JB spelling + * + * Revision 1.33 2002/04/03 16:02:18 gliptak + * Correcting compile warning with older gcc + * + * Revision 1.32 2002/03/31 17:18:59 jongfoster + * Win32 only: Enabling STRICT to fix a VC++ compile warning. + * + * Revision 1.31 2002/03/29 03:33:13 david__schmidt + * Fix Mac OSX compiler warnings + * + * Revision 1.30 2002/03/27 14:32:43 david__schmidt + * More compiler warning message maintenance + * + * Revision 1.29 2002/03/26 22:29:54 swa + * we have a new homepage! + * + * Revision 1.28 2002/03/24 13:25:43 swa + * name change related issues + * + * Revision 1.27 2002/03/13 00:27:05 jongfoster + * Killing warnings + * + * Revision 1.26 2002/03/11 22:07:02 david__schmidt + * OS/2 port maintenance: + * - Fixed EMX build - it had decayed a little + * - Fixed inexplicable crash during FD_ZERO - must be due to a bad macro. + * substituted a memset for now. + * + * Revision 1.25 2002/03/09 20:03:52 jongfoster + * - Making various functions return int rather than size_t. + * (Undoing a recent change). Since size_t is unsigned on + * Windows, functions like read_socket that return -1 on + * error cannot return a size_t. + * + * THIS WAS A MAJOR BUG - it caused frequent, unpredictable + * crashes, and also frequently caused JB to jump to 100% + * CPU and stay there. (Because it thought it had just + * read ((unsigned)-1) == 4Gb of data...) + * + * - The signature of write_socket has changed, it now simply + * returns success=0/failure=nonzero. + * + * - Trying to get rid of a few warnings --with-debug on + * Windows, I've introduced a new type "jb_socket". This is + * used for the socket file descriptors. On Windows, this + * is SOCKET (a typedef for unsigned). Everywhere else, it's + * an int. The error value can't be -1 any more, so it's + * now JB_INVALID_SOCKET (which is -1 on UNIX, and in + * Windows it maps to the #define INVALID_SOCKET.) + * + * - The signature of bind_port has changed. + * + * Revision 1.24 2002/03/07 03:51:36 oes + * - Improved handling of failed DNS lookups + * - Fixed compiler warnings etc + * + * Revision 1.23 2002/03/05 00:36:01 jongfoster + * Fixing bug 514988 - unable to restart Junkbuster + * * Revision 1.22 2002/03/04 02:08:02 david__schmidt * Enable web editing of actions file on OS/2 (it had been broken all this time!) * @@ -127,6 +264,9 @@ const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.22 2002/03/04 02:08:02 david_ #ifdef _WIN32 +#ifndef STRICT +#define STRICT +#endif #include #include #include @@ -153,18 +293,35 @@ const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.22 2002/03/04 02:08:02 david_ #if defined(__EMX__) || defined (__OS2__) #include /* OS/2/EMX needs a little help with select */ +#ifdef __OS2__ #include #endif +#endif #endif #include "project.h" + +#ifdef FEATURE_PTHREAD +#include "jcc.h" +/* jcc.h is for mutex semaphores only */ +#endif /* def FEATURE_PTHREAD */ + #include "jbsockets.h" #include "filters.h" #include "errlog.h" const char jbsockets_h_rcs[] = JBSOCKETS_H_VERSION; +/* + * Maximum number of gethostbyname(_r) retries in case of + * soft errors (TRY_AGAIN). + * XXX: Does it make sense to make this a config option? + */ +#define MAX_DNS_RETRIES 10 + +#define MAX_LISTEN_BACKLOG 128 + /********************************************************************* * @@ -179,13 +336,15 @@ const char jbsockets_h_rcs[] = JBSOCKETS_H_VERSION; * 3 : csp = Current client state (buffers, headers, etc...) * Not modified, only used for source IP and ACL. * - * Returns : -1 => failure, else it is the socket file descriptor. + * Returns : JB_INVALID_SOCKET => failure, else it is the socket + * file descriptor. * *********************************************************************/ -int connect_to(const char *host, int portnum, struct client_state *csp) +jb_socket connect_to(const char *host, int portnum, struct client_state *csp) { struct sockaddr_in inaddr; - int fd, addr; + jb_socket fd; + int addr; fd_set wfds; struct timeval tv[1]; #if !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) @@ -198,14 +357,14 @@ int connect_to(const char *host, int portnum, struct client_state *csp) memset((char *)&inaddr, 0, sizeof inaddr); - if ((addr = resolve_hostname_to_ip(host)) == -1) + if ((addr = resolve_hostname_to_ip(host)) == INADDR_NONE) { csp->http->host_ip_addr_str = strdup("unknown"); - return(-1); + return(JB_INVALID_SOCKET); } #ifdef FEATURE_ACL - dst->addr = ntohl(addr); + dst->addr = ntohl((unsigned long) addr); dst->port = portnum; if (block_acl(dst, csp)) @@ -215,7 +374,7 @@ int connect_to(const char *host, int portnum, struct client_state *csp) #else errno = EPERM; #endif - return(-1); + return(JB_INVALID_SOCKET); } #endif /* def FEATURE_ACL */ @@ -227,24 +386,28 @@ int connect_to(const char *host, int portnum, struct client_state *csp) if (sizeof(inaddr.sin_port) == sizeof(short)) #endif /* ndef _WIN32 */ { - inaddr.sin_port = htons((short)portnum); + inaddr.sin_port = htons((unsigned short) portnum); } #ifndef _WIN32 else { - inaddr.sin_port = htonl(portnum); + inaddr.sin_port = htonl((unsigned long)portnum); } #endif /* ndef _WIN32 */ +#ifdef _WIN32 + if ((fd = socket(inaddr.sin_family, SOCK_STREAM, 0)) == JB_INVALID_SOCKET) +#else if ((fd = socket(inaddr.sin_family, SOCK_STREAM, 0)) < 0) +#endif { - return(-1); + return(JB_INVALID_SOCKET); } #ifdef TCP_NODELAY { /* turn off TCP coalescence */ int mi = 1; - setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (char *) &mi, sizeof (int)); + setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (char *) &mi, sizeof (int)); } #endif /* def TCP_NODELAY */ @@ -256,7 +419,7 @@ int connect_to(const char *host, int portnum, struct client_state *csp) } #endif /* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) && !defined(__OS2__) */ - while (connect(fd, (struct sockaddr *) & inaddr, sizeof inaddr) == -1) + while (connect(fd, (struct sockaddr *) & inaddr, sizeof inaddr) == JB_INVALID_SOCKET) { #ifdef _WIN32 if (errno == WSAEINPROGRESS) @@ -276,7 +439,7 @@ int connect_to(const char *host, int portnum, struct client_state *csp) #endif /* __OS2__ */ { close_socket(fd); - return(-1); + return(JB_INVALID_SOCKET); } } @@ -295,10 +458,11 @@ int connect_to(const char *host, int portnum, struct client_state *csp) tv->tv_sec = 30; tv->tv_usec = 0; - if (select(fd + 1, NULL, &wfds, NULL, tv) <= 0) + /* MS Windows uses int, not SOCKET, for the 1st arg of select(). Wierd! */ + if (select((int)fd + 1, NULL, &wfds, NULL, tv) <= 0) { close_socket(fd); - return(-1); + return(JB_INVALID_SOCKET); } return(fd); @@ -316,45 +480,55 @@ int connect_to(const char *host, int portnum, struct client_state *csp) * 2 : buf = pointer to data to be written. * 3 : len = length of data to be written to the socket "fd". * - * Returns : Win32 & Unix: If no error occurs, returns the total number of - * bytes sent, which can be less than the number - * indicated by len. Otherwise, returns (-1). + * Returns : 0 on success (entire buffer sent). + * nonzero on error. * *********************************************************************/ -int write_socket(int fd, const char *buf, int len) +#ifdef AMIGA +int write_socket(jb_socket fd, const char *buf, ssize_t len) +#else +int write_socket(jb_socket fd, const char *buf, size_t len) +#endif { -#ifdef __OS2__ -#define SOCKET_SEND_MAX 65000 - int write_len = 0, send_len, send_rc = 0, i = 0; -#endif /* __OS2__ */ - if (len <= 0) + if (len == 0) { - return(0); + return 0; + } + + if (len < 0) /* constant condition - size_t isn't ever negative */ + { + return 1; } log_error(LOG_LEVEL_LOG, "%N", len, buf); -#if defined(_WIN32) || defined(__BEOS__) || defined(AMIGA) - return( send(fd, buf, len, 0)); +#if defined(_WIN32) + return (send(fd, buf, (int)len, 0) != (int)len); +#elif defined(__BEOS__) || defined(AMIGA) + return (send(fd, buf, len, 0) != len); #elif defined(__OS2__) /* * Break the data up into SOCKET_SEND_MAX chunks for sending... * OS/2 seemed to complain when the chunks were too large. */ - while ((i < len) && (send_rc != -1)) +#define SOCKET_SEND_MAX 65000 { - if ((i + SOCKET_SEND_MAX) > len) - send_len = len - i; - else - send_len = SOCKET_SEND_MAX; - send_rc = send(fd,(char*)buf + i, send_len, 0); - if (send_rc == -1) - return(0); - i = i + send_len; + int write_len = 0, send_len, send_rc = 0, i = 0; + while ((i < len) && (send_rc != -1)) + { + if ((i + SOCKET_SEND_MAX) > len) + send_len = len - i; + else + send_len = SOCKET_SEND_MAX; + send_rc = send(fd,(char*)buf + i, send_len, 0); + if (send_rc == -1) + return 1; + i = i + send_len; + } + return 0; } - return len; #else - return( write(fd, buf, len)); + return (write(fd, buf, len) != len); #endif } @@ -378,24 +552,26 @@ int write_socket(int fd, const char *buf, int len) * smaller than the number of bytes requested; this may hap- * pen for example because fewer bytes are actually available * right now (maybe because we were close to end-of-file, or - * because we are reading from a pipe, or from a terminal), - * or because read() was interrupted by a signal. On error, + * because we are reading from a pipe, or from a terminal, + * or because read() was interrupted by a signal). On error, * -1 is returned, and errno is set appropriately. In this * case it is left unspecified whether the file position (if * any) changes. * *********************************************************************/ -int read_socket(int fd, char *buf, int len) +int read_socket(jb_socket fd, char *buf, int len) { if (len <= 0) { return(0); } -#if defined(_WIN32) || defined(__BEOS__) || defined(AMIGA) || defined(__OS2__) - return( recv(fd, buf, len, 0)); +#if defined(_WIN32) + return(recv(fd, buf, len, 0)); +#elif defined(__BEOS__) || defined(AMIGA) || defined(__OS2__) + return(recv(fd, buf, (size_t)len, 0)); #else - return( read(fd, buf, len)); + return(read(fd, buf, (size_t)len)); #endif } @@ -412,7 +588,7 @@ int read_socket(int fd, char *buf, int len) * Returns : void * *********************************************************************/ -void close_socket(int fd) +void close_socket(jb_socket fd) { #if defined(_WIN32) || defined(__BEOS__) closesocket(fd); @@ -437,40 +613,53 @@ void close_socket(int fd) * Parameters : * 1 : hostnam = TCP/IP address to bind/listen to * 2 : portnum = port to listen on + * 3 : pfd = pointer used to return file descriptor. * - * Returns : if success, return file descriptor - * if failure, returns -2 if address is in use, otherwise -1 - * + * Returns : if success, returns 0 and sets *pfd. + * if failure, returns -3 if address is in use, + * -2 if address unresolvable, + * -1 otherwise *********************************************************************/ -int bind_port(const char *hostnam, int portnum) +int bind_port(const char *hostnam, int portnum, jb_socket *pfd) { struct sockaddr_in inaddr; - int fd; + jb_socket fd; #ifndef _WIN32 int one = 1; #endif /* ndef _WIN32 */ + *pfd = JB_INVALID_SOCKET; + memset((char *)&inaddr, '\0', sizeof inaddr); inaddr.sin_family = AF_INET; inaddr.sin_addr.s_addr = resolve_hostname_to_ip(hostnam); + if (inaddr.sin_addr.s_addr == INADDR_NONE) + { + return(-2); + } + #ifndef _WIN32 if (sizeof(inaddr.sin_port) == sizeof(short)) #endif /* ndef _WIN32 */ { - inaddr.sin_port = htons((short)portnum); + inaddr.sin_port = htons((unsigned short) portnum); } #ifndef _WIN32 else { - inaddr.sin_port = htonl(portnum); + inaddr.sin_port = htonl((unsigned long) portnum); } #endif /* ndef _WIN32 */ fd = socket(AF_INET, SOCK_STREAM, 0); +#ifdef _WIN32 + if (fd == JB_INVALID_SOCKET) +#else if (fd < 0) +#endif { return(-1); } @@ -478,34 +667,39 @@ int bind_port(const char *hostnam, int portnum) #ifndef _WIN32 /* * This is not needed for Win32 - in fact, it stops - * duplicate instances of JunkBuster from being caught. + * duplicate instances of Privoxy from being caught. * * On UNIX, we assume the user is sensible enough not - * to start JunkBuster multiple times on the same IP. - * Without this, stopping and restarting JunkBuster + * to start Privoxy multiple times on the same IP. + * Without this, stopping and restarting Privoxy * from a script fails. + * Note: SO_REUSEADDR is meant to only take over + * sockets which are *not* in listen state in Linux, + * e.g. sockets in TIME_WAIT. YMMV. */ setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)&one, sizeof(one)); #endif /* ndef _WIN32 */ - if (bind (fd, (struct sockaddr *)&inaddr, sizeof(inaddr)) < 0) + if (bind(fd, (struct sockaddr *)&inaddr, sizeof(inaddr)) < 0) { - close_socket (fd); #ifdef _WIN32 + errno = WSAGetLastError(); if (errno == WSAEADDRINUSE) #else if (errno == EADDRINUSE) #endif { - return(-2); + close_socket(fd); + return(-3); } else { + close_socket(fd); return(-1); } } - while (listen(fd, 5) == -1) + while (listen(fd, MAX_LISTEN_BACKLOG) == -1) { if (errno != EINTR) { @@ -513,32 +707,44 @@ int bind_port(const char *hostnam, int portnum) } } - return fd; + *pfd = fd; + return 0; } /********************************************************************* * - * Function : accept_connection + * Function : get_host_information * - * Description : Accepts a connection on a socket. Socket must have - * been created using bind_port(). + * Description : Determines the IP address the client used to + * reach us and the hostname associated with it. + * + * XXX: Most of the code has been copy and pasted + * from accept_connection() and not all of the + * ifdefs paths have been tested afterwards. * * 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 : 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 + * the hostname or NULL if the caller + * isn't interested in it. * - * Returns : when a connection is accepted, it returns 1 (TRUE). - * On an error it returns 0 (FALSE). + * Returns : void. * *********************************************************************/ -int accept_connection(struct client_state * csp, int fd) +void get_host_information(jb_socket afd, char **ip_address, char **hostname) { - struct sockaddr_in client, server; + struct sockaddr_in server; struct hostent *host = NULL; - int afd, c_length, s_length; +#if defined(_WIN32) || defined(__OS2__) || defined(__APPLE_CC__) || defined(AMIGA) + /* according to accept_connection() this fixes a warning. */ + int s_length; +#else + socklen_t s_length; +#endif #if defined(HAVE_GETHOSTBYADDR_R_8_ARGS) || defined(HAVE_GETHOSTBYADDR_R_7_ARGS) || defined(HAVE_GETHOSTBYADDR_R_5_ARGS) struct hostent result; #if defined(HAVE_GETHOSTBYADDR_R_5_ARGS) @@ -548,26 +754,26 @@ int accept_connection(struct client_state * csp, int fd) int thd_err; #endif /* def HAVE_GETHOSTBYADDR_R_5_ARGS */ #endif /* def HAVE_GETHOSTBYADDR_R_(8|7|5)_ARGS */ + s_length = sizeof(server); - c_length = s_length = sizeof(client); - - do + if (NULL != hostname) { - afd = accept (fd, (struct sockaddr *) &client, &c_length); - } while (afd < 1 && errno == EINTR); - - if (afd < 0) - { - return 0; + *hostname = NULL; } + *ip_address = NULL; - /* - * Determine the IP-Adress that the client used to reach us - * and the hostname associated with that address - */ if (!getsockname(afd, (struct sockaddr *) &server, &s_length)) { - csp->my_ip_addr_str = strdup(inet_ntoa(server.sin_addr)); + *ip_address = strdup(inet_ntoa(server.sin_addr)); + + if (NULL == hostname) + { + /* + * We're done here, the caller isn't + * interested in knowing the hostname. + */ + return; + } #if defined(HAVE_GETHOSTBYADDR_R_8_ARGS) gethostbyaddr_r((const char *)&server.sin_addr, sizeof(server.sin_addr), AF_INET, @@ -588,6 +794,11 @@ int accept_connection(struct client_state * csp, int fd) { host = NULL; } +#elif FEATURE_PTHREAD + pthread_mutex_lock(&resolver_mutex); + host = gethostbyaddr((const char *)&server.sin_addr, + sizeof(server.sin_addr), AF_INET); + pthread_mutex_unlock(&resolver_mutex); #else host = gethostbyaddr((const char *)&server.sin_addr, sizeof(server.sin_addr), AF_INET); @@ -598,11 +809,61 @@ int accept_connection(struct client_state * csp, int fd) } else { - csp->my_hostname = strdup(host->h_name); + *hostname = strdup(host->h_name); } } - csp->cfd = afd; + return; +} + + +/********************************************************************* + * + * Function : accept_connection + * + * Description : Accepts a connection on a socket. Socket 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 + * + * 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) +{ + struct sockaddr_in client; + jb_socket afd; +#if defined(_WIN32) || defined(__OS2__) || defined(__APPLE_CC__) || defined(AMIGA) + /* Wierdness - fix a warning. */ + int c_length; +#else + socklen_t c_length; +#endif + + c_length = sizeof(client); + +#ifdef _WIN32 + afd = accept (fd, (struct sockaddr *) &client, &c_length); + if (afd == JB_INVALID_SOCKET) + { + return 0; + } +#else + do + { + afd = accept (fd, (struct sockaddr *) &client, &c_length); + } while (afd < 1 && errno == EINTR); + if (afd < 0) + { + return 0; + } +#endif + + csp->cfd = afd; csp->ip_addr_str = strdup(inet_ntoa(client.sin_addr)); csp->ip_addr_long = ntohl(client.sin_addr.s_addr); @@ -621,13 +882,14 @@ int accept_connection(struct client_state * csp, int fd) * Parameters : * 1 : host = hostname to resolve * - * Returns : -1 => failure, INADDR_ANY or tcp/ip address if succesful. + * Returns : INADDR_NONE => failure, INADDR_ANY or tcp/ip address if succesful. * *********************************************************************/ -int resolve_hostname_to_ip(const char *host) +unsigned long resolve_hostname_to_ip(const char *host) { 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) @@ -648,12 +910,28 @@ int resolve_hostname_to_ip(const char *host) if ((inaddr.sin_addr.s_addr = inet_addr(host)) == -1) { #if defined(HAVE_GETHOSTBYNAME_R_6_ARGS) - gethostbyname_r(host, &result, hbuf, - HOSTENT_BUFFER_SIZE, &hostp, &thd_err); + 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); + } #elif defined(HAVE_GETHOSTBYNAME_R_5_ARGS) - hostp = gethostbyname_r(host, &result, hbuf, - HOSTENT_BUFFER_SIZE, &thd_err); + 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); + } #elif defined(HAVE_GETHOSTBYNAME_R_3_ARGS) + /* + * XXX: Doesn't retry in case of soft errors. + * Does this gethostbyname_r version set h_errno? + */ if (0 == gethostbyname_r(host, &result, &hdata)) { hostp = &result; @@ -662,13 +940,36 @@ int resolve_hostname_to_ip(const char *host) { hostp = NULL; } +#elif FEATURE_PTHREAD + pthread_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); + } + pthread_mutex_unlock(&resolver_mutex); #else - hostp = gethostbyname(host); + 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); + } #endif /* def HAVE_GETHOSTBYNAME_R_(6|5|3)_ARGS */ - if (hostp == NULL) + /* + * On Mac OSX, if a domain exists but doesn't have a type A + * record associated with it, the h_addr member of the struct + * hostent returned by gethostbyname is NULL, even if h_length + * is 4. Therefore the second test below. + */ + if (hostp == NULL || hostp->h_addr == NULL) { errno = EINVAL; - return(-1); + log_error(LOG_LEVEL_ERROR, "could not resolve hostname %s", host); + return(INADDR_NONE); } if (hostp->h_addrtype != AF_INET) { @@ -677,7 +978,8 @@ int resolve_hostname_to_ip(const char *host) #else errno = EPROTOTYPE; #endif - return(-1); + log_error(LOG_LEVEL_ERROR, "hostname %s resolves to unknown address type.", host); + return(INADDR_NONE); } memcpy( (char *) &inaddr.sin_addr,