From 2dc63cffea4f039c7b1132a437777efdd80ff168 Mon Sep 17 00:00:00 2001
From: Zaiming Shi <zmstone@gmail.com>
Date: Tue, 16 Nov 2021 08:37:53 +0100
Subject: [PATCH] fix(emqx_misc): call gen_tcp to decide if ipv6_probe is
 supported

---
 src/emqx_misc.erl | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/emqx_misc.erl b/src/emqx_misc.erl
index 2b77d0455..01495460f 100644
--- a/src/emqx_misc.erl
+++ b/src/emqx_misc.erl
@@ -66,16 +66,9 @@ maybe_parse_ip(Host) ->
 
 %% @doc Add `ipv6_probe' socket option if it's supported.
 ipv6_probe(Opts) ->
-    case persistent_term:get({?MODULE, ipv6_probe_supported}, unknown) of
-        unknown ->
-            %% e.g. 23.2.7.1-emqx-2-x86_64-unknown-linux-gnu-64
-            OtpVsn = emqx_vm:get_otp_version(),
-            Bool = (match =:= re:run(OtpVsn, "emqx", [{capture, none}])),
-            _ = persistent_term:put({?MODULE, ipv6_probe_supported}, Bool),
-            ipv6_probe(Bool, Opts);
-        Bool ->
-            ipv6_probe(Bool, Opts)
-    end.
+    Bool = try gen_tcp:ipv6_probe()
+           catch _ : _ -> false end,
+    ipv6_probe(Bool, Opts).
 
 ipv6_probe(false, Opts) -> Opts;
 ipv6_probe(true, Opts) -> [{ipv6_probe, true} | Opts].