X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=jbsockets.h;h=92c435053336793de28365a06ab0fbab8ac10618;hp=31393301bbbb42e4f1eb9a1791706acff4f30e8d;hb=e734bb1389aaa25ccc30da467aa439a9b00f9973;hpb=97110184221edacdb7d4dfc29de0e38d63f4d831 diff --git a/jbsockets.h b/jbsockets.h index 31393301..92c43505 100644 --- a/jbsockets.h +++ b/jbsockets.h @@ -1,16 +1,16 @@ #ifndef JBSOCKETS_H_INCLUDED #define JBSOCKETS_H_INCLUDED -#define JBSOCKETS_H_VERSION "$Id: jbsockets.h,v 1.7 2002/03/24 13:25:43 swa Exp $" +#define JBSOCKETS_H_VERSION "$Id: jbsockets.h,v 1.14 2008/12/20 14:53:55 fabiankeil 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 + * Copyright : Written by and Copyright (C) 2001-2009 the * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written @@ -37,6 +37,29 @@ * * Revisions : * $Log: jbsockets.h,v $ + * Revision 1.14 2008/12/20 14:53:55 fabiankeil + * Add config option socket-timeout to control the time + * Privoxy waits for data to arrive on a socket. Useful + * in case of stale ssh tunnels or when fuzz-testing. + * + * Revision 1.13 2008/03/21 11:13:59 fabiankeil + * Only gather host information if it's actually needed. + * Also move the code out of accept_connection() so it's less likely + * to delay other incoming connections if the host is misconfigured. + * + * Revision 1.12 2006/07/18 14:48:46 david__schmidt + * Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch) + * with what was really the latest development (the v_3_0_branch branch) + * + * Revision 1.9.2.1 2002/05/26 23:41:27 joergs + * AmigaOS: Fixed wrong type of len in write_socket() + * + * Revision 1.9 2002/04/08 20:31:41 swa + * fixed JB spelling + * + * 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 * @@ -94,15 +117,23 @@ extern "C" { struct client_state; extern jb_socket connect_to(const char *host, int portnum, struct client_state *csp); +#ifdef AMIGA +extern int write_socket(jb_socket fd, const char *buf, ssize_t n); +#else extern int write_socket(jb_socket fd, const char *buf, size_t n); +#endif 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 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 unsigned long resolve_hostname_to_ip(const char *host); +extern int socket_is_still_usable(jb_socket sfd); + /* Revision control strings from this header and associated .c file */ extern const char jbsockets_rcs[]; extern const char jbsockets_h_rcs[];