X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=parsers.h;h=802133f017d78074d0c65988f0151552f34dd7e6;hp=6d4bcef6b839cdc775e9a1d8116b9e990ebe71db;hb=e52674334610f4c2a1eb22b095c126527705f314;hpb=34fc68ad1f19d0ed17f8ecd47d197fcf3f6f9d05 diff --git a/parsers.h b/parsers.h index 6d4bcef6..802133f0 100644 --- a/parsers.h +++ b/parsers.h @@ -1,6 +1,5 @@ -#ifndef _PARSERS_H -#define _PARSERS_H -#define PARSERS_H_VERSION "$Id: parsers.h,v 1.6 2001/06/03 11:03:48 oes Exp $" +#ifndef PARSERS_H_INCLUDED +#define PARSERS_H_INCLUDED /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/parsers.h,v $ @@ -13,17 +12,17 @@ * `client_x_forwarded_adder', `client_xtra_adder', * `content_type', `crumble', `destroy_list', `enlist', * `flush_socket', `free_http_request', `get_header', - * `list_to_text', `parse_http_request', `sed', + * `parse_http_request', `sed', * and `server_set_cookie'. * - * Copyright : Written by and Copyright (C) 2001 the SourceForge - * IJBSWA team. http://ijbswa.sourceforge.net + * Copyright : Written by and Copyright (C) 2001 members of the + * Privoxy team. https://www.privoxy.org/ * * Based on the Internet Junkbuster originally written - * by and Copyright (C) 1997 Anonymous Coders and + * by and Copyright (C) 1997 Anonymous Coders and * Junkbusters Corporation. http://www.junkbusters.com * - * This program is free software; you can redistribute it + * This program is free software; you can redistribute it * and/or modify it under the terms of the GNU General * Public License as published by the Free Software * Foundation; either version 2 of the License, or (at @@ -41,154 +40,41 @@ * or write to the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * Revisions : - * $Log: parsers.h,v $ - * Revision 1.6 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.5 2001/05/31 21:30:33 jongfoster - * Removed list code - it's now in list.[ch] - * Renamed "permission" to "action", and changed many features - * to use the actions file rather than the global config. - * - * Revision 1.4 2001/05/27 13:19:06 oes - * Patched Joergs solution for the content-length in. - * - * Revision 1.3 2001/05/26 13:39:32 jongfoster - * Only crunches Content-Length header if applying RE filtering. - * Without this fix, Microsoft Windows Update wouldn't work. - * - * Revision 1.2 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.1.1.1 2001/05/15 13:59:01 oes - * Initial import of version 2.9.3 source tree - * - * *********************************************************************/ - + #include "project.h" -#ifdef __cplusplus -extern "C" { +/* Used for sed()'s second argument. */ +#define FILTER_CLIENT_HEADERS 0 +#define FILTER_SERVER_HEADERS 1 + +extern long flush_iob(jb_socket fd, struct iob *iob, unsigned int delay); +extern int can_add_to_iob(const struct iob *iob, const size_t buffer_limit, size_t n); +extern jb_err add_to_iob(struct iob *iob, const size_t buffer_limit, const char *src, long n); +extern void clear_iob(struct iob *iob); +extern jb_err decompress_iob(struct client_state *csp); +extern char *get_header(struct iob *iob); +extern char *get_header_value(const struct list *header_list, const char *header_name); +extern jb_err sed(struct client_state *csp, int filter_server_headers); +#ifdef FEATURE_HTTPS_INSPECTION +extern jb_err sed_https(struct client_state *csp); #endif - -extern const struct parsers client_patterns[]; -extern const struct parsers server_patterns[]; - -extern void (* const add_client_headers[])(struct client_state *); -extern void (* const add_server_headers[])(struct client_state *); - -extern int flush_socket(int fd, struct client_state *csp); -extern int add_to_iob(struct client_state *csp, char *buf, int n); -extern char *get_header(struct client_state *csp); - -extern char *sed(const struct parsers pats[], void (* const more_headers[])(struct client_state *), struct client_state *csp); - -extern void free_http_request(struct http_request *http); -extern void parse_http_request(char *req, struct http_request *http, struct client_state *csp); - -extern char *crumble(const struct parsers *v, char *s, struct client_state *csp); - -extern char *client_referrer(const struct parsers *v, char *s, struct client_state *csp); -extern char *client_uagent(const struct parsers *v, char *s, struct client_state *csp); -extern char *client_ua(const struct parsers *v, char *s, struct client_state *csp); -extern char *client_from(const struct parsers *v, char *s, struct client_state *csp); -extern char *client_send_cookie(const struct parsers *v, char *s, struct client_state *csp); -extern char *client_x_forwarded(const struct parsers *v, char *s, struct client_state *csp); -extern void client_cookie_adder(struct client_state *csp); -extern void client_xtra_adder(struct client_state *csp); -extern void client_x_forwarded_adder(struct client_state *csp); -extern char *server_set_cookie(const struct parsers *v, char *s, struct client_state *csp); - -#if defined(PCRS) || defined(KILLPOPUPS) -extern char *content_type(const struct parsers *v, char *s, struct client_state *csp); -#endif /* defined(PCRS) || defined(KILLPOPUPS) */ - -#ifdef PCRS -extern char *content_length(const struct parsers *v, char *s, struct client_state *csp); -#endif /* def PCRS */ - -#ifdef FORCE_LOAD -char *client_host(const struct parsers *v, char *s, struct client_state *csp); -int strclean(const char *string, const char *substring); -#endif /* def FORCE_LOAD */ - -#if defined(DETECT_MSIE_IMAGES) -extern char *client_accept(const struct parsers *v, char *s, struct client_state *csp); -#endif /* defined(DETECT_MSIE_IMAGES) */ - -/* Revision control strings from this header and associated .c file */ -extern const char parsers_rcs[]; -extern const char parsers_h_rcs[]; - -#ifdef __cplusplus -} /* extern "C" */ +extern jb_err header_adjust_content_length(char **header, size_t content_length); +extern jb_err update_server_headers(struct client_state *csp); +extern void get_http_time(int time_offset, char *buf, size_t buffer_size); +extern jb_err get_destination_from_headers(const struct list *headers, struct http_request *http); +#ifdef FEATURE_HTTPS_INSPECTION +extern jb_err get_destination_from_https_headers(const struct list *headers, struct http_request *http); #endif +extern unsigned long long get_expected_content_length(struct list *headers); +extern jb_err client_transfer_encoding(struct client_state *csp, char **header); + +#ifdef FEATURE_FORCE_LOAD +extern int strclean(char *string, const char *substring); +#endif /* def FEATURE_FORCE_LOAD */ -#endif /* ndef _PARSERS_H */ +#endif /* ndef PARSERS_H_INCLUDED */ /* Local Variables: