Merge branch 'ph/auto_recognize_ipv6' into dev

* ph/auto_recognize_ipv6:
  Add tests
  Let an 8-tuple given as ip_address() for gen_tcp/gen_udp/gen_sctp imply 'inet6'

OTP-8822

3 files changed, 168 insertions, 8 deletions

diff --git a/lib/kernel/test/gen_sctp_SUITE.erl b/lib/kernel/test/gen_sctp_SUITE.erl
index eb06d4324b..9aa94a0868 100644
--- a/lib/kernel/test/gen_sctp_SUITE.erl
+++ b/lib/kernel/test/gen_sctp_SUITE.erl
@@ -27,12 +27,12 @@
 -export(
    [basic/1,
     api_open_close/1,api_listen/1,api_connect_init/1,api_opts/1,
-    xfer_min/1,xfer_active/1,def_sndrcvinfo/1]).
+    xfer_min/1,xfer_active/1,def_sndrcvinfo/1,implicit_inet6/1]).
 
 all(suite) ->
     [basic,
      api_open_close,api_listen,api_connect_init,api_opts,
-     xfer_min,xfer_active,def_sndrcvinfo].
+     xfer_min,xfer_active,def_sndrcvinfo,implicit_inet6].
 
 init_per_testcase(_Func, Config) ->
     Dog = test_server:timetrap(test_server:seconds(15)),
@@ -551,3 +551,58 @@ api_opts(Config) when is_list(Config) ->
               {{error,einval},{unix,sunos}} ->
                   ok
           end.
+
+implicit_inet6(Config) when is_list(Config) ->
+    ?line Hostname = ok(inet:gethostname()),
+    ?line
+	case gen_sctp:open(0, [inet6]) of
+	    {ok,S1} ->
+		?line
+		    case inet:getaddr(Hostname, inet6) of
+			{ok,Host} ->
+			    ?line Loopback = {0,0,0,0,0,0,0,1},
+			    ?line io:format("~s ~p~n", ["Loopback",Loopback]),
+			    ?line implicit_inet6(S1, Loopback),
+			    ?line ok = gen_sctp:close(S1),
+			    %%
+			    ?line Localhost =
+				ok(inet:getaddr("localhost", inet6)),
+			    ?line io:format("~s ~p~n", ["localhost",Localhost]),
+			    ?line S2 =
+				ok(gen_sctp:open(0, [{ip,Localhost}])),
+			    ?line implicit_inet6(S2, Localhost),
+			    ?line ok = gen_sctp:close(S2),
+			    %%
+			    ?line io:format("~s ~p~n", [Hostname,Host]),
+			    ?line S3 =
+				ok(gen_sctp:open(0, [{ifaddr,Host}])),
+			    ?line implicit_inet6(S3, Host),
+			    ?line ok = gen_sctp:close(S1);
+			{error,eafnosupport} ->
+			    ?line ok = gen_sctp:close(S1),
+			    {skip,"Can not look up IPv6 address"}
+		    end;
+	    _ ->
+		{skip,"IPv6 not supported"}
+	end.
+
+implicit_inet6(S1, Addr) ->
+    ?line ok = gen_sctp:listen(S1, true),
+    ?line P1 = ok(inet:port(S1)),
+    ?line S2 = ok(gen_sctp:open(0, [inet6])),
+    ?line P2 = ok(inet:port(S2)),
+    ?line #sctp_assoc_change{state=comm_up} =
+	ok(gen_sctp:connect(S2, Addr, P1, [])),
+    ?line case ok(gen_sctp:recv(S1)) of
+	      {Addr,P2,[],#sctp_assoc_change{state=comm_up}} ->
+		  ok
+	  end,
+    ?line case ok(inet:sockname(S1)) of
+	      {Addr,P1} -> ok;
+	      {{0,0,0,0,0,0,0,0},P1} -> ok
+	  end,
+    ?line case ok(inet:sockname(S2)) of
+	      {Addr,P2} -> ok;
+	      {{0,0,0,0,0,0,0,0},P2} -> ok
+	  end,
+    ?line ok = gen_sctp:close(S2).
diff --git a/lib/kernel/test/gen_tcp_api_SUITE.erl b/lib/kernel/test/gen_tcp_api_SUITE.erl
index 11d19aaa82..94637290a1 100644
--- a/lib/kernel/test/gen_tcp_api_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_api_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2010. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -30,10 +30,11 @@
 	 t_connect/1, t_connect_bad/1,
 	 t_recv/1, t_recv_timeout/1, t_recv_eof/1,
 	 t_shutdown_write/1, t_shutdown_both/1, t_shutdown_error/1,
-	 t_fdopen/1]).
+	 t_fdopen/1, t_implicit_inet6/1]).
 
 all(suite) -> [t_accept, t_connect, t_recv, t_shutdown_write,
-	      t_shutdown_both, t_shutdown_error, t_fdopen].
+	       t_shutdown_both, t_shutdown_error, t_fdopen,
+	       t_implicit_inet6].
 
 init_per_testcase(_Func, Config) ->
     Dog = test_server:timetrap(test_server:seconds(60)),
