# HG changeset patch # User Kim Alvefur # Date 1375449144 -7200 # Node ID 969e0a054795cfca47ff20939eed1a660fced605 # Parent 0e52f1d5ca715ca7d7d802b5d32209a3de5f72d0 mod_c2s, mod_s2s: Log a message that stream encryption has been enabled with some details diff -r 0e52f1d5ca71 -r 969e0a054795 plugins/mod_c2s.lua --- a/plugins/mod_c2s.lua Fri Aug 02 14:44:56 2013 +0200 +++ b/plugins/mod_c2s.lua Fri Aug 02 15:12:24 2013 +0200 @@ -68,12 +68,15 @@ if session.secure == false then session.secure = true; - -- Check if TLS compression is used local sock = session.conn:socket(); if sock.info then - session.compressed = sock:info"compression"; - elseif sock.compression then - session.compressed = sock:compression(); --COMPAT mw/luasec-hg + 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.compressed = info.compression; + else + (session.log or log)("info", "Stream encrypted"); + session.compressed = sock.compression and sock:compression(); --COMPAT mw/luasec-hg end end diff -r 0e52f1d5ca71 -r 969e0a054795 plugins/mod_s2s/mod_s2s.lua --- a/plugins/mod_s2s/mod_s2s.lua Fri Aug 02 14:44:56 2013 +0200 +++ b/plugins/mod_s2s/mod_s2s.lua Fri Aug 02 15:12:24 2013 +0200 @@ -283,12 +283,15 @@ if session.secure == false then session.secure = true; - -- Check if TLS compression is used local sock = session.conn:socket(); if sock.info then - session.compressed = sock:info"compression"; - elseif sock.compression then - session.compressed = sock:compression(); --COMPAT mw/luasec-hg + 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.compressed = info.compression; + else + (session.log or log)("info", "Stream encrypted"); + session.compressed = sock.compression and sock:compression(); --COMPAT mw/luasec-hg end end