[socket-nif|test] Add more ttest (gen_tcp) test cases

Added a number of ttest test cases with transport gen_tcp.
Server with transport = gen_tcp, active = false and client
using transport = gen_tcp (and active = false, once and true).

Also "fixed" the gen_tcp socket buffer size (default size
was way to small for the "large" messages).

OTP-14831

7 files changed, 518 insertions, 48 deletions

diff --git a/erts/emulator/test/socket_SUITE.erl b/erts/emulator/test/socket_SUITE.erl
index 72fea0a40a..11d1f1ad5f 100644
--- a/erts/emulator/test/socket_SUITE.erl
+++ b/erts/emulator/test/socket_SUITE.erl
@@ -32,7 +32,7 @@
 
 %% Test cases
 -export([
-         %% API Basic
+         %% *** API Basic ***
          api_b_open_and_close_udp4/1,
          api_b_open_and_close_tcp4/1,
          api_b_sendto_and_recvfrom_udp4/1,
@@ -40,11 +40,11 @@
          api_b_send_and_recv_tcp4/1,
          api_b_sendmsg_and_recvmsg_tcp4/1,
 
-         %% API Options
+         %% *** API Options ***
          api_opt_simple_otp_options/1,
          api_opt_simple_otp_controlling_process/1,
 
-         %% API Operation Timeout
+         %% *** API Operation Timeout ***
          api_to_connect_tcp4/1,
          api_to_connect_tcp6/1,
          api_to_accept_tcp4/1,
@@ -68,7 +68,7 @@
          api_to_recvmsg_tcp4/1,
          api_to_recvmsg_tcp6/1,
 
-         %% Socket Closure
+         %% *** Socket Closure ***
          sc_cpe_socket_cleanup_tcp4/1,
          sc_cpe_socket_cleanup_tcp6/1,
          sc_cpe_socket_cleanup_udp4/1,
@@ -95,7 +95,7 @@
          sc_rs_recvmsg_send_shutdown_receive_tcp4/1,
          sc_rs_recvmsg_send_shutdown_receive_tcp6/1,
 
-         %% Traffic
+         %% *** Traffic ***
          traffic_send_and_recv_chunks_tcp4/1,
          traffic_send_and_recv_chunks_tcp6/1,
 
@@ -123,15 +123,62 @@
          traffic_ping_pong_medium_sendmsg_and_recvmsg_udp4/1,
          traffic_ping_pong_medium_sendmsg_and_recvmsg_udp6/1,
 
-         %% Time Test
+         %% *** Time Test ***
+         %% Server: transport = gen_tcp, active = false
+         %% Client: transport = gen_tcp
          ttest_sgenf_cgenf_small_tcp4/1,
-         ttest_sgenf_cgenf_small_tcp6/1%% ,
+         ttest_sgenf_cgenf_small_tcp6/1,
+         ttest_sgenf_cgenf_medium_tcp4/1,
+         ttest_sgenf_cgenf_medium_tcp6/1,
+         ttest_sgenf_cgenf_large_tcp4/1,
+         ttest_sgenf_cgenf_large_tcp6/1,
 
-         %% ttest_sgenf_cgenf_medium_tcp4/1,
-         %% ttest_sgenf_cgenf_medium_tcp6/1,
+         ttest_sgenf_cgeno_small_tcp4/1,
+         ttest_sgenf_cgeno_small_tcp6/1,
+         ttest_sgenf_cgeno_medium_tcp4/1,
+         ttest_sgenf_cgeno_medium_tcp6/1,
+         ttest_sgenf_cgeno_large_tcp4/1,
+         ttest_sgenf_cgeno_large_tcp6/1,
 
-         %% ttest_sgenf_cgenf_large_tcp4/1,
-         %% ttest_sgenf_cgenf_large_tcp6/1
+         ttest_sgenf_cgent_small_tcp4/1,
+         ttest_sgenf_cgent_small_tcp6/1,
+         ttest_sgenf_cgent_medium_tcp4/1,
+         ttest_sgenf_cgent_medium_tcp6/1,
+         ttest_sgenf_cgent_large_tcp4/1,
+         ttest_sgenf_cgent_large_tcp6/1
+
+         %% Server: transport = gen_tcp, active = false
+         %% Client: transport = socket(tcp)
+
+         %% Server: transport = gen_tcp, active = once
+         %% Client: transport = gen_tcp
+
+         %% Server: transport = gen_tcp, active = once
+         %% Client: transport = socket(tcp)
+
+         %% Server: transport = gen_tcp, active = true
+         %% Client: transport = gen_tcp
+
+         %% Server: transport = gen_tcp, active = true
+         %% Client: transport = socket(tcp)
+
+         %% Server: transport = socket(tcp), active = false
+         %% Client: transport = gen_tcp
+
+         %% Server: transport = socket(tcp), active = false
+         %% Client: transport = socket(tcp)
+
+         %% Server: transport = socket(tcp), active = once
+         %% Client: transport = gen_tcp
+
+         %% Server: transport = socket(tcp), active = once
+         %% Client: transport = socket(tcp)
+
+         %% Server: transport = socket(tcp), active = true
+         %% Client: transport = gen_tcp
+
+         %% Server: transport = socket(tcp), active = true
+         %% Client: transport = socket(tcp)
 
          %% Tickets
         ]).
