projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unblock URLs for the norwegian newspaper 'Adresseavisen'.
[privoxy.git]
/
jbsockets.c
diff --git
a/jbsockets.c
b/jbsockets.c
index
3ffe734
..
3d4b296
100644
(file)
--- a/
jbsockets.c
+++ b/
jbsockets.c
@@
-1,4
+1,4
@@
-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.6
3 2009/06/13 11:32:52
fabiankeil Exp $";
+const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.6
7 2009/09/10 14:53:34
fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
@@
-169,7
+169,10
@@
jb_socket connect_to(const char *host, int portnum, struct client_state *csp)
memset((char *)&hints, 0, sizeof(hints));
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = SOCK_STREAM;
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,
if ((retval = getaddrinfo(host, service, &hints, &result)))
{
log_error(LOG_LEVEL_INFO,
@@
-565,7
+568,7
@@
int read_socket(jb_socket fd, char *buf, int len)
#elif defined(__BEOS__) || defined(AMIGA) || defined(__OS2__)
return(recv(fd, buf, (size_t)len, 0));
#else
#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
}
#endif
}
@@
-586,6
+589,7
@@
int read_socket(jb_socket fd, char *buf, int len)
*********************************************************************/
int data_is_available(jb_socket fd, int seconds_to_wait)
{
*********************************************************************/
int data_is_available(jb_socket fd, int seconds_to_wait)
{
+ char buf[10];
fd_set rfds;
struct timeval timeout;
int n;
fd_set rfds;
struct timeval timeout;
int n;
@@
-606,7
+610,7
@@
int data_is_available(jb_socket fd, int seconds_to_wait)
/*
* XXX: Do we care about the different error conditions?
*/
/*
* XXX: Do we care about the different error conditions?
*/
- return (
n == 1
);
+ return (
(n == 1) && (1 == recv(fd, buf, 1, MSG_PEEK))
);
}
}
@@
-702,7
+706,10
@@
int bind_port(const char *hostnam, int portnum, jb_socket *pfd)
hints.ai_family = AF_UNSPEC;
}
hints.ai_socktype = SOCK_STREAM;
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;
hints.ai_protocol = 0; /* Realy any stream protocol or TCP only */
hints.ai_canonname = NULL;
hints.ai_addr = NULL;
@@
-1207,6
+1214,9
@@
unsigned long resolve_hostname_to_ip(const char *host)
*********************************************************************/
int socket_is_still_usable(jb_socket sfd)
{
*********************************************************************/
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];
#ifdef HAVE_POLL
int poll_result;
struct pollfd poll_fd[1];
@@
-1217,20
+1227,16
@@
int socket_is_still_usable(jb_socket sfd)
poll_result = poll(poll_fd, 1, 0);
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;
}
{
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;
#else
fd_set readable_fds;
struct timeval timeout;
int ret;
- int socket_is_alive = 0;
memset(&timeout, '\0', sizeof(timeout));
FD_ZERO(&readable_fds);
memset(&timeout, '\0', sizeof(timeout));
FD_ZERO(&readable_fds);
@@
-1239,17
+1245,13
@@
int socket_is_still_usable(jb_socket sfd)
ret = select((int)sfd+1, &readable_fds, NULL, NULL, &timeout);
if (ret < 0)
{
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 */
#endif /* def HAVE_POLL */
+
+ return (no_data_waiting || (1 == recv(sfd, buf, 1, MSG_PEEK)));
}
#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
}
#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */