projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix compiler warnings
[privoxy.git]
/
project.h
diff --git
a/project.h
b/project.h
index
f3aa09c
..
c23ca50
100644
(file)
--- a/
project.h
+++ b/
project.h
@@
-1,7
+1,5
@@
#ifndef PROJECT_H_INCLUDED
#define PROJECT_H_INCLUDED
#ifndef PROJECT_H_INCLUDED
#define PROJECT_H_INCLUDED
-/** Version string. */
-#define PROJECT_H_VERSION "$Id: project.h,v 1.212 2016/01/16 12:30:43 fabiankeil Exp $"
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/project.h,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/project.h,v $
@@
-53,7
+51,6
@@
# include <sys/socket.h>
# else
# include <stdint.h>
# include <sys/socket.h>
# else
# include <stdint.h>
-# include <winsock2.h>
# include <ws2tcpip.h>
typedef unsigned short in_port_t;
# endif
# include <ws2tcpip.h>
typedef unsigned short in_port_t;
# endif
@@
-498,7
+495,7
@@
struct iob
#define ACTION_CRUNCH_CLIENT_HEADER 0x00200000UL
/** Action bitmap: Enable text mode by force */
#define ACTION_FORCE_TEXT_MODE 0x00400000UL
#define ACTION_CRUNCH_CLIENT_HEADER 0x00200000UL
/** Action bitmap: Enable text mode by force */
#define ACTION_FORCE_TEXT_MODE 0x00400000UL
-/** Action bitmap:
Enable text mode by force
*/
+/** Action bitmap:
Remove the "If-None-Match" header.
*/
#define ACTION_CRUNCH_IF_NONE_MATCH 0x00800000UL
/** Action bitmap: Enable content-disposition crunching */
#define ACTION_HIDE_CONTENT_DISPOSITION 0x01000000UL
#define ACTION_CRUNCH_IF_NONE_MATCH 0x00800000UL
/** Action bitmap: Enable content-disposition crunching */
#define ACTION_HIDE_CONTENT_DISPOSITION 0x01000000UL
@@
-862,6
+859,12
@@
struct reusable_connection
*/
#define CSP_FLAG_CRUNCHED 0x04000000U
*/
#define CSP_FLAG_CRUNCHED 0x04000000U
+#ifdef FUZZ
+/**
+ * Flag for csp->flags: Set if we are working with fuzzed input
+ */
+#define CSP_FLAG_FUZZED_INPUT 0x08000000U
+#endif
/*
* Flags for use in return codes of child processes
/*
* Flags for use in return codes of child processes
@@
-927,6
+930,10
@@
struct client_state
unsigned long ip_addr_long;
#endif /* def HAVE_RFC2553 */
unsigned long ip_addr_long;
#endif /* def HAVE_RFC2553 */
+ /** The host name and port (as a string of the form '<hostname>:<port>')
+ of the server socket to which the client connected. */
+ char *listen_addr_str;
+
/** The URL that was requested */
struct http_request http[1];
/** The URL that was requested */
struct http_request http[1];
@@
-944,6
+951,12
@@
struct client_state
/** An I/O buffer used for buffering data read from the client */
struct iob client_iob[1];
/** An I/O buffer used for buffering data read from the client */
struct iob client_iob[1];
+ /** Buffer used to briefly store data read from the network
+ * before forwarding or processing it.
+ */
+ char *receive_buffer;
+ size_t receive_buffer_size;
+
/** List of all headers for this request */
struct list headers[1];
/** List of all headers for this request */
struct list headers[1];
@@
-953,6
+966,12
@@
struct client_state
#ifdef FEATURE_CLIENT_TAGS
/** List of all tags that apply to this client (assigned based on address) */
struct list client_tags[1];
#ifdef FEATURE_CLIENT_TAGS
/** List of all tags that apply to this client (assigned based on address) */
struct list client_tags[1];
+ /** The address of the client the request (presumably) came from.
+ * Either the address returned by accept(), or the address provided
+ * with the X-Forwarded-For header, provided Privoxy has been configured
+ * to use it.
+ */
+ char *client_address;
#endif
/** MIME-Type key, see CT_* above */
#endif
/** MIME-Type key, see CT_* above */
@@
-1322,12
+1341,26
@@
struct configuration_spec
/** IP addresses to bind to. Defaults to HADDR_DEFAULT == 127.0.0.1. */
const char *haddr[MAX_LISTENING_SOCKETS];
/** IP addresses to bind to. Defaults to HADDR_DEFAULT == 127.0.0.1. */
const char *haddr[MAX_LISTENING_SOCKETS];
+ /** Trusted referring site that can be used to reach CGI
+ * pages that aren't marked as harmful.
+ */
+ const char *trusted_cgi_referrer;
+
/** Ports to bind to. Defaults to HADDR_PORT == 8118. */
int hport[MAX_LISTENING_SOCKETS];
/** Size limit for IOB */
size_t buffer_limit;
/** Ports to bind to. Defaults to HADDR_PORT == 8118. */
int hport[MAX_LISTENING_SOCKETS];
/** Size limit for IOB */
size_t buffer_limit;
+ /** Size of the receive buffer */
+ size_t receive_buffer_size;
+
+ /** Use accf_http(4) if available */
+ int enable_accept_filter;
+
+ /** Backlog passed to listen() */
+ int listen_backlog;
+
#ifdef FEATURE_TRUST
/** The file name of the trust file. */
#ifdef FEATURE_TRUST
/** The file name of the trust file. */
@@
-1347,6
+1380,7
@@
struct configuration_spec
/* Maximum number of seconds a temporarily enabled tag stays enabled. */
unsigned int client_tag_lifetime;
#endif /* def FEATURE_CLIENT_TAGS */
/* Maximum number of seconds a temporarily enabled tag stays enabled. */
unsigned int client_tag_lifetime;
#endif /* def FEATURE_CLIENT_TAGS */
+ int trust_x_forwarded_for;
#ifdef FEATURE_ACL
#ifdef FEATURE_ACL
@@
-1412,7
+1446,7
@@
struct configuration_spec
*/
/** URL for the Privoxy home page. */
*/
/** URL for the Privoxy home page. */
-#define HOME_PAGE_URL "http://www.privoxy.org/"
+#define HOME_PAGE_URL "http
s
://www.privoxy.org/"
/** URL for the Privoxy user manual. */
#define USER_MANUAL_URL HOME_PAGE_URL VERSION "/user-manual/"
/** URL for the Privoxy user manual. */
#define USER_MANUAL_URL HOME_PAGE_URL VERSION "/user-manual/"