X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=project.h;h=bd89848e84ae2f6d7e297e092ecb3ad035845fc7;hb=695e02abafd32cf0c03aa5ec6b55828c82bfac4c;hp=7830259aec621e43a905e1e8a2ba75f877f29df1;hpb=b28e9205bb0d4ac98d591c6e506219438799d56c;p=privoxy.git

diff --git a/project.h b/project.h
index 7830259a..bd89848e 100644
--- a/project.h
+++ b/project.h
@@ -1,6 +1,6 @@
-#ifndef _PROJECT_H
-#define _PROJECT_H
-#define PROJECT_H_VERSION "$Id: project.h,v 1.19 2001/06/29 13:33:36 oes Exp $"
+#ifndef PROJECT_H_INCLUDED
+#define PROJECT_H_INCLUDED
+#define PROJECT_H_VERSION "$Id: project.h,v 1.26 2001/07/30 22:08:36 jongfoster Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/project.h,v $
@@ -36,6 +36,36 @@
  *
  * Revisions   :
  *    $Log: project.h,v $
+ *    Revision 1.26  2001/07/30 22:08:36  jongfoster
+ *    Tidying up #defines:
+ *    - All feature #defines are now of the form FEATURE_xxx
+ *    - Permanently turned off WIN_GUI_EDIT
+ *    - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS
+ *
+ *    Revision 1.25  2001/07/29 18:43:08  jongfoster
+ *    Changing #ifdef _FILENAME_H to FILENAME_H_INCLUDED, to conform to
+ *    ANSI C rules.
+ *
+ *    Revision 1.24  2001/07/25 17:20:27  oes
+ *    Introduced http->user_agent
+ *
+ *    Revision 1.23  2001/07/18 12:32:23  oes
+ *    - Added ACTION_STRING_DEANIMATE
+ *    - moved #define freez from jcc.h to project.h
+ *
+ *    Revision 1.22  2001/07/15 17:51:41  jongfoster
+ *    Renaming #define STATIC to STATIC_PCRE
+ *
+ *    Revision 1.21  2001/07/13 14:03:19  oes
+ *     - Reorganized regex header inclusion and #defines to
+ *       comply to the scheme in configure.in
+ *     - Added csp->content_type and its CT_* keys
+ *     - Added ACTION_DEANIMATE
+ *     - Removed all #ifdef PCRS
+ *
+ *    Revision 1.20  2001/06/29 21:45:41  oes
+ *    Indentation, CRLF->LF, Tab-> Space
+ *
  *    Revision 1.19  2001/06/29 13:33:36  oes
  *    - Improved comments
  *    - Introduced http_request.host_ip_addr_str
@@ -213,39 +243,38 @@
 
 /*
  * Include appropriate regular expression libraries.
- *
- * PCRS           ==> Include pcre
- * REGEX && PCRE  ==> Include pcre and pcreposix
- * REGEX && !PCRE ==> Include gnu_regex
- *
- * STATIC  ==> Use  #include "pcre.h"  (compiling at same time)
- * !STATIC ==> Use  #include <pcre.h>  (System library)
- *
+ * Note that pcrs and pcre (native) are needed for cgi
+ * and are included anyway.
  */
-#if (defined(REGEX) && defined(PCRE)) || defined(PCRS)
-#  ifdef STATIC
-#    include "pcre.h"
-#  else
-#    include <pcre.h>
-#  endif
-#endif /* (defined(REGEX) && defined(PCRE)) || defined(PCRS) */
 
-#if defined(REGEX) && defined(PCRE)
-#  ifdef STATIC
+#if defined(REGEX_PCRE) || defined (REGEX_GNU)
+# define REGEX
+#endif /* defined(REGEX_PCRE) || defined (REGEX_GNU) */
+
+#ifdef STATIC_PCRE
+#  include "pcre.h"
+#else
+#  include <pcre.h>
+#endif
+
+#ifdef STATIC_PCRS
+#  include "pcrs.h" 
+#else
+#  include <pcrs.h> 
+#endif
+
+#if defined(REGEX_PCRE)
+#  ifdef STATIC_PCRE
 #    include "pcreposix.h"
 #  else
 #    include <pcreposix.h>
 #  endif
-#endif /* defined(REGEX) && defined(PCRE) */
+#endif /* defined(REGEX_PCRE) */
 
-#if defined(REGEX) && !defined(PCRE)
+#if defined(REGEX_GNU)
 #  include "gnu_regex.h"
 #endif
 
-#ifdef PCRS
-#include "pcrs.h"
-#endif /* def PCRS */
-
 #ifdef AMIGA 
 #include "amiga.h" 
 #endif /* def AMIGA */
@@ -254,6 +283,8 @@
 extern "C" {
 #endif
 
+#define freez(X)  if(X) free(X); X = NULL
+
 #define BUFFER_SIZE 5000
 
 #define FOREVER 1
@@ -274,11 +305,17 @@ struct list /* FIXME: Why not separate entries and header? */
    struct list *next;
 };
 
+struct map_entry
+{
+   const char *name;
+   const char *value;
+   struct map_entry *next;
+};
+
 struct map
 {
-  char *name;
-  char *value;
-  struct map *next;
+   struct map_entry *first;
+   struct map_entry *last;
 };
 
 struct http_request
@@ -292,6 +329,7 @@ struct http_request
    char *ver;
    char *hostport; /* "host[:port]" */
    int   ssl;
+   char *user_agent; /* Client's User-Agent: header value */
 };
 
 /* Response generated by CGI, blocker, or error handler */
@@ -331,11 +369,11 @@ struct url_spec
 #endif
 };
 
+/* Constants for host part matching in URLs */
 #define ANCHOR_LEFT  1
 #define ANCHOR_RIGHT 2
 
 
-
 /* An I/O buffer */
 struct iob
 {
@@ -348,13 +386,16 @@ struct iob
 #define IOB_PEEK(CSP) ((CSP->iob->cur > CSP->iob->eod) ? (CSP->iob->eod - CSP->iob->cur) : 0)
 #define IOB_RESET(CSP) if(CSP->iob->buf) free(CSP->iob->buf); memset(CSP->iob, '\0', sizeof(CSP->iob));
 
-
+/* Keys for csp->content_type */
+#define CT_TEXT 0x01U
+#define CT_GIF  0x02U
 
 #define ACTION_MASK_ALL        (~0U)
 
 #define ACTION_MOST_COMPATIBLE 0x0000U
 
 #define ACTION_BLOCK           0x0001U
+#define ACTION_DEANIMATE       0x2000U
 #define ACTION_FAST_REDIRECTS  0x0002U
 #define ACTION_FILTER          0x0004U
 #define ACTION_HIDE_FORWARDED  0x0008U
@@ -368,11 +409,13 @@ struct iob
 #define ACTION_NO_POPUPS       0x0800U
 #define ACTION_VANILLA_WAFER   0x1000U
 
-#define ACTION_STRING_FROM          0
-#define ACTION_STRING_IMAGE_BLOCKER 1
-#define ACTION_STRING_REFERER       2
-#define ACTION_STRING_USER_AGENT    3
-#define ACTION_STRING_COUNT         4
+#define ACTION_STRING_DEANIMATE     0
+#define ACTION_STRING_FROM          1
+#define ACTION_STRING_IMAGE_BLOCKER 2
+#define ACTION_STRING_REFERER       3
+#define ACTION_STRING_USER_AGENT    4
+#define ACTION_STRING_COUNT         5
+
 
 #define ACTION_MULTI_ADD_HEADER     0
 #define ACTION_MULTI_WAFER          1
@@ -441,7 +484,7 @@ struct url_actions
 
 /* Constants defining bitmask for csp->accept_types */
 
-#ifdef DETECT_MSIE_IMAGES
+#ifdef FEATURE_IMAGE_DETECT_MSIE
 
 /* MSIE detected by user-agent string */
 #define ACCEPT_TYPE_IS_MSIE     0x0001
@@ -459,7 +502,7 @@ struct url_actions
  */
 #define ACCEPT_TYPE_MSIE_HTML   0x0004
 
-#endif /* def DETECT_MSIE_IMAGES */
+#endif /* def FEATURE_IMAGE_DETECT_MSIE */
 
 
 struct client_state
@@ -477,20 +520,20 @@ struct client_state
    int  sfd;
 
 
-#ifdef STATISTICS
+#ifdef FEATURE_STATISTICS
    /* 1 if this URL was rejected, 0 otherwise. Allows actual stats inc to 
     * occur in main thread only for thread-safety. 
     */
    int  rejected;
-#endif /* def STATISTICS */
+#endif /* def FEATURE_STATISTICS */
 
-#ifdef FORCE_LOAD
+#ifdef FEATURE_FORCE_LOAD
    int force;
-#endif /* def FORCE_LOAD */
+#endif /* def FEATURE_FORCE_LOAD */
 
-#ifdef TOGGLE
+#ifdef FEATURE_TOGGLE
    int   toggled_on;
-#endif /* def TOGGLE */
+#endif /* def FEATURE_TOGGLE */
 
    /*
     * Client PC's IP address, as reported by the accept()_ function.
@@ -507,17 +550,17 @@ struct client_state
    char *my_ip_addr_str;
    char *my_hostname;
 
-#ifdef TRUST_FILES
+#ifdef FEATURE_TRUST
    /* The referer in this request, if one was specified. */
    char *referrer;
-#endif /* def TRUST_FILES */
+#endif /* def FEATURE_TRUST */
 
-#if defined(DETECT_MSIE_IMAGES)
+#if defined(FEATURE_IMAGE_DETECT_MSIE)
    /* Types the client will accept.
     * Bitmask - see ACCEPT_TYPE_XXX constants.
     */
    int accept_types;
-#endif /* defined(DETECT_MSIE_IMAGES) */
+#endif /* defined(FEATURE_IMAGE_DETECT_MSIE) */
 
    /* The URL that was requested */
    struct http_request http[1];
@@ -531,10 +574,8 @@ struct client_state
    /* List of all cookies for this request */
    struct list cookie_list[1];
 
-#if defined(PCRS) || defined(KILLPOPUPS)
-   /* Nonzero if this has a text MIME type */
-   int is_text;
-#endif /* defined(PCRS) || defined(KILLPOPUPS) */
+   /* MIME-Type bitmap, see CT_* above */
+   unsigned char content_type;
 
    /* The "X-Forwarded-For:" header sent by the client */
    char   *x_forwarded;
@@ -548,14 +589,12 @@ struct client_state
    /* files associated with this client */
    struct file_list *actions_list;
 
-#ifdef PCRS
-     struct file_list *rlist;   /* Perl re_filterfile */
-     size_t content_length;     /* Length after processing */ 
-#endif /* def PCRS */
+   struct file_list *rlist;   /* pcrs job file */
+   size_t content_length;     /* Length after content modification */ 
 
-#ifdef TRUST_FILES
+#ifdef FEATURE_TRUST
    struct file_list *tlist;   /* trustfile */
-#endif /* def TRUST_FILES */
+#endif /* def FEATURE_TRUST */
 
    struct client_state *next;
 };
