From 806017ef909a88567b4844a90e73c99f26497f7d Mon Sep 17 00:00:00 2001
From: Thales Macedo Garitezi <thalesmg@gmail.com>
Date: Fri, 22 Sep 2023 16:23:39 -0300
Subject: [PATCH] chore: check ekka proto dist module type when resolving node
 address

Follow up to https://github.com/emqx/emqx/pull/11637#discussion_r1334462917

Fixes https://emqx.atlassian.net/browse/EMQX-10944
---
 apps/emqx_machine/src/emqx_machine.erl        | 18 +++++++++++++++++-
 apps/emqx_machine/test/emqx_machine_SUITE.erl |  2 +-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/apps/emqx_machine/src/emqx_machine.erl b/apps/emqx_machine/src/emqx_machine.erl
index 5931413cb..36635d50e 100644
--- a/apps/emqx_machine/src/emqx_machine.erl
+++ b/apps/emqx_machine/src/emqx_machine.erl
@@ -195,7 +195,8 @@ do_check({Node, #{resolved_ips := [IP | _]} = Plan}) ->
 node_to_ips(Node) ->
     NodeBin0 = atom_to_binary(Node),
     HostOrIP = re:replace(NodeBin0, <<"^.+@">>, <<"">>, [{return, list}]),
-    case inet:gethostbyname(HostOrIP, inet) of
+    AddressType = resolve_dist_address_type(),
+    case inet:gethostbyname(HostOrIP, AddressType) of
         {ok, #hostent{h_addr_list = AddrList}} ->
             AddrList;
         _ ->
@@ -210,3 +211,18 @@ is_tcp_port_open(IP, Port) ->
         _ ->
             false
     end.
+
+resolve_dist_address_type() ->
+    ProtoDistStr = os:getenv("EKKA_PROTO_DIST_MOD", "inet_tcp"),
+    case ProtoDistStr of
+        "inet_tcp" ->
+            inet;
+        "inet6_tcp" ->
+            inet6;
+        "inet_tls" ->
+            inet;
+        "inet6_tls" ->
+            inet6;
+        _ ->
+            inet
+    end.
diff --git a/apps/emqx_machine/test/emqx_machine_SUITE.erl b/apps/emqx_machine/test/emqx_machine_SUITE.erl
index 3c84194da..98cd4e12b 100644
--- a/apps/emqx_machine/test/emqx_machine_SUITE.erl
+++ b/apps/emqx_machine/test/emqx_machine_SUITE.erl
@@ -170,7 +170,7 @@ t_open_ports_check(Config) ->
                 }
         },
         erpc:call(Core1, emqx_machine, open_ports_check, []),
-        #{core2 => Core2}
+        #{core2 => Core2, gen_rpc_port => GenRPCPort, ekka_port => EkkaPort}
     ),
 
     ok.