X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=jbsockets.h;h=7221bac7d314eec0c0266e7ae9017225d43fed7c;hp=f19968c833ab249fbe489683e470f3fe17995ff2;hb=69b45dc21f48175fb34a8e1e2f45d46870e37941;hpb=05dd2cc7b727e9600f3808d9156d94d1a3396155 diff --git a/jbsockets.h b/jbsockets.h index f19968c8..7221bac7 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.16 2009/05/16 13:27:20 fabiankeil Exp $" +#define JBSOCKETS_H_VERSION "$Id: jbsockets.h,v 1.19 2011/07/30 15:17:35 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 @@ -57,8 +57,8 @@ extern int data_is_available(jb_socket fd, int seconds_to_wait); extern void 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 fd); -extern void get_host_information(jb_socket afd, char **ip_address, char **hostname); +extern int accept_connection(struct client_state * csp, jb_socket fds[]); +extern void get_host_information(jb_socket afd, char **ip_address, char **port, char **hostname); extern unsigned long resolve_hostname_to_ip(const char *host); @@ -68,6 +68,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