X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=jcc.h;h=3e170424e74df6ab0e577f4898c15d7cb1069ab3;hp=b9b5a54fa52442fd149d02aadbcf873595b8567b;hb=e52674334610f4c2a1eb22b095c126527705f314;hpb=e72b401da5537a14b29e945944926373cb251825 diff --git a/jcc.h b/jcc.h index b9b5a54f..3e170424 100644 --- a/jcc.h +++ b/jcc.h @@ -1,21 +1,20 @@ #ifndef JCC_H_INCLUDED #define JCC_H_INCLUDED -#define JCC_H_VERSION "$Id: jcc.h,v 1.25 2008/10/09 18:21:41 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/jcc.h,v $ * - * Purpose : Main file. Contains main() method, main loop, and + * 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 + * 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 @@ -36,10 +35,6 @@ *********************************************************************/ -#ifdef __cplusplus -extern "C" { -#endif - struct client_state; struct file_list; @@ -50,13 +45,13 @@ extern int urls_read; extern int urls_rejected; #endif /*def FEATURE_STATISTICS*/ -extern struct client_state clients[1]; +extern struct client_states clients[1]; extern struct file_list files[1]; #ifdef unix extern const char *pidfile; #endif -extern int no_daemon; +extern int daemon_mode; #ifdef FEATURE_GRACEFUL_TERMINATION extern int g_terminate; @@ -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,22 +107,25 @@ extern privoxy_mutex_t resolver_mutex; extern privoxy_mutex_t rand_mutex; #endif /* ndef HAVE_RANDOM */ +#ifdef FEATURE_HTTPS_INSPECTION +extern privoxy_mutex_t certificate_mutex; +extern privoxy_mutex_t ssl_init_mutex; +#endif + #endif /* FEATURE_PTHREAD */ /* Functions */ #ifdef __MINGW32__ -int real_main(int argc, const char *argv[]); +int real_main(int argc, char **argv); #else -int main(int argc, const 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 */