X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=jcc.h;h=4c263c777dddbb24e9794e983c50d7eff4bcd858;hp=f3ee7344a5ee3f67bad3067ccb19d3d11b33d36e;hb=11d4d86d90ca075d52a87bb95af11de1b0c5ac1a;hpb=536a88ebe11300228987eaa39ef4bbd63cd0e1ba diff --git a/jcc.h b/jcc.h index f3ee7344..4c263c77 100644 --- a/jcc.h +++ b/jcc.h @@ -1,6 +1,6 @@ #ifndef JCC_H_INCLUDED #define JCC_H_INCLUDED -#define JCC_H_VERSION "$Id: jcc.h,v 1.5 2001/07/29 19:32:00 jongfoster Exp $" +#define JCC_H_VERSION "$Id: jcc.h,v 1.21 2007/04/22 13:18:06 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/jcc.h,v $ @@ -8,8 +8,8 @@ * Purpose : Main file. Contains main() method, main loop, and * the main connection-handling function. * - * Copyright : Written by and Copyright (C) 2001 the SourceForge - * IJBSWA team. http://ijbswa.sourceforge.net + * Copyright : Written by and Copyright (C) 2001-2006 the SourceForge + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -35,6 +35,102 @@ * * Revisions : * $Log: jcc.h,v $ + * Revision 1.21 2007/04/22 13:18:06 fabiankeil + * Keep the HTTP snippets local. + * + * Revision 1.20 2006/12/26 17:31:41 fabiankeil + * Mutex protect rand() if POSIX threading + * is used, warn the user if that's not possible + * and stop using it on _WIN32 where it could + * cause crashes. + * + * Revision 1.19 2006/12/06 19:41:39 fabiankeil + * Privoxy is now able to run as intercepting + * proxy in combination with any packet filter + * that does the port redirection. The destination + * is extracted from the "Host:" header which + * should be available for nearly all requests. + * + * Moved HTTP snipplets into jcc.c. + * Added error message for gopher proxy requests. + * + * Revision 1.18 2006/11/13 19:05:51 fabiankeil + * Make pthread mutex locking more generic. Instead of + * checking for OSX and OpenBSD, check for FEATURE_PTHREAD + * and use mutex locking unless there is an _r function + * available. Better safe than sorry. + * + * Fixes "./configure --disable-pthread" and should result + * in less threading-related problems on pthread-using platforms, + * but it still doesn't fix BR#1122404. + * + * Revision 1.17 2006/11/06 19:58:23 fabiankeil + * Move pthread.h inclusion from jcc.c to jcc.h. + * Fixes build on x86-freebsd1 (FreeBSD 5.4-RELEASE). + * + * Revision 1.16 2006/09/02 15:36:42 fabiankeil + * Follow the OpenBSD port's lead and protect the resolve + * functions on OpenBSD as well. + * + * Revision 1.15 2006/09/02 10:24:30 fabiankeil + * Include pthread.h for OpenBSD to make Privoxy build again. + * + * Tested shortly on OpenBSD 3.9 without problems, but the OpenBSD + * port has additional patches to use the mutexes OSX_DARWIN needs, + * and it should be investigated if they are still required for + * reliable operation. + * + * Revision 1.14 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.12.2.3 2006/01/21 16:16:08 david__schmidt + * Thanks to Edward Carrel for his patch to modernize OSX's pthreads support. See bug #1409623. + * + * Revision 1.12.2.2 2005/04/03 20:10:50 david__schmidt + * Thanks to Jindrich Makovicka for a race condition fix for the log + * file. The race condition remains for non-pthread implementations. + * Reference patch #1175720. + * + * Revision 1.12.2.1 2003/03/07 03:41:05 david__schmidt + * Wrapping all *_r functions (the non-_r versions of them) with mutex + * semaphores for OSX. Hopefully this will take care of all of those pesky + * crash reports. + * + * Revision 1.12 2002/03/26 22:29:55 swa + * we have a new homepage! + * + * Revision 1.11 2002/03/24 13:25:43 swa + * name change related issues + * + * Revision 1.10 2002/03/16 23:54:06 jongfoster + * Adding graceful termination feature, to help look for memory leaks. + * If you enable this (which, by design, has to be done by hand + * editing config.h) and then go to http://i.j.b/die, then the program + * will exit cleanly after the *next* request. It should free all the + * memory that was used. + * + * Revision 1.9 2002/03/07 03:52:44 oes + * Set logging to tty for --no-daemon mode + * + * Revision 1.8 2002/03/04 18:19:49 oes + * Added extern const char *pidfile + * + * Revision 1.7 2001/11/05 21:41:43 steudten + * Add changes to be a real daemon just for unix os. + * (change cwd to /, detach from controlling tty, set + * process group and session leader to the own process. + * Add DBG() Macro. + * Add some fatal-error log message for failed malloc(). + * Add '-d' if compiled with 'configure --with-debug' to + * enable debug output. + * + * Revision 1.6 2001/07/30 22:08:36 jongfoster + * Tidying up #defines: + * - All feature #defines are now of the form FEATURE_xxx + * - Permanently turned off WIN_GUI_EDIT + * - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS + * * Revision 1.5 2001/07/29 19:32:00 jongfoster * Renaming _main() [mingw32 only] to real_main(), for ANSI compliance. * @@ -65,7 +161,6 @@ extern "C" { struct client_state; struct file_list; - /* Global variables */ #ifdef FEATURE_STATISTICS @@ -73,10 +168,40 @@ extern int urls_read; extern int urls_rejected; #endif /*def FEATURE_STATISTICS*/ -extern struct client_state clients[]; +extern struct client_state clients[1]; +extern struct file_list files[1]; + +#ifdef unix +extern const char *pidfile; +#endif +extern int no_daemon; + +#ifdef FEATURE_GRACEFUL_TERMINATION +extern int g_terminate; +#endif + +#ifdef FEATURE_PTHREAD +#include +extern pthread_mutex_t log_mutex; +extern pthread_mutex_t log_init_mutex; + +#ifndef HAVE_GMTIME_R +extern pthread_mutex_t gmtime_mutex; +#endif /* ndef HAVE_GMTIME_R */ + +#ifndef HAVE_LOCALTIME_R +extern pthread_mutex_t localtime_mutex; +#endif /* ndef HAVE_GMTIME_R */ + +#if !defined(HAVE_GETHOSTBYADDR_R) || !defined(HAVE_GETHOSTBYNAME_R) +extern pthread_mutex_t resolver_mutex; +#endif /* !defined(HAVE_GETHOSTBYADDR_R) || !defined(HAVE_GETHOSTBYNAME_R) */ -extern struct file_list files[]; +#ifndef HAVE_RANDOM +extern pthread_mutex_t rand_mutex; +#endif /* ndef HAVE_RANDOM */ +#endif /* FEATURE_PTHREAD */ /* Functions */