X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=src%2Fproject.h;h=06412cd825e1fcd1fb130807ee9e8da24b1378c6;hb=6f24a45d91655474f9a2eab1f6c5de4f08fdfc9b;hp=0111568299af10fbc7808e1f10e753353da01dee;hpb=a0cc18809c72f9fa66166c18139952b85509e54c;p=privoxy.git diff --git a/src/project.h b/src/project.h index 01115682..06412cd8 100644 --- a/src/project.h +++ b/src/project.h @@ -1,10 +1,10 @@ #ifndef PROJECT_H_INCLUDED #define PROJECT_H_INCLUDED /** Version string. */ -#define PROJECT_H_VERSION "$Id: project.h,v 2.0 2002/06/04 14:34:21 jongfoster Exp $" +#define PROJECT_H_VERSION "$Id: project.h,v 2.2 2002/07/12 04:26:17 agotneja Exp $" /********************************************************************* * - * File : $Source: /cvsroot/ijbswa/current/src/project.h,v $ + * File : $Source: /cvsroot/ijbswa//current/src/project.h,v $ * * Purpose : Defines data structures which are widely used in the * project. Does not define any variables or functions @@ -37,6 +37,17 @@ * * Revisions : * $Log: project.h,v $ + * Revision 2.2 2002/07/12 04:26:17 agotneja + * Re-factored 'chat()' to become understandable and maintainable as + * a first step in adding Transparent Proxy functionality. + * + * Added several new static functions in jcc.c, and moved some data + * parameters up into project.h to allow them to be passed between + * the new functions. + * + * Revision 2.1 2002/06/04 16:35:56 jongfoster + * Moving three variable declarations to jcc.c from project.h + * * Revision 2.0 2002/06/04 14:34:21 jongfoster * Moving source files to src/ * @@ -455,6 +466,8 @@ /* Need time_t for file_list */ #include +/* Needed for pcre choice */ +#include "config.h" /* * Include appropriate regular expression libraries. @@ -465,7 +478,11 @@ #ifdef STATIC_PCRE # include "pcre.h" #else -# include +# ifdef PCRE_H_IN_SUBDIR +# include +# else +# include +# endif #endif #ifdef STATIC_PCRS @@ -477,7 +494,11 @@ #ifdef STATIC_PCRE # include "pcreposix.h" #else -# include +# ifdef PCRE_H_IN_SUBDIR +# include +# else +# include +# endif #endif #ifdef AMIGA @@ -531,6 +552,7 @@ typedef int jb_socket; */ typedef int jb_err; +#define JB_ERR_GENERIC -1 /* General error return value */ #define JB_ERR_OK 0 /**< Success, no error */ #define JB_ERR_MEMORY 1 /**< Out of memory */ #define JB_ERR_CGI_PARAMS 2 /**< Missing or corrupt CGI parameters */ @@ -538,7 +560,7 @@ typedef int jb_err; #define JB_ERR_PARSE 4 /**< Error parsing file */ #define JB_ERR_MODIFIED 5 /**< File has been modified outside of the CGI actions editor. */ - +#define JB_ERR_INTERCEPT 6 /* This page should be intercepted */ /** * This macro is used to free a pointer that may be NULL. @@ -700,6 +722,9 @@ struct http_request char *dbuffer; /**< Buffer with '\0'-delimited domain name. */ char **dvec; /**< List of pointers to the strings in dbuffer. */ int dcount; /**< How many parts to this domain? (length of dvec) */ + + const struct forward_spec *fwd ; + }; @@ -1049,6 +1074,10 @@ struct client_state /** Next thread in linked list. Only read or modify from the main thread! */ struct client_state *next; + + char *(*content_filter)() ; + int all_headers_read ; + };