X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=project.h;h=28511c91c954e319cf6e962b5836881a57dda1cc;hp=5f4324ae809e62ad7f00ff815ae47a408aa5878a;hb=817f8ec235017b941eda0c205971ce0d4c907cea;hpb=c75584ebcc79f939fb4ec9c8f842cef6692640c7
diff --git a/project.h b/project.h
index 5f4324ae..28511c91 100644
--- a/project.h
+++ b/project.h
@@ -1,9 +1,9 @@
#ifndef _PROJECT_H
#define _PROJECT_H
-#define PROJECT_H_VERSION "$Id: project.h,v 1.1 2001/05/13 21:57:07 administrator Exp $"
+#define PROJECT_H_VERSION "$Id: project.h,v 1.3 2001/05/20 01:21:20 jongfoster Exp $"
/*********************************************************************
*
- * File : $Source: /home/administrator/cvs/ijb/project.h,v $
+ * File : $Source: /cvsroot/ijbswa/current/project.h,v $
*
* Purpose : Defines data structures which are widely used in the
* project. Does not define any variables or functions
@@ -36,6 +36,25 @@
*
* Revisions :
* $Log: project.h,v $
+ * Revision 1.3 2001/05/20 01:21:20 jongfoster
+ * Version 2.9.4 checkin.
+ * - Merged popupfile and cookiefile, and added control over PCRS
+ * filtering, in new "permissionsfile".
+ * - Implemented LOG_LEVEL_FATAL, so that if there is a configuration
+ * file error you now get a message box (in the Win32 GUI) rather
+ * than the program exiting with no explanation.
+ * - Made killpopup use the PCRS MIME-type checking and HTTP-header
+ * skipping.
+ * - Removed tabs from "config"
+ * - Moved duplicated url parsing code in "loaders.c" to a new funcition.
+ * - Bumped up version number.
+ *
+ * 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
+ *
*
*********************************************************************/
@@ -112,7 +131,6 @@ struct http_request
int ssl;
};
-
struct gateway
{
/* generic attributes */
@@ -182,8 +200,8 @@ struct list
struct client_state
{
- int send_user_cookie;
- int accept_server_cookie;
+ int permissions;
+
int cfd;
int sfd;
@@ -225,9 +243,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;
@@ -235,8 +253,9 @@ 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;
+
#ifdef ACL_FILES
struct file_list *alist; /* aclfile */
@@ -246,10 +265,6 @@ struct client_state
struct file_list *ilist; /* imagefile */
#endif /* def USE_IMAGE_LIST */
-#ifdef KILLPOPUPS
- struct file_list *plist; /* kill popup file */
-#endif /* def KILLPOPUPS */
-
#ifdef PCRS
struct file_list *rlist; /* Perl re_filterfile */
#endif /* def PCRS */
@@ -343,20 +358,23 @@ struct file_list
struct block_spec
{
struct url_spec url[1];
- int reject;
+ int reject;
struct block_spec *next;
};
-struct cookie_spec
+#define PERMIT_COOKIE_SET 0x0001
+#define PERMIT_COOKIE_READ 0x0002
+#define PERMIT_RE_FILTER 0x0004
+#define PERMIT_POPUPS 0x0008
+
+struct permissions_spec
{
- struct url_spec url[1];
- int send_user_cookie;
- int accept_server_cookie;
- struct cookie_spec *next;
+ struct url_spec url[1];
+ int permissions;
+ struct permissions_spec * next;
};
-
struct forward_spec
{
struct url_spec url[1];
@@ -376,22 +394,6 @@ struct re_filterfile_spec
#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 */
-
#ifdef ACL_FILES
#define ACL_PERMIT 1 /* accept connection request */
#define ACL_DENY 2 /* reject connection request */
@@ -420,20 +422,113 @@ struct access_control_list
#define BANNER "Internet JUNKBUSTER"
#ifdef FORCE_LOAD
-/*
- * FIXME: Unfortunately, IE lowercases the domain name. JunkBuster does
- * a case-sensitive compare. JunkBuster should be modified to do a
- * case-insensitive compatison. As a temporary workaround, I've lowercased
- * the FORCE_PREFIX.
- *
- * #define FORCE_PREFIX "IJB-FORCE-LOAD-"
- */
-#define FORCE_PREFIX "ijb-force-load-"
+#define FORCE_PREFIX "/IJB-FORCE-LOAD"
#endif /* def FORCE_LOAD */
#define HOME_PAGE_URL "http://ijbswa.sourceforge.net/"
#define REDIRECT_URL HOME_PAGE_URL "redirect.php?v=" VERSION "&to="
+static const char CFAIL[] =
+ "HTTP/1.0 503 Connect failed\n"
+ "Content-Type: text/html\n\n"
+ "\n"
+ "\n"
+ "Internet Junkbuster: Connect failed\n"
+ "\n"
+ BODY
+ ""
+ BANNER
+ "
"
+ "TCP connection to '%s' failed: %s.\n
"
+ "\n"
+ "