X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=jbsockets.h;h=e41aab2f51bcc69ced27277e107d29b1a30bd134;hp=6b74b1d2f3e9a464c17e60ae832e7f8c28325050;hb=b91046acbab9f2c88421e0bfc988ef2132fbcae1;hpb=dde30f5e8bb12c63688330c97fde75493f92c09c diff --git a/jbsockets.h b/jbsockets.h index 6b74b1d2..e41aab2f 100644 --- a/jbsockets.h +++ b/jbsockets.h @@ -1,6 +1,6 @@ #ifndef JBSOCKETS_H_INCLUDED #define JBSOCKETS_H_INCLUDED -#define JBSOCKETS_H_VERSION "$Id: jbsockets.h,v 1.17 2010/04/23 11:53:48 fabiankeil Exp $" +#define JBSOCKETS_H_VERSION "$Id: jbsockets.h,v 1.20 2011/09/04 11:10:56 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/jbsockets.h,v $ @@ -14,10 +14,10 @@ * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written - * by and Copyright (C) 1997 Anonymous Coders and + * by and Copyright (C) 1997 Anonymous Coders and * Junkbusters Corporation. http://www.junkbusters.com * - * This program is free software; you can redistribute it + * This program is free software; you can redistribute it * and/or modify it under the terms of the GNU General * Public License as published by the Free Software * Foundation; either version 2 of the License, or (at @@ -55,6 +55,7 @@ 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 int data_is_available(jb_socket fd, int seconds_to_wait); extern void close_socket(jb_socket fd); +extern void drain_and_close_socket(jb_socket fd); extern int bind_port(const char *hostnam, int portnum, jb_socket *pfd); extern int accept_connection(struct client_state * csp, jb_socket fds[]); @@ -68,6 +69,15 @@ extern int socket_is_still_alive(jb_socket sfd); extern const char jbsockets_rcs[]; extern const char jbsockets_h_rcs[]; +/* + * Solaris workaround + * XXX: still necessary? + */ +#ifndef INADDR_NONE +#define INADDR_NONE -1 +#endif + + #ifdef __cplusplus } /* extern "C" */ #endif