[esock|test] Make the ttest groups of test cases work with IPv6

OTP-15897

5 files changed, 113 insertions, 168 deletions

diff --git a/erts/emulator/test/socket_SUITE.erl b/erts/emulator/test/socket_SUITE.erl
index a495ab18b4..777274c36c 100644
--- a/erts/emulator/test/socket_SUITE.erl
+++ b/erts/emulator/test/socket_SUITE.erl
@@ -26102,7 +26102,7 @@ ttest_tcp(TC,
            fun() ->
                    if
                        (Domain =:= local) -> has_support_unix_domain_socket(); 
-                       (Domain =:= inet6) -> has_support_ipv6(); 
+                       (Domain =:= inet6) -> has_support_ipv6();
                        true -> ok 
                    end
            end,
@@ -26565,16 +26565,22 @@ ttest_tcp(InitState) ->
          ?SEV_FINISH_NORMAL
         ],
 
+    Domain = maps:get(domain, InitState),
+    LHost  = local_host(),
+    LAddr  = which_local_addr(Domain),
+
     i("start server evaluator"),
-    ServerInitState = #{host   => local_host(),
-                        domain => maps:get(domain,        InitState),
+    ServerInitState = #{host   => LHost,
+			addr   => LAddr,
+                        domain => Domain,
                         mod    => maps:get(server_mod,    InitState),
                         active => maps:get(server_active, InitState)},
     Server          = ?SEV_START("server", ServerSeq, ServerInitState),
 
     i("start client evaluator"),
-    ClientInitState = #{host            => local_host(),
-                        domain          => maps:get(domain,          InitState),
+    ClientInitState = #{host            => LHost,
+			addr            => LAddr,
+                        domain          => Domain,
                         mod             => maps:get(client_mod,      InitState),
                         active          => maps:get(client_active,   InitState),
                         msg_id          => maps:get(msg_id,          InitState),
@@ -26583,9 +26589,14 @@ ttest_tcp(InitState) ->
     Client          = ?SEV_START("client", ClientSeq, ClientInitState),
     
     i("start 'tester' evaluator"),
-    TesterInitState = #{domain => maps:get(domain, InitState),
-                        server => Server#ev.pid,
-                        client => Client#ev.pid},
+    TesterInitState = #{domain        => Domain,
+			msg_id        => maps:get(msg_id,        InitState),
+                        client        => Client#ev.pid,
+			client_mod    => maps:get(client_mod,    InitState),
+			client_active => maps:get(client_active, InitState),
+                        server        => Server#ev.pid,
+                        server_mod    => maps:get(server_mod,    InitState),
+                        server_active => maps:get(server_active, InitState)},
     Tester = ?SEV_START("tester", TesterSeq, TesterInitState),
 
     i("await evaluator(s)"),
@@ -26593,8 +26604,9 @@ ttest_tcp(InitState) ->
 
 
 
