From 75347adb4c6f20fffc8881af6861ba7e466fc62a Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Wed, 10 Jul 2019 12:09:00 +0200
Subject: [esock|test] Make the ttest groups of test cases work with IPv6

OTP-15897
---
 .../emulator/test/socket_test_ttest_tcp_server.erl | 104 +++++++++++----------
 1 file changed, 55 insertions(+), 49 deletions(-)

(limited to 'erts/emulator/test/socket_test_ttest_tcp_server.erl')

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).
 
 
 %% ==========================================================================
-- 
cgit v1.2.3