mirror of
https://github.com/deneraraujo/OpenVPNAdapter.git
synced 2026-04-24 00:00:05 +08:00
Squashed 'Sources/OpenVPNAdapter/Libraries/Vendors/openvpn/' changes from 554d8b888..cc90cde57
cc90cde57 win: use 'MSVC 2017 Professional' as default compiler 4b072bce1 [OVPN3-311] function.hpp: fix Windows build 48b9b78de [OVPN3-310] logging: fix 'OPENVPN_LOG_NTNL': identifier not found 5a4a87552 cosmetics: helper function to check registry errors fc52fd8a5 [OC-78] proxy: support PROXY_AUTO_CONFIG_URL on Windows f5178cff9 [OC-77] proxy: refactor proxy settings code 18e50ec3f ReplyParser: added undefined status 8178ae06f unix file utils: added update_file_mod_time_nanoseconds() 8f20f7693 build: use LZ4_SYS=1 default when target is Linux 4bd996e61 timestr: added date_time_utc() and nanosec_time_to_string() 0eaa2586f string: added remove_spaces() method d47ae03cc OptionList: added get_c_str() method 1eb9cd657 unix file utils: added mtime_ns parameter to write_binary_unix() and write_binary_atomic() bf00c6e3e Time::delta_str(): use "INF" to denote infinite time 0e598a87b kovpn.hpp: asio must be included before sys/ and linux/ headers to avoid redefinition conflicts 1d2ce460d BufferType: added read_alloc_buf() method 148ae6085 BufferType: added reset_offset() method 6218ed618 Factor out IP::random_addr_v4() and IP::random_addr_v6() from IP::random_addr(). 5468670b9 pool: minor changes 36a885a82 route: allow for specialized IPv4/v6 RouteType 5e29e6628 BufferType: added typedef T value_type d92021c99 strerror.hpp: added #include <errno.h> for benefit of users 363cbece3 Function: misc cleanup d88435ecd IP::Route: added defined() method 3371cb745 kovpn.hpp: fix centos build with DCO enabled dc9e48d98 Fix bug in macos tunnel interface setup. Second ip address should be gateway address bcdb27993 Merged in schwabe/fix_clang_warnings (pull request #25) ede5e90ff Merged in schabe/fix_swig_ipadr (pull request #27) c0d580d24 Merged in schwabe/fix_openvpn_extern (pull request #26) 0965882e5 Merged in schwabe/stats_morecpus (pull request #23) 5f1f8470b Revert bugfix for not compiling IA32 ASM of 2.7.5 bde2c41be dep: switch from mbeTLS 2.7.0 to 2.7.5 9d06b5c97 [OC-77] proxy: support PROXY_AUTO_CONFIG_URL on macOS 3f2ad8e8c Hide const std::string IP methods from SWIG ba264862a Send also kovpn statistics of CPU Cores >= 16 via status message 2991d38b3 Fix warnings reported by LLVM/Clang 02d2a7975 Fix multiple inclusion of OpenVPN3 header with OPENPVN_EXTERN git-subtree-dir: Sources/OpenVPNAdapter/Libraries/Vendors/openvpn git-subtree-split: cc90cde5769dcf9e13fdd9e85d6d0857963dabce
This commit is contained in:
@@ -223,7 +223,7 @@ namespace openvpn {
|
||||
}
|
||||
|
||||
// return the first line (without newline) of a multi-line string
|
||||
std::string first_line(const std::string& str)
|
||||
inline std::string first_line(const std::string& str)
|
||||
{
|
||||
const size_t pos = str.find_first_of('\n');
|
||||
if (pos != std::string::npos)
|
||||
@@ -310,6 +310,19 @@ namespace openvpn {
|
||||
return false;
|
||||
}
|
||||
|
||||
// remove all spaces in string
|
||||
inline std::string remove_spaces(const std::string& str)
|
||||
{
|
||||
std::string ret;
|
||||
for (std::string::const_iterator i = str.begin(); i != str.end(); ++i)
|
||||
{
|
||||
char c = *i;
|
||||
if (!is_space(c))
|
||||
ret += c;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
// replace all spaces in string with rep
|
||||
inline std::string replace_spaces(const std::string& str, const char rep)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user