ssl: Create connection_env

4 files changed, 54 insertions, 45 deletions

diff --git a/lib/ssl/src/dtls_connection.erl b/lib/ssl/src/dtls_connection.erl
index ac380f2595..178668e808 100644
--- a/lib/ssl/src/dtls_connection.erl
+++ b/lib/ssl/src/dtls_connection.erl
@@ -796,6 +796,7 @@ initial_state(Role, Host, Port, Socket, {SSLOptions, SocketOptions, _}, User,
                               renegotiation = {false, first},
                               allow_renegotiate = SSLOptions#ssl_options.client_renegotiation
                              },
+           connection_env = #connection_env{user_application = {Monitor, User}},
            socket_options = SocketOptions,
 	   %% We do not want to save the password in the state so that
 	   %% could be written in the clear into error logs.
@@ -803,7 +804,6 @@ initial_state(Role, Host, Port, Socket, {SSLOptions, SocketOptions, _}, User,
 	   session = #session{is_resumable = new},
 	   connection_states = ConnectionStates,
 	   protocol_buffers = #protocol_buffers{},
-	   user_application = {Monitor, User},
 	   user_data_buffer = <<>>,
 	   start_or_recv_from = undefined,
 	   flight_buffer = new_flight(),
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl
index 9d5b6efced..e048dba38d 100644
--- a/lib/ssl/src/ssl_connection.erl
+++ b/lib/ssl/src/ssl_connection.erl
@@ -366,8 +366,8 @@ handle_normal_shutdown(Alert, StateName, #state{static_env = #static_env{role =
                                                                          transport_cb = Transport,
                                                                          protocol_cb = Connection,
                                                                          tracker = Tracker},
-                                                                         socket_options = Opts,
-                                                                         user_application = {_Mon, Pid},
+                                                connection_env  = #connection_env{user_application = {_Mon, Pid}},
+                                                socket_options = Opts,
 						start_or_recv_from = RecvFrom} = State) ->
     Pids = Connection:pids(State),
     alert_user(Pids, Transport, Tracker, Socket, StateName, Opts, Pid, RecvFrom, Alert, Role, Connection).
@@ -380,9 +380,10 @@ handle_alert(#alert{level = ?FATAL} = Alert, StateName,
                                              tracker = Tracker,
                                              transport_cb = Transport,
                                              protocol_cb = Connection},
+                    connection_env  = #connection_env{user_application = {_Mon, Pid}},
 		    ssl_options = SslOpts,
                     start_or_recv_from = From,
