mirror/openvpn3
0
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn3.git synced 2024-09-20 12:12:15 +02:00
Code

Merge branch 'released' into master

Browse Source
This commit is contained in:
David Sommerseth 2019-11-14 18:42:15 +01:00
commit 02e524dcef
No known key found for this signature in database
GPG Key ID: 86CF944C9671FDF2
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openvpn/transport/client/httpcli.hpp
View File

@ -246,6 +246,7 @@ namespace openvpn {
// resolve it
parent->transport_pre_resolve();
async_resolve_lock();
async_resolve_name(proxy_host, proxy_port);
}
}
@ -340,7 +341,6 @@ namespace openvpn {
socket(io_context_arg),
config(config_arg),
parent(parent_arg),
resolver(io_context_arg),
halt(false),
n_transactions(0),
proxy_established(false),
@ -855,7 +855,6 @@ namespace openvpn {
impl->stop();
socket.close();
resolver.cancel();
async_resolve_cancel();
}
}
@ -864,6 +863,9 @@ namespace openvpn {
void resolve_callback(const openvpn_io::error_code& error,
openvpn_io::ip::tcp::resolver::results_type results) override
{
// release resolver allocated resources
async_resolve_cancel();
if (!halt)
{
if (!error)
@ -1008,7 +1010,6 @@ namespace openvpn {
ClientConfig::Ptr config;
TransportClientParent* parent;
LinkImpl::Ptr impl;
openvpn_io::ip::tcp::resolver resolver;
LinkImpl::protocol::endpoint server_endpoint;
bool halt;