X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=jcc.h;h=d229e3d25f074d060dda9ee35096f62e282458b5;hb=7df7fc1c547ddc6cddf161fab52358f7499cc9b1;hp=56e6724adc74cc515831aa47c81f32d4844b2c16;hpb=53a7b1252f28700bcac181b241bcc6f64601013d;p=privoxy.git diff --git a/jcc.h b/jcc.h index 56e6724a..d229e3d2 100644 --- a/jcc.h +++ b/jcc.h @@ -1,15 +1,15 @@ #ifndef JCC_H_INCLUDED #define JCC_H_INCLUDED -#define JCC_H_VERSION "$Id: jcc.h,v 1.4 2001/07/29 18:58:15 jongfoster Exp $" +#define JCC_H_VERSION "$Id: jcc.h,v 1.12.2.3 2006/01/21 16:16:08 david__schmidt Exp $" /********************************************************************* * - * File : $Source: /cvsroot/ijbswa/current/jcc.h,v $ + * File : $Source: /cvsroot/ijbswa/current/Attic/jcc.h,v $ * * 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 + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -35,6 +35,56 @@ * * Revisions : * $Log: jcc.h,v $ + * 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. + * * Revision 1.4 2001/07/29 18:58:15 jongfoster * Removing nested #includes, adding forward declarations for needed * structures, and changing the #define _FILENAME_H to FILENAME_H_INCLUDED. @@ -62,18 +112,37 @@ extern "C" { struct client_state; struct file_list; - /* Global variables */ -#ifdef STATISTICS +#ifdef FEATURE_STATISTICS extern int urls_read; extern int urls_rejected; -#endif /*def STATISTICS*/ +#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 -extern struct file_list files[]; +#ifdef OSX_DARWIN +#include +extern pthread_mutex_t gmtime_mutex; +extern pthread_mutex_t localtime_mutex; +extern pthread_mutex_t gethostbyaddr_mutex; +extern pthread_mutex_t gethostbyname_mutex; +#endif /* def OSX_DARWIN */ +#ifdef FEATURE_PTHREAD +extern pthread_mutex_t log_mutex; +extern pthread_mutex_t log_init_mutex; +#endif /* FEATURE_PTHREAD */ /* Functions */