-                    session = Session, user_application = {_Mon, Pid},
+                    session = Session, 
 		    socket_options = Opts} = State) ->
     invalidate_session(Role, Host, Port, Session),
     log_alert(SslOpts#ssl_options.log_alert, Role, Connection:protocol_name(), 
@@ -508,14 +509,15 @@ read_application_data(
     %%
     case get_data(SocketOpts0, BytesToRead, Buffer0) of
 	{ok, ClientData, Buffer} -> % Send data
-            #state{
-               static_env =
-                   #static_env{
-                      socket = Socket,
-                      protocol_cb = Connection,
-                      transport_cb = Transport,
-                      tracker = Tracker},
-               user_application = {_Mon, Pid}} = State,
+            #state{static_env =
+                       #static_env{
+                          socket = Socket,
+                          protocol_cb = Connection,
+                          transport_cb = Transport,
+                          tracker = Tracker},
+                   connection_env = 
+                       #connection_env{user_application = {_Mon, Pid}}}
+                = State,
             SocketOpts =
                 deliver_app_data(
                   Connection:pids(State),
@@ -530,30 +532,31 @@ read_application_data(
                     {no_record,
                      State#state{
                        user_data_buffer = Buffer,
-                       start_or_recv_from = undefined,
+                              start_or_recv_from = undefined,
                        timer = undefined,
                        bytes_to_read = undefined,
                        socket_options = SocketOpts
                       }};
                 true -> %% We have more data
-                    read_application_data(
-                      Buffer, State, SocketOpts,
-                      undefined, undefined, undefined)
+                           read_application_data(
+                             Buffer, State, SocketOpts,
+                             undefined, undefined, undefined)
             end;
-	{more, Buffer} -> % no reply, we need more data
+        {more, Buffer} -> % no reply, we need more data
             {no_record, State#state{user_data_buffer = Buffer}};
-	{passive, Buffer} ->
-	    {no_record, State#state{user_data_buffer = Buffer}};
-	{error,_Reason} -> %% Invalid packet in packet mode
-            #state{
-               static_env =
-                   #static_env{
-                      socket = Socket,
-                      protocol_cb = Connection,
-                      transport_cb = Transport,
-                      tracker = Tracker},
-               user_application = {_Mon, Pid}} = State,
-	    deliver_packet_error(
+        {passive, Buffer} ->
+            {no_record, State#state{user_data_buffer = Buffer}};
+        {error,_Reason} -> %% Invalid packet in packet mode
+            #state{static_env =
+                       #static_env{
+                          socket = Socket,
+                          protocol_cb = Connection,
+                          transport_cb = Transport,
+                          tracker = Tracker},
+                   connection_env = 
+                       #connection_env{user_application = {_Mon, Pid}}}
+                = State,
+            deliver_packet_error(
               Connection:pids(State), Transport, Socket, SocketOpts0,
               Buffer0, Pid, RecvFrom, Tracker, Connection),
             {stop, {shutdown, normal}, State}
@@ -1228,10 +1231,10 @@ handle_call({recv, N, Timeout}, RecvFrom, StateName, State, _) ->
 					timer = Timer}, 
      [{next_event, internal, {recv, RecvFrom}}]};
 handle_call({new_user, User}, From, StateName, 
-		  State =#state{user_application = {OldMon, _}}, _) ->
+            State = #state{connection_env = #connection_env{user_application = {OldMon, _}} = CEnv}, _) ->
     NewMon = erlang:monitor(process, User),
     erlang:demonitor(OldMon, [flush]),
-    {next_state, StateName, State#state{user_application = {NewMon,User}},
+    {next_state, StateName, State#state{connection_env = CEnv#connection_env{user_application = {NewMon, User}}},
      [{reply, From, ok}]};
 handle_call({get_opts, OptTags}, From, _,
             #state{static_env = #static_env{socket = Socket,
@@ -1305,14 +1308,14 @@ handle_info({ErrorTag, Socket, Reason}, StateName, #state{static_env = #static_e
     {stop, {shutdown,normal}, State};
 
 handle_info({'DOWN', MonitorRef, _, _, Reason}, _,
-            #state{user_application = {MonitorRef, _Pid},
+            #state{connection_env = #connection_env{user_application = {MonitorRef, _Pid}},
                    ssl_options = #ssl_options{erl_dist = true}}) ->
     {stop, {shutdown, Reason}};
 handle_info({'DOWN', MonitorRef, _, _, _}, _,
-            #state{user_application = {MonitorRef, _Pid}}) ->
+            #state{connection_env = #connection_env{user_application = {MonitorRef, _Pid}}}) ->
     {stop, {shutdown, normal}};
 handle_info({'EXIT', Pid, _Reason}, StateName,
-            #state{user_application = {_MonitorRef, Pid}} = State) ->
+            #state{connection_env = #connection_env{user_application = {_MonitorRef, Pid}}} = State) ->
     %% It seems the user application has linked to us
     %% - ignore that and let the monitor handle this
     {next_state, StateName, State};
diff --git a/lib/ssl/src/ssl_connection.hrl b/lib/ssl/src/ssl_connection.hrl
index e55ef37b71..f182783f54 100644
--- a/lib/ssl/src/ssl_connection.hrl
+++ b/lib/ssl/src/ssl_connection.hrl
@@ -68,26 +68,33 @@
                         negotiated_protocol
                        }).
 
+-record(connection_env, { 
+                          user_application      :: {Monitor::reference(), User::pid()},
+                                                   
+                        }).
+
 -record(state, {
                 static_env            :: #static_env{},
                 handshake_env         :: #handshake_env{} | secret_printout(),
+                connection_env        :: #connection_env{},                
+
+                %% Changed often
+                connection_states     :: ssl_record:connection_states() | secret_printout(),
+                protocol_buffers      :: term() | secret_printout() , %% #protocol_buffers{} from tls_record.hrl or dtls_recor.hr
+                user_data_buffer     :: undefined | binary() | secret_printout(),
+                bytes_to_read        :: undefined | integer(), %% bytes to read in passive mode
+                start_or_recv_from   :: term(),
+                timer                :: undefined | reference(), % start_or_recive_timer
+             
                 %% Change seldome
-                user_application      :: {Monitor::reference(), User::pid()},
                 ssl_options           :: #ssl_options{},
                 socket_options        :: #socket_options{},
                 session               :: #session{} | secret_printout(),
                 terminated = false                          ::boolean() | closed,
                 negotiated_version    :: ssl_record:ssl_version() | 'undefined',
-                bytes_to_read        :: undefined | integer(), %% bytes to read in passive mode
                 downgrade,
-
-                %% Changed often
-                connection_states     :: ssl_record:connection_states() | secret_printout(),
-                protocol_buffers      :: term() | secret_printout() , %% #protocol_buffers{} from tls_record.hrl or dtls_recor.hr
-                user_data_buffer     :: undefined | binary() | secret_printout(),
                 
                 %% Used only in HS
-                
                 client_certificate_requested = false :: boolean(),
                 key_algorithm         :: ssl:key_algo(),
                 hashsign_algorithm = {undefined, undefined},
@@ -100,8 +107,7 @@
                 srp_params           :: #srp_user{} | secret_printout() | 'undefined',
                 srp_keys             ::{PublicKey :: binary(), PrivateKey :: binary()} | secret_printout() | 'undefined',
                 premaster_secret     :: binary() | secret_printout() | 'undefined',
-                start_or_recv_from   :: term(),
-                timer                :: undefined | reference(), % start_or_recive_timer
+             
                 flight_buffer = []   :: list() | map(),  %% Buffer of TLS/DTLS records, used during the TLS handshake
                 %% to when possible pack more than one TLS record into the
                 %% underlaying packet format. Introduced by DTLS - RFC 4347.
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl
index fc9c3ba66a..7c901c882b 100644
--- a/lib/ssl/src/tls_connection.erl
+++ b/lib/ssl/src/tls_connection.erl
@@ -794,12 +794,12 @@ initial_state(Role, Sender, Host, Port, Socket, {SSLOptions, SocketOptions, Trac
                           renegotiation = {false, first},
                           allow_renegotiate = SSLOptions#ssl_options.client_renegotiation
                          },
+       connection_env = #connection_env{user_application = {UserMonitor, User}},
        socket_options = SocketOptions,
        ssl_options = SSLOptions,
        session = #session{is_resumable = new},
        connection_states = ConnectionStates,
        protocol_buffers = #protocol_buffers{},
-       user_application = {UserMonitor, User},
        user_data_buffer = <<>>,
        start_or_recv_from = undefined,
        flight_buffer = [],