Fixing bug in LOG_LEVEL_LOG

[privoxy.git] / jbsockets.c

diff --git a/jbsockets.c b/jbsockets.c
index 69f3e3a..7d4da5e 100644 (file)
--- a/jbsockets.c
+++ b/jbsockets.c
@@ -1,4 +1,4 @@
-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.3 2001/05/25 21:57:54 jongfoster Exp $";
+const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.6 2001/05/26 17:28:32 jongfoster Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
@@ -35,6 +35,16 @@ const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.3 2001/05/25 21:57:54 jongfos
  *
  * Revisions   :
  *    $Log: jbsockets.c,v $
+ *    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.
@@ -85,6 +95,7 @@ const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.3 2001/05/25 21:57:54 jongfos
 #include "project.h"
 #include "jbsockets.h"
 #include "filters.h"
+#include "errlog.h"
 
 const char jbsockets_h_rcs[] = JBSOCKETS_H_VERSION;
 
@@ -116,7 +127,7 @@ int connect_to(char *host, int portnum, struct client_state *csp)
 #endif /* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) */
 
 #ifdef ACL_FILES
-   struct access_control_addr src[1], dst[1];
+   struct access_control_addr dst[1];
 #endif /* def ACL_FILES */
 
    memset((char *)&inaddr, 0, sizeof inaddr);
@@ -127,13 +138,10 @@ int connect_to(char *host, int portnum, struct client_state *csp)
    }
 
 #ifdef ACL_FILES
-   src->addr = csp->ip_addr_long;
-   src->port = 0;
-
    dst->addr = ntohl(addr);
    dst->port = portnum;
 
-   if (block_acl(src, dst, csp))
+   if (block_acl(dst, csp))
    {
       errno = EPERM;
       return(-1);
@@ -239,7 +247,7 @@ int write_socket(int fd, const char *buf, int len)
       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)
    return( send(fd, buf, len, 0));