Version 2.9.4 checkin.

[privoxy.git] / project.h

diff --git a/project.h b/project.h
index 4941582..7371d65 100644 (file)
--- 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.1.1.1 2001/05/15 13:59:03 oes Exp $"
+#define PROJECT_H_VERSION "$Id: project.h,v 1.2 2001/05/17 23:01:01 oes Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/project.h,v $
@@ -36,6 +36,9 @@
  *
  * Revisions   :
  *    $Log: project.h,v $
+ *    Revision 1.2  2001/05/17 23:01:01  oes
+ *     - Cleaned CRLF's from the sources and related files
+ *
  *    Revision 1.1.1.1  2001/05/15 13:59:03  oes
  *    Initial import of version 2.9.3 source tree
  *
@@ -185,8 +188,8 @@ struct list
 
 struct client_state
 {
-   int  send_user_cookie;
-   int  accept_server_cookie;
+   int  permissions;\r
+   \r
    int  cfd;
    int  sfd;
 
@@ -228,9 +231,9 @@ struct client_state
 
    struct list headers[1];
    struct list cookie_list[1];
-#ifdef PCRS
+#if defined(PCRS) || defined(KILLPOPUPS)
    int is_text;
-#endif /* def PCRS */
+#endif /* defined(PCRS) || defined(KILLPOPUPS) */
 
    char   *x_forwarded;
 
@@ -238,21 +241,18 @@ struct client_state
 
    /* files associated with this client */
    struct file_list *blist;   /* blockfile */
-   struct file_list *clist;   /* cookiefile */
    struct file_list *flist;   /* forwardfile */
+   struct file_list *permissions_list;\r
+\r
 
-#ifdef ACL_FILES
+#ifdef ACL_FILES\r
    struct file_list *alist;   /* aclfile */
 #endif /* def ACL_FILES */
 
 #ifdef USE_IMAGE_LIST
    struct file_list *ilist;   /* imagefile */
 #endif /* def USE_IMAGE_LIST */
-
-#ifdef KILLPOPUPS
-   struct file_list *plist;   /* kill popup file */
-#endif /* def KILLPOPUPS */
-
+\r
 #ifdef PCRS
      struct file_list *rlist;   /* Perl re_filterfile */
 #endif /* def PCRS */
@@ -260,7 +260,7 @@ struct client_state
 #ifdef TRUST_FILES
    struct file_list *tlist;   /* trustfile */
 #endif /* def TRUST_FILES */
-
+\r
    struct client_state *next;
 };
 
@@ -346,20 +346,23 @@ struct file_list
 struct block_spec
 {
    struct url_spec url[1];
-   int   reject;
+   int    reject;
    struct block_spec *next;
 };
-
-
-struct cookie_spec
-{
-   struct url_spec url[1];
-   int   send_user_cookie;
-   int   accept_server_cookie;
-   struct cookie_spec *next;
-};
-
-
+\r
+
+#define PERMIT_COOKIE_SET    0x0001\r
+#define PERMIT_COOKIE_READ   0x0002\r
+#define PERMIT_RE_FILTER     0x0004\r
+#define PERMIT_POPUPS        0x0008\r
+
+struct permissions_spec\r
+{\r
+   struct url_spec           url[1];\r
+   int                       permissions;\r
+   struct permissions_spec * next;\r
+};\r
+\r
 struct forward_spec
 {
    struct url_spec url[1];
@@ -377,23 +380,7 @@ struct re_filterfile_spec
    pcrs_job *joblist;
 };
 #endif /* def PCRS */
-
-
-#ifdef KILLPOPUPS
-/* Entries on popup blocklist */
-struct popup_blocklist
-{
-   char *host_name;
-   struct popup_blocklist *next;
-};
-
-/* Actual type used in file object */
-struct popup_settings
-{
-   struct popup_blocklist *blocked;
-   struct popup_blocklist *allowed;
-};
-#endif /* def KILLPOPUPS */
+\r
 
 #ifdef ACL_FILES
 #define ACL_PERMIT   1  /* accept connection request */