X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=project.h;h=5446bb79b349381ac29b9dcd3a9de83203e6fb21;hb=ae99f3faaf55df0e6e3b4b62ef687b03b9733b7f;hp=92ee41ce47d0f4ffb05d17b1b526a8e5787b8f2d;hpb=25fa58f84190ecef8f921613e7c681a56a1f5f57;p=privoxy.git

diff --git a/project.h b/project.h
index 92ee41ce..5446bb79 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.20 2001/06/29 21:45:41 oes Exp $"
+#ifndef PROJECT_H_INCLUDED
+#define PROJECT_H_INCLUDED
+#define PROJECT_H_VERSION "$Id: project.h,v 1.25 2001/07/29 18:43:08 jongfoster Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/project.h,v $
@@ -36,6 +36,27 @@
  *
  * Revisions   :
  *    $Log: project.h,v $
+ *    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
  *
@@ -224,7 +245,7 @@
 # define REGEX
 #endif /* defined(REGEX_PCRE) || defined (REGEX_GNU) */
 
-#ifdef STATIC
+#ifdef STATIC_PCRE
 #  include "pcre.h"
 #else
 #  include <pcre.h>
@@ -237,7 +258,7 @@
 #endif
 
 #if defined(REGEX_PCRE)
-#  ifdef STATIC
+#  ifdef STATIC_PCRE
 #    include "pcreposix.h"
 #  else
 #    include <pcreposix.h>
@@ -256,6 +277,8 @@
 extern "C" {
 #endif
 
+#define freez(X)  if(X) free(X); X = NULL
+
 #define BUFFER_SIZE 5000
 
 #define FOREVER 1
@@ -294,6 +317,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 */
@@ -333,11 +357,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
 {
@@ -373,11 +397,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
@@ -446,7 +472,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
@@ -464,7 +490,7 @@ struct url_actions
  */
 #define ACCEPT_TYPE_MSIE_HTML   0x0004
 
-#endif /* def DETECT_MSIE_IMAGES */
+#endif /* def FEATURE_IMAGE_DETECT_MSIE */
 
 
 struct client_state
@@ -482,20 +508,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.
@@ -512,17 +538,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];
@@ -554,9 +580,9 @@ struct client_state
    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;
 };
@@ -596,13 +622,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.
     */
@@ -619,14 +638,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 */
@@ -654,11 +673,13 @@ struct forward_spec
 
 struct re_filterfile_spec
 {
+   char *username;
+   char *filtername;
    struct list patterns[1];
    pcrs_job *joblist;
 };
 
-#ifdef ACL_FILES
+#ifdef FEATURE_ACL
 #define ACL_PERMIT   1  /* accept connection request */
 #define ACL_DENY     2  /* reject connection request */
 
@@ -677,7 +698,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, ...) */
@@ -707,10 +728,10 @@ struct configuration_spec
 
    const char *re_filterfile;
 
-#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.
@@ -719,25 +740,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;
 
@@ -757,9 +769,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"
@@ -778,7 +790,7 @@ static const char CHEADER[] =
 } /* extern "C" */
 #endif
 
-#endif /* ndef _PROJECT_H */
+#endif /* ndef PROJECT_H_INCLUDED */
 
 /*
   Local Variables: