Merge branch 'ingela/ssl/controlling-process-allowed-on-transport-accept-socket' into maint

* ingela/ssl/controlling-process-allowed-on-transport-accept-socket:
  ssl: controlling_process should be allowed on transpor_accept sockets along with handshake

1 files changed, 25 insertions, 0 deletions

diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index 289793bac8..8a2f0824fb 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -204,6 +204,14 @@ start_server_transport_abuse_socket(Args) ->
 	    Result
     end.
 
+start_server_transport_control(Args) ->
+    Result = spawn_link(?MODULE, transport_switch_control, [Args]),
+    receive
+	{listen, up} ->
+	    Result
+    end.
+
+
 transport_accept_abuse(Opts) ->
     Node = proplists:get_value(node, Opts),
     Port = proplists:get_value(port, Opts),
@@ -220,6 +228,23 @@ transport_accept_abuse(Opts) ->
     _ = rpc:call(Node, ssl, handshake, [AcceptSocket, infinity]),
     Pid ! {self(), ok}.
 
+
+transport_switch_control(Opts) ->
+    Node = proplists:get_value(node, Opts),
+    Port = proplists:get_value(port, Opts),
+    Options = proplists:get_value(options, Opts),
+    Pid = proplists:get_value(from, Opts),
+    Transport =  proplists:get_value(transport, Opts, ssl),
+    ct:log("~p:~p~nssl:listen(~p, ~p)~n", [?MODULE,?LINE, Port, Options]),
+    {ok, ListenSocket} = rpc:call(Node, Transport, listen, [Port, Options]),
+    Pid ! {listen, up},
+    send_selected_port(Pid, Port, ListenSocket),
+    {ok, AcceptSocket} = rpc:call(Node, ssl, transport_accept, 
+                                  [ListenSocket]),    
+    ok = rpc:call(Node, ssl, controlling_process, [AcceptSocket, self()]),
+    Pid ! {self(), ok}.
+
+
 remove_close_msg(0) ->
     ok;
 remove_close_msg(ReconnectTimes) ->