@@ -156,6 +157,54 @@ t_fdopen(Config) when is_list(Config) ->
     ok.
 
 
+%%% implicit inet6 option to api functions
+
+t_implicit_inet6(Config) when is_list(Config) ->
+    ?line Hostname = ok(inet:gethostname()),
+    ?line
+	case gen_tcp:listen(0, [inet6]) of
+	    {ok,S1} ->
+		?line
+		    case inet:getaddr(Hostname, inet6) of
+			{ok,Host} ->
+			    ?line Loopback = {0,0,0,0,0,0,0,1},
+			    ?line io:format("~s ~p~n", ["Loopback",Loopback]),
+			    ?line implicit_inet6(S1, Loopback),
+			    ?line ok = gen_tcp:close(S1),
+			    %%
+			    ?line Localhost =
+				ok(inet:getaddr("localhost", inet6)),
+			    ?line io:format("~s ~p~n", ["localhost",Localhost]),
+			    ?line S2 = ok(gen_tcp:listen(0, [{ip,Localhost}])),
+			    ?line implicit_inet6(S2, Localhost),
+			    ?line ok = gen_tcp:close(S2),
+			    %%
+			    ?line io:format("~s ~p~n", [Hostname,Host]),
+			    ?line S3 = ok(gen_tcp:listen(0, [{ifaddr,Host}])),
+			    ?line implicit_inet6(S3, Host),
+			    ?line ok = gen_tcp:close(S1);
+			{error,eafnosupport} ->
+			    ?line ok = gen_tcp:close(S1),
+			    {skip,"Can not look up IPv6 address"}
+		    end;
+	    _ ->
+		{skip,"IPv6 not supported"}
+	end.
+
+implicit_inet6(S, Addr) ->
+    ?line P = ok(inet:port(S)),
+    ?line S2 = ok(gen_tcp:connect(Addr, P, [])),
+    ?line P2 = ok(inet:port(S2)),
+    ?line S1 = ok(gen_tcp:accept(S)),
+    ?line P1 = P = ok(inet:port(S1)),
+    ?line {Addr,P2} = ok(inet:peername(S1)),
+    ?line {Addr,P1} = ok(inet:peername(S2)),
+    ?line {Addr,P1} = ok(inet:sockname(S1)),
+    ?line {Addr,P2} = ok(inet:sockname(S2)),
+    ?line ok = gen_tcp:close(S2),
+    ?line ok = gen_tcp:close(S1).
+
+
 
 %%% Utilities
 
@@ -217,3 +266,5 @@ unused_ip(A, B, C, D) ->
 	{ok, _} -> unused_ip(A, B, C, D+1);
 	{error, _} -> {ok, {A, B, C, D}}
     end.
