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

openvpn/time/time.hpp

@@ -268,6 +268,8 @@ namespace openvpn {
     {
       if (!defined())
 	return "UNDEF-TIME";
+      if (is_infinite())
+	return "INF";
       const double df = delta_float(t);
       std::string ret;
       if (df >= 0.0)

openvpn/time/timestr.hpp

@@ -25,13 +25,15 @@
 #define OPENVPN_TIME_TIMESTR_H
 
 #include <string>
-#include <cstring> // for std::strlen
+#include <cstring> // for std::strlen and std::memset
 #include <time.h>
 #include <stdio.h>
 #include <ctype.h>
+#include <cstdint> // for std::uint64_t
 
 #include <openvpn/common/platform.hpp>
 #include <openvpn/common/size.hpp>
+#include <openvpn/common/string.hpp>
 
 #if defined(OPENVPN_PLATFORM_WIN)
 #include <windows.h>
@@ -72,6 +74,7 @@ namespace openvpn {
     struct tm lt;
     char buf[64];
 
+    std::memset(&lt, 0, sizeof(lt));
     if (!localtime_r(&t, &lt))
       return "LOCALTIME_ERROR";
     if (!asctime_r(&lt, buf))
@@ -82,6 +85,22 @@ namespace openvpn {
     return std::string(buf);
   }
 
+  inline std::string date_time_utc(const time_t t)
+  {
+    struct tm lt;
+    char buf[64];
+
+    std::memset(&lt, 0, sizeof(lt));
+    if (!gmtime_r(&t, &lt))
+      return "GMTIME_ERROR";
+    if (!asctime_r(&lt, buf))
+      return "ASCTIME_ERROR";
+    const size_t len = std::strlen(buf);
+    if (len > 0 && buf[len-1] == '\n')
+      buf[len-1] = '\0';
+    return std::string(buf);
+  }
+
   // msecs == false : Tue Feb 17 01:24:30 2015
   // msecs == true  : Tue Feb 17 01:24:30.123 2015
   inline std::string date_time(const struct timeval *tv, const bool msecs)
@@ -93,9 +112,9 @@ namespace openvpn {
 	const size_t pos = dt.find_last_of(':');
 	if (pos != std::string::npos
 	    && pos + 3 < dt.length()
-	    && isdigit(dt[pos+1])
-	    && isdigit(dt[pos+2])
-	    && isspace(dt[pos+3]))
+	    && string::is_digit(dt[pos+1])
+	    && string::is_digit(dt[pos+2])
+	    && string::is_space(dt[pos+3]))
 	  {
 	    char ms[5];
 	    ::snprintf(ms, sizeof(ms), ".%03u", static_cast<unsigned int>(tv->tv_usec / 1000));
@@ -105,6 +124,28 @@ namespace openvpn {
     return dt;
   }
 
+  inline std::string nanosec_time_to_string(const std::uint64_t ns_time)
+  {
+    const std::uint64_t sec = ns_time / std::uint64_t(1000000000);
+    const std::uint64_t ns = ns_time % std::uint64_t(1000000000);
+
+    const std::string dt = date_time_utc(sec);
+
+    // find correct position in string to insert nanoseconds
+    const size_t pos = dt.find_last_of(':');
+    if (pos != std::string::npos
+	&& pos + 3 < dt.length()
+	&& string::is_digit(dt[pos+1])
+	&& string::is_digit(dt[pos+2])
+	&& string::is_space(dt[pos+3]))
+      {
+	char ms[11];
+	::snprintf(ms, sizeof(ms), ".%09u", (unsigned int)ns);
+	return dt.substr(0, pos+3) + ms + dt.substr(pos+3);
+      }
+    return dt;
+  }
+
   inline std::string date_time()
   {
     struct timeval tv;