-ttest_tcp_server_start(Node, _Domain, gen, Active) ->
-    Transport = socket_test_ttest_tcp_gen,
+ttest_tcp_server_start(Node, Domain, gen, Active) ->
+    TransportMod = socket_test_ttest_tcp_gen,
+    Transport    = {TransportMod, #{domain => Domain}},
     socket_test_ttest_tcp_server:start_monitor(Node, Transport, Active);
 ttest_tcp_server_start(Node, Domain, sock, Active) ->
     TransportMod = socket_test_ttest_tcp_socket,
@@ -26608,9 +26620,10 @@ ttest_tcp_server_stop(Pid) ->
 
 ttest_tcp_client_start(Node,
                        Notify,
-                       _Domain, gen,
+                       Domain, gen,
                        ServerInfo, Active, MsgID, MaxOutstanding, RunTime) ->
-    Transport = socket_test_ttest_tcp_gen,
+    TransportMod = socket_test_ttest_tcp_gen,
+    Transport    = {TransportMod, #{domain => Domain}},    
     socket_test_ttest_tcp_client:start_monitor(Node,
                                                Notify,
                                                Transport,
@@ -26905,39 +26918,6 @@ sock_sockname(Sock) ->
             ?FAIL({sockname, C, E, S})
     end.
     
-
-%% sock_listen(Sock) ->
-%%     sock_listen2(fun() -> socket:listen(Sock) end).
-
-%% sock_listen(Sock, BackLog) ->
-%%     sock_listen2(fun() -> socket:listen(Sock, BackLog) end).
-
-%% sock_listen2(Listen) ->
-%%     try Listen() of
-%%         ok ->
-%%             ok;
-%%         {error, Reason} ->
-%%             ?FAIL({listen, Reason})
-%%     catch
-%%         C:E:S ->
-%%             ?FAIL({listen, C, E, S})
-%%     end.
-
-
-%% sock_accept(LSock) ->
-%%     try socket:accept(LSock) of
-%%         {ok, Sock} ->
-%%             Sock;
-%%         {error, Reason} ->
-%%             i("sock_accept -> error: ~p", [Reason]),
-%%             ?FAIL({accept, Reason})
-%%     catch
-%%         C:E:S ->
-%%             i("sock_accept -> failed: ~p, ~p, ~p", [C, E, S]),
-%%             ?FAIL({accept, C, E, S})
-%%     end.
-
-
 sock_close(Sock) ->
     try socket:close(Sock) of
         ok ->
@@ -27003,7 +26983,7 @@ which_local_socket_addr(local = Domain) ->
     #{family => Domain,
       path   => mk_unique_path()};
 
-%% This gets the local address (not 127.0...)
+%% This gets the local socket address (not 127.0...)
 %% We should really implement this using the (new) net module,
 %% but until that gets the necessary functionality...
 which_local_socket_addr(Domain) ->
@@ -27016,55 +26996,20 @@ which_local_socket_addr(Domain) ->
     end.
 
 
-%% Returns the interface (name), flags and address (not 127...)
-%% of the local host.
-%% which_local_host_info(Domain) ->
-%%     case inet:getifaddrs() of
-%%         {ok, IFL} ->
-%%             which_local_host_info(Domain, IFL);
-%%         {error, _} = ERROR ->
-%%             ERROR
-%%     end.
-
-%% which_local_host_info(_Domain, []) ->
-%%     ?FAIL(no_address);
-%% which_local_host_info(Domain, [{"lo" ++ _, _}|IFL]) ->
-%%     which_local_host_info(Domain, IFL);
-%% which_local_host_info(Domain, [{"docker" ++ _, _}|IFL]) ->
-%%     which_local_host_info(Domain, IFL);
-%% which_local_host_info(Domain, [{"br-" ++ _, _}|IFL]) ->
-%%     which_local_host_info(Domain, IFL);
-%% which_local_host_info(Domain, [{Name, IFO}|IFL]) ->
-%%     case which_local_host_info2(Domain, IFO) of
-%%         {ok, {Flags, Addr}} ->
-%%             {ok, {Name, Flags, Addr}};
-%%         {error, _} ->
-%%             which_local_host_info(Domain, IFL)
-%%     end;
-%% which_local_host_info(Domain, [_|IFL]) ->
-%%     which_local_host_info(Domain, IFL).
-
-%% which_local_host_info2(Domain, IFO) ->
-%%     case lists:keysearch(flags, 1, IFO) of
-%%         {value, {flags, Flags}} ->
-%%             which_local_host_info2(Domain, IFO, Flags);
-%%         false ->
-%%             {error, no_flags}
-%%     end.
 
-%% which_local_host_info2(_Domain, [], _Flags) ->
-%%     {error, no_address};
-%% which_local_host_info2(inet = _Domain, [{addr, Addr}|_IFO], Flags)
-%%   when (size(Addr) =:= 4) andalso (element(1, Addr) =/= 127) ->
-%%     {ok, {Flags, Addr}};
-%% which_local_host_info2(inet6 = _Domain, [{addr, Addr}|_IFO], Flags)
-%%   when (size(Addr) =:= 8) andalso 
-%%        (element(1, Addr) =/= 0) andalso
-%%        (element(1, Addr) =/= 16#fe80) ->
-%%     {ok, {Flags, Addr}};
-%% which_local_host_info2(Domain, [_|IFO], Flags) ->
-%%     which_local_host_info2(Domain, IFO, Flags).
+which_local_addr(local = Domain) ->
+    mk_unique_path();
 
+%% This gets the local address (not 127.0...)
+%% We should really implement this using the (new) net module,
+%% but until that gets the necessary functionality...
+which_local_addr(Domain) ->
+    case ?LIB:which_local_host_info(Domain) of
+        {ok, {_Name, _Flags, Addr}} ->
+            Addr;
+        {error, Reason} ->
+            ?FAIL(Reason)
+    end.
 
 
 
@@ -27143,7 +27088,6 @@ has_support_unix_domain_socket() ->
 %% support for IPv6. If not, there is no point in running IPv6 tests.
 %% Currently we just skip.
 has_support_ipv6() ->
-    %%not_yet_implemented().
     ?LIB:has_support_ipv6().
 
 
diff --git a/erts/emulator/test/socket_test_ttest_tcp_client.erl b/erts/emulator/test/socket_test_ttest_tcp_client.erl
index b5c5300fd0..f28819ca69 100644
--- a/erts/emulator/test/socket_test_ttest_tcp_client.erl
+++ b/erts/emulator/test/socket_test_ttest_tcp_client.erl
@@ -266,8 +266,9 @@ init(Quiet,
             (catch Mod:close(Sock)),
             exit(normal);
         {error, Reason} ->
-            ?E("connect failed: ~p", [Reason]),
-            exit({connect, Reason})
+            ?E("connect failed: ~p"
+	       "~n   ~p", [Reason, ServerInfo]),
+            exit({connect, Reason, ServerInfo})
     end.
 
 process_transport(Mod) when is_atom(Mod) ->
diff --git a/erts/emulator/test/socket_test_ttest_tcp_gen.erl b/erts/emulator/test/socket_test_ttest_tcp_gen.erl
index 05b250e3d9..e59bd881e7 100644
--- a/erts/emulator/test/socket_test_ttest_tcp_gen.erl
+++ b/erts/emulator/test/socket_test_ttest_tcp_gen.erl
@@ -36,19 +36,7 @@
 	]).
 
 
-%% ==========================================================================
-
-%% getopt(Sock, Opt) when is_atom(Opt) ->
-%%     case inet:getopts(Sock, [Opt]) of
-%%         {ok, [{Opt, Value}]} ->
-%%             {ok, Value};
-%%         {error, _} = ERROR ->
-%%             ERROR
-%%     end.
-
-%% setopt(Sock, Opt, Value) when is_atom(Opt) ->
-%%     inet:setopts(Sock, [{Opt, Value}]).
-
+-define(LIB, socket_test_lib).
 
 %% ==========================================================================
 
@@ -106,12 +94,12 @@ listen(Port) ->
     listen(Port, #{domain => inet}).
 
 listen(Port, #{domain := Domain}) when is_integer(Port) andalso (Port >= 0) ->
-    Opts = [Domain,
-            binary, {ip, {0,0,0,0}}, {packet, raw}, {active, false},
-            {buffer, 32*1024}],
-    case gen_tcp:listen(Port, Opts) of
-	{ok, Sock} ->
-	    {ok, Sock};
+    case ?LIB:which_local_host_info(Domain) of
+	{ok, {_, _, Addr}} ->
+	    Opts = [Domain,
+		    binary, {ip, Addr}, {packet, raw}, {active, false},
+		    {buffer, 32*1024}],
+	    gen_tcp:listen(Port, Opts);
 	{error, _} = ERROR ->
 	    ERROR
     end.
diff --git a/erts/emulator/test/socket_test_ttest_tcp_server.erl b/erts/emulator/test/socket_test_ttest_tcp_server.erl
index 27b561d4b7..2394dc7924 100644
--- a/erts/emulator/test/socket_test_ttest_tcp_server.erl
+++ b/erts/emulator/test/socket_test_ttest_tcp_server.erl
@@ -134,12 +134,18 @@ server_init(Starter, Parent, Transport, Active) ->
                         if
                             is_integer(PortOrPath) ->
                                 %% This is just for convenience
-                                Addr = which_addr(),
-                                ?I("listening on:"
-                                   "~n   Addr: ~p (~s)"
-                                   "~n   Port: ~w"
-                                   "~n", [Addr, inet:ntoa(Addr), PortOrPath]),
-                                {Addr, PortOrPath};
+                                case Mod:sockname(LSock) of
+				    {ok, {Addr, _}} ->
+					?I("listening on:"
+					   "~n   Addr: ~p (~s)"
+					   "~n   Port: ~w"
+					   "~n", [Addr,
+						  inet:ntoa(Addr),
+						  PortOrPath]),
+					{Addr, PortOrPath};
+				    {error, SNReason} ->
+					exit({sockname, SNReason})
+				end;
                             is_list(PortOrPath) ->
                                 ?I("listening on:"
                                    "~n   Path: ~s"
@@ -569,51 +575,51 @@ handler_maybe_activate(_, _, _) ->
 
 %% ==========================================================================
 
-which_addr() ->
-    case inet:getifaddrs() of
-        {ok, IfAddrs} ->
-            which_addrs(inet, IfAddrs);
-        {error, Reason} ->
-            exit({getifaddrs, Reason})
-    end.
+%% which_addr() ->
+%%     case inet:getifaddrs() of
+%%         {ok, IfAddrs} ->
+%%             which_addrs(inet, IfAddrs);
+%%         {error, Reason} ->
+%%             exit({getifaddrs, Reason})
+%%     end.
 
-which_addrs(_Family, []) ->
-    exit({getifaddrs, not_found});
-which_addrs(Family, [{"lo", _} | IfAddrs]) ->
-    %% Skip
-    which_addrs(Family, IfAddrs);
-which_addrs(Family, [{"docker" ++ _, _} | IfAddrs]) ->
-    %% Skip docker
-    which_addrs(Family, IfAddrs);
-which_addrs(Family, [{"br-" ++ _, _} | IfAddrs]) ->
-    %% Skip docker
-    which_addrs(Family, IfAddrs);
-which_addrs(Family, [{"en" ++ _, IfOpts} | IfAddrs]) ->
-    %% Maybe take this one
-    case which_addr(Family, IfOpts) of
-        {ok, Addr} ->
-            Addr;
-        error ->
-            which_addrs(Family, IfAddrs)
-    end;
-which_addrs(Family, [{_IfName, IfOpts} | IfAddrs]) ->
-    case which_addr(Family, IfOpts) of
-        {ok, Addr} ->
-            Addr;
-        error ->
-            which_addrs(Family, IfAddrs)
-    end.
+%% which_addrs(_Family, []) ->
+%%     exit({getifaddrs, not_found});
+%% which_addrs(Family, [{"lo", _} | IfAddrs]) ->
+%%     %% Skip
+%%     which_addrs(Family, IfAddrs);
+%% which_addrs(Family, [{"docker" ++ _, _} | IfAddrs]) ->
+%%     %% Skip docker
+%%     which_addrs(Family, IfAddrs);
+%% which_addrs(Family, [{"br-" ++ _, _} | IfAddrs]) ->
+%%     %% Skip docker
+%%     which_addrs(Family, IfAddrs);
+%% which_addrs(Family, [{"en" ++ _, IfOpts} | IfAddrs]) ->
+%%     %% Maybe take this one
+%%     case which_addr(Family, IfOpts) of
+%%         {ok, Addr} ->
+%%             Addr;
+%%         error ->
+%%             which_addrs(Family, IfAddrs)
+%%     end;
+%% which_addrs(Family, [{_IfName, IfOpts} | IfAddrs]) ->
+%%     case which_addr(Family, IfOpts) of
+%%         {ok, Addr} ->
+%%             Addr;
+%%         error ->
+%%             which_addrs(Family, IfAddrs)
+%%     end.
 
-which_addr(_, []) ->
-    error;
-which_addr(inet, [{addr, Addr}|_])
-  when is_tuple(Addr) andalso (size(Addr) =:= 4) ->
-    {ok, Addr};
-which_addr(inet6, [{addr, Addr}|_])
-  when is_tuple(Addr) andalso (size(Addr) =:= 8) ->
-    {ok, Addr};
-which_addr(Family, [_|IfOpts]) ->
-    which_addr(Family, IfOpts).
+%% which_addr(_, []) ->
+%%     error;
+%% which_addr(inet, [{addr, Addr}|_])
+%%   when is_tuple(Addr) andalso (size(Addr) =:= 4) ->
+%%     {ok, Addr};
+%% which_addr(inet6, [{addr, Addr}|_])
+%%   when is_tuple(Addr) andalso (size(Addr) =:= 8) ->
+%%     {ok, Addr};
+%% which_addr(Family, [_|IfOpts]) ->
+%%     which_addr(Family, IfOpts).
 
 
 %% ==========================================================================
diff --git a/erts/emulator/test/socket_test_ttest_tcp_socket.erl b/erts/emulator/test/socket_test_ttest_tcp_socket.erl
index 3aa3b2c504..9112748b4c 100644
--- a/erts/emulator/test/socket_test_ttest_tcp_socket.erl
+++ b/erts/emulator/test/socket_test_ttest_tcp_socket.erl
@@ -247,10 +247,16 @@ listen(Path, #{domain := local = Domain} = Opts)
 listen(Port, #{domain := Domain} = Opts)
   when is_integer(Port) andalso (Port >= 0) ->
     %% Bind fills in the rest
-    SA = #{family => Domain,
-           port   => Port},
-    Cleanup = fun() -> ok end,
-    do_listen(SA, Cleanup, Opts#{proto => tcp}).
+    case ?LIB:which_local_host_info(Domain) of
+	{ok, {_, _, Addr}} ->
+	    SA = #{family => Domain,
+		   addr   => Addr,
+		   port   => Port},
+	    Cleanup = fun() -> ok end,
+	    do_listen(SA, Cleanup, Opts#{proto => tcp});
+	{error, _} = ERROR ->
+	    ERROR
+    end.
 
 do_listen(SA,
           Cleanup,