+
+ok({ok,V}) -> V.
diff --git a/lib/kernel/test/gen_udp_SUITE.erl b/lib/kernel/test/gen_udp_SUITE.erl
index fa1991872b..44dd8607b9 100644
--- a/lib/kernel/test/gen_udp_SUITE.erl
+++ b/lib/kernel/test/gen_udp_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2010. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -34,12 +34,12 @@
 
 -export([send_to_closed/1, 
 	 buffer_size/1, binary_passive_recv/1, bad_address/1,
-	 read_packets/1, open_fd/1, connect/1]).
+	 read_packets/1, open_fd/1, connect/1, implicit_inet6/1]).
 
 all(suite) ->
     [send_to_closed, 
      buffer_size, binary_passive_recv, bad_address, read_packets,
-     open_fd, connect].
+     open_fd, connect, implicit_inet6].
 
 init_per_testcase(_Case, Config) ->
     ?line Dog=test_server:timetrap(?default_timeout),
@@ -425,3 +425,57 @@ connect(Config) when is_list(Config) ->
     ok = gen_udp:send(S2, <<16#deadbeef:32>>),
     {error,econnrefused} = gen_udp:recv(S2, 0, 5),
     ok.
+
+implicit_inet6(Config) when is_list(Config) ->
+    ?line Hostname = ok(inet:gethostname()),
+    ?line Active = {active,false},
+    ?line
+	case gen_udp:open(0, [inet6,Active]) of
+	    {ok,S1} ->
+		?line
+		    case inet:getaddr(Hostname, inet6) of
+			{ok,Host} ->
+			    ?line Loopback = {0,0,0,0,0,0,0,1},
+			    ?line io:format("~s ~p~n", ["Loopback",Loopback]),
+			    ?line implicit_inet6(S1, Active, Loopback),
+			    ?line ok = gen_udp:close(S1),
+			    %%
+			    ?line Localhost =
+				ok(inet:getaddr("localhost", inet6)),
+			    ?line io:format("~s ~p~n", ["localhost",Localhost]),
+			    ?line S2 =
+				ok(gen_udp:open(0, [{ip,Localhost},Active])),
+			    ?line implicit_inet6(S2, Active, Localhost),
+			    ?line ok = gen_udp:close(S2),
+			    %%
+			    ?line io:format("~s ~p~n", [Hostname,Host]),
+			    ?line S3 =
+				ok(gen_udp:open(0, [{ifaddr,Host},Active])),
+			    ?line implicit_inet6(S3, Active, Host),
+			    ?line ok = gen_udp:close(S1);
+			{error,eafnosupport} ->
+			    ?line ok = gen_udp:close(S1),
+			    {skip,"Can not look up IPv6 address"}
+		    end;
+	    _ ->
+		{skip,"IPv6 not supported"}
+	end.
+
+implicit_inet6(S1, Active, Addr) ->
+    ?line P1 = ok(inet:port(S1)),
+    ?line S2 = ok(gen_udp:open(0, [inet6,Active])),
+    ?line P2 = ok(inet:port(S2)),
+    ?line ok = gen_udp:connect(S2, Addr, P1),
+    ?line ok = gen_udp:connect(S1, Addr, P2),
+    ?line {Addr,P2} = ok(inet:peername(S1)),
+    ?line {Addr,P1} = ok(inet:peername(S2)),
+    ?line {Addr,P1} = ok(inet:sockname(S1)),
+    ?line {Addr,P2} = ok(inet:sockname(S2)),
+    ?line ok = gen_udp:send(S1, Addr, P2, "ping"),
+    ?line {Addr,P1,"ping"} = ok(gen_udp:recv(S2, 1024, 1000)),
+    ?line ok = gen_udp:send(S2, Addr, P1, "pong"),
+    ?line {Addr,P2,"pong"} = ok(gen_udp:recv(S1, 1024)),
+    ?line ok = gen_udp:close(S2).
+
+
+ok({ok,V}) -> V.