-const char errlog_rcs[] = "$Id: errlog.c,v 1.3 2001/05/20 01:11:40 jongfoster Exp $";
+const char errlog_rcs[] = "$Id: errlog.c,v 1.6 2001/05/25 21:55:08 jongfoster Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/errlog.c,v $
*
* Revisions :
* $Log: errlog.c,v $
+ * Revision 1.6 2001/05/25 21:55:08 jongfoster
+ * Now cleans up properly on FATAL (removes taskbar icon etc)
+ *
+ * Revision 1.5 2001/05/22 18:46:04 oes
+ *
+ * - Enabled filtering banners by size rather than URL
+ * by adding patterns that replace all standard banner
+ * sizes with the "Junkbuster" gif to the re_filterfile
+ *
+ * - Enabled filtering WebBugs by providing a pattern
+ * which kills all 1x1 images
+ *
+ * - Added support for PCRE_UNGREEDY behaviour to pcrs,
+ * which is selected by the (nonstandard and therefore
+ * capital) letter 'U' in the option string.
+ * It causes the quantifiers to be ungreedy by default.
+ * Appending a ? turns back to greedy (!).
+ *
+ * - Added a new interceptor ijb-send-banner, which
+ * sends back the "Junkbuster" gif. Without imagelist or
+ * MSIE detection support, or if tinygif = 1, or the
+ * URL isn't recognized as an imageurl, a lame HTML
+ * explanation is sent instead.
+ *
+ * - Added new feature, which permits blocking remote
+ * script redirects and firing back a local redirect
+ * to the browser.
+ * The feature is conditionally compiled, i.e. it
+ * can be disabled with --disable-fast-redirects,
+ * plus it must be activated by a "fast-redirects"
+ * line in the config file, has its own log level
+ * and of course wants to be displayed by show-proxy-args
+ * Note: Boy, all the #ifdefs in 1001 locations and
+ * all the fumbling with configure.in and acconfig.h
+ * were *way* more work than the feature itself :-(
+ *
+ * - Because a generic redirect template was needed for
+ * this, tinygif = 3 now uses the same.
+ *
+ * - Moved GIFs, and other static HTTP response templates
+ * to project.h
+ *
+ * - Some minor fixes
+ *
+ * - Removed some >400 CRs again (Jon, you really worked
+ * a lot! ;-)
+ *
+ * Revision 1.4 2001/05/21 19:32:54 jongfoster
+ * Added another #ifdef _WIN_CONSOLE
+ *
* Revision 1.3 2001/05/20 01:11:40 jongfoster
* Added support for LOG_LEVEL_FATAL
* Renamed LOG_LEVEL_FRC to LOG_LEVEL_FORCE,
#ifdef _WIN32
#include <windows.h>
-#ifndef _WIN_CONSOLE\r
+#ifndef _WIN_CONSOLE
#include "w32log.h"
-#endif /* ndef _WIN_CONSOLE */\r
+#endif /* ndef _WIN_CONSOLE */
#endif /* def _WIN32 */
#include "errlog.h"
#include "project.h"
const char errlog_h_rcs[] = ERRLOG_H_VERSION;
-\r
-/*\r
- * LOG_LEVEL_FATAL, LOG_LEVEL_ERROR and LOG_LEVEL_INFO\r
- * cannot be turned off. (There are some exceptional situations\r
- * where we need to get a message to the user).\r
- *\r
- * FIXME: Do we need LOG_LEVEL_INFO here?\r
+
+/*
+ * LOG_LEVEL_FATAL, LOG_LEVEL_ERROR and LOG_LEVEL_INFO
+ * cannot be turned off. (There are some exceptional situations
+ * where we need to get a message to the user).
+ *
+ * FIXME: Do we need LOG_LEVEL_INFO here?
*/
#define LOG_LEVEL_MINIMUM (LOG_LEVEL_FATAL | LOG_LEVEL_ERROR | LOG_LEVEL_INFO)
/* logging detail level. */
static int debug = LOG_LEVEL_MINIMUM;
-static void fatal_error(const char * error_message);\r
-\r
-\r
-/*********************************************************************\r
- *\r
- * Function : fatal_error\r
- *\r
- * Description : Displays a fatal error to standard error (or, on \r
- * a WIN32 GUI, to a dialog box), and exits\r
- * JunkBuster with status code 1.\r
- *\r
- * Parameters :\r
- * 1 : error_message = The error message to display.\r
- *\r
- * Returns : Does not return.\r
- *\r
- *********************************************************************/\r
-static void fatal_error(const char * error_message)\r
-{\r
-#if defined(_WIN32) && !defined(_WIN_CONSOLE)\r
- MessageBox(NULL, error_message, "Internet JunkBuster Error", \r
- MB_OK | MB_ICONERROR | MB_TASKMODAL | MB_SETFOREGROUND | MB_TOPMOST); \r
-#else /* if !defined(_WIN32) || defined(_WIN_CONSOLE) */\r
- fputs(error_message, stderr);\r
-#endif /* defined(_WIN32) && !defined(_WIN_CONSOLE) */\r
-\r
- exit(1);\r
-}\r
-\r
+static void fatal_error(const char * error_message);
+
+
+/*********************************************************************
+ *
+ * Function : fatal_error
+ *
+ * Description : Displays a fatal error to standard error (or, on
+ * a WIN32 GUI, to a dialog box), and exits
+ * JunkBuster with status code 1.
+ *
+ * Parameters :
+ * 1 : error_message = The error message to display.
+ *
+ * Returns : Does not return.
+ *
+ *********************************************************************/
+static void fatal_error(const char * error_message)
+{
+#if defined(_WIN32) && !defined(_WIN_CONSOLE)
+ MessageBox(g_hwndLogFrame, error_message, "Internet JunkBuster Error",
+ MB_OK | MB_ICONERROR | MB_TASKMODAL | MB_SETFOREGROUND | MB_TOPMOST);
+
+ /* Cleanup - remove taskbar icon etc. */
+ TermLogWindow();
+
+#else /* if !defined(_WIN32) || defined(_WIN_CONSOLE) */
+ fputs(error_message, stderr);
+#endif /* defined(_WIN32) && !defined(_WIN_CONSOLE) */
+
+ exit(1);
+}
+
/*********************************************************************
*
if( logfname )
{
if( !(fp = fopen(logfname, "a")) )
- {\r
+ {
log_error(LOG_LEVEL_FATAL, "init_errlog(): can't open logfile: %s", logfname);
}
char * src = fmt;
int outc = 0;
long this_thread = 1; /* was: pthread_t this_thread;*/
-
+\r
+#if defined(_WIN32) && !defined(_WIN_CONSOLE)\r
+ /*\r
+ * Irrespective of debug setting, a GET/POST/CONNECT makes\r
+ * the taskbar icon animate. (There is an option to disable\r
+ * this but checking that is handled inside LogShowActivity()).\r
+ */\r
+ if (loglevel == LOG_LEVEL_GPC)\r
+ {\r
+ LogShowActivity();\r
+ }
+#endif /* defined(_WIN32) && !defined(_WIN_CONSOLE) */\r
+\r
/* verify if loglevel applies to current settings and bail out if negative */
if(!(loglevel & debug))
{
- return;
+ return;
}
/* FIXME get current thread id */
switch (loglevel)
{
- case LOG_LEVEL_ERROR:\r
- outc = sprintf(outbuf, "IJB(%d) Error: ", this_thread);\r
- break;\r
- case LOG_LEVEL_FATAL:\r
- outc = sprintf(outbuf, "IJB(%d) Fatal error: ", this_thread);\r
- break;\r
+ /* FIXME: What about LOG_LEVEL_LOG ??? */
+ case LOG_LEVEL_ERROR:
+ outc = sprintf(outbuf, "IJB(%d) Error: ", this_thread);
+ break;
+ case LOG_LEVEL_FATAL:
+ outc = sprintf(outbuf, "IJB(%d) Fatal error: ", this_thread);
+ break;
case LOG_LEVEL_GPC:
outc = sprintf(outbuf, "IJB(%d) Request: ", this_thread);
break;
case LOG_LEVEL_HEADER:
outc = sprintf(outbuf, "IJB(%d) Header: ", this_thread);
break;
- case LOG_LEVEL_INFO:\r
- outc = sprintf(outbuf, "IJB(%d) Info: ", this_thread);\r
- break;\r
+ case LOG_LEVEL_INFO:
+ outc = sprintf(outbuf, "IJB(%d) Info: ", this_thread);
+ break;
+#ifdef PCRS
case LOG_LEVEL_RE_FILTER:
outc = sprintf(outbuf, "IJB(%d) Re-Filter: ", this_thread);
break;
+#endif /* def PCRS */
+#ifdef FORCE_LOAD
case LOG_LEVEL_FORCE:
outc = sprintf(outbuf, "IJB(%d) Force: ", this_thread);
- break;\r
+ break;
+#endif /* def FORCE_LOAD */
+#ifdef FAST_REDIRECTS
+ case LOG_LEVEL_REDIRECTS:
+ outc = sprintf(outbuf, "IJB(%d) Redirect: ", this_thread);
+ break;
+#endif /* def FAST_REDIRECTS */
default:
outc = sprintf(outbuf, "IJB(%d) UNKNOWN LOG TYPE(%d): ", this_thread, loglevel);
break;
}
fputs(outbuf, logfp);
/* FIXME RACE HAZARD: should end critical section error_log_use here */
- fatal_error(outbuf);\r
- /* Never get here */\r
+ fatal_error(outbuf);
+ /* Never get here */
break;
}
if (outc < BUFSIZ-1)
}
fputs(outbuf, logfp);
/* FIXME RACE HAZARD: should end critical section error_log_use here */
- fatal_error(outbuf);\r
- /* Never get here */\r
+ fatal_error(outbuf);
+ /* Never get here */
break;
} /* switch( p ) */
fputs(outbuf, logfp);
- if (loglevel == LOG_LEVEL_FATAL)\r
- {\r
- fatal_error(outbuf);\r
- /* Never get here */\r
- }\r
-\r
+ if (loglevel == LOG_LEVEL_FATAL)
+ {
+ fatal_error(outbuf);
+ /* Never get here */
+ }
+
/* FIXME RACE HAZARD: should end critical section error_log_use here */
-\r
+
#if defined(_WIN32) && !defined(_WIN_CONSOLE)
/* Write to display */
LogPutString(outbuf);
- LogShowActivity();
#endif /* defined(_WIN32) && !defined(_WIN_CONSOLE) */
}
projects / privoxy.git / blobdiff