From 3cf6c9328250061600b78c8a7deb0edc850e739b Mon Sep 17 00:00:00 2001
From: James Yonan <james@openvpn.net>
Date: Mon, 24 May 2010 22:51:16 +0000
Subject: Implemented http-proxy-override and http-proxy-fallback directives to
 make it easier for OpenVPN client UIs to start a pre-existing client config
 file with proxy options, or to adaptively fall back to a proxy connection if
 a direct connection fails.

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@5652 e7ae566f-a301-0410-adde-c780ea21d3b5
---
 syshead.h | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

(limited to 'syshead.h')

diff --git a/syshead.h b/syshead.h
index 3d09ce6..b159bf9 100644
--- a/syshead.h
+++ b/syshead.h
@@ -624,6 +624,22 @@ socket_defined (const socket_descriptor_t sd)
  */
 #define ENABLE_INLINE_FILES 1
 
+/*
+ * Support "connection" directive
+ */
+#if ENABLE_INLINE_FILES
+#define ENABLE_CONNECTION 1
+#endif
+
+/*
+ * Should we include http proxy fallback functionality
+ */
+#if defined(ENABLE_CONNECTION) && defined(ENABLE_MANAGEMENT) && defined(ENABLE_HTTP_PROXY)
+#define HTTP_PROXY_FALLBACK 1
+#else
+#define HTTP_PROXY_FALLBACK 0
+#endif
+
 /*
  * Reduce sensitivity to system clock instability
  * and backtracks.
@@ -646,11 +662,4 @@ socket_defined (const socket_descriptor_t sd)
 #define AUTO_USERID 0
 #endif
 
-/*
- * Support "connection" directive
- */
-#if ENABLE_INLINE_FILES
-#define ENABLE_CONNECTION 1
-#endif
-
 #endif
-- 
cgit v1.2.3


From aaf72974672e4f2af2053247b63ef6f06bdc80c0 Mon Sep 17 00:00:00 2001
From: James Yonan <james@openvpn.net>
Date: Tue, 1 Jun 2010 07:12:27 +0000
Subject: Implemented a key/value auth channel from client to server.

Version 2.1.1i


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@5668 e7ae566f-a301-0410-adde-c780ea21d3b5
---
 syshead.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'syshead.h')

diff --git a/syshead.h b/syshead.h
index b159bf9..d2ea8de 100644
--- a/syshead.h
+++ b/syshead.h
@@ -662,4 +662,9 @@ socket_defined (const socket_descriptor_t sd)
 #define AUTO_USERID 0
 #endif
 
+/*
+ * Do we support pushing peer info?
+ */
+#define ENABLE_PUSH_PEER_INFO
+
 #endif
-- 
cgit v1.2.3