Merge commit '84ad2a289f33a43dd71276cc494f337d0fbb3ed6' into feature/update-dependencies

2026-04-24 00:00:05 +08:00 · 2018-04-04 12:34:20 +03:00
parent f3baaed4df 84ad2a289f
commit 3030551e3d
81 changed files with 5189 additions and 856 deletions
@@ -0,0 +1,48 @@
+From 28cdfe3f923affa87420a47f8ac71e791c77bcde Mon Sep 17 00:00:00 2001
+From: James Yonan <james@openvpn.net>
+Date: Mon, 19 Mar 2018 11:24:10 +0800
+Subject: [PATCH] Added Apple NAT64 support when both ASIO_HAS_GETADDRINFO and
+ ASIO_APPLE_NAT64 ar defined
+
+* When calling getaddrinfo(), Apple recommends to set
+  AI_DEFAULT flags in hint.
+
+* iOS bug workaround: sometimes iOS getaddrinfo() returns a
+  non-zero scope ID for non-link-local addresses.
+  Workaround by forcing scope ID to 0 for non-link-local
+  addresses.
+---
+ asio/include/asio/detail/impl/socket_ops.ipp | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/asio/include/asio/detail/impl/socket_ops.ipp b/asio/include/asio/detail/impl/socket_ops.ipp
+index b3b1a0cf..e1a07e06 100644
+--- a/asio/include/asio/detail/impl/socket_ops.ipp
+++ b/asio/include/asio/detail/impl/socket_ops.ipp
+@@ -3338,6 +3338,23 @@ asio::error_code getaddrinfo(const char* host,
+ # endif
+ #elif !defined(ASIO_HAS_GETADDRINFO)
+   int error = getaddrinfo_emulation(host, service, &hints, result);
+  return ec = translate_addrinfo_error(error);
+#elif defined(ASIO_HAS_GETADDRINFO) && defined(ASIO_APPLE_NAT64)
+  // For NAT64 compatibility, Apple recommends to set AI_DEFAULT flags
+  addrinfo_type new_hints = hints;
+  new_hints.ai_flags |= AI_DEFAULT;
+  int error = ::getaddrinfo(host, service, &new_hints, result);
+
+  // iOS bug workaround: sometimes iOS getaddrinfo() returns a non-zero scope ID
+  // for non-link-local addresses.  Workaround by forcing scope ID to 0 for
+  // non-link-local addresses.
+  if (!error && (*result)->ai_family == AF_INET6)
+  {
+    sockaddr_in6* a6 = (sockaddr_in6*)(*result)->ai_addr;
+    if (a6->sin6_scope_id && !(IN6_IS_ADDR_LINKLOCAL(&a6->sin6_addr) || IN6_IS_ADDR_MC_NODELOCAL(&a6->sin6_addr) || IN6_IS_ADDR_MC_LINKLOCAL(&a6->sin6_addr)))
+      a6->sin6_scope_id = 0;
+  }
+
+   return ec = translate_addrinfo_error(error);
+ #else
+   int error = ::getaddrinfo(host, service, &hints, result);
+-- 
+2.16.2
+
@@ -0,0 +1,38 @@
+From c6cb856ac923472e56d8dd631585b4ca58e71c31 Mon Sep 17 00:00:00 2001
+From: James Yonan <james@openvpn.net>
+Date: Wed, 2 Sep 2015 12:18:48 -0700
+Subject: [PATCH] Added randomize() method to
+ asio::ip::tcp::resolver::results_type.
+
+---
+ asio/include/asio/ip/basic_resolver_results.hpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/asio/include/asio/ip/basic_resolver_results.hpp b/asio/include/asio/ip/basic_resolver_results.hpp
+index 4146a46b..f0ae258c 100644
+--- a/asio/include/asio/ip/basic_resolver_results.hpp
+++ b/asio/include/asio/ip/basic_resolver_results.hpp
+@@ -18,6 +18,7 @@
+ #include "asio/detail/config.hpp"
+ #include <cstddef>
+ #include <cstring>
+#include <algorithm>
+ #include "asio/detail/socket_ops.hpp"
+ #include "asio/detail/socket_types.hpp"
+ #include "asio/ip/basic_resolver_iterator.hpp"
+@@ -299,6 +300,12 @@ public:
+     return !a.equal(b);
+   }
+ 
+  template <typename Random>
+  void randomize(Random& r)
+  {
+    std::shuffle(this->values_->begin(), this->values_->end(), r);
+  }
+
+ private:
+   typedef std::vector<basic_resolver_entry<InternetProtocol> > values_type;
+ };
+-- 
+2.16.2
+
@@ -0,0 +1,38 @@
+From 69a6d6aec54b41f4ceac3ac2ba14465a36bf1984 Mon Sep 17 00:00:00 2001
+From: James Yonan <james@openvpn.net>
+Date: Mon, 27 Feb 2017 13:01:26 -0700
+Subject: [PATCH] Added user code hook async_connect_post_open() to be called
+ immediately after socket open in async_connect.
+
+---
+ asio/include/asio/basic_socket.hpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/asio/include/asio/basic_socket.hpp b/asio/include/asio/basic_socket.hpp
+index 43430161..0d1b0d28 100644
+--- a/asio/include/asio/basic_socket.hpp
+++ b/asio/include/asio/basic_socket.hpp
+@@ -865,6 +865,8 @@ public:
+       asio::error_code ec;
+       const protocol_type protocol = peer_endpoint.protocol();
+       this->get_service().open(this->get_implementation(), protocol, ec);
+      if (!ec)
+	async_connect_post_open(protocol, ec);
+       if (ec)
+       {
+         async_completion<ConnectHandler,
+@@ -1741,6 +1743,11 @@ protected:
+   }
+ 
+ private:
+  // optional user code hook immediately after socket open in async_connect
+  virtual void async_connect_post_open(const protocol_type& protocol, asio::error_code& ec)
+  {
+  }
+
+   // Disallow copying and assignment.
+   basic_socket(const basic_socket&) ASIO_DELETED;
+   basic_socket& operator=(const basic_socket&) ASIO_DELETED;
+-- 
+2.16.2
+