From c3ed67b67dae122d51e32709b675834f39115d22 Mon Sep 17 00:00:00 2001 From: Sergey Abramchuk Date: Sun, 3 Nov 2019 11:05:14 +0300 Subject: [PATCH] Reset tun without any conditions and drop idea to override remote server --- Sources/OpenVPNAdapter/OpenVPNClient.h | 3 --- Sources/OpenVPNAdapter/OpenVPNClient.mm | 13 +------------ 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/Sources/OpenVPNAdapter/OpenVPNClient.h b/Sources/OpenVPNAdapter/OpenVPNClient.h index 7f539ab..30be5a6 100644 --- a/Sources/OpenVPNAdapter/OpenVPNClient.h +++ b/Sources/OpenVPNAdapter/OpenVPNClient.h @@ -93,9 +93,6 @@ public: void external_pki_cert_request(ClientAPI::ExternalPKICertRequest& certreq) override; void external_pki_sign_request(ClientAPI::ExternalPKISignRequest& signreq) override; - bool remote_override_enabled() override; - void remote_override(ClientAPI::RemoteOverride& remote) override; - void event(const ClientAPI::Event& event) override; void log(const ClientAPI::LogInfo& log) override; diff --git a/Sources/OpenVPNAdapter/OpenVPNClient.mm b/Sources/OpenVPNAdapter/OpenVPNClient.mm index 11b35c3..b2adbae 100644 --- a/Sources/OpenVPNAdapter/OpenVPNClient.mm +++ b/Sources/OpenVPNAdapter/OpenVPNClient.mm @@ -153,10 +153,7 @@ bool OpenVPNClient::tun_builder_persist() { void OpenVPNClient::tun_builder_teardown(bool disconnect) { [this->delegate resetSettings]; - - if (disconnect || !this->tun_builder_persist()) { - [this->delegate resetTun]; - } + [this->delegate resetTun]; } bool OpenVPNClient::socket_protect(int socket, std::string remote, bool ipv6) { @@ -170,14 +167,6 @@ bool OpenVPNClient::pause_on_connection_timeout() { void OpenVPNClient::external_pki_cert_request(ClientAPI::ExternalPKICertRequest& certreq) { } void OpenVPNClient::external_pki_sign_request(ClientAPI::ExternalPKISignRequest& signreq) { } -bool OpenVPNClient::remote_override_enabled() { - return false; -} - -void OpenVPNClient::remote_override(ClientAPI::RemoteOverride& remote) { - // TODO: Override remote server -} - void OpenVPNClient::event(const ClientAPI::Event& ev) { NSString *name = [NSString stringWithUTF8String:ev.name.c_str()]; NSString *message = [NSString stringWithUTF8String:ev.info.c_str()];