Mercurial > prosody-hg

comparison plugins/mod_s2s/mod_s2s.lua @ 5801:224644752bf4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mod_c2s, mod_s2s: Log cipher and encryption info in a more compact and (hopefully) less confusing way
author Kim Alvefur <zash@zash.se>
date Wed, 14 Aug 2013 15:00:36 +0200
parents 3a48acbcb7f3
children e327f2d4e09f
comparison
equal deleted inserted replaced
5800:3a48acbcb7f3 5801:224644752bf4
285 session.secure = true; 285 session.secure = true;
286 286
287 local sock = session.conn:socket(); 287 local sock = session.conn:socket();
288 if sock.info then 288 if sock.info then
289 local info = sock:info(); 289 local info = sock:info();
290 (session.log or log)("info", "Stream encrypted (%s) with %s, authenticated with %s and exchanged keys with %s", 290 (session.log or log)("info", "Stream encrypted (%s with %s)", info.protocol, info.cipher);
291 info.protocol, info.encryption, info.authentication, info.key);
292 session.compressed = info.compression; 291 session.compressed = info.compression;
293 else 292 else
294 (session.log or log)("info", "Stream encrypted"); 293 (session.log or log)("info", "Stream encrypted");
295 session.compressed = sock.compression and sock:compression(); --COMPAT mw/luasec-hg 294 session.compressed = sock.compression and sock:compression(); --COMPAT mw/luasec-hg
296 end 295 end