X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=jbsockets.h;h=78f2ee0d9477b07bbd870043128ecedd084bf148;hp=08f0ddec0015b417bf513b1e314e9bb6c89742bc;hb=c6961c9f888462c4ac8cc01aca54c5188ec1c898;hpb=34bf407d7722634d6363c46dd4d0df00f53732ef diff --git a/jbsockets.h b/jbsockets.h index 08f0ddec..78f2ee0d 100644 --- a/jbsockets.h +++ b/jbsockets.h @@ -1,17 +1,17 @@ #ifndef JBSOCKETS_H_INCLUDED #define JBSOCKETS_H_INCLUDED -#define JBSOCKETS_H_VERSION "$Id: jbsockets.h,v 1.4 2002/03/07 03:51:36 oes Exp $" +#define JBSOCKETS_H_VERSION "$Id: jbsockets.h,v 1.8 2002/03/26 22:29:54 swa Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/jbsockets.h,v $ * * Purpose : Contains wrappers for system-specific sockets code, - * so that the rest of JunkBuster can be more + * so that the rest of Junkbuster can be more * OS-independent. Contains #ifdefs to make this work * on many platforms. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * IJBSWA team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -37,6 +37,39 @@ * * Revisions : * $Log: jbsockets.h,v $ + * Revision 1.8 2002/03/26 22:29:54 swa + * we have a new homepage! + * + * Revision 1.7 2002/03/24 13:25:43 swa + * name change related issues + * + * Revision 1.6 2002/03/13 00:27:05 jongfoster + * Killing warnings + * + * Revision 1.5 2002/03/09 20:03:52 jongfoster + * - Making various functions return int rather than size_t. + * (Undoing a recent change). Since size_t is unsigned on + * Windows, functions like read_socket that return -1 on + * error cannot return a size_t. + * + * THIS WAS A MAJOR BUG - it caused frequent, unpredictable + * crashes, and also frequently caused JB to jump to 100% + * CPU and stay there. (Because it thought it had just + * read ((unsigned)-1) == 4Gb of data...) + * + * - The signature of write_socket has changed, it now simply + * returns success=0/failure=nonzero. + * + * - Trying to get rid of a few warnings --with-debug on + * Windows, I've introduced a new type "jb_socket". This is + * used for the socket file descriptors. On Windows, this + * is SOCKET (a typedef for unsigned). Everywhere else, it's + * an int. The error value can't be -1 any more, so it's + * now JB_INVALID_SOCKET (which is -1 on UNIX, and in + * Windows it maps to the #define INVALID_SOCKET.) + * + * - The signature of bind_port has changed. + * * Revision 1.4 2002/03/07 03:51:36 oes * - Improved handling of failed DNS lookups * - Fixed compiler warnings etc @@ -64,7 +97,7 @@ extern "C" { struct client_state; extern jb_socket connect_to(const char *host, int portnum, struct client_state *csp); -extern int write_socket(jb_socket fd, const char *buf, int n); +extern int write_socket(jb_socket fd, const char *buf, size_t n); extern int read_socket(jb_socket fd, char *buf, int n); extern void close_socket(jb_socket fd);