mod_c2s, mod_s2s: Log cipher and encryption info in a more compact and (hopefully...

diff --git a/plugins/mod_c2s.lua b/plugins/mod_c2s.lua
index 8a652a3394ac8c1fa90efa30be3c1a8b9160396b..1cf4b98dd9a435dc65cf70986fdbf31d7aa2ed9b 100644 (file)
--- a/plugins/mod_c2s.lua
+++ b/plugins/mod_c2s.lua
@@ -73,8 +73,7 @@ function stream_callbacks.streamopened(session, attr)
                local sock = session.conn:socket();
                if sock.info then
                        local info = sock:info();
-                       (session.log or log)("info", "Stream encrypted (%s) with %s, authenticated with %s and exchanged keys with %s",
-                               info.protocol, info.encryption, info.authentication, info.key);
+                       (session.log or log)("info", "Stream encrypted (%s with %s)", info.protocol, info.cipher);
                        session.compressed = info.compression;
                else
                        (session.log or log)("info", "Stream encrypted");

diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index 331e99f170b4032dbedc7f82fdaca1836252fa36..1d03f3e4e57eb208e59ddf4074d8a3b23b7cabe8 100644 (file)
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@ -287,8 +287,7 @@ function stream_callbacks.streamopened(session, attr)
                local sock = session.conn:socket();
                if sock.info then
                        local info = sock:info();
-                       (session.log or log)("info", "Stream encrypted (%s) with %s, authenticated with %s and exchanged keys with %s",
-                               info.protocol, info.encryption, info.authentication, info.key);
+                       (session.log or log)("info", "Stream encrypted (%s with %s)", info.protocol, info.cipher);
                        session.compressed = info.compression;
                else
                        (session.log or log)("info", "Stream encrypted");