use buildroot, export init to separate file (better manageability)

[privoxy.git] / jcc.c

diff --git a/jcc.c b/jcc.c
index 11c8d5a..102f1b0 100644 (file)
--- a/jcc.c
+++ b/jcc.c
@@ -1,4 +1,4 @@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.16 2001/06/01 18:49:17 jongfoster Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.18 2001/06/03 19:12:16 oes Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jcc.c,v $
@@ -33,6 +33,66 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.16 2001/06/01 18:49:17 jongfoster Exp $";
  *
  * Revisions   :
  *    $Log: jcc.c,v $
+ *    Revision 1.18  2001/06/03 19:12:16  oes
+ *    introduced new cgi handling
+ *
+ *    Revision 1.18  2001/06/03 11:03:48  oes
+ *    Makefile/in
+ *
+ *    introduced cgi.c
+ *
+ *    actions.c:
+ *
+ *    adapted to new enlist_unique arg format
+ *
+ *    conf loadcfg.c
+ *
+ *    introduced confdir option
+ *
+ *    filters.c filtrers.h
+ *
+ *     extracted-CGI relevant stuff
+ *
+ *    jbsockets.c
+ *
+ *     filled comment
+ *
+ *    jcc.c
+ *
+ *     support for new cgi mechansim
+ *
+ *    list.c list.h
+ *
+ *    functions for new list type: "map"
+ *    extended enlist_unique
+ *
+ *    miscutil.c .h
+ *    introduced bindup()
+ *
+ *    parsers.c parsers.h
+ *
+ *    deleted const struct interceptors
+ *
+ *    pcrs.c
+ *    added FIXME
+ *
+ *    project.h
+ *
+ *    added struct map
+ *    added struct http_response
+ *    changes struct interceptors to struct cgi_dispatcher
+ *    moved HTML stuff to cgi.h
+ *
+ *    re_filterfile:
+ *
+ *    changed
+ *
+ *    showargs.c
+ *    NO TIME LEFT
+ *
+ *    Revision 1.17  2001/06/01 20:07:23  jongfoster
+ *    Now uses action +image-blocker{} rather than config->tinygif
+ *
  *    Revision 1.16  2001/06/01 18:49:17  jongfoster
  *    Replaced "list_share" with "list" - the tiny memory gain was not
  *    worth the extra complexity.
@@ -236,6 +296,7 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.16 2001/06/01 18:49:17 jongfoster Exp $";
 #include "jbsockets.h"
 #include "gateway.h"
 #include "actions.h"
+#include "cgi.h"
 
 const char jcc_h_rcs[] = JCC_H_VERSION;
 const char project_h_rcs[] = PROJECT_H_VERSION;
@@ -312,11 +373,11 @@ static void chat(struct client_state *csp)
 #endif /* ndef TOGGLE */
 #ifdef FORCE_LOAD
 #   define IS_NOT_FORCED_AND (!csp->force) && 
-#else /* ifndef TOGGLE */
+#else /* ifndef FORCE_LOAD */
 #   define IS_NOT_FORCED_AND
 #endif /* def FORCE_LOAD */
 
-#define IS_ENABLED_AND IS_TOGGLED_ON_AND IS_NOT_FORCED_AND
+#define IS_ENABLED_AND   IS_TOGGLED_ON_AND IS_NOT_FORCED_AND
 
    char buf[BUFSIZ], *hdr, *p, *req;
    char *err = NULL;
@@ -325,7 +386,7 @@ static void chat(struct client_state *csp)
    int n, maxfd, server_body;
    int ms_iis5_hack = 0;
    int byte_count = 0;
-   const struct gateway *gw;
+   const struct forward_spec * fwd;
    struct http_request *http;
 #ifdef KILLPOPUPS
    int block_popups;         /* bool, 1==will block popups */
@@ -335,6 +396,7 @@ static void chat(struct client_state *csp)
    int pcrs_filter;   /* bool, 1==will filter through pcrs */
    int filtering = 0; /* bool, 1==currently filtering through pcrs */
 #endif /* def PCRS */
+   struct http_response *rsp;
 
    http = csp->http;
 
@@ -397,7 +459,7 @@ static void chat(struct client_state *csp)
 
    /* decide how to route the HTTP request */
 
-   if ((gw = forward_url(http, csp)) == NULL)
+   if ((fwd = forward_url(http, csp)) == NULL)
    {
       log_error(LOG_LEVEL_FATAL, "gateway spec is NULL!?!?  This can't happen!");
       /* Never get here - LOG_LEVEL_FATAL causes program exit */
@@ -428,7 +490,7 @@ static void chat(struct client_state *csp)
     *
     */
 
-   if (gw->forward_host)
+   if (fwd->forward_host)
    {
       /* if forwarding, just pass the request as is */
       enlist(csp->headers, http->cmd);
@@ -518,17 +580,23 @@ static void chat(struct client_state *csp)
     * we're toggled off or in force mode. 
     */
  
-   if (intercept_url(http, csp))
+   if (NULL != (rsp = cgi_dispatch(csp)))
    {
-      /*
-       * The interceptor will write out the data.
-       * We don't need to do anything else
-       */
+          if(0 != (n = make_http_response(rsp)))
+      {
+         if ((write_socket(csp->cfd, rsp->head, n) != n)
+                    || (write_socket(csp->cfd, rsp->body, rsp->content_length) != rsp->content_length))
+         { 
+            log_error(LOG_LEVEL_ERROR, "write to: %s failed: %E", http->host);
+             }
+          }
+
 
 #ifdef STATISTICS
       csp->rejected = 1;
 #endif /* def STATISTICS */
 
+      free_http_response(rsp);
       freez(hdr);
       return;
    }
@@ -615,10 +683,10 @@ static void chat(struct client_state *csp)
 
    log_error(LOG_LEVEL_GPC, "%s%s", http->hostport, http->path);
 
-   if (gw->forward_host)
+   if (fwd->forward_host)
    {
       log_error(LOG_LEVEL_CONNECT, "via %s:%d to: %s",
-               gw->forward_host, gw->forward_port, http->hostport);
+               fwd->forward_host, fwd->forward_port, http->hostport);
    }
    else
    {
@@ -627,7 +695,7 @@ static void chat(struct client_state *csp)
 
    /* here we connect to the server, gateway, or the forwarder */
 
-   csp->sfd = (gw->conn)(gw, http, csp);
+   csp->sfd = forwarded_connect(fwd, http, csp);
 
    if (csp->sfd < 0)
    {
@@ -661,7 +729,7 @@ static void chat(struct client_state *csp)
 
    log_error(LOG_LEVEL_CONNECT, "OK");
 
-   if (gw->forward_host || (http->ssl == 0))
+   if (fwd->forward_host || (http->ssl == 0))
    {
       /* write the client's (modified) header to the server
        * (along with anything else that may be in the buffer)