diff options
| author | Alberto Gonzalez Iniesta <agi@inittab.org> | 2016-01-20 12:01:07 +0100 |
|---|---|---|
| committer | Alberto Gonzalez Iniesta <agi@inittab.org> | 2016-01-20 12:01:07 +0100 |
| commit | 19eab1fe2df20e38ea64d7a642d3e21c957082b8 (patch) | |
| tree | fad602b603321d3e0e45807f8abb4f6c670a6cf2 /src/openvpn/options.h | |
| parent | 35807e5652390e8b2fd66b9051f3b41c9488302e (diff) | |
| parent | 9653b1bffea4e96c1eb7c1814e8bed21fea62321 (diff) | |
Merge tag 'upstream/2.3.10'
Upstream version 2.3.10
Diffstat (limited to 'src/openvpn/options.h')
| -rw-r--r-- | src/openvpn/options.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/openvpn/options.h b/src/openvpn/options.h index af9a47f..26b09ea 100644 --- a/src/openvpn/options.h +++ b/src/openvpn/options.h @@ -593,6 +593,7 @@ struct options bool exit_event_initial_state; bool show_net_up; int route_method; + bool block_outside_dns; #endif bool use_peer_id; @@ -689,6 +690,10 @@ void usage_small (void); void show_library_versions(const unsigned int flags); +#ifdef WIN32 +void show_windows_version(const unsigned int flags); +#endif + void init_options (struct options *o, const bool init_gc); void uninit_options (struct options *o); @@ -777,8 +782,7 @@ void options_string_import (struct options *options, struct env_set *es); bool get_ipv6_addr( const char * prefix_str, struct in6_addr *network, - unsigned int * netbits, char ** printable_ipv6, - int msglevel ); + unsigned int * netbits, int msglevel ); /* * inline functions |