X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=filters.c;h=5e26f502b8340130c55b31f0c2c1b4b5581b027a;hp=b2940c1b8f0097b0b2699e7ca126191526a911a8;hb=f090cfd5f7af75c6133110de7db72ac39d9ec870;hpb=f4107f65b676b63a199fe4230e58695757f9f199

diff --git a/filters.c b/filters.c
index b2940c1b..5e26f502 100644
--- a/filters.c
+++ b/filters.c
@@ -1,4 +1,4 @@
-const char filters_rcs[] = "$Id: filters.c,v 1.103 2008/03/06 16:33:45 fabiankeil Exp $";
+const char filters_rcs[] = "$Id: filters.c,v 1.110 2008/11/10 16:40:25 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/filters.c,v $
@@ -10,8 +10,8 @@ const char filters_rcs[] = "$Id: filters.c,v 1.103 2008/03/06 16:33:45 fabiankei
  *                   `filter_popups', `forward_url', 'redirect_url',
  *                   `ij_untrusted_url', `intercept_url', `pcrs_filter_respose',
  *                   `ijb_send_banner', `trust_url', `gif_deanimate_response',
- *                   `jpeg_inspect_response', `execute_single_pcrs_command',
- *                   `rewrite_url', `get_last_url'
+ *                   `execute_single_pcrs_command', `rewrite_url',
+ *                   `get_last_url'
  *
  * Copyright   :  Written by and Copyright (C) 2001, 2004-2008 the SourceForge
  *                Privoxy team. http://www.privoxy.org/
@@ -40,6 +40,32 @@ const char filters_rcs[] = "$Id: filters.c,v 1.103 2008/03/06 16:33:45 fabiankei
  *
  * Revisions   :
  *    $Log: filters.c,v $
+ *    Revision 1.110  2008/11/10 16:40:25  fabiankeil
+ *    Fix a gcc44 warning.
+ *
+ *    Revision 1.109  2008/11/08 15:48:41  fabiankeil
+ *    Mention actual values when complaining about
+ *    the chunk size exceeding the buffer size.
+ *
+ *    Revision 1.108  2008/05/21 15:35:08  fabiankeil
+ *    - Mark csp as immutable for block_acl().
+ *    - Remove an obsolete complaint about filter_popups().
+ *
+ *    Revision 1.107  2008/05/04 17:52:56  fabiankeil
+ *    Adjust parse_http_url() call to new prototype.
+ *
+ *    Revision 1.106  2008/05/03 16:40:44  fabiankeil
+ *    Change content_filters_enabled()'s parameter from
+ *    csp->action to action so it can be also used in the
+ *    CGI code. Don't bother checking if there are filters
+ *    loaded, as that's somewhat besides the point.
+ *
+ *    Revision 1.105  2008/03/28 15:13:39  fabiankeil
+ *    Remove inspect-jpegs action.
+ *
+ *    Revision 1.104  2008/03/27 18:27:24  fabiankeil
+ *    Remove kill-popups action.
+ *
  *    Revision 1.103  2008/03/06 16:33:45  fabiankeil
  *    If limit-connect isn't used, don't limit CONNECT requests to port 443.
  *
@@ -691,7 +717,7 @@ static jb_err prepare_for_filtering(struct client_state *csp);
  * Returns     : 0 = FALSE (don't block) and 1 = TRUE (do block)
  *
  *********************************************************************/
-int block_acl(struct access_control_addr *dst, struct client_state *csp)
+int block_acl(const struct access_control_addr *dst, const struct client_state *csp)
 {
    struct access_control_list *acl = csp->config->acl;
 
@@ -815,7 +841,7 @@ int acl_addr(const char *aspec, struct access_control_addr *aca)
    aca->mask = 0;
    for (i=1; i <= masklength ; i++)
    {
-      aca->mask |= (1 << (32 - i));
+      aca->mask |= (1U << (32 - i));
    }
 
    /* now mask off the host portion of the ip address
@@ -1729,7 +1755,7 @@ int is_untrusted_url(const struct client_state *csp)
    /*
     * If not, do we maybe trust its referrer?
     */
-   err = parse_http_url(referer, rhttp, csp);
+   err = parse_http_url(referer, rhttp, REQUIRE_PROTOCOL);
    if (err)
    {
       return 1;
@@ -2057,68 +2083,6 @@ static char *gif_deanimate_response(struct client_state *csp)
 }
 
 
-/*********************************************************************
- *
- * Function    :  jpeg_inspect_response
- *
- * Description :  
- *
- * Parameters  :
- *          1  :  csp = Current client state (buffers, headers, etc...)
- *
- * Returns     :  a pointer to the (newly allocated) modified buffer
- *                or NULL in case something went wrong.
- *
- *********************************************************************/
-static char *jpeg_inspect_response(struct client_state *csp)
-{
-   struct binbuffer  *in = NULL;
-   struct binbuffer *out = NULL;
-   char *p = NULL;
-   size_t size;
-
-   size = (size_t)(csp->iob->eod - csp->iob->cur);
-
-   if (NULL == (in =  (struct binbuffer *)zalloc(sizeof *in )))
-   {
-      log_error(LOG_LEVEL_DEANIMATE, "failed! (jpeg no mem 1)");
-      return NULL;
-   }
-
-   if (NULL == (out = (struct binbuffer *)zalloc(sizeof *out)))
-   {
-      log_error(LOG_LEVEL_DEANIMATE, "failed! (jpeg no mem 2)");
-      return NULL;
-   }
-
-   in->buffer = csp->iob->cur;
-   in->size = size;
-
-   /*
-    * Calling jpeg_inspect has the side-effect of creating and 
-    * modifying the image buffer of "out" directly.
-    */
-   if (jpeg_inspect(in, out))
-   {
-      log_error(LOG_LEVEL_DEANIMATE, "failed! (jpeg parsing)");
-      freez(in);
-      buf_free(out);
-      return(NULL);
-
-   }
-   else
-   {
-      csp->content_length = out->offset;
-      csp->flags |= CSP_FLAG_MODIFIED;
-      p = out->buffer;
-      freez(in);
-      freez(out);
-      return(p);
-   }
-
-}
-
-
 /*********************************************************************
  *
  * Function    :  get_filter_function
@@ -2126,12 +2090,6 @@ static char *jpeg_inspect_response(struct client_state *csp)
  * Description :  Decides which content filter function has
  *                to be applied (if any).
  *
- *                XXX: Doesn't handle filter_popups()
- *                because of the different prototype. Probably
- *                we should ditch filter_popups() anyway, it's
- *                even less reliable than popup blocking based
- *                on pcrs filters.
- *
  * Parameters  :
  *          1  :  csp = Current client state (buffers, headers, etc...)
  *
@@ -2190,11 +2148,6 @@ filter_function_ptr get_filter_function(struct client_state *csp)
    {
       filter_function = gif_deanimate_response;
    }
-   else if ((csp->content_type & CT_JPEG)  &&
-            (csp->action->flags & ACTION_JPEG_INSPECT))
-   {
-      filter_function = jpeg_inspect_response;
-   }
 
    return filter_function;
 }
@@ -2232,7 +2185,7 @@ static jb_err remove_chunked_transfer_coding(char *buffer, size_t *size)
       return JB_ERR_PARSE;
    }
 
-   while (chunksize > 0)
+   while (chunksize > 0U)
    {
       if (NULL == (from_p = strstr(from_p, "\r\n")))
       {
@@ -2242,7 +2195,9 @@ static jb_err remove_chunked_transfer_coding(char *buffer, size_t *size)
 
       if ((newsize += chunksize) >= *size)
       {
-         log_error(LOG_LEVEL_ERROR, "Chunksize exceeds buffer in  \"chunked\" transfer coding");
+         log_error(LOG_LEVEL_ERROR,
+            "Chunk size %d exceeds buffer size %d in  \"chunked\" transfer coding",
+            chunksize, *size);
          return JB_ERR_PARSE;
       }
       from_p += 2;
@@ -2724,16 +2679,15 @@ struct http_response *direct_response(struct client_state *csp)
  *                enabled for the current request.
  *
  * Parameters  :  
- *          1  :  csp = Current client state (buffers, headers, etc...)
+ *          1  :  action = Action spec to check.
  *
  * Returns     :  TRUE for yes, FALSE otherwise
  *
  *********************************************************************/
-inline int content_filters_enabled(const struct client_state *csp)
+int content_filters_enabled(const struct current_action_spec *action)
 {
-   return (((csp->rlist != NULL) &&
-      (!list_is_empty(csp->action->multi[ACTION_MULTI_FILTER]))) ||
-      (csp->action->flags & (ACTION_DEANIMATE|ACTION_JPEG_INSPECT)));
+   return ((action->flags & ACTION_DEANIMATE) ||
+      !list_is_empty(action->multi[ACTION_MULTI_FILTER]));
 }
 
 /*