[esock|test] Update the esock-ttest tool to work with IPv6

Needed to do some tweaking to make the tool work with IPv6 sockets.
Also found and corrected some unrelated bugs in the tool.

OTP-15897

4 files changed, 41 insertions, 28 deletions

diff --git a/erts/emulator/test/esock_ttest/esock-ttest b/erts/emulator/test/esock_ttest/esock-ttest
index 9adc51fc8b..2ded557484 100755
--- a/erts/emulator/test/esock_ttest/esock-ttest
+++ b/erts/emulator/test/esock_ttest/esock-ttest
@@ -203,7 +203,7 @@ process_client_args(["--max-outstanding", Max|Args], State) ->
     end;
 
 process_client_args(["--scon", Server|Args], State) ->
-    case string:tokens(Server, [$:]) of
+    case string:split(Server, ":", trailing) of
         [AddrStr,PortStr] ->
             Addr = case inet:parse_address(AddrStr) of
                        {ok, A} ->
@@ -343,9 +343,9 @@ exec(#{role            := client,
        runtime         := RunTime}) ->
     case socket_test_ttest_tcp_client_socket:start(true,
                                                    Async,
+						   Active,
                                                    Method,
                                                    ServerInfo,
-                                                   Active,
                                                    MsgID, MaxOutstanding,
                                                    RunTime) of
         {ok, Pid} ->
diff --git a/erts/emulator/test/esock_ttest/esock-ttest-client b/erts/emulator/test/esock_ttest/esock-ttest-client
index 7c90ae6391..5ae05d03b8 100755
--- a/erts/emulator/test/esock_ttest/esock-ttest-client
+++ b/erts/emulator/test/esock_ttest/esock-ttest-client
@@ -20,23 +20,30 @@
 #  %CopyrightEnd%
 # 
 
+#
+# This is just a simple convenience wrapper to the esock-ttest.
+# That means that there are some options not available here.
+#
+
 EMU=$ERL_TOP/erts/emulator
 EMU_TEST=$EMU/test
 ESOCK_TTEST=$EMU_TEST/esock_ttest
 
 RUNTIME=30
