diff options
| author | David Sommerseth <davids@redhat.com> | 2011-08-24 13:06:39 +0200 |
|---|---|---|
| committer | David Sommerseth <davids@redhat.com> | 2011-08-24 13:06:39 +0200 |
| commit | 20fc33707eab708dfd7e8ffcf2eea0f8362b10b3 (patch) | |
| tree | 7f60234df8fc0e073cf40ea25361d1e3f35bed50 /options.h | |
| parent | 3b75dec3e32e7d838ed56be5667d1cf3ac4cef18 (diff) | |
| parent | 576dc96ca1ef1badb651e05ac694f07c91e02518 (diff) | |
| download | openvpn-20fc33707eab708dfd7e8ffcf2eea0f8362b10b3.tar.gz openvpn-20fc33707eab708dfd7e8ffcf2eea0f8362b10b3.tar.xz openvpn-20fc33707eab708dfd7e8ffcf2eea0f8362b10b3.zip | |
Merge branch 'svn-merger'
Diffstat (limited to 'options.h')
| -rw-r--r-- | options.h | 25 |
1 files changed, 24 insertions, 1 deletions
@@ -110,7 +110,15 @@ struct connection_entry # define CE_HTTP_PROXY_FALLBACK (1<<1) time_t ce_http_proxy_fallback_timestamp; /* time when fallback http_proxy_options was last updated */ #endif - +#if MANAGEMENT_QUERY_REMOTE +# define CE_MAN_QUERY_REMOTE_UNDEF 0 +# define CE_MAN_QUERY_REMOTE_QUERY 1 +# define CE_MAN_QUERY_REMOTE_ACCEPT 2 +# define CE_MAN_QUERY_REMOTE_MOD 3 +# define CE_MAN_QUERY_REMOTE_SKIP 4 +# define CE_MAN_QUERY_REMOTE_MASK (0x07) +# define CE_MAN_QUERY_REMOTE_SHIFT (2) +#endif unsigned int flags; }; @@ -150,6 +158,14 @@ struct hpo_store }; #endif +#if MANAGEMENT_QUERY_REMOTE +struct remote_host_store +{ +# define RH_HOST_LEN 80 + char host[RH_HOST_LEN]; +}; +#endif + /* Command line options */ struct options { @@ -202,6 +218,10 @@ struct options struct hpo_store *hpo_store; /* used to store dynamic proxy info given by management interface */ #endif +#if MANAGEMENT_QUERY_REMOTE + struct remote_host_store *rh_store; +#endif + bool remote_random; const char *ipchange; const char *dev; @@ -457,6 +477,9 @@ struct options int scheduled_exit_interval; +#ifdef ENABLE_CLIENT_CR + struct static_challenge_info sc_info; +#endif #endif #ifdef USE_CRYPTO |