Merge branch 'peterdmv/ssl/fix-peername-sockname' into maint

* peterdmv/ssl/fix-peername-sockname:
  ssl: Update ssl_test_lib

2 files changed, 33 insertions, 11 deletions

diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl
index f61f688589..bd9d25b3fd 100644
--- a/lib/ssl/test/ssl_basic_SUITE.erl
+++ b/lib/ssl/test/ssl_basic_SUITE.erl
@@ -1312,14 +1312,14 @@ peername(Config) when is_list(Config) ->
 					{options, [{port, 0} | ClientOpts]}]),
     
     ClientPort = ssl_test_lib:inet_port(Client),
-    ServerIp = ssl_test_lib:node_to_hostip(ServerNode),
-    ClientIp = ssl_test_lib:node_to_hostip(ClientNode),
+    ServerIp = ssl_test_lib:node_to_hostip(ServerNode, server),
+    ClientIp = ssl_test_lib:node_to_hostip(ClientNode, client),
     ServerMsg = {ok, {ClientIp, ClientPort}},
     ClientMsg = {ok, {ServerIp, Port}},
-	
+
     ct:log("Testcase ~p, Client ~p  Server ~p ~n",
 		       [self(), Client, Server]),
-		   
+
     ssl_test_lib:check_result(Server, ServerMsg, Client, ClientMsg),
     
     ssl_test_lib:close(Server),
@@ -1422,10 +1422,10 @@ sockname(Config) when is_list(Config) ->
 		%% so we can only get a ClientIP, ServerIP will always be 0.0.0.0
 		{0,0,0,0};
 	    _ ->
-		ssl_test_lib:node_to_hostip(ServerNode)
+		ssl_test_lib:node_to_hostip(ServerNode, server)
 	end,
 
-    ClientIp = ssl_test_lib:node_to_hostip(ClientNode),
+    ClientIp = ssl_test_lib:node_to_hostip(ClientNode, client),
     ServerMsg = {ok, {ServerIp, Port}},
     ClientMsg = {ok, {ClientIp, ClientPort}},
 			   
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index 32fd917937..a081d65200 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -45,9 +45,18 @@ run_where(_, ipv6) ->
     Host = rpc:call(ServerNode, net_adm, localhost, []),
     {ClientNode, ServerNode, Host}.
 
-node_to_hostip(Node) ->
+node_to_hostip(Node, Role) ->
     [_ , Host] = string:tokens(atom_to_list(Node), "@"),
     {ok, Address} = inet:getaddr(Host, inet),
+    %% Convert client addresses in 127.0.0.0/24 subnet to the atom 'localhost'.
+    %% This is a workaround for testcase problems caused by the fact that
+    %% inet:peername/1 and inet:getaddr/2 return different addresses when
+    %% running on localhost.
+    normalize_loopback(Address, Role).
+
+normalize_loopback({127,_,_,_}, client) ->
+    localhost;
+normalize_loopback(Address, _) ->
     Address.
 
 start_server(Args) ->
@@ -393,14 +402,16 @@ close(Pid, Timeout) ->
 	    exit(Pid, kill)
     end.
 
-check_result(Server, ServerMsg, Client, ClientMsg) -> 
+check_result(Server, ServerMsg, Client, ClientMsg) ->
+    {ClientIP, ClientPort} = get_ip_port(ServerMsg),
     receive 
 	{Server, ServerMsg} ->
 	    check_result(Client, ClientMsg);
-
+        %% Workaround to accept local addresses (127.0.0.0/24)
+        {Server, {ok, {{127,_,_,_}, ClientPort}}} when ClientIP =:= localhost  ->
+            check_result(Client, ClientMsg);
 	{Client, ClientMsg} ->
 	    check_result(Server, ServerMsg);
-
 	{Port, {data,Debug}} when is_port(Port) ->
 	    ct:log("~p:~p~n Openssl ~s~n",[?MODULE,?LINE, Debug]),
 	    check_result(Server, ServerMsg, Client, ClientMsg);
@@ -413,10 +424,14 @@ check_result(Server, ServerMsg, Client, ClientMsg) ->
 	    ct:fail(Reason)
     end.
 
-check_result(Pid, Msg) -> 
+check_result(Pid, Msg) ->
+    {ClientIP, ClientPort} = get_ip_port(Msg),
     receive 
 	{Pid, Msg} -> 
 	    ok;
+        %% Workaround to accept local addresses (127.0.0.0/24)
+        {Pid, {ok, {{127,_,_,_}, ClientPort}}} when ClientIP =:= localhost ->
+            ok;
 	{Port, {data,Debug}} when is_port(Port) ->
 	    ct:log("~p:~p~n Openssl ~s~n",[?MODULE,?LINE, Debug]),
 	    check_result(Pid,Msg);
@@ -429,6 +444,13 @@ check_result(Pid, Msg) ->
 	    ct:fail(Reason)
     end.
 
+
+get_ip_port({ok,{ClientIP, ClientPort}}) ->
+    {ClientIP, ClientPort};
+get_ip_port(_) ->
+    {undefined, undefined}.
+
+
 check_server_alert(Pid, Alert) ->
     receive
 	{Pid, {error, {tls_alert, {Alert, STxt}}}} ->