-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.104 2011/07/04 17:47:29 fabiankeil Exp $";
+const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.108 2011/07/30 15:12:02 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
* Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
- * by and Copyright (C) 1997 Anonymous Coders and
+ * by and Copyright (C) 1997 Anonymous Coders and
* Junkbusters Corporation. http://www.junkbusters.com
*
- * This program is free software; you can redistribute it
+ * This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
* Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at
if (errno != EINTR)
{
+ socket_error = errno;
close_socket(fd);
connect_failed = 1;
break;
{
#ifdef _WIN32
if (errno == WSAEINPROGRESS)
-#elif __OS2__
+#elif __OS2__
if (sock_errno() == EINPROGRESS)
#else /* ifndef _WIN32 */
if (errno == EINPROGRESS)
break;
}
-#ifdef __OS2__
+#ifdef __OS2__
if (sock_errno() != EINTR)
#else
if (errno != EINTR)
#if defined(_WIN32) || defined(__BEOS__)
closesocket(fd);
#elif defined(AMIGA)
- CloseSocket(fd);
+ CloseSocket(fd);
#elif defined(__OS2__)
soclose(fd);
#else
}
#elif defined(MUTEX_LOCKS_AVAILABLE)
privoxy_mutex_lock(&resolver_mutex);
- host = gethostbyaddr((const char *)&server.sin_addr,
+ host = gethostbyaddr((const char *)&server.sin_addr,
sizeof(server.sin_addr), AF_INET);
privoxy_mutex_unlock(&resolver_mutex);
#else
- host = gethostbyaddr((const char *)&server.sin_addr,
+ host = gethostbyaddr((const char *)&server.sin_addr,
sizeof(server.sin_addr), AF_INET);
#endif
if (host == NULL)
*
* Function : accept_connection
*
- * Description : Accepts a connection on one of more socket. Sockets
- * must have been created using bind_port().
+ * Description : Accepts a connection on one of possibly multiple
+ * sockets. The socket(s) to check 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.
+ * 1 : csp = Client state, cfd, ip_addr_str, and
+ * ip_addr_long will be set by this routine.
* 2 : fds = File descriptors returned from bind_port
*
* Returns : when a connection is accepted, it returns 1 (TRUE).
c_length = sizeof(client);
- /* Wait for a connection on any socket. Return immediately if no socket is
- * listening. */
+ /*
+ * Wait for a connection on any socket.
+ * Return immediately if no socket is listening.
+ * XXX: Why not treat this as fatal error?
+ */
FD_ZERO(&selected_fds);
max_selected_socket = 0;
for (i = 0; i < MAX_LISTENING_SOCKETS; i++)
if (i >= MAX_LISTENING_SOCKETS)
{
log_error(LOG_LEVEL_ERROR,
- "select(2) reported connected clients (number = %u, "
- "descriptor boundary = %u), but none found.",
- retval, max_selected_socket);
+ "select(2) reported connected clients (number = %u, "
+ "descriptor boundary = %u), but none found.",
+ retval, max_selected_socket);
return 0;
}
fd = fds[i];
if (!csp->ip_addr_str || retval)
{
log_error(LOG_LEVEL_ERROR, "Can not save csp->ip_addr_str: %s",
- (csp->ip_addr_str) ? gai_strerror(retval) : "Insuffcient memory");
+ (csp->ip_addr_str) ? gai_strerror(retval) : "Insuffcient memory");
freez(csp->ip_addr_str);
}
#undef client
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);
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);
privoxy_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);
errno = WSAEPROTOTYPE;
#else
errno = EPROTOTYPE;
-#endif
+#endif
log_error(LOG_LEVEL_ERROR, "hostname %s resolves to unknown address type.", host);
return(INADDR_NONE);
}