-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.1 2001/05/13 21:57:06 administrator Exp $";
+const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.18 2001/09/21 23:02:02 david__schmidt Exp $";
/*********************************************************************
*
- * File : $Source: /home/administrator/cvs/ijb/jbsockets.c,v $
+ * 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
*
* Revisions :
* $Log: jbsockets.c,v $
+ * Revision 1.18 2001/09/21 23:02:02 david__schmidt
+ * Cleaning up 2 compiler warnings on OS/2.
+ *
+ * Revision 1.17 2001/09/13 20:11:46 jongfoster
+ * Fixing 2 compiler warnings under Win32
+ *
+ * Revision 1.16 2001/07/30 22:08:36 jongfoster
+ * Tidying up #defines:
+ * - All feature #defines are now of the form FEATURE_xxx
+ * - Permanently turned off WIN_GUI_EDIT
+ * - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS
+ *
+ * Revision 1.15 2001/07/29 17:40:43 jongfoster
+ * Fixed compiler warning by adding a cast
+ *
+ * Revision 1.14 2001/07/18 13:47:59 oes
+ * Eliminated dirty hack for getsockbyname()
+ *
+ * Revision 1.13 2001/07/15 13:56:57 jongfoster
+ * Removing unused local variable.
+ *
+ * Revision 1.12 2001/07/01 17:04:11 oes
+ * Bugfix: accept_connection no longer uses the obsolete hstrerror() function
+ *
+ * Revision 1.11 2001/06/29 21:45:41 oes
+ * Indentation, CRLF->LF, Tab-> Space
+ *
+ * Revision 1.10 2001/06/29 13:29:15 oes
+ * - Added remote (server) host IP to csp->http->host_ip_addr_str
+ * - Added detection of local socket IP and fqdn
+ * - Removed logentry from cancelled commit
+ *
+ * Revision 1.9 2001/06/07 23:06:09 jongfoster
+ * The host parameter to connect_to() is now const.
+ *
+ * Revision 1.8 2001/06/03 19:12:07 oes
+ * filled comment
+ *
+ * Revision 1.7 2001/05/28 16:14:00 jongfoster
+ * Fixing bug in LOG_LEVEL_LOG
+ *
+ * Revision 1.6 2001/05/26 17:28:32 jongfoster
+ * Fixed LOG_LEVEL_LOG
+ *
+ * Revision 1.5 2001/05/26 15:26:15 jongfoster
+ * ACL feature now provides more security by immediately dropping
+ * connections from untrusted hosts.
+ *
+ * Revision 1.4 2001/05/26 00:37:42 jongfoster
+ * Cosmetic indentation correction.
+ *
+ * Revision 1.3 2001/05/25 21:57:54 jongfoster
+ * Now gives a warning under Windows if you try to bind
+ * it to a port that's already in use.
+ *
+ * Revision 1.2 2001/05/17 23:01:01 oes
+ * - Cleaned CRLF's from the sources and related files
+ *
+ * Revision 1.1.1.1 2001/05/15 13:58:54 oes
+ * Initial import of version 2.9.3 source tree
+ *
*
*********************************************************************/
\f
#else
+#ifndef __OS2__
#include <unistd.h>
+#endif
#include <sys/time.h>
#include <netinet/in.h>
#include <sys/ioctl.h>
#ifndef __BEOS__
#include <netinet/tcp.h>
+#ifndef __OS2__
#include <arpa/inet.h>
+#endif
#else
#include <socket.h>
#endif
+#if defined(__EMX__) || defined (__OS2__)
+#include <sys/select.h> /* OS/2/EMX needs a little help with select */
+#include <nerrno.h>
+#endif
+
#endif
#include "project.h"
#include "jbsockets.h"
#include "filters.h"
+#include "errlog.h"
const char jbsockets_h_rcs[] = JBSOCKETS_H_VERSION;
* Returns : -1 => failure, else it is the socket file descriptor.
*
*********************************************************************/
-int connect_to(char *host, int portnum, struct client_state *csp)
+int connect_to(const char *host, int portnum, struct client_state *csp)
{
struct sockaddr_in inaddr;
int fd, addr;
int flags;
#endif /* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) */
-#ifdef ACL_FILES
- struct access_control_addr src[1], dst[1];
-#endif /* def ACL_FILES */
+#ifdef FEATURE_ACL
+ struct access_control_addr dst[1];
+#endif /* def FEATURE_ACL */
memset((char *)&inaddr, 0, sizeof inaddr);
if ((addr = resolve_hostname_to_ip(host)) == -1)
{
+ csp->http->host_ip_addr_str = strdup("unknown");
return(-1);
}
-#ifdef ACL_FILES
- src->addr = csp->ip_addr_long;
- src->port = 0;
-
+#ifdef FEATURE_ACL
dst->addr = ntohl(addr);
dst->port = portnum;
- if (block_acl(src, dst, csp))
+ if (block_acl(dst, csp))
{
+#ifdef __OS2__
+ errno = SOCEPERM;
+#else
errno = EPERM;
+#endif
return(-1);
}
-#endif /* def ACL_FILES */
+#endif /* def FEATURE_ACL */
inaddr.sin_addr.s_addr = addr;
inaddr.sin_family = AF_INET;
+ csp->http->host_ip_addr_str = strdup(inet_ntoa(inaddr.sin_addr));
+#ifndef _WIN32
if (sizeof(inaddr.sin_port) == sizeof(short))
+#endif /* ndef _WIN32 */
{
inaddr.sin_port = htons((short)portnum);
}
+#ifndef _WIN32
else
{
inaddr.sin_port = htonl(portnum);
}
+#endif /* ndef _WIN32 */
if ((fd = socket(inaddr.sin_family, SOCK_STREAM, 0)) < 0)
{
}
#endif /* def TCP_NODELAY */
-#if !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA)\r
+#if !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) && !defined(__OS2__)
if ((flags = fcntl(fd, F_GETFL, 0)) != -1)
{
flags |= O_NDELAY;
fcntl(fd, F_SETFL, flags);
}
-#endif /* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) */
+#endif /* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) && !defined(__OS2__) */
while (connect(fd, (struct sockaddr *) & inaddr, sizeof inaddr) == -1)
{
#ifdef _WIN32
if (errno == WSAEINPROGRESS)
+#elif __OS2__
+ if (sock_errno() == EINPROGRESS)
#else /* ifndef _WIN32 */
if (errno == EINPROGRESS)
-#endif /* ndef _WIN32 */
+#endif /* ndef _WIN32 || __OS2__ */
{
break;
}
+#ifdef __OS2__
+ if (sock_errno() != EINTR)
+#else
if (errno != EINTR)
+#endif /* __OS2__ */
{
close_socket(fd);
return(-1);
}
}
-#if !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA)
+#if !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) && !defined(__OS2__)
if (flags != -1)
{
flags &= ~O_NDELAY;
fcntl(fd, F_SETFL, flags);
}
-#endif /* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) */
+#endif /* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) && !defined(__OS2__) */
/* wait for connection to complete */
FD_ZERO(&wfds);
* 2 : buf = pointer to data to be written.
* 3 : len = length of data to be written to the socket "fd".
*
- * Returns : Win32: If no error occurs, returns the total number of
+ * Returns : Win32 & Unix: If no error occurs, returns the total number of
* bytes sent, which can be less than the number
* indicated by len. Otherwise, returns (-1).
- * Unix: ??? (Please fill me in!)
*
*********************************************************************/
int write_socket(int fd, const char *buf, int len)
{
- if (len <= 0) return(0);
+ if (len <= 0)
+ {
+ return(0);
+ }
- /* if (DEBUG(LOG)) fwrite(buf, n, 1, logfp); */
+ log_error(LOG_LEVEL_LOG, "%N", len, buf);
-#if defined(_WIN32) || defined(__BEOS__) || defined(AMIGA)
+#if defined(_WIN32) || defined(__BEOS__) || defined(AMIGA) || defined(__OS2__)
return( send(fd, buf, len, 0));
#else
return( write(fd, buf, len));
return(0);
}
-#if defined(_WIN32) || defined(__BEOS__) || defined(AMIGA)
+#if defined(_WIN32) || defined(__BEOS__) || defined(AMIGA) || defined(__OS2__)
return( recv(fd, buf, len, 0));
#else
return( read(fd, buf, len));
{
#if defined(_WIN32) || defined(__BEOS__)
closesocket(fd);
-#elif defined(AMIGA)\r
- CloseSocket(fd); \r
+#elif defined(AMIGA)
+ CloseSocket(fd);
+#elif defined(__OS2__)
+ soclose(fd);
#else
close(fd);
#endif
inaddr.sin_family = AF_INET;
inaddr.sin_addr.s_addr = resolve_hostname_to_ip(hostnam);
+#ifndef _WIN32
if (sizeof(inaddr.sin_port) == sizeof(short))
+#endif /* ndef _WIN32 */
{
inaddr.sin_port = htons((short)portnum);
}
+#ifndef _WIN32
else
{
inaddr.sin_port = htonl(portnum);
}
+#endif /* ndef _WIN32 */
fd = socket(AF_INET, SOCK_STREAM, 0);
return(-1);
}
+#ifndef _WIN32
+ /*
+ * FIXME: 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
+ */
setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)&one, sizeof(one));
+#endif /* ndef _WIN32 */
if (bind (fd, (struct sockaddr *)&inaddr, sizeof(inaddr)) < 0)
{
*********************************************************************/
int accept_connection(struct client_state * csp, int fd)
{
- struct sockaddr raddr;
- struct sockaddr_in *rap = (struct sockaddr_in *) &raddr;
- int afd, raddrlen;
+ struct sockaddr_in client, server;
+ struct hostent *host = NULL;
+ int afd, c_length, s_length;
+
+ c_length = s_length = sizeof(client);
- raddrlen = sizeof raddr;
do
{
- afd = accept (fd, &raddr, &raddrlen);
+ afd = accept (fd, (struct sockaddr *) &client, &c_length);
} while (afd < 1 && errno == EINTR);
if (afd < 0)
return 0;
}
+ /*
+ * Determine the IP-Adress that the client used to reach us
+ * and the hostname associated with that address
+ */
+ if (!getsockname(afd, (struct sockaddr *) &server, &s_length))
+ {
+ csp->my_ip_addr_str = strdup(inet_ntoa(server.sin_addr));
+
+ host = gethostbyaddr((const char *)&server.sin_addr,
+ sizeof(server.sin_addr), AF_INET);
+ if (host == NULL)
+ {
+ log_error(LOG_LEVEL_ERROR, "Unable to get my own hostname: %E\n");
+ }
+ else
+ {
+ csp->my_hostname = strdup(host->h_name);
+ }
+ }
+
csp->cfd = afd;
- csp->ip_addr_str = strdup(inet_ntoa(rap->sin_addr));
- csp->ip_addr_long = ntohl(rap->sin_addr.s_addr);
+ csp->ip_addr_str = strdup(inet_ntoa(client.sin_addr));
+ csp->ip_addr_long = ntohl(client.sin_addr.s_addr);
return 1;
+
}
projects / privoxy.git / blobdiff