X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=jbsockets.c;h=f3f5750e0b5498137216c653d70910c25fd6b2b5;hp=6a89f6834e19b7a1a78a4a69372a07bf44a37a3b;hb=873efe14859c0fb3f53a905eb346c36cf5fe7eda;hpb=a40aa0237d6ef1be4c333260f71403ac931008bc diff --git a/jbsockets.c b/jbsockets.c index 6a89f683..f3f5750e 100644 --- a/jbsockets.c +++ b/jbsockets.c @@ -1,15 +1,14 @@ -const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.139 2016/12/24 16:00:49 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 Privoxy can be more * OS-independent. Contains #ifdefs to make this work * on many platforms. * - * Copyright : Written by and Copyright (C) 2001-2016 the - * Privoxy team. http://www.privoxy.org/ + * Copyright : Written by and Copyright (C) 2001-2017 the + * Privoxy team. https://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -57,9 +56,7 @@ const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.139 2016/12/24 16:00:49 fabia #else -#ifndef __OS2__ #include -#endif #include #include #include @@ -68,20 +65,11 @@ const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.139 2016/12/24 16:00:49 fabia #ifndef __BEOS__ #include -#ifndef __OS2__ #include -#endif #else #include #endif -#if defined(__EMX__) || defined (__OS2__) -#include /* OS/2/EMX needs a little help with select */ -#ifdef __OS2__ -#include -#endif -#endif - #endif #ifdef HAVE_POLL @@ -107,8 +95,6 @@ const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.139 2016/12/24 16:00:49 fabia #define AI_NUMERICSERV 0 #endif -const char jbsockets_h_rcs[] = JBSOCKETS_H_VERSION; - /* * Maximum number of gethostbyname(_r) retries in case of * soft errors (TRY_AGAIN). @@ -116,8 +102,6 @@ const char jbsockets_h_rcs[] = JBSOCKETS_H_VERSION; */ #define MAX_DNS_RETRIES 10 -#define MAX_LISTEN_BACKLOG 128 - #ifdef HAVE_RFC2553 static jb_socket rfc2553_connect_to(const char *host, int portnum, struct client_state *csp); #else @@ -128,7 +112,8 @@ static jb_socket no_rfc2553_connect_to(const char *host, int portnum, struct cli * * Function : set_no_delay_flag * - * Description : Disables TCP coalescence for the given socket. + * Description : Disables the Nagle algorithm (TCP send coalescence) + * for the given socket. * * Parameters : * 1 : fd = The file descriptor to operate on @@ -217,12 +202,12 @@ static jb_socket rfc2553_connect_to(const char *host, int portnum, struct client fd_set wfds; struct timeval timeout; #endif -#if !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) && !defined(__OS2__) +#if !defined(_WIN32) && !defined(__BEOS__) int flags; #endif int connect_failed; /* - * XXX: Initializeing it here is only necessary + * XXX: Initializing it here is only necessary * because not all situations are properly * covered yet. */ @@ -258,10 +243,10 @@ static jb_socket rfc2553_connect_to(const char *host, int portnum, struct client { 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->error_message = strdup(gai_strerror(retval)); csp->http->host_ip_addr_str = strdup("unknown"); + /* XXX: Should find a better way to propagate this error. */ + errno = EINVAL; return(JB_INVALID_SOCKET); } @@ -275,11 +260,7 @@ static jb_socket rfc2553_connect_to(const char *host, int portnum, struct client if (block_acl(dst, csp)) { -#ifdef __OS2__ - socket_error = errno = SOCEPERM; -#else socket_error = errno = EPERM; -#endif continue; } #endif /* def FEATURE_ACL */ @@ -324,26 +305,22 @@ static jb_socket rfc2553_connect_to(const char *host, int portnum, struct client set_no_delay_flag(fd); -#if !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) && !defined(__OS2__) +#if !defined(_WIN32) && !defined(__BEOS__) if ((flags = fcntl(fd, F_GETFL, 0)) != -1) { flags |= O_NDELAY; fcntl(fd, F_SETFL, flags); } -#endif /* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) && !defined(__OS2__) */ +#endif /* !defined(_WIN32) && !defined(__BEOS__) */ connect_failed = 0; while (connect(fd, rp->ai_addr, rp->ai_addrlen) == JB_INVALID_SOCKET) { -#ifdef __OS2__ - errno = sock_errno(); -#endif /* __OS2__ */ - #ifdef _WIN32 if (errno == WSAEINPROGRESS) #else /* ifndef _WIN32 */ if (errno == EINPROGRESS) -#endif /* ndef _WIN32 || __OS2__ */ +#endif /* ndef _WIN32 */ { break; } @@ -361,19 +338,38 @@ static jb_socket rfc2553_connect_to(const char *host, int portnum, struct client continue; } -#if !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) && !defined(__OS2__) +#if !defined(_WIN32) && !defined(__BEOS__) if (flags != -1) { flags &= ~O_NDELAY; fcntl(fd, F_SETFL, flags); } -#endif /* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) && !defined(__OS2__) */ +#endif /* !defined(_WIN32) && !defined(__BEOS__) */ #ifdef HAVE_POLL - poll_fd[0].fd = fd; - poll_fd[0].events = POLLOUT; + poll_fd[0].fd = fd; + poll_fd[0].events = POLLOUT; - if (poll(poll_fd, 1, 30000) > 0) + retval = poll(poll_fd, 1, 30000); + if (retval == 0) + { + if (rp->ai_next != NULL) + { + /* Log this now as we'll try another address next */ + log_error(LOG_LEVEL_CONNECT, + "Could not connect to [%s]:%s: Operation timed out.", + csp->http->host_ip_addr_str, service); + } + else + { + /* + * This is the last address, don't log this now + * as it would result in a duplicated log message. + */ + socket_error = ETIMEDOUT; + } + } + else if (retval > 0) #else /* wait for connection to complete */ FD_ZERO(&wfds); @@ -449,7 +445,7 @@ static jb_socket no_rfc2553_connect_to(const char *host, int portnum, struct cli fd_set wfds; struct timeval tv[1]; #endif -#if !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) && !defined(__OS2__) +#if !defined(_WIN32) && !defined(__BEOS__) int flags; #endif @@ -474,11 +470,7 @@ static jb_socket no_rfc2553_connect_to(const char *host, int portnum, struct cli if (block_acl(dst, csp)) { -#ifdef __OS2__ - errno = SOCEPERM; -#else errno = EPERM; -#endif return(JB_INVALID_SOCKET); } #endif /* def FEATURE_ACL */ @@ -525,7 +517,7 @@ static jb_socket no_rfc2553_connect_to(const char *host, int portnum, struct cli set_no_delay_flag(fd); -#if !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) && !defined(__OS2__) +#if !defined(_WIN32) && !defined(__BEOS__) if ((flags = fcntl(fd, F_GETFL, 0)) != -1) { flags |= O_NDELAY; @@ -534,39 +526,33 @@ static jb_socket no_rfc2553_connect_to(const char *host, int portnum, struct cli mark_socket_for_close_on_execute(fd); #endif } -#endif /* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) && !defined(__OS2__) */ +#endif /* !defined(_WIN32) && !defined(__BEOS__) */ while (connect(fd, (struct sockaddr *) & inaddr, sizeof inaddr) == JB_INVALID_SOCKET) { #ifdef _WIN32 if (errno == WSAEINPROGRESS) -#elif __OS2__ - if (sock_errno() == EINPROGRESS) #else /* ifndef _WIN32 */ if (errno == EINPROGRESS) -#endif /* ndef _WIN32 || __OS2__ */ +#endif /* ndef _WIN32 */ { break; } -#ifdef __OS2__ - if (sock_errno() != EINTR) -#else if (errno != EINTR) -#endif /* __OS2__ */ { close_socket(fd); return(JB_INVALID_SOCKET); } } -#if !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) && !defined(__OS2__) +#if !defined(_WIN32) && !defined(__BEOS__) if (flags != -1) { flags &= ~O_NDELAY; fcntl(fd, F_SETFL, flags); } -#endif /* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) && !defined(__OS2__) */ +#endif /* !defined(_WIN32) && !defined(__BEOS__) */ #ifdef HAVE_POLL poll_fd[0].fd = fd; @@ -609,11 +595,7 @@ static jb_socket no_rfc2553_connect_to(const char *host, int portnum, struct cli * nonzero on error. * *********************************************************************/ -#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 { if (len == 0) { @@ -632,32 +614,65 @@ int write_socket(jb_socket fd, const char *buf, size_t len) #if defined(_WIN32) return (send(fd, buf, (int)len, 0) != (int)len); -#elif defined(__BEOS__) || defined(AMIGA) +#elif defined(__BEOS__) 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. - */ -#define SOCKET_SEND_MAX 65000 +#else + return (write(fd, buf, len) != len); +#endif + +} + + +/********************************************************************* + * + * Function : write_socket_delayed + * + * Description : Write the contents of buf (for n bytes) to + * socket fd, optionally delaying the operation. + * + * Parameters : + * 1 : fd = File descriptor (aka. handle) of socket to write to. + * 2 : buf = Pointer to data to be written. + * 3 : len = Length of data to be written to the socket "fd". + * 4 : delay = Delay in milliseconds. + * + * Returns : 0 on success (entire buffer sent). + * nonzero on error. + * + *********************************************************************/ +int write_socket_delayed(jb_socket fd, const char *buf, size_t len, unsigned int delay) +{ + size_t i = 0; + + if (delay == 0) + { + return write_socket(fd, buf, len); + } + + while (i < len) { - int send_len, send_rc = 0, i = 0; - while ((i < len) && (send_rc != -1)) + size_t write_length; + enum {MAX_WRITE_LENGTH = 10}; + + if ((i + MAX_WRITE_LENGTH) > len) { - 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; + write_length = len - i; } - return 0; + else + { + write_length = MAX_WRITE_LENGTH; + } + + privoxy_millisleep(delay); + + if (write_socket(fd, buf + i, write_length) != 0) + { + return 1; + } + i += write_length; } -#else - return (write(fd, buf, len) != len); -#endif + + return 0; } @@ -698,7 +713,7 @@ int read_socket(jb_socket fd, char *buf, int len) #if defined(_WIN32) ret = recv(fd, buf, len, 0); -#elif defined(__BEOS__) || defined(AMIGA) || defined(__OS2__) +#elif defined(__BEOS__) ret = recv(fd, buf, (size_t)len, 0); #else ret = (int)read(fd, buf, (size_t)len); @@ -745,12 +760,7 @@ int data_is_available(jb_socket fd, int seconds_to_wait) memset(&timeout, 0, sizeof(timeout)); timeout.tv_sec = seconds_to_wait; -#ifdef __OS2__ - /* Copy and pasted from jcc.c ... */ - memset(&rfds, 0, sizeof(fd_set)); -#else FD_ZERO(&rfds); -#endif FD_SET(fd, &rfds); n = select(fd+1, &rfds, NULL, NULL, &timeout); @@ -779,10 +789,6 @@ void close_socket(jb_socket fd) { #if defined(_WIN32) || defined(__BEOS__) closesocket(fd); -#elif defined(AMIGA) - CloseSocket(fd); -#elif defined(__OS2__) - soclose(fd); #else close(fd); #endif @@ -871,14 +877,15 @@ void drain_and_close_socket(jb_socket 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. + * 3 : backlog = Listen backlog + * 4 : pfd = pointer used to return file descriptor. * * 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, jb_socket *pfd) +int bind_port(const char *hostnam, int portnum, int backlog, jb_socket *pfd) { #ifdef HAVE_RFC2553 struct addrinfo hints; @@ -1004,6 +1011,10 @@ int bind_port(const char *hostnam, int portnum, jb_socket *pfd) setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)&one, sizeof(one)); #endif /* ndef _WIN32 */ +#ifdef IP_FREEBIND + setsockopt(fd, IPPROTO_IP, IP_FREEBIND, (char *)&one, sizeof(one)); +#endif + #ifdef HAVE_RFC2553 if (bind(fd, rp->ai_addr, rp->ai_addrlen) < 0) #else @@ -1053,7 +1064,7 @@ int bind_port(const char *hostnam, int portnum, jb_socket *pfd) } #endif /* ndef HAVE_RFC2553 */ - while (listen(fd, MAX_LISTEN_BACKLOG) == -1) + while (listen(fd, backlog) == -1) { if (errno != EINTR) { @@ -1102,7 +1113,7 @@ void get_host_information(jb_socket afd, char **ip_address, char **port, struct sockaddr_in server; struct hostent *host = NULL; #endif /* HAVE_RFC2553 */ -#if defined(_WIN32) || defined(__OS2__) || defined(AMIGA) +#if defined(_WIN32) /* according to accept_connection() this fixes a warning. */ int s_length, s_length_provided; #else @@ -1254,8 +1265,8 @@ int accept_connection(struct client_state * csp, jb_socket fds[]) struct sockaddr_in client; #endif jb_socket afd; -#if defined(_WIN32) || defined(__OS2__) || defined(AMIGA) - /* Wierdness - fix a warning. */ +#if defined(_WIN32) + /* Weirdness - fix a warning. */ int c_length; #else socklen_t c_length; @@ -1358,12 +1369,6 @@ int accept_connection(struct client_state * csp, jb_socket fds[]) #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 < 0 && errno == EINTR); if (afd < 0) @@ -1435,7 +1440,7 @@ int accept_connection(struct client_state * csp, jb_socket fds[]) { log_error(LOG_LEVEL_ERROR, "Server name (%s) and port number (%d) ASCII decimal representation" - "don't fit into %d bytes", + "don't fit into %lu bytes", host_addr, csp->config->hport[i], listen_addr_size); return 0; } @@ -1577,7 +1582,6 @@ 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];