@@ -343,14 +390,38 @@ traffic_cases() ->
 
 ttest_cases() ->
     [
+     %% Server: transport = gen_tcp, active = false
+     %% Client: transport = gen_tcp, active = false
      ttest_sgenf_cgenf_small_tcp4,
-     ttest_sgenf_cgenf_small_tcp6%% ,
+     ttest_sgenf_cgenf_small_tcp6,
+
+     ttest_sgenf_cgenf_medium_tcp4,
+     ttest_sgenf_cgenf_medium_tcp6,
+
+     ttest_sgenf_cgenf_large_tcp4,
+     ttest_sgenf_cgenf_large_tcp6,
+
+     %% Server: transport = gen_tcp, active = false
+     %% Client: transport = gen_tcp, active = once
+     ttest_sgenf_cgeno_small_tcp4,
+     ttest_sgenf_cgeno_small_tcp6,
 
-     %% ttest_sgenf_cgenf_medium_tcp4,
-     %% ttest_sgenf_cgenf_medium_tcp6,
+     ttest_sgenf_cgeno_medium_tcp4,
+     ttest_sgenf_cgeno_medium_tcp6,
 
-     %% ttest_sgenf_cgenf_large_tcp4,
-     %% ttest_sgenf_cgenf_large_tcp6
+     ttest_sgenf_cgeno_large_tcp4,
+     ttest_sgenf_cgeno_large_tcp6,
+
+     %% Server: transport = gen_tcp, active = false
+     %% Client: transport = gen_tcp, active = true
+     ttest_sgenf_cgent_small_tcp4,
+     ttest_sgenf_cgent_small_tcp6,
+
+     ttest_sgenf_cgent_medium_tcp4,
+     ttest_sgenf_cgent_medium_tcp6,
+
+     ttest_sgenf_cgent_large_tcp4,
+     ttest_sgenf_cgent_large_tcp6
     ].
 
 
@@ -10161,6 +10232,11 @@ tpp_udp_sock_close(Sock) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% This test case uses the time test (ttest) utility to implement a 
 %% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
 
 ttest_sgenf_cgenf_small_tcp4(suite) ->
     [];
@@ -10176,6 +10252,12 @@ ttest_sgenf_cgenf_small_tcp4(_Config) when is_list(_Config) ->
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: small (=1)
+%% Domain:       inet6
 %% 
 
 ttest_sgenf_cgenf_small_tcp6(suite) ->
