From 6e0ee7a598c892b6db3282bd719583b68f2d8a89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Dimitrov?= <peterdmv@erlang.org>
Date: Wed, 23 May 2018 16:44:58 +0200
Subject: ssl: Add logging for TLS record protocol

Change-Id: I18786a9a8523d0ec3d9ca37ad5b2284721c5c4a1
---
 lib/ssl/src/ssl_connection.erl | 37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

(limited to 'lib/ssl/src/ssl_connection.erl')

diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl
index b4f60c683c..271365b709 100644
--- a/lib/ssl/src/ssl_connection.erl
+++ b/lib/ssl/src/ssl_connection.erl
@@ -335,9 +335,14 @@ handle_own_alert(Alert, Version, StateName,
                         connection_states = ConnectionStates,
                         ssl_options = SslOpts} = State) ->
     try %% Try to tell the other side
-	{BinMsg, _} =
-	Connection:encode_alert(Alert, Version, ConnectionStates),
-	Connection:send(Transport, Socket, BinMsg)
+        {BinMsg, _} =
+            Connection:encode_alert(Alert, Version, ConnectionStates),
+        Connection:send(Transport, Socket, BinMsg),
+        Report = #{direction => outbound,
+                   protocol => 'tls_record',
+                   message => BinMsg,
+                   version => Version},
+        logger:info(Report, #{domain => [beam,erlang,otp,ssl,tls_record]})
     catch _:_ ->  %% Can crash if we are in a uninitialized state
 	    ignore
     end,
@@ -431,16 +436,22 @@ write_application_data(Data0, {FromPid, _} = From,
 	    {Msgs, ConnectionStates} =
                 Connection:encode_data(Data, Version, ConnectionStates0),
             NewState = State#state{connection_states = ConnectionStates},
-	    case Connection:send(Transport, Socket, Msgs) of
-                ok when FromPid =:= self() ->
-                    hibernate_after(connection, NewState, []);
-                Error when FromPid =:= self() ->
-                    stop({shutdown, Error}, NewState);
-                ok ->
-                    hibernate_after(connection, NewState, [{reply, From, ok}]);
-                Result ->
-                    hibernate_after(connection, NewState, [{reply, From, Result}])
-            end
+	    RetVal = case Connection:send(Transport, Socket, Msgs) of
+                         ok when FromPid =:= self() ->
+                             hibernate_after(connection, NewState, []);
+                         Error when FromPid =:= self() ->
+                             stop({shutdown, Error}, NewState);
+                         ok ->
+                             hibernate_after(connection, NewState, [{reply, From, ok}]);
+                         Result ->
+                             hibernate_after(connection, NewState, [{reply, From, Result}])
+                     end,
+            Report = #{direction => outbound,
+                       protocol => 'tls_record',
+                       message => Msgs,
+                       version => Version},
+            logger:info(Report, #{domain => [beam,erlang,otp,ssl,tls_record]}),
+            RetVal
     end.
 
 read_application_data(Data, #state{user_application = {_Mon, Pid},
-- 
cgit v1.2.3