mod_c2s, mod_s2s: Log cipher and encryption info in a more compact and (hopefully) less confusing way
--- a/plugins/mod_c2s.lua Wed Aug 14 14:53:50 2013 +0200
+++ b/plugins/mod_c2s.lua Wed Aug 14 15:00:36 2013 +0200
@@ -73,8 +73,7 @@
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");
--- a/plugins/mod_s2s/mod_s2s.lua Wed Aug 14 14:53:50 2013 +0200
+++ b/plugins/mod_s2s/mod_s2s.lua Wed Aug 14 15:00:36 2013 +0200
@@ -287,8 +287,7 @@
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");