X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=jcc.c;h=62694b0c00075307daaf6f8992e5489f39bb2fb1;hp=0997ef866018d9df54a95fff33da91735bfaece4;hb=843a317efcb345c83d9f1d76890fdb5465fb014a;hpb=52bd067225c1e12ecf7156e5707161ed7df8e8c4 diff --git a/jcc.c b/jcc.c index 0997ef86..62694b0c 100644 --- a/jcc.c +++ b/jcc.c @@ -1,4 +1,4 @@ -const char jcc_rcs[] = "$Id: jcc.c,v 1.80 2002/03/11 22:07:05 david__schmidt Exp $"; +const char jcc_rcs[] = "$Id: jcc.c,v 1.91 2002/04/08 20:35:58 swa Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/jcc.c,v $ @@ -7,7 +7,7 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.80 2002/03/11 22:07:05 david__schmidt Exp * 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 @@ -33,6 +33,43 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.80 2002/03/11 22:07:05 david__schmidt Exp * * Revisions : * $Log: jcc.c,v $ + * Revision 1.91 2002/04/08 20:35:58 swa + * fixed JB spelling + * + * Revision 1.90 2002/04/02 14:57:28 oes + * Made sending wafers independent of FEATURE_COOKIE_JAR + * + * Revision 1.89 2002/03/31 17:18:59 jongfoster + * Win32 only: Enabling STRICT to fix a VC++ compile warning. + * + * Revision 1.88 2002/03/27 14:32:43 david__schmidt + * More compiler warning message maintenance + * + * Revision 1.87 2002/03/26 22:29:54 swa + * we have a new homepage! + * + * Revision 1.86 2002/03/25 17:04:55 david__schmidt + * Workaround for closing the jarfile before load_config() comes around again + * + * Revision 1.85 2002/03/24 15:23:33 jongfoster + * Name changes + * + * Revision 1.84 2002/03/24 13:25:43 swa + * name change related issues + * + * Revision 1.83 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.82 2002/03/13 00:27:05 jongfoster + * Killing warnings + * + * Revision 1.81 2002/03/12 01:42:50 oes + * Introduced modular filters + * * Revision 1.80 2002/03/11 22:07:05 david__schmidt * OS/2 port maintenance: * - Fixed EMX build - it had decayed a little @@ -502,6 +539,9 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.80 2002/03/11 22:07:05 david__schmidt Exp #ifdef _WIN32 # ifndef FEATURE_PTHREAD +# ifndef STRICT +# define STRICT +# endif # include # include # endif /* ndef FEATURE_PTHREAD */ @@ -580,6 +620,9 @@ int urls_read = 0; /* total nr of urls read inc rejected */ int urls_rejected = 0; /* total nr of urls rejected */ #endif /* def FEATURE_STATISTICS */ +#ifdef FEATURE_GRACEFUL_TERMINATION +int g_terminate = 0; +#endif static void listen_loop(void); static void chat(struct client_state *csp); @@ -741,13 +784,20 @@ static void chat(struct client_state *csp) * could get blocked here if a client connected, then didn't say anything! */ - while (FOREVER) + for (;;) { len = read_socket(csp->cfd, buf, sizeof(buf)); if (len <= 0) break; /* error! */ - - add_to_iob(csp, buf, len); + + /* + * If there is no memory left for buffering the + * request, there is nothing we can do but hang up + */ + if (add_to_iob(csp, buf, len)) + { + return; + } req = get_header(csp); @@ -930,19 +980,15 @@ static void chat(struct client_state *csp) enlist(csp->headers, http->cmd); -#ifdef FEATURE_COOKIE_JAR /* - * If we're logging cookies in a cookie jar, and the user has not - * supplied any wafers, and the user has not told us to suppress the - * vanilla wafer, then send the vanilla wafer. + * If the user has not supplied any wafers, and the user has not + * told us to suppress the vanilla wafer, then send the vanilla wafer. */ - if ((csp->config->jarfile != NULL) - && list_is_empty(csp->action->multi[ACTION_MULTI_WAFER]) + if (list_is_empty(csp->action->multi[ACTION_MULTI_WAFER]) && ((csp->action->flags & ACTION_VANILLA_WAFER) != 0)) { enlist(csp->action->multi[ACTION_MULTI_WAFER], VANILLA_WAFER); } -#endif /* def FEATURE_COOKIE_JAR */ #ifdef FEATURE_KILL_POPUPS @@ -956,9 +1002,9 @@ static void chat(struct client_state *csp) /* grab the rest of the client's headers */ - while (FOREVER) + for (;;) { - if ( ( p = get_header(csp) ) && ( *p == '\0' ) ) + if ( ( ( p = get_header(csp) ) != NULL) && ( *p == '\0' ) ) { len = read_socket(csp->cfd, buf, sizeof(buf)); if (len <= 0) @@ -966,7 +1012,15 @@ static void chat(struct client_state *csp) log_error(LOG_LEVEL_ERROR, "read from client failed: %E"); return; } - add_to_iob(csp, buf, len); + + /* + * If there is no memory left for buffering the + * request, there is nothing we can do but hang up + */ + if (add_to_iob(csp, buf, len)) + { + return; + } continue; } @@ -1146,7 +1200,7 @@ static void chat(struct client_state *csp) server_body = 0; - while (FOREVER) + for (;;) { #ifdef __OS2__ /* @@ -1160,7 +1214,7 @@ static void chat(struct client_state *csp) FD_SET(csp->cfd, &rfds); FD_SET(csp->sfd, &rfds); - n = select(maxfd+1, &rfds, NULL, NULL, NULL); + n = select((int)maxfd+1, &rfds, NULL, NULL, NULL); if (n < 0) { @@ -1181,7 +1235,7 @@ static void chat(struct client_state *csp) break; /* "game over, man" */ } - if (write_socket(csp->sfd, buf, len)) + if (write_socket(csp->sfd, buf, (size_t)len)) { log_error(LOG_LEVEL_ERROR, "write to: %s failed: %E", http->host); return; @@ -1323,39 +1377,50 @@ static void chat(struct client_state *csp) { if (content_filter) { - add_to_iob(csp, buf, len); - /* - * If the buffer limit will be reached on the next read, - * switch to non-filtering mode, i.e. make & write the - * header, flush the socket and get out of the way. + * If there is no memory left for buffering the content, or the buffer limit + * has been reached, switch to non-filtering mode, i.e. make & write the + * header, flush the iob and buf, and get out of the way. */ - if (((size_t)(csp->iob->eod - csp->iob->buf)) + (size_t)BUFFER_SIZE > csp->config->buffer_limit) + if (add_to_iob(csp, buf, len)) { - log_error(LOG_LEVEL_ERROR, "Buffer size limit reached! Flushing and stepping back."); + size_t hdrlen; + int flushed; + + log_error(LOG_LEVEL_ERROR, "Flushing header and buffers. Stepping back from filtering."); hdr = sed(server_patterns, add_server_headers, csp); if (hdr == NULL) { - /* FIXME Should handle error properly */ - log_error(LOG_LEVEL_FATAL, "Out of memory parsing server header"); + /* + * Memory is too tight to even generate the header. + * Send our static "Out-of-memory" page. + */ + log_error(LOG_LEVEL_ERROR, "Out of memory while trying to flush."); + rsp = cgi_error_memory(); + + if (write_socket(csp->cfd, rsp->head, rsp->head_length) + || write_socket(csp->cfd, rsp->body, rsp->content_length)) + { + log_error(LOG_LEVEL_ERROR, "write to: %s failed: %E", http->host); + } + return; } - len = strlen(hdr); - byte_count += len; + hdrlen = strlen(hdr); - if (write_socket(csp->cfd, hdr, len) - || (len = flush_socket(csp->cfd, csp) < 0)) + if (write_socket(csp->cfd, hdr, hdrlen) + || ((flushed = flush_socket(csp->cfd, csp)) < 0) + || (write_socket(csp->cfd, buf, len))) { - log_error(LOG_LEVEL_CONNECT, "write header to client failed: %E"); + log_error(LOG_LEVEL_CONNECT, "Flush header and buffers to client failed: %E"); freez(hdr); return; } + byte_count += hdrlen + flushed + len; freez(hdr); - byte_count += len; - content_filter = NULL; server_body = 1; @@ -1363,7 +1428,7 @@ static void chat(struct client_state *csp) } else { - if (write_socket(csp->cfd, buf, len)) + if (write_socket(csp->cfd, buf, (size_t)len)) { log_error(LOG_LEVEL_ERROR, "write to client failed: %E"); return; @@ -1379,12 +1444,27 @@ static void chat(struct client_state *csp) * parsing an "out of body experience" ? */ - /* buffer up the data we just read */ - add_to_iob(csp, buf, len); + /* + * buffer up the data we just read. If that fails, + * there's little we can do but send our static + * out-of-memory page. + */ + if (add_to_iob(csp, buf, len)) + { + log_error(LOG_LEVEL_ERROR, "Out of memory while looking for end of server headers."); + rsp = cgi_error_memory(); + + if (write_socket(csp->cfd, rsp->head, rsp->head_length) + || write_socket(csp->cfd, rsp->body, rsp->content_length)) + { + log_error(LOG_LEVEL_ERROR, "write to: %s failed: %E", http->host); + } + return; + } /* get header lines from the iob */ - while ((p = get_header(csp))) + while ((p = get_header(csp)) != NULL) { if (*p == '\0') { @@ -1480,10 +1560,8 @@ static void chat(struct client_state *csp) * may be in the buffer) */ - len = strlen(hdr); - - if (write_socket(csp->cfd, hdr, len) - || (len = flush_socket(csp->cfd, csp) < 0)) + if (write_socket(csp->cfd, hdr, strlen(hdr)) + || ((len = flush_socket(csp->cfd, csp)) < 0)) { log_error(LOG_LEVEL_CONNECT, "write header to client failed: %E"); @@ -1591,7 +1669,7 @@ static int32 server_thread(void *data) *********************************************************************/ void usage(const char *myname) { - printf("JunkBuster proxy version " VERSION " (" HOME_PAGE_URL ")\n" + printf("Privoxy version " VERSION " (" HOME_PAGE_URL ")\n" "Usage: %s [--help] [--version] [--no-daemon] [--pidfile pidfile] [--user user[.group]] [configfile]\n" "Aborting.\n", myname); @@ -1661,7 +1739,7 @@ int main(int argc, const char *argv[]) else if(strcmp(argv[argc_pos], "--version") == 0) { - printf("Junkbuster version " VERSION " (" HOME_PAGE_URL ")\n"); + printf("Privoxy version " VERSION " (" HOME_PAGE_URL ")\n"); exit(0); } @@ -1886,7 +1964,7 @@ int main(int argc, const char *argv[]) * on failure. * * Parameters : - * 1 : config = Junkbuster configuration. Specifies port + * 1 : config = Privoxy configuration. Specifies port * to bind to. * * Returns : Port that was opened. @@ -1925,7 +2003,7 @@ static jb_socket bind_port_helper(struct configuration_spec * config) { case -3 : log_error(LOG_LEVEL_FATAL, "can't bind to %s:%d: " - "There may be another junkbuster or some other " + "There may be another Privoxy or some other " "proxy running on port %d", (NULL != config->haddr) ? config->haddr : "INADDR_ANY", config->hport, config->hport); @@ -1971,7 +2049,11 @@ static void listen_loop(void) bfd = bind_port_helper(config); - while (FOREVER) +#ifdef FEATURE_GRACEFUL_TERMINATION + while (!g_terminate) +#else + for (;;) +#endif { #if !defined(FEATURE_PTHREAD) && !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) && !defined(__OS2__) while (waitpid(-1, NULL, WNOHANG) > 0) @@ -1996,6 +2078,23 @@ static void listen_loop(void) } #endif +#ifdef __OS2__ +#ifdef FEATURE_COOKIE_JAR + /* + * Need a workaround here: we have to fclose() the jarfile, or we die because it's + * already open. I think unload_configfile() is not being run, which should do + * this work. Until that can get resolved, we'll use this workaround. + */ + if (csp) + if(csp->config) + if (csp->config->jar) + { + fclose(csp->config->jar); + csp->config->jar = NULL; + } +#endif /* FEATURE_COOKIE_JAR */ +#endif /* __OS2__ */ + if ( NULL == (csp = (struct client_state *) zalloc(sizeof(*csp))) ) { log_error(LOG_LEVEL_FATAL, "malloc(%d) for csp failed: %E", sizeof(*csp)); @@ -2099,7 +2198,7 @@ static void listen_loop(void) #if defined(_WIN32) && !defined(_CYGWIN) && !defined(SELECTED_ONE_OPTION) #define SELECTED_ONE_OPTION child_id = _beginthread( - (void*)serve, + (void (*)(void *))serve, 64 * 1024, csp); #endif @@ -2107,7 +2206,7 @@ static void listen_loop(void) #if defined(__OS2__) && !defined(SELECTED_ONE_OPTION) #define SELECTED_ONE_OPTION child_id = _beginthread( - serve, + (void(* _Optlink)(void*))serve, NULL, 64 * 1024, csp); @@ -2137,7 +2236,7 @@ static void listen_loop(void) NP_Entry, (ULONG)server_thread, NP_Output, Output(), NP_CloseOutput, FALSE, - NP_Name, (ULONG)"junkbuster child", + NP_Name, (ULONG)"privoxy child", NP_StackSize, 200*1024, TAG_DONE))) { @@ -2185,7 +2284,7 @@ static void listen_loop(void) log_error(LOG_LEVEL_ERROR, "can't fork: %E"); - sprintf(buf , "JunkBuster: can't fork: errno = %d", errno); + sprintf(buf , "Privoxy: can't fork: errno = %d", errno); write_socket(csp->cfd, buf, strlen(buf)); close_socket(csp->cfd); @@ -2199,7 +2298,48 @@ static void listen_loop(void) serve(csp); } } - /* NOTREACHED */ + + /* NOTREACHED unless FEATURE_GRACEFUL_TERMINATION is defined */ + + /* Clean up. Aim: free all memory (no leaks) */ +#ifdef FEATURE_GRACEFUL_TERMINATION + + log_error(LOG_LEVEL_ERROR, "Graceful termination requested"); + + unload_current_config_file(); + unload_current_actions_file(); + unload_current_re_filterfile(); +#ifdef FEATURE_TRUST + unload_current_trust_file(); +#endif + + if (config->multi_threaded) + { + int i = 60; + do + { + sleep(1); + sweep(); + } while ((clients->next != NULL) && (--i > 0)); + + if (i <= 0) + { + log_error(LOG_LEVEL_ERROR, "Graceful termination failed - still some live clients after 1 minute wait."); + } + } + sweep(); + sweep(); + +#if defined(unix) + free(basedir); +#endif +#if defined(_WIN32) && !defined(_WIN_CONSOLE) + /* Cleanup - remove taskbar icon etc. */ + TermLogWindow(); +#endif + + exit(0); +#endif /* FEATURE_GRACEFUL_TERMINATION */ }