-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.35 2002/04/26 15:50:04 joergs Exp $";
+const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.35.2.4 2003/04/04 12:40:20 oes Exp $";
/*********************************************************************
*
- * File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
+ * File : $Source: /cvsroot/ijbswa/current/Attic/jbsockets.c,v $
*
* Purpose : Contains wrappers for system-specific sockets code,
* so that the rest of Junkbuster can be more
*
* Revisions :
* $Log: jbsockets.c,v $
+ * 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.
*
#endif
+#ifdef OSX_DARWIN
+#include <pthread.h>
+#include "jcc.h"
+/* jcc.h is for mutex semaphores only */
+#endif /* def OSX_DARWIN */
+
#include "project.h"
#include "jbsockets.h"
#include "filters.h"
#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
+ * 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,
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
{
+ close_socket(fd);
return(-3);
}
else
{
+ close_socket(fd);
return(-1);
}
}
{
host = NULL;
}
+#elif defined(OSX_DARWIN)
+ pthread_mutex_lock(&gethostbyaddr_mutex);
+ host = gethostbyaddr((const char *)&server.sin_addr,
+ sizeof(server.sin_addr), AF_INET);
+ pthread_mutex_unlock(&gethostbyaddr_mutex);
#else
host = gethostbyaddr((const char *)&server.sin_addr,
sizeof(server.sin_addr), AF_INET);
{
hostp = NULL;
}
+#elif OSX_DARWIN
+ pthread_mutex_lock(&gethostbyname_mutex);
+ hostp = gethostbyname(host);
+ pthread_mutex_unlock(&gethostbyname_mutex);
#else
hostp = gethostbyname(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;
log_error(LOG_LEVEL_ERROR, "could not resolve hostname %s", host);