X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=project.h;h=9acd84e29149b42bb86f75b6a2b5abffbf254b68;hp=467bb9e28b787bad42b54b280f694400d8b6eb56;hb=d413f089844873c5d88bb1580357124b45fab66c;hpb=1be5c48e561329dfecddebf0f27f9ccc47bce3cf
diff --git a/project.h b/project.h
index 467bb9e2..9acd84e2 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.9 2001/05/31 17:32:31 oes Exp $"
+#define PROJECT_H_VERSION "$Id: project.h,v 1.16 2001/06/04 18:31:58 swa Exp $"
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/project.h,v $
@@ -36,6 +36,84 @@
*
* Revisions :
* $Log: project.h,v $
+ * Revision 1.16 2001/06/04 18:31:58 swa
+ * files are now prefixed with either `confdir' or `logdir'.
+ * `make redhat-dist' replaces both entries confdir and logdir
+ * with redhat values
+ *
+ * Revision 1.15 2001/06/04 11:28:53 swa
+ * redirect did not work due to missing /
+ *
+ * Revision 1.14 2001/06/03 11:03:48 oes
+ * Makefile/in
+ *
+ * introduced cgi.c
+ *
+ * actions.c:
+ *
+ * adapted to new enlist_unique arg format
+ *
+ * conf loadcfg.c
+ *
+ * introduced confdir option
+ *
+ * filters.c filtrers.h
+ *
+ * extracted-CGI relevant stuff
+ *
+ * jbsockets.c
+ *
+ * filled comment
+ *
+ * jcc.c
+ *
+ * support for new cgi mechansim
+ *
+ * list.c list.h
+ *
+ * functions for new list type: "map"
+ * extended enlist_unique
+ *
+ * miscutil.c .h
+ * introduced bindup()
+ *
+ * parsers.c parsers.h
+ *
+ * deleted const struct interceptors
+ *
+ * pcrs.c
+ * added FIXME
+ *
+ * project.h
+ *
+ * added struct map
+ * added struct http_response
+ * changes struct interceptors to struct cgi_dispatcher
+ * moved HTML stuff to cgi.h
+ *
+ * re_filterfile:
+ *
+ * changed
+ *
+ * showargs.c
+ * NO TIME LEFT
+ *
+ * Revision 1.13 2001/06/01 20:05:36 jongfoster
+ * Support for +image-blocker{}: added ACTION_IMAGE_BLOCKER
+ * constant, and removed csp->tinygif.
+ *
+ * Revision 1.12 2001/06/01 18:49:17 jongfoster
+ * Replaced "list_share" with "list" - the tiny memory gain was not
+ * worth the extra complexity.
+ *
+ * Revision 1.11 2001/06/01 10:32:47 oes
+ * Added constants for anchoring selection bitmap
+ *
+ * Revision 1.10 2001/05/31 21:33:53 jongfoster
+ * Changes for new actions file, replacing permissionsfile
+ * and parts of the config file. Also added support for
+ * list_shared.
+ *
* Revision 1.9 2001/05/31 17:32:31 oes
*
* - Enhanced domain part globbing with infix and prefix asterisk
@@ -210,12 +288,23 @@ extern "C" {
#define HADDR_PORT 8000
-/* Need this for struct gateway */
-struct client_state;
-
/* Need this for struct client_state */
struct configuration_spec;
+/* Generic linked list of strings */
+struct list /* FIXME: Why not separate entries and header? */
+{
+ char * str; /* valid in an entry */
+ struct list *last; /* valid in header */
+ struct list *next;
+};
+
+struct map
+{
+ char *name;
+ char *value;
+ struct map *next;
+};
struct http_request
{
@@ -229,58 +318,46 @@ struct http_request
int ssl;
};
-struct gateway
+/* CGI or blocker generated response */
+struct http_response
{
- /* generic attributes */
- char *name;
- int (*conn)(const struct gateway *, struct http_request *, struct client_state *);
- int type;
-
- /* domain specific attributes */
- char *gateway_host;
- int gateway_port;
-
- char *forward_host;
- int forward_port;
+ char *status; /* HTTP status */
+ struct list headers[1]; /* List of header lines */
+ int content_length; /* Length of body, REQUIRED if binary body*/
+ char *head; /* Formatted http response head */
+ char *body; /* HTTP document body */
};
-
-/* Generic linked list of strings */
-struct list /* FIXME: Why not separate entries and header? */
-{
- char * str; /* valid in an entry */
- struct list *last; /* valid in header */
- struct list *next;
-};
-
-
-/* Generic linked list of strings */
-struct list_share /* FIXME: Why not separate entries and header? */
-{
- const char * str; /* valid in an entry */
- struct list_share *last; /* valid in header */
- struct list_share *next;
-};
-
-
/* A URL pattern */
struct url_spec
{
- char *spec;
- char *domain;
- char *dbuf;
- char **dvec;
- int dcnt;
- int unanchored;
-
- char *path;
- int pathlen;
- int port;
+ char *spec; /* The string which was parsed to produce this */
+ /* url_spec. Used for debugging or display only. */
+
+ /* Hostname matching: */
+ char *domain; /* Fully qalified domain name (FQDN) pattern. */
+ /* May contain "*". */
+ char *dbuf; /* FIXME: Comment this */
+ char **dvec; /* Domain ptr vector */
+ int dcnt; /* How many domains in fqdn? */
+ int unanchored; /* Bitmap - flags are ANCHOR_LEFT and ANCHOR_RIGHT */
+
+ /* Port matching: */
+ int port; /* The port number, or 0 to match all ports. */
+
+ /* Path matching: */
+ char *path; /* The path prefix (if not using regex), or source */
+ /* for the regex. */
+ int pathlen; /* ==strlen(path). Needed for prefix matching. */
#ifdef REGEX
- regex_t *preg;
+ regex_t *preg; /* Regex for matching path part */
#endif
};
+#define ANCHOR_LEFT 1
+#define ANCHOR_RIGHT 2
+
+
/* An I/O buffer */
struct iob
@@ -298,7 +375,7 @@ struct iob
#define ACTION_MASK_ALL (~0U)
-#define ACTION_MOST_COMPATIBLE 0U
+#define ACTION_MOST_COMPATIBLE 0x0000U
#define ACTION_BLOCK 0x0001U
#define ACTION_FAST_REDIRECTS 0x0002U
@@ -308,21 +385,28 @@ struct iob
#define ACTION_HIDE_REFERER 0x0020U /* sic - follow HTTP, not English */
#define ACTION_HIDE_USER_AGENT 0x0040U
#define ACTION_IMAGE 0x0080U
-#define ACTION_NO_COOKIE_READ 0x0100U
-#define ACTION_NO_COOKIE_SET 0x0200U
-#define ACTION_NO_POPUPS 0x0400U
-#define ACTION_VANILLA_WAFER 0x0800U
-
-#define ACTION_STRING_FROM 0
-#define ACTION_STRING_REFERER 1
-#define ACTION_STRING_USER_AGENT 2
-#define ACTION_STRING_COUNT 3
-
-#define ACTION_MULTI_ADD_HEADER 0
-#define ACTION_MULTI_WAFER 1
-#define ACTION_MULTI_COUNT 2
-
+#define ACTION_IMAGE_BLOCKER 0x0100U
+#define ACTION_NO_COOKIE_READ 0x0200U
+#define ACTION_NO_COOKIE_SET 0x0400U
+#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_MULTI_ADD_HEADER 0
+#define ACTION_MULTI_WAFER 1
+#define ACTION_MULTI_COUNT 2
+/*
+ * This structure contains a list of actions to apply to a URL.
+ * It only contains positive instructions - no "-" options.
+ * It is not used to store the actions list itself, only for
+ * url_actions() to return the current values.
+ */
struct current_action_spec
{
unsigned flags; /* a bit set to "1" = add action */
@@ -333,9 +417,15 @@ struct current_action_spec
char * string[ACTION_STRING_COUNT];
/* Strings to add */
- struct list_share multi[ACTION_MULTI_COUNT][1];
+ struct list multi[ACTION_MULTI_COUNT][1];
};
+
+/*
+ * This structure contains a set of changes to actions.
+ * It can contain both positive and negative instructions.
+ * It is used to store an entry in the actions list.
+ */
struct action_spec
{
unsigned mask; /* a bit set to "0" = remove action */
@@ -356,6 +446,12 @@ struct action_spec
struct list multi_add[ACTION_MULTI_COUNT][1];
};
+/*
+ * This structure is used to store the actions list.
+ *
+ * It contains a URL pattern, and the chages to the actions.
+ * It is a linked list.
+ */
struct url_actions
{
struct url_spec url[1];
@@ -467,14 +563,8 @@ struct client_state
int active;
/* files associated with this client */
- struct file_list *flist; /* forwardfile */
struct file_list *actions_list;
-
-#ifdef ACL_FILES
- struct file_list *alist; /* aclfile */
-#endif /* def ACL_FILES */
-
#ifdef PCRS
struct file_list *rlist; /* Perl re_filterfile */
size_t content_length; /* Length after processing */
@@ -495,15 +585,14 @@ struct parsers
char *(*parser)(const struct parsers *, char *, struct client_state *);
};
-
-struct interceptors
+struct cgi_dispatcher
{
- char *str;
- char len;
- char *(*interceptor)(struct http_request *http, struct client_state *csp);
+ char *name;
+ int name_length;
+ int (*handler)(struct client_state *csp, struct http_response *rsp, struct map *parameters);
+ char *description;
};
-
struct file_list
{
/*
@@ -556,10 +645,26 @@ struct block_spec
#endif /* def TRUST_FILES */
+#define SOCKS_NONE 0 /* Don't use a SOCKS server */
+#define SOCKS_4 40 /* original SOCKS 4 protocol */
+#define SOCKS_4A 41 /* as modified for hosts w/o external DNS */
+
struct forward_spec
{
struct url_spec url[1];
- struct gateway gw[1];
+
+ /* Connection type - must be a SOCKS_xxx constant */
+ int type;
+
+ /* SOCKS server */
+ char *gateway_host;
+ int gateway_port;
+
+ /* Parent HTTP proxy */
+ char *forward_host;
+ int forward_port;
+
+ /* For the linked list */
struct forward_spec *next;
};
@@ -568,7 +673,6 @@ struct forward_spec
struct re_filterfile_spec
{
struct list patterns[1];
- /* See README.re_filter */
pcrs_job *joblist;
};
#endif /* def PCRS */
@@ -596,7 +700,7 @@ struct access_control_list
#endif /* def ACL_FILES */
-/* Maximum number of loaders (actions, block, forward, acl...) */
+/* Maximum number of loaders (actions, re_filter, ...) */
#define NLOADERS 8
/*
@@ -609,19 +713,11 @@ struct configuration_spec
int debug;
int multi_threaded;
-#ifdef IMAGE_BLOCKING
- int tinygif; /* FIXME Should be an action */
- const char *tinygifurl; /* FIXME Should be an action */
-#endif /* def IMAGE_BLOCKING */
-
const char *logfile;
+ const char *confdir;
+ const char *logdir;
const char *actions_file;
- const char *forwardfile;
-
-#ifdef ACL_FILES
- const char *aclfile;
-#endif /* def ACL_FILES */
#ifdef PCRS
const char *re_filterfile;
@@ -655,10 +751,15 @@ struct configuration_spec
struct url_spec *trust_list[64];
#endif /* def TRUST_FILES */
+#ifdef ACL_FILES
+ struct access_control_list *acl;
+#endif /* def ACL_FILES */
+
+ struct forward_spec *forward;
+
/* Various strings for show-proxy-args */
char *proxy_args_header;
char *proxy_args_invocation;
- char *proxy_args_gateways;
char *proxy_args_trailer;
/* the configuration file object. */
@@ -682,54 +783,11 @@ struct configuration_spec
#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"
- "