mirror of
https://github.com/deneraraujo/OpenVPNAdapter.git
synced 2026-05-13 00:04:14 +08:00
Merge commit '8e87aecebf66f50957e35966c547d77a6fb526ab' into feature/update-dependencies
This commit is contained in:
@@ -436,7 +436,10 @@ namespace openvpn {
|
||||
std::string tls_version_min_override;
|
||||
std::string tls_cert_profile_override;
|
||||
std::string gui_version;
|
||||
std::string sso_methods;
|
||||
bool allow_local_lan_access;
|
||||
std::string hw_addr_override;
|
||||
std::string platform_version;
|
||||
ProtoContextOptions::Ptr proto_context_options;
|
||||
PeerInfo::Set::Ptr extra_peer_info;
|
||||
HTTPProxyTransport::Options::Ptr http_proxy_options;
|
||||
@@ -689,6 +692,9 @@ namespace openvpn {
|
||||
state->tls_cert_profile_override = config.tlsCertProfileOverride;
|
||||
state->allow_local_lan_access = config.allowLocalLanAccess;
|
||||
state->gui_version = config.guiVersion;
|
||||
state->sso_methods = config.ssoMethods;
|
||||
state->platform_version = config.platformVersion;
|
||||
state->hw_addr_override = config.hwAddrOverride;
|
||||
state->alt_proxy = config.altProxy;
|
||||
state->dco = config.dco;
|
||||
state->echo = config.echo;
|
||||
@@ -962,6 +968,9 @@ namespace openvpn {
|
||||
cc.tls_version_min_override = state->tls_version_min_override;
|
||||
cc.tls_cert_profile_override = state->tls_cert_profile_override;
|
||||
cc.gui_version = state->gui_version;
|
||||
cc.sso_methods = state->sso_methods;
|
||||
cc.hw_addr_override = state->hw_addr_override;
|
||||
cc.platform_version = state->platform_version;
|
||||
cc.extra_peer_info = state->extra_peer_info;
|
||||
cc.stop = state->async_stop_local();
|
||||
cc.allow_local_lan_access = state->allow_local_lan_access;
|
||||
|
||||
@@ -172,6 +172,20 @@ namespace openvpn {
|
||||
// Passed to server as IV_GUI_VER.
|
||||
std::string guiVersion;
|
||||
|
||||
// Set to a comma seperated list of supported SSO mechanisms that may
|
||||
// be signalled via INFO_PRE to the client.
|
||||
// "openurl" is to continue authentication by opening an url in a browser
|
||||
// "crtext" gives a challenge response in text format that needs to
|
||||
// responded via control channel. (
|
||||
// Passed to the server as IV_SSO
|
||||
std::string ssoMethods;
|
||||
|
||||
// Override the string that is passed as IV_HWADDR to the server
|
||||
std::string hwAddrOverride;
|
||||
|
||||
// Set the string that is passed to the server as IV_PLAT_VER
|
||||
std::string platformVersion;
|
||||
|
||||
// Use a different server than that specified in "remote"
|
||||
// option of profile
|
||||
std::string serverOverride;
|
||||
|
||||
Reference in New Issue
Block a user