@@ -595,13 +634,6 @@ struct file_list
    /* Used internally by sweep().  Do not access from elsewhere. */
    int active;
 
-#ifndef SPLIT_PROXY_ARGS
-   /* String to be displayed as part of show-proxy-args display.
-    * Read-only once the structure has been created.
-    */
-   char *proxy_args;
-#endif /* ndef SPLIT_PROXY_ARGS */
-
    /* Following variables allow us to check if file has been changed.
     * Read-only once the structure has been created.
     */
@@ -618,14 +650,14 @@ struct file_list
 };
 
 
-#ifdef TRUST_FILES
+#ifdef FEATURE_TRUST
 struct block_spec
 {
    struct url_spec url[1];
    int    reject;
    struct block_spec *next;
 };
-#endif /* def TRUST_FILES */
+#endif /* def FEATURE_TRUST */
 
 
 #define SOCKS_NONE    0    /* Don't use a SOCKS server */
@@ -651,17 +683,15 @@ struct forward_spec
    struct forward_spec *next;
 };
 
-
-#ifdef PCRS
 struct re_filterfile_spec
 {
+   char *username;
+   char *filtername;
    struct list patterns[1];
    pcrs_job *joblist;
 };
-#endif /* def PCRS */
-
 
-#ifdef ACL_FILES
+#ifdef FEATURE_ACL
 #define ACL_PERMIT   1  /* accept connection request */
 #define ACL_DENY     2  /* reject connection request */
 
@@ -680,7 +710,7 @@ struct access_control_list
    short action;
    struct access_control_list *next;
 };
-#endif /* def ACL_FILES */
+#endif /* def FEATURE_ACL */
 
 
 /* Maximum number of loaders (actions, re_filter, ...) */
@@ -708,14 +738,12 @@ struct configuration_spec
    /* A URL with info on this proxy */
    char *proxy_info_url;
 
-#ifdef PCRS
    const char *re_filterfile;
-#endif /* def PCRS */
 
-#ifdef JAR_FILES
+#ifdef FEATURE_COOKIE_JAR
    const char * jarfile;
    FILE * jar;
-#endif /* def JAR_FILES */
+#endif /* def FEATURE_COOKIE_JAR */
 
    /*
     * Port and IP to bind to.
@@ -724,25 +752,16 @@ struct configuration_spec
    const char *haddr;
    int         hport;
 
-#ifndef SPLIT_PROXY_ARGS
-   const char *suppress_message;
-#endif /* ndef SPLIT_PROXY_ARGS */
-
-#ifndef SPLIT_PROXY_ARGS
-   /* suppress listing config files */
-   int suppress_blocklists;
-#endif /* ndef SPLIT_PROXY_ARGS */
-
-#ifdef TRUST_FILES
+#ifdef FEATURE_TRUST
    const char * trustfile;
 
    struct list trust_info[1];
    struct url_spec *trust_list[64];
-#endif /* def TRUST_FILES */
+#endif /* def FEATURE_TRUST */
 
-#ifdef ACL_FILES
+#ifdef FEATURE_ACL
    struct access_control_list *acl;
-#endif /* def ACL_FILES */
+#endif /* def FEATURE_ACL */
 
    struct forward_spec *forward;
 
@@ -762,9 +781,9 @@ struct configuration_spec
 
 #define SZ(X)  (sizeof(X) / sizeof(*X))
 
-#ifdef FORCE_LOAD
+#ifdef FEATURE_FORCE_LOAD
 #define FORCE_PREFIX "/IJB-FORCE-LOAD"
-#endif /* def FORCE_LOAD */
+#endif /* def FEATURE_FORCE_LOAD */
 
 /* Hardwired URLs */
 #define HOME_PAGE_URL  "http://ijbswa.sourceforge.net"
@@ -783,7 +802,7 @@ static const char CHEADER[] =
 } /* extern "C" */
 #endif
 
-#endif /* ndef _PROJECT_H */
+#endif /* ndef PROJECT_H_INCLUDED */
 
 /*
   Local Variables: