projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't add '-src' to the name of the tar ball generated by the gen-dist target
[privoxy.git]
/
project.h
diff --git
a/project.h
b/project.h
index
5530bf5
..
a53aa87
100644
(file)
--- a/
project.h
+++ b/
project.h
@@
-1,7
+1,7
@@
#ifndef PROJECT_H_INCLUDED
#define PROJECT_H_INCLUDED
/** Version string. */
#ifndef PROJECT_H_INCLUDED
#define PROJECT_H_INCLUDED
/** Version string. */
-#define PROJECT_H_VERSION "$Id: project.h,v 1.2
08 2014/11/12 12:00:41
fabiankeil Exp $"
+#define PROJECT_H_VERSION "$Id: project.h,v 1.2
13 2016/03/17 10:40:53
fabiankeil Exp $"
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/project.h,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/project.h,v $
@@
-400,6
+400,9
@@
struct pattern_spec
/** Pattern spec bitmap: It's a NO-RESPONSE-TAG pattern. */
#define PATTERN_SPEC_NO_RESPONSE_TAG_PATTERN 0x00000008UL
/** Pattern spec bitmap: It's a NO-RESPONSE-TAG pattern. */
#define PATTERN_SPEC_NO_RESPONSE_TAG_PATTERN 0x00000008UL
+/** Pattern spec bitmap: It's a CLIENT-TAG pattern. */
+#define PATTERN_SPEC_CLIENT_TAG_PATTERN 0x00000010UL
+
/**
* An I/O buffer. Holds a string which can be appended to, and can have data
* removed from the beginning.
/**
* An I/O buffer. Holds a string which can be appended to, and can have data
* removed from the beginning.
@@
-642,7
+645,7
@@
struct url_actions
};
enum forwarder_type {
};
enum forwarder_type {
- /**< Don't use a SOCKS server
*/
+ /**< Don't use a SOCKS server
, forward to a HTTP proxy directly
*/
SOCKS_NONE = 0,
/**< original SOCKS 4 protocol */
SOCKS_4 = 40,
SOCKS_NONE = 0,
/**< original SOCKS 4 protocol */
SOCKS_4 = 40,
@@
-652,6
+655,12
@@
enum forwarder_type {
SOCKS_5 = 50,
/**< Like SOCKS5, but uses non-standard Tor extensions (currently only optimistic data) */
SOCKS_5T,
SOCKS_5 = 50,
/**< Like SOCKS5, but uses non-standard Tor extensions (currently only optimistic data) */
SOCKS_5T,
+ /**<
+ * Don't use a SOCKS server, forward to the specified webserver.
+ * The difference to SOCKS_NONE is that a request line without
+ * full URL is sent.
+ */
+ FORWARD_WEBSERVER,
};
/*
};
/*
@@
-859,13
+868,13
@@
struct reusable_connection
*/
/**
*/
/**
- * Flag for process return code: Set if exiting p
or
cess has been toggled
+ * Flag for process return code: Set if exiting p
ro
cess has been toggled
* during its lifetime.
*/
#define RC_FLAG_TOGGLED 0x10
/**
* during its lifetime.
*/
#define RC_FLAG_TOGGLED 0x10
/**
- * Flag for process return code: Set if exiting p
or
cess has blocked its
+ * Flag for process return code: Set if exiting p
ro
cess has blocked its
* request.
*/
#define RC_FLAG_BLOCKED 0x20
* request.
*/
#define RC_FLAG_BLOCKED 0x20
@@
-941,6
+950,11
@@
struct client_state
/** List of all tags that apply to this request */
struct list tags[1];
/** List of all tags that apply to this request */
struct list tags[1];
+#ifdef FEATURE_CLIENT_TAGS
+ /** List of all tags that apply to this client (assigned based on address) */
+ struct list client_tags[1];
+#endif
+
/** MIME-Type key, see CT_* above */
unsigned int content_type;
/** MIME-Type key, see CT_* above */
unsigned int content_type;
@@
-1196,6
+1210,15
@@
struct access_control_list
/** Maximum number of loaders (actions, re_filter, ...) */
#define NLOADERS 8
/** Maximum number of loaders (actions, re_filter, ...) */
#define NLOADERS 8
+/**
+ * This struct represents a client-spcific-tag and it's description
+ */
+struct client_tag_spec
+{
+ char *name; /**< Name from "client-specific-tag bla" directive */
+ char *description; /**< Description from "client-specific-tag-description " directive */
+ struct client_tag_spec *next; /**< The pointer for chaining. */
+};
/** configuration_spec::feature_flags: CGI actions editor. */
#define RUNTIME_FEATURE_CGI_EDIT_ACTIONS 1U
/** configuration_spec::feature_flags: CGI actions editor. */
#define RUNTIME_FEATURE_CGI_EDIT_ACTIONS 1U
@@
-1318,6
+1341,13
@@
struct configuration_spec
#endif /* def FEATURE_TRUST */
#endif /* def FEATURE_TRUST */
+#ifdef FEATURE_CLIENT_TAGS
+ struct client_tag_spec client_tags[1];
+
+ /* Maximum number of seconds a temporarily enabled tag stays enabled. */
+ unsigned int client_tag_lifetime;
+#endif /* def FEATURE_CLIENT_TAGS */
+
#ifdef FEATURE_ACL
/** The access control list (ACL). */
#ifdef FEATURE_ACL
/** The access control list (ACL). */
@@
-1382,7
+1412,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/"