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

Display configured family address for UDP and DCO

Browse Source 
Instead if displaying resolved family address (v4/v6),
display the one which is configured - either in ovpn profile
or config override options.

This is already the case for TCP.

Signed-off-by: Lev Stipakov <lev@openvpn.net>
This commit is contained in:
Lev Stipakov 2023-05-10 16:26:47 +03:00 committed by David Sommerseth
parent d6d4d547b5
commit de01e278cc
No known key found for this signature in database
GPG Key ID: 86CF944C9671FDF2
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openvpn/dco/dcocli.hpp
View File

@ -192,8 +192,7 @@ class Client : public TransportClient,
host = server_host;
port = server_port;
const IP::Addr addr = server_endpoint_addr();
proto = config->transport.protocol.is_tcp() ? "TCP" : "UDP";
proto += addr.version_string();
proto = std::string(transport_protocol().str());
proto += "-DCO";
ip_addr = addr.to_string();
}

14
openvpn/transport/client/udpcli.hpp
View File

@ -95,7 +95,7 @@ class Client : public TransportClient, AsyncResolvableUDP
if (!impl)
{
halt = false;
if (config->remote_list->endpoint_available(&server_host, &server_port, nullptr))
if (config->remote_list->endpoint_available(&server_host, &server_port, &server_protocol))
{
start_connect_();
}
@ -156,9 +156,8 @@ class Client : public TransportClient, AsyncResolvableUDP
{
host = server_host;
port = server_port;
proto = server_protocol.str();
const IP::Addr addr = server_endpoint_addr();
proto = "UDP";
proto += addr.version_string();
ip_addr = addr.to_string();
}
@ -179,12 +178,7 @@ class Client : public TransportClient, AsyncResolvableUDP
Protocol transport_protocol() const override
{
if (server_endpoint.address().is_v4())
return Protocol(Protocol::UDPv4);
else if (server_endpoint.address().is_v6())
return Protocol(Protocol::UDPv6);
else
return Protocol();
return server_protocol;
}
void stop() override
@ -339,6 +333,8 @@ class Client : public TransportClient, AsyncResolvableUDP
std::string server_host;
std::string server_port;
Protocol server_protocol;
openvpn_io::ip::udp::socket socket;
ClientConfig::Ptr config;
TransportClientParent *parent;