-const char jcc_rcs[] = "$Id: jcc.c,v 1.1 2001/05/13 21:57:06 administrator Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.12 2001/05/27 22:17:04 oes Exp $";
/*********************************************************************
*
- * File : $Source: /home/administrator/cvs/ijb/jcc.c,v $
+ * File : $Source: /cvsroot/ijbswa/current/jcc.c,v $
*
* Purpose : Main file. Contains main() method, main loop, and
* the main connection-handling function.
*
* Revisions :
* $Log: jcc.c,v $
+ * Revision 1.12 2001/05/27 22:17:04 oes
+ *
+ * - re_process_buffer no longer writes the modified buffer
+ * to the client, which was very ugly. It now returns the
+ * buffer, which it is then written by chat.
+ *
+ * - content_length now adjusts the Content-Length: header
+ * for modified documents rather than crunch()ing it.
+ * (Length info in csp->content_length, which is 0 for
+ * unmodified documents)
+ *
+ * - For this to work, sed() is called twice when filtering.
+ *
+ * Revision 1.11 2001/05/26 17:27:53 jongfoster
+ * Added support for CLF and fixed LOG_LEVEL_LOG.
+ * Also did CRLF->LF fix of my previous patch.
+ *
+ * Revision 1.10 2001/05/26 15:26:15 jongfoster
+ * ACL feature now provides more security by immediately dropping
+ * connections from untrusted hosts.
+ *
+ * Revision 1.9 2001/05/26 00:28:36 jongfoster
+ * Automatic reloading of config file.
+ * Removed obsolete SIGHUP support (Unix) and Reload menu option (Win32).
+ * Most of the global variables have been moved to a new
+ * struct configuration_spec, accessed through csp->config->globalname
+ * Most of the globals remaining are used by the Win32 GUI.
+ *
+ * Revision 1.8 2001/05/25 22:43:18 jongfoster
+ * Fixing minor memory leak and buffer overflow.
+ *
+ * Revision 1.7 2001/05/25 22:34:30 jongfoster
+ * Hard tabs->Spaces
+ *
+ * Revision 1.6 2001/05/23 00:13:58 joergs
+ * AmigaOS support fixed.
+ *
+ * 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:34:01 jongfoster
+ * Made failure to bind() a fatal error.
+ *
+ * Revision 1.3 2001/05/20 01:21:20 jongfoster
+ * Version 2.9.4 checkin.
+ * - Merged popupfile and cookiefile, and added control over PCRS
+ * filtering, in new "permissionsfile".
+ * - Implemented LOG_LEVEL_FATAL, so that if there is a configuration
+ * file error you now get a message box (in the Win32 GUI) rather
+ * than the program exiting with no explanation.
+ * - Made killpopup use the PCRS MIME-type checking and HTTP-header
+ * skipping.
+ * - Removed tabs from "config"
+ * - Moved duplicated url parsing code in "loaders.c" to a new funcition.
+ * - Bumped up version number.
+ *
+ * Revision 1.2 2001/05/17 22:34:44 oes
+ * - Added hint on GIF char array generation to jcc.c
+ * - Cleaned CRLF's from the sources and related files
+ * - Repaired logging for REF and FRC
+ *
+ * Revision 1.1.1.1 2001/05/15 13:58:56 oes
+ * Initial import of version 2.9.3 source tree
+ *
*
*********************************************************************/
\f
static void listen_loop(void);
static void chat(struct client_state *csp);
+#ifdef AMIGA
+void serve(struct client_state *csp);
+#else /* ifndef AMIGA */
static void serve(struct client_state *csp);
+#endif /* def AMIGA */
+
#ifdef __BEOS__
static int32 server_thread(void *data);
#endif /* def __BEOS__ */
-
-#define BODY "<body bgcolor=\"#f8f8f0\" link=\"#000078\" alink=\"#ff0022\" vlink=\"#787878\">\n"
-
-static const char CFAIL[] =
- "HTTP/1.0 503 Connect failed\n"
- "Content-Type: text/html\n\n"
- "<html>\n"
- "<head>\n"
- "<title>Internet Junkbuster: Connect failed</title>\n"
- "</head>\n"
- BODY
- "<h1><center>"
- BANNER
- "</center></h1>"
- "TCP connection to '%s' failed: %s.\n<br>"
- "</body>\n"
- "</html>\n";
-
-static const char CNXDOM[] =
- "HTTP/1.0 404 Non-existent domain\n"
- "Content-Type: text/html\n\n"
- "<html>\n"
- "<head>\n"
- "<title>Internet Junkbuster: Non-existent domain</title>\n"
- "</head>\n"
- BODY
- "<h1><center>"
- BANNER
- "</center></h1>"
- "No such domain: %s\n"
- "</body>\n"
- "</html>\n";
-
-static const char CSUCCEED[] =
- "HTTP/1.0 200 Connection established\n"
- "Proxy-Agent: IJ/" VERSION "\n\n";
-
-static const char CHEADER[] =
- "HTTP/1.0 400 Invalid header received from browser\n\n";
-
-static const char SHEADER[] =
- "HTTP/1.0 502 Invalid header received from server\n\n";
-
-#if defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST)
-static const char BLANKGIF[] =
- "HTTP/1.0 200 OK\r\n"
- "Pragma: no-cache\r\n"
- "Last-Modified: Thu Jul 31, 1997 07:42:22 pm GMT\r\n"\r
- "Expires: Thu Jul 31, 1997 07:42:22 pm GMT\r\n"\r
- "Content-type: image/gif\r\n\r\n"
- "GIF89a\001\000\001\000\200\000\000\377\377\377\000\000"
- "\000!\371\004\001\000\000\000\000,\000\000\000\000\001"
- "\000\001\000\000\002\002D\001\000;";
-
-static const char JBGIF[] =
- "HTTP/1.0 200 OK\r\n"
- "Pragma: no-cache\r\n"
- "Last-Modified: Thu Jul 31, 1997 07:42:22 pm GMT\r\n"\r
- "Expires: Thu Jul 31, 1997 07:42:22 pm GMT\r\n"\r
- "Content-type: image/gif\r\n\r\n"
- "GIF89aD\000\013\000\360\000\000\000\000\000\377\377\377!"
- "\371\004\001\000\000\001\000,\000\000\000\000D\000\013\000"
- "\000\002a\214\217\251\313\355\277\000\200G&K\025\316hC\037"
- "\200\234\230Y\2309\235S\230\266\206\372J\253<\3131\253\271"
- "\270\215\342\254\013\203\371\202\264\334P\207\332\020o\266"
- "N\215I\332=\211\312\3513\266:\026AK)\364\370\365aobr\305"
- "\372\003S\275\274k2\354\254z\347?\335\274x\306^9\374\276"
- "\037Q\000\000;";
-\r
-static const char FWGIF[] =\r
- "HTTP/1.0 302 Blocked Advert\r\n" \r
- "Pragma: no-cache\r\n"\r
- "Last-Modified: Thu Jul 31, 1997 07:42:22 pm GMT\r\n"\r
- "Expires: Thu Jul 31, 1997 07:42:22 pm GMT\r\n"\r
- "Location: ";\r
-\r
-#endif /* defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST) */
-
#ifdef _WIN32
#define sleep(N) Sleep(((N) * 1000))
#endif
*********************************************************************/
static void chat(struct client_state *csp)
{
+/*
+ * This next lines are a little ugly, but they simplifies the if statements below.
+ * Basically if TOGGLE, then we want the if to test "csp->toggled_on", else we don't
+ * And if FORCE_LOAD, then we want the if to test "csp->toggled_on", else we don't
+ */
+#ifdef TOGGLE
+# define IS_TOGGLED_ON_AND (csp->toggled_on) &&
+#else /* ifndef TOGGLE */
+# define IS_TOGGLED_ON_AND
+#endif /* ndef TOGGLE */
+#ifdef FORCE_LOAD
+# define IS_NOT_FORCED_AND (!csp->force) &&
+#else /* ifndef TOGGLE */
+# define IS_NOT_FORCED_AND
+#endif /* def FORCE_LOAD */
+
+#define IS_ENABLED_AND IS_TOGGLED_ON_AND IS_NOT_FORCED_AND
+
char buf[BUFSIZ], *hdr, *p, *req;
char *err = NULL;
char *eno;
fd_set rfds;
- int n, maxfd, server_body, ms_iis5_hack = 0;
- struct cookie_spec *cs;
+ int n, maxfd, server_body;
+ int ms_iis5_hack = 0;
+ int byte_count = 0;
const struct gateway *gw;
struct http_request *http;
+#ifdef KILLPOPUPS
+ int block_popups; /* bool, 1==will block popups */
+ int block_popups_now = 0; /* bool, 1==currently blocking popups */
+#endif /* def KILLPOPUPS */
#ifdef PCRS
- int filtering = 0;
+ int pcrs_filter; /* bool, 1==will filter through pcrs */
+ int filtering = 0; /* bool, 1==currently filtering through pcrs */
#endif /* def PCRS */
http = csp->http;
req = get_header(csp);
- if (req == NULL)\r
- {\r
- break; /* no HTTP request! */\r
+ if (req == NULL)
+ {
+ break; /* no HTTP request! */
}
- if (*req == '\0')\r
- {\r
- continue; /* more to come! */\r
+ if (*req == '\0')
+ {
+ continue; /* more to come! */
}
#ifdef FORCE_LOAD
/* If this request contains the FORCE_PREFIX,
- * better get rid of it now and set the force flag --oes
+ * better get rid of it now and set the force flag --oes
*/
- if(strstr(req, FORCE_PREFIX))
+ if (strstr(req, FORCE_PREFIX))
{
- strclean(req, FORCE_PREFIX);
- /* if DEBUG(FRC) fprintf(logfp, "%s: Enforcing request \"%s\".\n", prog, req); */
- csp->force = 1;
- }
+ strclean(req, FORCE_PREFIX);
+ log_error(LOG_LEVEL_FORCE, "Enforcing request \"%s\".\n", req);
+ csp->force = 1;
+ }
else
{
- csp->force = 0;
- }
+ csp->force = 0;
+ }
#endif /* def FORCE_LOAD */
parse_http_request(req, http, csp);
{
strcpy(buf, CHEADER);
write_socket(csp->cfd, buf, strlen(buf));
+
+ log_error(LOG_LEVEL_CLF, "%s - - [%T] \" \" 400 0", csp->ip_addr_str);
+
return;
}
if ((gw = forward_url(http, csp)) == NULL)
{
- log_error(LOG_LEVEL_ERROR, "gateway spec is NULL!?!? This can't happen!");
- abort();
+ log_error(LOG_LEVEL_FATAL, "gateway spec is NULL!?!? This can't happen!");
+ /* Never get here - LOG_LEVEL_FATAL causes program exit */
}
/* build the http request to send to the server
/* decide what we're to do with cookies */
-#if defined(TOGGLE)
- /*
- * by haroon - most of credit to srt19170
- * if toggled_on flag is false IJB is disabled, pass cookies thru
- */
+#ifdef TOGGLE
if (!csp->toggled_on)
{
- csp->accept_server_cookie = 1;
- csp->send_user_cookie = 1;
- }
- else
-#endif
-
- if ((cs = cookie_url(http, csp)))
- {
- csp->accept_server_cookie = cs->accept_server_cookie;
- csp->send_user_cookie = cs->send_user_cookie;
+ /* Most compatible set of permissions */
+ csp->permissions = PERMIT_MOST_COMPATIBLE;
}
else
+#endif /* ndef TOGGLE */
{
- csp->accept_server_cookie = 0;
- csp->send_user_cookie = 0;
+ csp->permissions = url_permissions(http, csp);
}
+#ifdef KILLPOPUPS
+ block_popups = ((csp->permissions & PERMIT_POPUPS) == 0);
+#endif /* def KILLPOPUPS */
+#ifdef PCRS
+ pcrs_filter = (csp->rlist != NULL) && /* There are expressions to be used */
+ ((csp->permissions & PERMIT_RE_FILTER) != 0);
+#endif /* def PCRS */
+
+
/* grab the rest of the client's headers */
while (FOREVER)
destroy_list(csp->headers);
-#ifdef TOGGLE
- /*
- * by haroon - most of credit to srt19170
- * if toggled_on flag is true then IJB is enabled, do the usual
- * otherwise avoid crunching
+ /* Check the request against all rules, unless
+ * we're toggled off or in force mode.
*/
+
+ if (intercept_url(http, csp))
+ {
+ /*
+ * The interceptor will write out the data.
+ * We don't need to do anything else
+ */
-/* This next line is a little ugly, but it simplifies the if statement below. */
-/* Basically if TOGGLE, then we want the if to test "csp->toggled_on", else we don't */
-#define IS_TOGGLED_ON csp->toggled_on &&
-
-#else /* ifndef TOGGLE */
-
-/* We don't have TOGGLE, so we don't care about toggling. */
-#define IS_TOGGLED_ON
-
-#endif /* ndef TOGGLE */
+#ifdef STATISTICS
+ csp->rejected = 1;
+#endif /* def STATISTICS */
+ freez(hdr);
+ return;
+ }
-#ifdef TRUST_FILES
-/* This next line is a little ugly, but it simplifies the if statement below. */
-/* Basically if TRUST_FILES, then we want the if to call "trust_url", else we don't */
-#define IS_TRUSTED_URL (p = trust_url(http, csp)) ||
+#ifdef FAST_REDIRECTS
+ else if (IS_ENABLED_AND
+ ((csp->permissions & PERMIT_FAST_REDIRECTS) != 0) &&
+ (p = redirect_url(http, csp)))
+ {
+ /* This must be blocked as HTML */
+#ifdef STATISTICS
+ csp->rejected = 1;
+#endif /* def STATISTICS */
-#else /* ifndef TRUST_FILES */
+ log_error(LOG_LEVEL_GPC, "%s%s crunch!", http->hostport, http->path);
-/* We don't have TRUST_FILES, so we don't care about trusted URL's. */
-#define IS_TRUSTED_URL
+ log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 200 3",
+ csp->ip_addr_str, http->cmd);
-#endif /* ndef TRUST_FILES */
+ /* Send HTML redirection result */
+ write_socket(csp->cfd, p, strlen(p));
+ freez(p);
+ freez(hdr);
+ return;
+ }
+#endif /* def FAST_REDIRECTS */
- /* Check the request against all rules, unless
- * we're disabled or in force mode.
- */
-
- if (IS_TOGGLED_ON
-#ifdef FORCE_LOAD
- (!csp->force) &&
-#endif /* def FORCE_LOAD */
- ( (p = intercept_url(http, csp)) ||
- IS_TRUSTED_URL
+ else if (IS_ENABLED_AND (
+#ifdef TRUST_FILES
+ (p = trust_url(http, csp)) ||
+#endif /* def TRUST_FILES */
(p = block_url(http, csp)) ))
{
+ /* Block as HTML or image */
#ifdef STATISTICS
csp->rejected = 1;
#endif /* def STATISTICS */
log_error(LOG_LEVEL_GPC, "%s%s crunch!", http->hostport, http->path);
-#if defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST)
- /* now use block_imageurl */
- if ( (tinygif > 0) && block_imageurl(http, csp) )
+ log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 200 1",
+ csp->ip_addr_str, http->cmd);
+
+#ifdef IMAGE_BLOCKING
+ /* Block as image? */
+ if ( (csp->config->tinygif > 0) && block_imageurl(http, csp) )
{
/* Send "blocked" image */
log_error(LOG_LEVEL_GPC, "%s%s image crunch!",
http->hostport, http->path);
- if (tinygif == 1)
+ if (csp->config->tinygif == 1)
{
write_socket(csp->cfd, BLANKGIF, sizeof(BLANKGIF)-1);
}
- else if ((tinygif == 3) && (tinygifurl))\r
- {\r
- write_socket(csp->cfd, FWGIF, sizeof(FWGIF)-1);\r
- write_socket(csp->cfd, tinygifurl, strlen(tinygifurl));\r
- }\r
+ else if (csp->config->tinygif == 2)
+ {
+ write_socket(csp->cfd, JBGIF, sizeof(JBGIF)-1);
+ }
+ else if ((csp->config->tinygif == 3) && (csp->config->tinygifurl))
+ {
+ freez(p);
+ p = (char *)malloc(sizeof(HTTP_REDIRECT_TEMPLATE)
+ + strlen(csp->config->tinygifurl));
+ sprintf(p, HTTP_REDIRECT_TEMPLATE, csp->config->tinygifurl);
+ write_socket(csp->cfd, p, strlen(p));
+ }
else
{
+ /* Should never happen */
write_socket(csp->cfd, JBGIF, sizeof(JBGIF)-1);
}
}
else
-#endif /* defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST) */
+#endif /* def IMAGE_BLOCKING */
+ /* Block as HTML */
{
- /* Send HTML "blocked" message */
+ /* Send HTML "blocked" message, interception, or redirection result */
write_socket(csp->cfd, p, strlen(p));
}
- log_error(LOG_LEVEL_LOG, "%s", p);
-
freez(p);
freez(hdr);
return;
{
err = zalloc(strlen(CNXDOM) + strlen(http->host));
sprintf(err, CNXDOM, http->host);
+
+ log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 404 0",
+ csp->ip_addr_str, http->cmd);
}
else
{
eno = safe_strerror(errno);
err = zalloc(strlen(CFAIL) + strlen(http->hostport) + strlen(eno));
sprintf(err, CFAIL, http->hostport, eno);
+
+ log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 503 0",
+ csp->ip_addr_str, http->cmd);
}
write_socket(csp->cfd, err, strlen(err));
- log_error(LOG_LEVEL_LOG, err);
-
freez(err);
freez(hdr);
return;
sprintf(err, CFAIL, http->hostport, eno);
write_socket(csp->cfd, err, strlen(err));
+ log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 503 0",
+ csp->ip_addr_str, http->cmd);
+
freez(err);
freez(hdr);
return;
* so just send the "connect succeeded" message to the
* client, flush the rest, and get out of the way.
*/
+ log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 200 2\n",
+ csp->ip_addr_str, http->cmd);
+
if (write_socket(csp->cfd, CSUCCEED, sizeof(CSUCCEED)-1) < 0)
{
freez(hdr);
{
n = read_socket(csp->cfd, buf, sizeof(buf));
- if (n <= 0) break; /* "game over, man" */
+ if (n <= 0)
+ {
+ break; /* "game over, man" */
+ }
if (write_socket(csp->sfd, buf, n) != n)
{
eno = safe_strerror(errno);
sprintf(buf, CFAIL, http->hostport, eno);
freez(eno);
+
+ log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 503 0",
+ csp->ip_addr_str, http->cmd);
+
write_socket(csp->cfd, buf, strlen(buf));
return;
}
#ifdef KILLPOPUPS
/* Filter the popups on this read. */
- if ( IS_TOGGLED_ON
- ( kill_all_popups ||
- ( ( http->host != NULL ) && ( popupfile != NULL ) ) ) )
+ if (block_popups_now)
{
- filter_popups(csp, http->host, buf, n);
+ filter_popups(buf, n);
}
#endif /* def KILLPOPUPS */
#ifdef PCRS
if (filtering)
{
- re_process_buffer(csp);
+ p = re_process_buffer(csp);
+ hdr = sed(server_patterns, add_server_headers, csp);
+ n = strlen(hdr);
+ if ((write_socket(csp->cfd, hdr, n) != n)
+ || (write_socket(csp->cfd, p, csp->content_length) != csp->content_length))
+ {
+ log_error(LOG_LEVEL_CONNECT, "write modified content to client failed: %E");
+ return;
+ }
+ freez(hdr);
+ freez(p);
}
#endif /* def PCRS */
break; /* "game over, man" */
return;
}
}
+ byte_count += n;
continue;
}
else
* may be in the buffer)
*/
+#ifdef KILLPOPUPS
+ /* Start blocking popups if appropriate. */
+
+ if (csp->is_text && /* It's a text / * MIME-Type */
+ !http->ssl && /* We talk plaintext */
+ block_popups) /* Policy allows */
+ {
+ block_popups_now = 1;
+ }
+
+#endif /* def KILLPOPUPS */
+
#ifdef PCRS
- /* Decide if we want to re_filter this. */
+ /* Start re_filtering this if appropriate. */
- if (IS_TOGGLED_ON /* Only filter if toggle is "on" */
- csp->is_text && /* It's a text / * MIME-Type */
- re_filterfile && /* There are expressions to be used */
+ if (csp->is_text && /* It's a text / * MIME-Type */
!http->ssl && /* We talk plaintext */
- (re_filter_all || !csp->send_user_cookie)) /* Policy allows */
+ pcrs_filter) /* Policy allows */
{
filtering = 1;
}
#endif /* def PCRS */
-
- if ((write_socket(csp->cfd, hdr, n) != n)
- || (NOT_FILTERING_AND (flush_socket(csp->cfd, csp) < 0)))
+ if (NOT_FILTERING_AND ((write_socket(csp->cfd, hdr, n) != n)
+ || (n = flush_socket(csp->cfd, csp) < 0)))
{
log_error(LOG_LEVEL_CONNECT, "write header to client failed: %E");
return;
}
+ NOT_FILTERING_AND (byte_count += n);
+
/* we're finished with the server's header */
freez(hdr);
return; /* huh? we should never get here */
}
-
+ log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 200 %d",
+ csp->ip_addr_str, http->cmd, byte_count);
}
* Returns : N/A
*
*********************************************************************/
+#ifdef AMIGA
+void serve(struct client_state *csp)
+#else /* ifndef AMIGA */
static void serve(struct client_state *csp)
+#endif /* def AMIGA */
{
chat(csp);
close_socket(csp->cfd);
#endif
{
configfile =
-#ifndef _WIN32
+#ifdef AMIGA
+ "AmiTCP:db/junkbuster.config"
+#elif !defined(_WIN32)
"config"
#else
"junkbstr.txt"
}
#endif /* !defined(_WIN32) || defined(_WIN_CONSOLE) */
+#ifdef AMIGA
+ InitAmiga();
+#endif
+
Argc = argc;
Argv = argv;
configfile = argv[1];
}
- remove_all_loaders();
- memset( proxy_args, 0, sizeof( proxy_args ) );
files->next = NULL;
- load_config( 0 );
-
- /*
- * Since load_config acts as a signal handler too, it returns
- * its status in configret. Check it for an error in loading.
- */
- if ( 0 != configret )
- {
- /* load config failed! Exit with error. */
- return( 1 );
- }
-
#ifdef _WIN32
InitWin32();
#endif
#ifndef _WIN32
signal(SIGPIPE, SIG_IGN);
signal(SIGCHLD, SIG_IGN);
- signal(SIGHUP, load_config);
#else /* ifdef _WIN32 */
# ifdef _WIN_CONSOLE
{
struct client_state *csp = NULL;
int bfd;
+ struct configuration_spec * config;
+
+ config = load_config();
log_error(LOG_LEVEL_CONNECT, "bind (%s, %d)",
- haddr ? haddr : "INADDR_ANY", hport);
+ config->haddr ? config->haddr : "INADDR_ANY", config->hport);
- bfd = bind_port(haddr, hport);
- config_changed = 0;
+ bfd = bind_port(config->haddr, config->hport);
if (bfd < 0)
{
- log_error(LOG_LEVEL_ERROR, "can't bind %s:%d: %E "
+ log_error(LOG_LEVEL_FATAL, "can't bind %s:%d: %E "
"- There may be another junkbuster or some other "
"proxy running on port %d",
- (NULL != haddr) ? haddr : "INADDR_ANY", hport, hport
+ (NULL != config->haddr) ? config->haddr : "INADDR_ANY",
+ config->hport, config->hport
);
+ /* shouldn't get here */
return;
}
+ config->need_bind = 0;
+
while (FOREVER)
{
#endif /* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) */
sweep();
- if ( NULL == (csp = (struct client_state *) malloc(sizeof(*csp))) )
+ if ( NULL == (csp = (struct client_state *) zalloc(sizeof(*csp))) )
{
- log_error(LOG_LEVEL_ERROR, "malloc(%d) for csp failed: %E", sizeof(*csp));
+ log_error(LOG_LEVEL_FATAL, "malloc(%d) for csp failed: %E", sizeof(*csp));
continue;
}
csp->active = 1;
csp->sfd = -1;
- if ( config_changed )
+ csp->config = config = load_config();
+
+ if ( config->need_bind )
{
/*
* Since we were listening to the "old port", we will not see
* request. This should not be a so common of an operation
* that this will hurt people's feelings.
*/
+
close_socket(bfd);
log_error(LOG_LEVEL_CONNECT, "bind (%s, %d)",
- haddr ? haddr : "INADDR_ANY", hport);
- bfd = bind_port(haddr, hport);
+ config->haddr ? config->haddr : "INADDR_ANY", config->hport);
+ bfd = bind_port(config->haddr, config->hport);
+
+ if (bfd < 0)
+ {
+ log_error(LOG_LEVEL_FATAL, "can't bind %s:%d: %E "
+ "- There may be another junkbuster or some other "
+ "proxy running on port %d",
+ (NULL != config->haddr) ? config->haddr : "INADDR_ANY",
+ config->hport, config->hport
+ );
+ /* shouldn't get here */
+ return;
+ }
- config_changed = 0;
+ config->need_bind = 0;
}
log_error(LOG_LEVEL_CONNECT, "accept connection ... ");
if (!accept_connection(csp, bfd))
{
log_error(LOG_LEVEL_CONNECT, "accept failed: %E");
-\r
-#ifdef AMIGA\r
- if(!childs)\r
- {\r
- exit(1); \r
- }\r
-#endif\r
+
+#ifdef AMIGA
+ if(!childs)
+ {
+ exit(1);
+ }
+#endif
+ freez(csp);
continue;
}
else
csp->toggled_on = g_bToggleIJB;
#endif
- /* add it to the list of clients */
- csp->next = clients->next;
- clients->next = csp;
-
if (run_loader(csp))
{
- log_error(LOG_LEVEL_ERROR, "a loader failed - must exit");
- return;
+ log_error(LOG_LEVEL_FATAL, "a loader failed - must exit");
+ /* Never get here - LOG_LEVEL_FATAL causes program exit */
+ }
+
+ if (block_acl(NULL,csp))
+ {
+ log_error(LOG_LEVEL_CONNECT, "Connection dropped due to ACL");
+ close_socket(csp->cfd);
+ freez(csp);
+ continue;
}
- if (multi_threaded)
+ /* add it to the list of clients */
+ csp->next = clients->next;
+ clients->next = csp;
+
+ if (config->multi_threaded)
{
int child_id;
}
#endif
-#if defined(AMIGA) && !defined(SELECTED_ONE_OPTION)\r
-#define SELECTED_ONE_OPTION\r
- csp->cfd = ReleaseSocket(csp->cfd, -1);\r
- if((child_id = (int)CreateNewProcTags(\r
- NP_Entry, (ULONG)server_thread,\r
- NP_Output, Output(),\r
- NP_CloseOutput, FALSE,\r
- NP_Name, (ULONG)"junkbuster child",\r
- NP_StackSize, 20*1024,\r
- TAG_DONE)))\r
- {\r
- childs++;\r
- ((struct Task *)child_id)->tc_UserData = csp;\r
- Signal((struct Task *)child_id, SIGF_SINGLE);\r
- Wait(SIGF_SINGLE);\r
- }\r
-#endif\r
-\r
+#if defined(AMIGA) && !defined(SELECTED_ONE_OPTION)
+#define SELECTED_ONE_OPTION
+ csp->cfd = ReleaseSocket(csp->cfd, -1);
+ if((child_id = (int)CreateNewProcTags(
+ NP_Entry, (ULONG)server_thread,
+ NP_Output, Output(),
+ NP_CloseOutput, FALSE,
+ NP_Name, (ULONG)"junkbuster child",
+ NP_StackSize, 20*1024,
+ TAG_DONE)))
+ {
+ childs++;
+ ((struct Task *)child_id)->tc_UserData = csp;
+ Signal((struct Task *)child_id, SIGF_SINGLE);
+ Wait(SIGF_SINGLE);
+ }
+#endif
+
#if !defined(SELECTED_ONE_OPTION)
child_id = fork();
#endif
projects / privoxy.git / blobdiff