-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.18 2001/09/21 23:02:02 david__schmidt Exp $";
+const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.23 2002/03/05 00:36:01 jongfoster Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
*
* Revisions :
* $Log: jbsockets.c,v $
+ * 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!)
+ *
+ * Revision 1.21 2002/01/09 14:32:33 oes
+ * Added support for gethostbyname_r and gethostbyaddr_r.
+ *
+ * Revision 1.20 2001/11/16 00:48:48 jongfoster
+ * Enabling duplicate-socket detection for all platforms, not
+ * just Win32.
+ *
+ * Revision 1.19 2001/10/25 03:40:47 david__schmidt
+ * Change in porting tactics: OS/2's EMX porting layer doesn't allow multiple
+ * threads to call select() simultaneously. So, it's time to do a real, live,
+ * native OS/2 port. See defines for __EMX__ (the porting layer) vs. __OS2__
+ * (native). Both versions will work, but using __OS2__ offers multi-threading.
+ *
* Revision 1.18 2001/09/21 23:02:02 david__schmidt
* Cleaning up 2 compiler warnings on OS/2.
*
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);
}
#ifdef FEATURE_ACL
- dst->addr = ntohl(addr);
+ dst->addr = ntohl((unsigned long) addr);
dst->port = portnum;
if (block_acl(dst, 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 */
* indicated by len. Otherwise, returns (-1).
*
*********************************************************************/
-int write_socket(int fd, const char *buf, int len)
+size_t write_socket(int fd, const char *buf, size_t len)
{
if (len <= 0)
{
log_error(LOG_LEVEL_LOG, "%N", len, buf);
-#if defined(_WIN32) || defined(__BEOS__) || defined(AMIGA) || defined(__OS2__)
- return( send(fd, buf, len, 0));
+#if defined(_WIN32) || defined(__BEOS__) || defined(AMIGA)
+ return(send(fd, buf, len, 0));
+#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
+ {
+ 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(0);
+ i = i + send_len;
+ }
+ return len;
+ }
#else
- return( write(fd, buf, len));
+ return(write(fd, buf, len));
#endif
}
* any) changes.
*
*********************************************************************/
-int read_socket(int fd, char *buf, int len)
+size_t read_socket(int fd, char *buf, size_t len)
{
if (len <= 0)
{
}
#if defined(_WIN32) || defined(__BEOS__) || defined(AMIGA) || defined(__OS2__)
- return( recv(fd, buf, len, 0));
+ return(recv(fd, buf, len, 0));
#else
- return( read(fd, buf, len));
+ return(read(fd, buf, len));
#endif
}
* 2 : portnum = port to listen on
*
* Returns : if success, return file descriptor
- * if failure, returns -2 if address is in use, otherwise -1
+ * if failure, returns -3 if address is in use,
+ * -2 if address unresolvable,
+ * -1 otherwise
*
*********************************************************************/
int bind_port(const char *hostnam, int portnum)
{
struct sockaddr_in inaddr;
int fd;
+#ifndef _WIN32
int one = 1;
+#endif /* ndef _WIN32 */
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 */
#ifndef _WIN32
/*
- * FIXME: This is not needed for Win32 - in fact, it stops
+ * This is not needed for Win32 - in fact, it stops
* duplicate instances of JunkBuster from being caught.
- * Is this really needed under UNIX, or should it be taked out?
- * -- Jon
+ *
+ * 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
+ * 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 (errno == EADDRINUSE)
#endif
{
- return(-2);
+ return(-3);
}
else
{
{
struct sockaddr_in client, server;
struct hostent *host = NULL;
- int afd, c_length, s_length;
+ int afd;
+ size_t c_length, s_length;
+#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)
+ struct hostent_data hdata;
+#else
+ char hbuf[HOSTENT_BUFFER_SIZE];
+ int thd_err;
+#endif /* def HAVE_GETHOSTBYADDR_R_5_ARGS */
+#endif /* def HAVE_GETHOSTBYADDR_R_(8|7|5)_ARGS */
c_length = s_length = sizeof(client);
if (!getsockname(afd, (struct sockaddr *) &server, &s_length))
{
csp->my_ip_addr_str = strdup(inet_ntoa(server.sin_addr));
-
+#if defined(HAVE_GETHOSTBYADDR_R_8_ARGS)
+ gethostbyaddr_r((const char *)&server.sin_addr,
+ sizeof(server.sin_addr), AF_INET,
+ &result, hbuf, HOSTENT_BUFFER_SIZE,
+ &host, &thd_err);
+#elif defined(HAVE_GETHOSTBYADDR_R_7_ARGS)
+ host = gethostbyaddr_r((const char *)&server.sin_addr,
+ sizeof(server.sin_addr), AF_INET,
+ &result, hbuf, HOSTENT_BUFFER_SIZE, &thd_err);
+#elif defined(HAVE_GETHOSTBYADDR_R_5_ARGS)
+ if (0 == gethostbyaddr_r((const char *)&server.sin_addr,
+ sizeof(server.sin_addr), AF_INET,
+ &result, &hdata))
+ {
+ host = &result;
+ }
+ else
+ {
+ host = NULL;
+ }
+#else
host = gethostbyaddr((const char *)&server.sin_addr,
sizeof(server.sin_addr), AF_INET);
+#endif
if (host == NULL)
{
log_error(LOG_LEVEL_ERROR, "Unable to get my own hostname: %E\n");
* 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;
+#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)
+ char hbuf[HOSTENT_BUFFER_SIZE];
+ int thd_err;
+#else /* defined(HAVE_GETHOSTBYNAME_R_3_ARGS) */
+ struct hostent_data hdata;
+#endif /* def HAVE_GETHOSTBYNAME_R_(6|5)_ARGS */
+#endif /* def HAVE_GETHOSTBYNAME_R_(6|5|3)_ARGS */
if ((host == NULL) || (*host == '\0'))
{
if ((inaddr.sin_addr.s_addr = inet_addr(host)) == -1)
{
- if ((hostp = gethostbyname(host)) == NULL)
+#if defined(HAVE_GETHOSTBYNAME_R_6_ARGS)
+ gethostbyname_r(host, &result, hbuf,
+ HOSTENT_BUFFER_SIZE, &hostp, &thd_err);
+#elif defined(HAVE_GETHOSTBYNAME_R_5_ARGS)
+ hostp = gethostbyname_r(host, &result, hbuf,
+ HOSTENT_BUFFER_SIZE, &thd_err);
+#elif defined(HAVE_GETHOSTBYNAME_R_3_ARGS)
+ if (0 == gethostbyname_r(host, &result, &hdata))
+ {
+ hostp = &result;
+ }
+ else
+ {
+ hostp = NULL;
+ }
+#else
+ hostp = gethostbyname(host);
+#endif /* def HAVE_GETHOSTBYNAME_R_(6|5|3)_ARGS */
+ if (hostp == 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)
{
errno = WSAEPROTOTYPE;
#else
errno = EPROTOTYPE;
-#endif
- return(-1);
+#endif
+ log_error(LOG_LEVEL_ERROR, "hostname %s resolves to unknown address type.", host);
+ return(INADDR_NONE);
}
memcpy(
(char *) &inaddr.sin_addr,
projects / privoxy.git / blobdiff