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

In split_host_port(), allow caller to specify a default

Browse Source 
port and handle cases where IP address or host is bracketed,
such as "[IP]:PORT".
This commit is contained in:
James Yonan 2015-09-02 03:06:32 -07:00
parent 8d78caf733
commit 22b9fb347f
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
openvpn/common/hostport.hpp
View File

@ -82,18 +82,31 @@ namespace openvpn {
inline bool split_host_port(const std::string& str,
std::string& host,
std::string& port,
const std::string& title,
const std::string& default_port,
unsigned int *port_save = nullptr)
{
const size_t pos = str.find_last_of(':');
if (pos != std::string::npos && pos > 0 && str.length() >= pos + 2)
const size_t cb = str.find_last_of(']');
if (pos != std::string::npos && (cb == std::string::npos || pos > cb))
{
// host:port or [host]:port specified
host = str.substr(0, pos);
port = str.substr(pos + 1);
return is_valid_host(host) && is_valid_port(port, port_save);
}
else if (!default_port.empty())
{
// only host specified
host = str;
port = default_port;
}
else
return false;
// unbracket host
if (host.length() >= 2 && host[0] == '[' && host[host.length()-1] == ']')
host = host.substr(1, host.length()-2);
return is_valid_host(host) && is_valid_port(port, port_save);
}
}