+# RUNTIME=60
+# RUNTIME=600
 
 if [ $# = 3 ]; then
     MSGID=$1
     SERVER_INFO=$2:$3
 
     ITERATIONS="\
-       gen  false  $MSGID
-       gen  true   $MSGID
-       gen  once   $MSGID
-       sock false  $MSGID
-       sock true   $MSGID
-       sock once   $MSGID"
+       gen  false $MSGID
+       gen  true  $MSGID
+       gen  once  $MSGID
+       sock false $MSGID --async
+       sock true  $MSGID --async
+       sock once  $MSGID --async"
 
 else
     if [ $# = 2 ]; then
@@ -44,9 +51,9 @@ else
 	SERVER_INFO=$2
 
 	ITERATIONS="\
-           sock false  $MSGID
-           sock true   $MSGID
-           sock once   $MSGID"
+           sock false $MSGID --async
+           sock true  $MSGID --async
+           sock once  $MSGID --async"
 
     else
 	echo "Invalid number of args"
@@ -70,14 +77,14 @@ fi
 # ---------------------------------------------------------------------------
 
 echo "$ITERATIONS" |
-  while read TRANSPORT ACTIVE MSG_ID; do
+  while read TRANSPORT ACTIVE MSG_ID ASYNC; do
 
       echo ""
       echo "=========== transport = $TRANSPORT, active = $ACTIVE, msg-id = $MSG_ID ==========="
       # The /dev/null at the end is necessary because erlang "does things" with stdin
       # and this case would cause the 'while read' to "fail" so that we only would
       # loop one time
-      $ESOCK_TTEST/esock-ttest --client --transport $TRANSPORT --active $ACTIVE --msg-id $MSG_ID --scon $SERVER_INFO --runtime $RUNTIME </dev/null
+      $ESOCK_TTEST/esock-ttest --client --transport $TRANSPORT $ASYNC --active $ACTIVE --msg-id $MSG_ID --scon $SERVER_INFO --runtime $RUNTIME </dev/null
       echo ""
 
   done
diff --git a/erts/emulator/test/esock_ttest/esock-ttest-server-sock b/erts/emulator/test/esock_ttest/esock-ttest-server-sock
index fc87499f09..c443d42e64 100755
--- a/erts/emulator/test/esock_ttest/esock-ttest-server-sock
+++ b/erts/emulator/test/esock_ttest/esock-ttest-server-sock
@@ -24,9 +24,10 @@ EMU=$ERL_TOP/erts/emulator
 EMU_TEST=$EMU/test
 ESOCK_TTEST=$EMU_TEST/esock_ttest
 
-# $1 - async  - boolean()
-# $2 - active - once | boolean()
-if [ $# = 2 ]; then
+#  $1 - async  - boolean()
+#  $2 - active - once | boolean()
+# [$3 - domain - inet (default) | inet6 | local]
+if [ $# -ge 2 ]; then
 
     async=$1
     active=$2
@@ -39,6 +40,11 @@ if [ $# = 2 ]; then
 
     ACTIVE="--active $active"
 
+    if [ $# = 3 ]; then
+	DOMAIN="--domain $3"
+    fi
+
+
 else
     echo "<ERROR> Missing args: async and active"
     echo ""
@@ -46,5 +52,5 @@ else
 fi
 
 
-$ESOCK_TTEST/esock-ttest --server $ASYNC --transport sock $ACTIVE
+$ESOCK_TTEST/esock-ttest --server $DOMAIN $ASYNC --transport sock $ACTIVE
 
diff --git a/erts/emulator/test/socket_test_ttest_tcp_client_socket.erl b/erts/emulator/test/socket_test_ttest_tcp_client_socket.erl
index ca7eff4437..2fb1242028 100644
--- a/erts/emulator/test/socket_test_ttest_tcp_client_socket.erl
+++ b/erts/emulator/test/socket_test_ttest_tcp_client_socket.erl
@@ -34,24 +34,24 @@ start(Method, Async, Active, ServerInfo)
   when is_list(ServerInfo) ->
     Domain = local,
     socket_test_ttest_tcp_client:start_monitor(?MOD(Domain, Async, Method),
-                                               Active, ServerInfo);
+                                               ServerInfo, Active);
 start(Method, Async, Active, ServerInfo = {Addr, _})
   when is_tuple(Addr) andalso (size(Addr) =:= 4) ->
     Domain = inet,
     socket_test_ttest_tcp_client:start_monitor(?MOD(Domain, Async, Method),
-                                               Active, ServerInfo);
+                                               ServerInfo, Active);
 start(Method, Async, Active, ServerInfo = {Addr, _})
   when is_tuple(Addr) andalso (size(Addr) =:= 8) ->
     Domain = inet6,
     socket_test_ttest_tcp_client:start_monitor(?MOD(Domain, Async, Method),
-                                               Active, ServerInfo).
+                                               ServerInfo, Active).
 
 start(Method, Async, Active, ServerInfo, MsgID)
   when is_list(ServerInfo) ->
     %% This is just a simplification
     Domain = local,
     socket_test_ttest_tcp_client:start(?MOD(Domain, Async, Method),
-                                       Active, ServerInfo, MsgID);
+                                       ServerInfo, Active, MsgID);
 start(Method, Async, Active, ServerInfo = {Addr, _}, MsgID)
   when is_tuple(Addr) andalso (size(Addr) =:= 4) ->
     %% This is just a simplification
@@ -62,14 +62,14 @@ start(Method, Async, Active, ServerInfo = {Addr, _}, MsgID)
   when is_tuple(Addr) andalso (size(Addr) =:= 8) ->
     Domain = inet6,
     socket_test_ttest_tcp_client:start(?MOD(Domain, Async, Method),
-                                       Active, ServerInfo, MsgID).
+                                       ServerInfo, Active, MsgID).
 
 start(Method, Async, Active, ServerInfo, MsgID, MaxOutstanding, RunTime)
   when is_list(ServerInfo) ->
     Domain = local,
     socket_test_ttest_tcp_client:start(false,
 				       ?MOD(Domain, Async, Method),
-                                       Active, ServerInfo, 
+                                       ServerInfo, Active,
                                        MsgID, MaxOutstanding, RunTime);
 start(Method, Async, Active, ServerInfo = {Addr, _},
       MsgID, MaxOutstanding, RunTime)
@@ -77,7 +77,7 @@ start(Method, Async, Active, ServerInfo = {Addr, _},
     Domain = inet,
     socket_test_ttest_tcp_client:start(false,
 				       ?MOD(Domain, Async, Method),
-                                       Active, ServerInfo,
+                                       ServerInfo, Active,
                                        MsgID, MaxOutstanding, RunTime);
 start(Method, Async, Active, ServerInfo = {Addr, _},
       MsgID, MaxOutstanding, RunTime)
@@ -85,7 +85,7 @@ start(Method, Async, Active, ServerInfo = {Addr, _},
     Domain = inet6,
     socket_test_ttest_tcp_client:start(false,
 				       ?MOD(Domain, Async, Method),
-                                       Active, ServerInfo,
+                                       ServerInfo, Active,
                                        MsgID, MaxOutstanding, RunTime).
 
 start(Quiet, Async, Active, Method, ServerInfo, MsgID, MaxOutstanding, RunTime)
@@ -93,7 +93,7 @@ start(Quiet, Async, Active, Method, ServerInfo, MsgID, MaxOutstanding, RunTime)
     Domain = local,
     socket_test_ttest_tcp_client:start(Quiet,
 				       ?MOD(Domain, Async, Method),
-                                       Active, ServerInfo,
+                                       ServerInfo, Active,
                                        MsgID, MaxOutstanding, RunTime);
 start(Quiet, Async, Active, Method, ServerInfo = {Addr, _},
       MsgID, MaxOutstanding, RunTime)
@@ -101,7 +101,7 @@ start(Quiet, Async, Active, Method, ServerInfo = {Addr, _},
     Domain = inet,
     socket_test_ttest_tcp_client:start(Quiet,
 				       ?MOD(Domain, Async, Method),
-                                       Active, ServerInfo,
+                                       ServerInfo, Active,
                                        MsgID, MaxOutstanding, RunTime);
 start(Quiet, Async, Active, Method, ServerInfo = {Addr, _}, 
       MsgID, MaxOutstanding, RunTime)
@@ -109,7 +109,7 @@ start(Quiet, Async, Active, Method, ServerInfo = {Addr, _},
     Domain = inet6,
     socket_test_ttest_tcp_client:start(Quiet,
 				       ?MOD(Domain, Async, Method),
-                                       Active, ServerInfo,
+                                       ServerInfo, Active,
                                        MsgID, MaxOutstanding, RunTime).
 
 stop(Pid) ->