X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=jbsockets.c;h=06a11e000aa26e843cfae917195aa0a8f8965382;hb=25330cfa3ef351a2ca78e9b3c2c8688ca1e8baab;hp=00ed5b3dfb8142216d1975a01b2c6325dbfeb792;hpb=8e22cb9cdedac101a56a2f4e724aef21ef1a1cc4;p=privoxy.git diff --git a/jbsockets.c b/jbsockets.c index 00ed5b3d..06a11e00 100644 --- a/jbsockets.c +++ b/jbsockets.c @@ -1,4 +1,4 @@ -const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.4 2001/05/26 00:37:42 jongfoster Exp $"; +const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.8 2001/06/03 19:12:07 oes Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $ @@ -35,6 +35,73 @@ const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.4 2001/05/26 00:37:42 jongfos * * Revisions : * $Log: jbsockets.c,v $ + * Revision 1.8 2001/06/03 19:12:07 oes + * filled comment + * + * Revision 1.8 2001/06/03 11:03:48 oes + * Makefile/in + * + * introduced cgi.c + * + * actions.c: + * + * adapted to new enlist_unique arg format + * + * conf loadcfg.c + * + * introduced confdir option + * + * filters.c filtrers.h + * + * extracted-CGI relevant stuff + * + * jbsockets.c + * + * filled comment + * + * jcc.c + * + * support for new cgi mechansim + * + * list.c list.h + * + * functions for new list type: "map" + * extended enlist_unique + * + * miscutil.c .h + * introduced bindup() + * + * parsers.c parsers.h + * + * deleted const struct interceptors + * + * pcrs.c + * added FIXME + * + * project.h + * + * added struct map + * added struct http_response + * changes struct interceptors to struct cgi_dispatcher + * moved HTML stuff to cgi.h + * + * re_filterfile: + * + * changed + * + * showargs.c + * NO TIME LEFT + * + * 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. * @@ -88,6 +155,7 @@ const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.4 2001/05/26 00:37:42 jongfos #include "project.h" #include "jbsockets.h" #include "filters.h" +#include "errlog.h" const char jbsockets_h_rcs[] = JBSOCKETS_H_VERSION; @@ -108,7 +176,7 @@ 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; @@ -226,10 +294,9 @@ int connect_to(char *host, int portnum, struct client_state *csp) * 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) @@ -239,7 +306,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));