Merge branch 'maint'

1 files changed, 20 insertions, 1 deletions

diff --git a/lib/kernel/test/gen_tcp_api_SUITE.erl b/lib/kernel/test/gen_tcp_api_SUITE.erl
index 77ec89b4f4..92a74465b7 100644
--- a/lib/kernel/test/gen_tcp_api_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_api_SUITE.erl
@@ -38,7 +38,7 @@
 	 t_local_basic/1, t_local_unbound/1, t_local_fdopen/1,
 	 t_local_fdopen_listen/1, t_local_fdopen_listen_unbound/1,
 	 t_local_fdopen_connect/1, t_local_fdopen_connect_unbound/1,
-	 t_local_abstract/1]).
+	 t_local_abstract/1, t_accept_inet6_tclass/1]).
 
 -export([getsockfd/0,closesockfd/1]).
 
@@ -50,6 +50,7 @@ all() ->
     [{group, t_accept}, {group, t_connect}, {group, t_recv},
      t_shutdown_write, t_shutdown_both, t_shutdown_error,
      t_shutdown_async, t_fdopen, t_fdconnect, t_implicit_inet6,
+     t_accept_inet6_tclass,
      {group, t_local}].
 
 groups() -> 
@@ -521,6 +522,24 @@ local_handshake(S, SAddr, C, CAddr) ->
     SData = ok(gen_tcp:recv(C, length(SData))),
     ok.
 
+t_accept_inet6_tclass(Config) when is_list(Config) ->
+    TClassOpt = {tclass,8#56 bsl 2}, % Expedited forwarding
+    case gen_tcp:listen(0, [inet6,TClassOpt]) of
+	{ok,L} ->
+	    LPort = ok(inet:port(L)),
+	    Loopback = {0,0,0,0,0,0,0,1},
+	    Sa = ok(gen_tcp:connect(Loopback, LPort, [])),
+	    Sb = ok(gen_tcp:accept(L)),
+	    [TClassOpt] = ok(inet:getopts(Sb, [tclass])),
+	    ok = gen_tcp:close(Sb),
+	    ok = gen_tcp:close(Sa),
+	    ok = gen_tcp:close(L),
+	    ok;
+	{error,_} ->
+	    {skip,"IPv6 TCLASS not supported"}
+    end.
+
+
 %%% Utilities
 
 %% Calls M:F/length(A), which should return a timeout error, and complete