@@ -10192,6 +10274,358 @@ ttest_sgenf_cgenf_small_tcp6(_Config) when is_list(_Config) ->
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_sgenf_cgenf_medium_tcp4(suite) ->
+    [];
+ttest_sgenf_cgenf_medium_tcp4(doc) ->
+    [];
+ttest_sgenf_cgenf_medium_tcp4(_Config) when is_list(_Config) ->
+    ttest_tcp(ttest_sgenf_cgenf_medium_tcp4,
+              inet,
+              gen, false,
+              gen, false,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_sgenf_cgenf_medium_tcp6(suite) ->
+    [];
+ttest_sgenf_cgenf_medium_tcp6(doc) ->
+    [];
+ttest_sgenf_cgenf_medium_tcp6(_Config) when is_list(_Config) ->
+    ttest_tcp(ttest_sgenf_cgenf_medium_tcp6,
+              inet6,
+              gen, false,
+              gen, false,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_sgenf_cgenf_large_tcp4(suite) ->
+    [];
+ttest_sgenf_cgenf_large_tcp4(doc) ->
+    [];
+ttest_sgenf_cgenf_large_tcp4(_Config) when is_list(_Config) ->
+    ttest_tcp(ttest_sgenf_cgenf_large_tcp4,
+              inet,
+              gen, false,
+              gen, false,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_sgenf_cgenf_large_tcp6(suite) ->
+    [];
+ttest_sgenf_cgenf_large_tcp6(doc) ->
+    [];
+ttest_sgenf_cgenf_large_tcp6(_Config) when is_list(_Config) ->
+    ttest_tcp(ttest_sgenf_cgenf_large_tcp6,
+              inet6,
+              gen, false,
+              gen, false,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_sgenf_cgeno_small_tcp4(suite) ->
+    [];
+ttest_sgenf_cgeno_small_tcp4(doc) ->
+    [];
+ttest_sgenf_cgeno_small_tcp4(_Config) when is_list(_Config) ->
+    ttest_tcp(ttest_sgenf_cgeno_small_tcp4,
+              inet,
+              gen, false,
+              gen, once,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_sgenf_cgeno_small_tcp6(suite) ->
+    [];
+ttest_sgenf_cgeno_small_tcp6(doc) ->
+    [];
+ttest_sgenf_cgeno_small_tcp6(_Config) when is_list(_Config) ->
+    ttest_tcp(ttest_sgenf_cgeno_small_tcp6,
+              inet6,
+              gen, false,
+              gen, once,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_sgenf_cgeno_medium_tcp4(suite) ->
+    [];
+ttest_sgenf_cgeno_medium_tcp4(doc) ->
+    [];
+ttest_sgenf_cgeno_medium_tcp4(_Config) when is_list(_Config) ->
+    ttest_tcp(ttest_sgenf_cgeno_medium_tcp4,
+              inet,
+              gen, false,
+              gen, once,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_sgenf_cgeno_medium_tcp6(suite) ->
+    [];
+ttest_sgenf_cgeno_medium_tcp6(doc) ->
+    [];
+ttest_sgenf_cgeno_medium_tcp6(_Config) when is_list(_Config) ->
+    ttest_tcp(ttest_sgenf_cgeno_medium_tcp6,
+              inet6,
+              gen, false,
+              gen, once,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_sgenf_cgeno_large_tcp4(suite) ->
+    [];
+ttest_sgenf_cgeno_large_tcp4(doc) ->
+    [];
+ttest_sgenf_cgeno_large_tcp4(_Config) when is_list(_Config) ->
+    ttest_tcp(ttest_sgenf_cgeno_large_tcp4,
+              inet,
+              gen, false,
+              gen, once,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_sgenf_cgeno_large_tcp6(suite) ->
+    [];
+ttest_sgenf_cgeno_large_tcp6(doc) ->
+    [];
+ttest_sgenf_cgeno_large_tcp6(_Config) when is_list(_Config) ->
+    ttest_tcp(ttest_sgenf_cgeno_large_tcp6,
+              inet6,
+              gen, false,
+              gen, once,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_sgenf_cgent_small_tcp4(suite) ->
+    [];
+ttest_sgenf_cgent_small_tcp4(doc) ->
+    [];
+ttest_sgenf_cgent_small_tcp4(_Config) when is_list(_Config) ->
+    ttest_tcp(ttest_sgenf_cgent_small_tcp4,
+              inet,
+              gen, false,
+              gen, true,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_sgenf_cgent_small_tcp6(suite) ->
+    [];
+ttest_sgenf_cgent_small_tcp6(doc) ->
+    [];
+ttest_sgenf_cgent_small_tcp6(_Config) when is_list(_Config) ->
+    ttest_tcp(ttest_sgenf_cgeno_small_tcp6,
+              inet6,
+              gen, false,
+              gen, true,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_sgenf_cgent_medium_tcp4(suite) ->
+    [];
+ttest_sgenf_cgent_medium_tcp4(doc) ->
+    [];
+ttest_sgenf_cgent_medium_tcp4(_Config) when is_list(_Config) ->
+    ttest_tcp(ttest_sgenf_cgent_medium_tcp4,
+              inet,
+              gen, false,
+              gen, true,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_sgenf_cgent_medium_tcp6(suite) ->
+    [];
+ttest_sgenf_cgent_medium_tcp6(doc) ->
+    [];
+ttest_sgenf_cgent_medium_tcp6(_Config) when is_list(_Config) ->
+    ttest_tcp(ttest_sgenf_cgent_medium_tcp6,
+              inet6,
+              gen, false,
+              gen, true,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_sgenf_cgent_large_tcp4(suite) ->
+    [];
+ttest_sgenf_cgent_large_tcp4(doc) ->
+    [];
+ttest_sgenf_cgent_large_tcp4(_Config) when is_list(_Config) ->
+    ttest_tcp(ttest_sgenf_cgent_large_tcp4,
+              inet,
+              gen, false,
+              gen, true,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_sgenf_cgent_large_tcp6(suite) ->
+    [];
+ttest_sgenf_cgent_large_tcp6(doc) ->
+    [];
+ttest_sgenf_cgent_large_tcp6(_Config) when is_list(_Config) ->
+    ttest_tcp(ttest_sgenf_cgent_large_tcp6,
+              inet6,
+              gen, false,
+              gen, true,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 ttest_tcp(TC,
           Domain,
diff --git a/erts/emulator/test/socket_test_ttest_tcp_client.erl b/erts/emulator/test/socket_test_ttest_tcp_client.erl
index 180c280fb0..cfd16496cc 100644
--- a/erts/emulator/test/socket_test_ttest_tcp_client.erl
+++ b/erts/emulator/test/socket_test_ttest_tcp_client.erl
@@ -528,8 +528,13 @@ recv_reply_message3(_Mod, Sock, ID, Acc) ->
 			      (Tag =:= socket) ->
             process_acc_data(ID, <<Acc/binary, Msg/binary>>)
         
-    %% after ?RECV_TIMEOUT ->
-    %%         {error, timeout}
+    after ?RECV_TIMEOUT ->
+            ?I("timeout when"
+               "~n   ID:        ~p"
+               "~n   size(Acc): ~p",
+               [ID, size(Acc)]),
+            %% {error, timeout}
+            recv_reply_message3(_Mod, Sock, ID, Acc)
     end.
 
 
diff --git a/erts/emulator/test/socket_test_ttest_tcp_gen.erl b/erts/emulator/test/socket_test_ttest_tcp_gen.erl
index de8822157d..604408c489 100644
--- a/erts/emulator/test/socket_test_ttest_tcp_gen.erl
+++ b/erts/emulator/test/socket_test_ttest_tcp_gen.erl
@@ -38,6 +38,20 @@
 
 %% ==========================================================================
 
+%% 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}]).
+
+
+%% ==========================================================================
+
 accept(Sock) ->
     case gen_tcp:accept(Sock) of
 	{ok, NewSock} ->
@@ -65,7 +79,7 @@ close(Sock) ->
 
 
 connect(Addr, Port) ->
-    Opts = [binary, {packet, raw}, {active, false}], 
+    Opts = [binary, {packet, raw}, {active, false}, {buffer, 32*1024}], 
     case gen_tcp:connect(Addr, Port, Opts) of
 	{ok, Sock} ->
 	    {ok, Sock};
@@ -82,7 +96,8 @@ listen() ->
     listen(0).
 
 listen(Port) when is_integer(Port) andalso (Port >= 0) ->
-    Opts = [binary, {ip, {0,0,0,0}}, {packet, raw}, {active, false}],
+    Opts = [binary, {ip, {0,0,0,0}}, {packet, raw}, {active, false},
+            {buffer, 32*1024}],
     case gen_tcp:listen(Port, Opts) of
 	{ok, Sock} ->
 	    {ok, Sock};
diff --git a/erts/emulator/test/socket_test_ttest_tcp_server.erl b/erts/emulator/test/socket_test_ttest_tcp_server.erl
index 257bb18592..15f65d56b6 100644
--- a/erts/emulator/test/socket_test_ttest_tcp_server.erl
+++ b/erts/emulator/test/socket_test_ttest_tcp_server.erl
@@ -349,11 +349,12 @@ handler_loop(State) ->
     handler_loop( handler_handle_message( handler_recv_message(State) ) ).
 
 %% When passive, we read *one* request and then attempt to reply to it.
-handler_recv_message(#{mod    := Mod,
-		       sock   := Sock,
-                       active := false,
-                       mcnt   := MCnt,
-                       bcnt   := BCnt} = State) ->
+handler_recv_message(#{mod        := Mod,
+		       sock       := Sock,
+                       active     := false,
+                       mcnt       := MCnt,
+                       bcnt       := BCnt,
+                       last_reply := LID} = State) ->
     case handler_recv_message2(Mod, Sock) of
         {ok, {MsgSz, ID, Body}} ->
             handler_send_reply(Mod, Sock, ID, Body),
@@ -363,6 +364,10 @@ handler_recv_message(#{mod    := Mod,
         {error, closed} ->
             handler_done(State);
         {error, timeout} ->
+	    ?I("timeout when: "
+               "~n   MCnt: ~p"
+               "~n   BCnt: ~p"
+               "~n   LID:  ~p", [MCnt, BCnt, LID]),
             State
     end;
 
@@ -403,6 +408,11 @@ handler_recv_message(#{mod        := Mod,
             end;
 
         {error, timeout} ->
+	    ?I("timeout when: "
+               "~n   MCnt:      ~p"
+               "~n   BCnt:      ~p"
+               "~n   LID:       ~p"
+               "~n   size(Acc): ~p", [MCnt, BCnt, LID, size(Acc)]),
             State
     end.
 
@@ -443,7 +453,6 @@ handler_recv_message2(Mod, Sock) ->
                     exit({recv, body, ID, SZ, BReason})
             end;
         {error, timeout} = ERROR ->
-	    ?I("timeout"),
             ERROR;
         {error, closed} = ERROR ->
             ERROR;
diff --git a/erts/emulator/test/socket_test_ttest_tcp_server_gen.erl b/erts/emulator/test/socket_test_ttest_tcp_server_gen.erl
index 425e3d74af..b1b31f5158 100644
--- a/erts/emulator/test/socket_test_ttest_tcp_server_gen.erl
+++ b/erts/emulator/test/socket_test_ttest_tcp_server_gen.erl
@@ -21,22 +21,20 @@
 -module(socket_test_ttest_tcp_server_gen).
 
 -export([
-         start_monitor/1,
+         start/1,
          stop/1
         ]).
 
 -define(TRANSPORT_MOD, socket_test_ttest_tcp_gen).
 
-start_monitor(Active) ->
-    case socket_test_ttest_tcp_server:start_monitor(node(),
-                                                    ?TRANSPORT_MOD,
-                                                    Active) of
-        {ok, {Pid, AddrPort}} ->
-            MRef = erlang:monitor(process, Pid),
-            {ok, {Pid, MRef, AddrPort}};
-        {error, _} = ERROR ->
-            ERROR
-    end.
+start(Active) ->
+    socket_test_ttest_tcp_server:start(?TRANSPORT_MOD, Active).
+    %%     {ok, {Pid, AddrPort}} ->
+    %%         MRef = erlang:monitor(process, Pid),
+    %%         {ok, {Pid, MRef, AddrPort}};
+    %%     {error, _} = ERROR ->
+    %%         ERROR
+    %% end.
             
 
 stop(Pid) ->
diff --git a/erts/emulator/test/socket_test_ttest_tcp_server_socket.erl b/erts/emulator/test/socket_test_ttest_tcp_server_socket.erl
index c78c7111ce..b7ea1e8e93 100644
--- a/erts/emulator/test/socket_test_ttest_tcp_server_socket.erl
+++ b/erts/emulator/test/socket_test_ttest_tcp_server_socket.erl
@@ -21,7 +21,7 @@
 -module(socket_test_ttest_tcp_server_socket).
 
 -export([
-         start_monitor/2,
+         start/2,
          stop/1
         ]).
 
@@ -30,16 +30,14 @@
 %%                                           stats_interval => 10000}}).
 -define(MOD(M),        {?TRANSPORT_MOD, #{method => M}}).
 
-start_monitor(Method, Active) ->
-    case socket_test_ttest_tcp_server:start_monitor(node(),
-                                                    ?MOD(Method),
-                                                    Active) of
-        {ok, {Pid, AddrPort}} ->
-            MRef = erlang:monitor(process, Pid),
-            {ok, {Pid, MRef, AddrPort}};
-        {error, _} = ERROR ->
-            ERROR
-    end.
+start(Method, Active) ->
+    socket_test_ttest_tcp_server:start(?MOD(Method), Active).
+    %%     {ok, {Pid, AddrPort}} ->
+    %%         MRef = erlang:monitor(process, Pid),
+    %%         {ok, {Pid, MRef, AddrPort}};
+    %%     {error, _} = ERROR ->
+    %%         ERROR
+    %% end.
 
 stop(Pid) ->
     socket_test_ttest_tcp_server:stop(Pid).
diff --git a/erts/emulator/test/socket_test_ttest_tcp_socket.erl b/erts/emulator/test/socket_test_ttest_tcp_socket.erl
index 9af25c5f50..0ae2412e4c 100644
--- a/erts/emulator/test/socket_test_ttest_tcp_socket.erl
+++ b/erts/emulator/test/socket_test_ttest_tcp_socket.erl
@@ -55,6 +55,17 @@
 
 %% ==========================================================================
 
+%% This does not really work. Its just a placeholder for the time beeing...
+
+%% getopt(Sock, Opt) when is_atom(Opt) ->
+%%     socket:getopt(Sock, socket, Opt).
+
+%% setopt(Sock, Opt, Value) when is_atom(Opt) ->
+%%     socket:setopts(Sock, socket, Opt, Value).
+
+
+%% ==========================================================================
+
 accept(#{sock := LSock, opts := #{method := Method} = Opts}) ->
     case socket:accept(LSock) of
 	{ok, Sock} ->