diff options
| author | Heiko Hund <heiko.hund@sophos.com> | 2012-02-05 13:47:09 +0100 |
|---|---|---|
| committer | David Sommerseth <davids@redhat.com> | 2012-06-13 10:44:33 +0200 |
| commit | 8e1975b046dcf821eaf03098677dc5e34cd3a1a5 (patch) | |
| tree | 3bd5f67b3c97ead27dd26f68164bc4883655f98d /src/openvpn/proxy.h | |
| parent | e656b995b44fab0b8290c6c2a4a73079b3f9813b (diff) | |
| download | openvpn-8e1975b046dcf821eaf03098677dc5e34cd3a1a5.tar.gz openvpn-8e1975b046dcf821eaf03098677dc5e34cd3a1a5.tar.xz openvpn-8e1975b046dcf821eaf03098677dc5e34cd3a1a5.zip | |
remove the --auto-proxy option from openvpn
During discussion on FOSDEM 2012 it was decided that proxy auto detection
is best done in the GUI as it's highly platform specific and shouldn't be
handled in openvpn itself for every supported platform in openvpn itself.
This removes --auto-proxy from openvpn.
Signed-off-by: Heiko Hund <heiko.hund@sophos.com>
Acked-by: David Sommerseth <davids@redhat.com>
Message-Id: 1328446029-30523-1-git-send-email-heiko.hund@sophos.com
URL: http://article.gmane.org/gmane.network.openvpn.devel/5333
Signed-off-by: David Sommerseth <davids@redhat.com>
Diffstat (limited to 'src/openvpn/proxy.h')
| -rw-r--r-- | src/openvpn/proxy.h | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/src/openvpn/proxy.h b/src/openvpn/proxy.h index d89aa4a..355a4c3 100644 --- a/src/openvpn/proxy.h +++ b/src/openvpn/proxy.h @@ -28,30 +28,6 @@ #include "buffer.h" #include "misc.h" -#ifdef GENERAL_PROXY_SUPPORT - -/* - * Return value for get_proxy_settings to automatically - * determine proxy information. - */ -struct auto_proxy_info_entry { - char *server; - int port; -}; - -struct auto_proxy_info { - struct auto_proxy_info_entry http; - struct auto_proxy_info_entry socks; -}; - -struct auto_proxy_info *get_proxy_settings (char **err, struct gc_arena *gc); - -#ifdef WIN32 -void show_win_proxy_settings (const int msglevel); -#endif /* WIN32 */ - -#endif /* GENERAL_PROXY_SUPPORT */ - #ifdef ENABLE_HTTP_PROXY /* HTTP CONNECT authentication methods */ @@ -94,8 +70,7 @@ struct http_proxy_info { bool queried_creds; }; -struct http_proxy_info *http_proxy_new (const struct http_proxy_options *o, - struct auto_proxy_info *auto_proxy_info); +struct http_proxy_info *http_proxy_new (const struct http_proxy_options *o); void http_proxy_close (struct http_proxy_info *hp); |