X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=jcc.h;h=3e170424e74df6ab0e577f4898c15d7cb1069ab3;hp=e871f5df1a15c6ce9bf440b284e959f069c67460;hb=41bcde325feaf65a42fe2c4ab21cee5771ac60ad;hpb=43f5258489643f42346c27d440f6353cda2838d2 diff --git a/jcc.h b/jcc.h index e871f5df..3e170424 100644 --- a/jcc.h +++ b/jcc.h @@ -1,6 +1,5 @@ #ifndef JCC_H_INCLUDED #define JCC_H_INCLUDED -#define JCC_H_VERSION "$Id: jcc.h,v 1.30 2011/09/04 11:10:56 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/jcc.h,v $ @@ -8,8 +7,8 @@ * Purpose : Main file. Contains main() method, main loop, and * the main connection-handling function. * - * Copyright : Written by and Copyright (C) 2001-2006 the SourceForge - * Privoxy team. http://www.privoxy.org/ + * Copyright : Written by and Copyright (C) 2001-2014 the + * Privoxy team. https://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -36,10 +35,6 @@ *********************************************************************/ -#ifdef __cplusplus -extern "C" { -#endif - struct client_state; struct file_list; @@ -83,6 +78,19 @@ extern privoxy_mutex_t log_mutex; extern privoxy_mutex_t log_init_mutex; extern privoxy_mutex_t connection_reuse_mutex; +#ifdef FEATURE_EXTERNAL_FILTERS +extern privoxy_mutex_t external_filter_mutex; +#endif + +#ifdef FEATURE_CLIENT_TAGS +extern privoxy_mutex_t client_tags_mutex; +#endif + +#ifdef FEATURE_EXTENDED_STATISTICS +extern privoxy_mutex_t filter_statistics_mutex; +extern privoxy_mutex_t block_statistics_mutex; +#endif + #ifndef HAVE_GMTIME_R extern privoxy_mutex_t gmtime_mutex; #endif /* ndef HAVE_GMTIME_R */ @@ -99,9 +107,10 @@ extern privoxy_mutex_t resolver_mutex; extern privoxy_mutex_t rand_mutex; #endif /* ndef HAVE_RANDOM */ -#ifdef HAVE_STRTOK -extern privoxy_mutex_t strtok_mutex; -#endif /* ndef HAVE_STRTOK */ +#ifdef FEATURE_HTTPS_INSPECTION +extern privoxy_mutex_t certificate_mutex; +extern privoxy_mutex_t ssl_init_mutex; +#endif #endif /* FEATURE_PTHREAD */ @@ -113,12 +122,10 @@ int real_main(int argc, char **argv); int main(int argc, char **argv); #endif -/* Revision control strings from this header and associated .c file */ -extern const char jcc_rcs[]; -extern const char jcc_h_rcs[]; - -#ifdef __cplusplus -} /* extern "C" */ +#ifdef FUZZ +extern int fuzz_client_request(struct client_state *csp, char *fuzz_input_file); +extern int fuzz_server_response(struct client_state *csp, char *fuzz_input_file); +extern int fuzz_chunked_transfer_encoding(struct client_state *csp, char *fuzz_input_file); #endif #endif /* ndef JCC_H_INCLUDED */