github/OpenVPNAdapter
4
0
Fork 0
mirror of https://github.com/deneraraujo/OpenVPNAdapter.git synced 2026-04-24 00:00:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '84ad2a289f33a43dd71276cc494f337d0fbb3ed6' into feature/update-dependencies

Browse Source
This commit is contained in:
Sergey Abramchuk
2018-04-04 12:34:20 +03:00
parent f3baaed4df 84ad2a289f
commit 3030551e3d
81 changed files with 5189 additions and 856 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OpenVPN Adapter/Vendors/openvpn/client/ovpncli.cpp
+5
View File
@@ -322,6 +322,8 @@ namespace openvpn {
const std::string title = "remote-override";
ClientAPI::RemoteOverride ro;
parent->remote_override(ro);
if (!ro.error.empty())
throw Exception("remote override exception: " + ro.error);
RemoteList::Item::Ptr ri(new RemoteList::Item);
if (!ro.ip.empty())
ri->set_ip_addr(IP::Addr(ro.ip, title));
@@ -414,6 +416,7 @@ namespace openvpn {
bool google_dns_fallback = false;
bool synchronous_dns_lookup = false;
bool autologin_sessions = false;
bool retry_on_auth_failed = false;
std::string private_key_password;
std::string external_pki_alias;
bool disable_client_cert = false;
@@ -654,6 +657,7 @@ namespace openvpn {
state->google_dns_fallback = config.googleDnsFallback;
state->synchronous_dns_lookup = config.synchronousDnsLookup;
state->autologin_sessions = config.autologinSessions;
state->retry_on_auth_failed = config.retryOnAuthFailed;
state->private_key_password = config.privateKeyPassword;
if (!config.protoOverride.empty())
state->proto_override = Protocol::parse(config.protoOverride, Protocol::NO_SUFFIX);
@@ -921,6 +925,7 @@ namespace openvpn {
cc.google_dns_fallback = state->google_dns_fallback;
cc.synchronous_dns_lookup = state->synchronous_dns_lookup;
cc.autologin_sessions = state->autologin_sessions;
cc.retry_on_auth_failed = state->retry_on_auth_failed;
cc.proto_context_options = state->proto_context_options;
cc.http_proxy_options = state->http_proxy_options;
cc.alt_proxy = state->alt_proxy;
OpenVPN Adapter/Vendors/openvpn/client/ovpncli.hpp
+5
View File
@@ -206,6 +206,10 @@ namespace openvpn {
// Enable autologin sessions
bool autologinSessions = true;
// If true, consider AUTH_FAILED to be a non-fatal error,
// and retry the connection after a pause.
bool retryOnAuthFailed = false;
// An ID used for get-certificate and RSA signing callbacks
// for External PKI profiles.
std::string externalPkiAlias;
@@ -414,6 +418,7 @@ namespace openvpn {
std::string ip; // or ip must be defined (or both)
std::string port;
std::string proto;
std::string error; // if non-empty, indicates an error
};
namespace Private {