From 3cf6c9328250061600b78c8a7deb0edc850e739b Mon Sep 17 00:00:00 2001 From: James Yonan 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 --- proxy.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'proxy.h') diff --git a/proxy.h b/proxy.h index 480cda1..d89aa4a 100644 --- a/proxy.h +++ b/proxy.h @@ -71,7 +71,7 @@ struct http_proxy_options { # define PAR_NO 0 /* don't support any auth retries */ # define PAR_ALL 1 /* allow all proxy auth protocols */ # define PAR_NCT 2 /* disable cleartext proxy auth protocols */ - bool auth_retry; + int auth_retry; const char *auth_method_string; const char *auth_file; @@ -79,12 +79,19 @@ struct http_proxy_options { const char *user_agent; }; +struct http_proxy_options_simple { + const char *server; + int port; + int auth_retry; +}; + struct http_proxy_info { bool defined; int auth_method; struct http_proxy_options options; struct user_pass up; char *proxy_authenticate; + bool queried_creds; }; struct http_proxy_info *http_proxy_new (const struct http_proxy_options *o, -- cgit v1.2.3