# HG changeset patch # User Kim Alvefur # Date 1488810273 -3600 # Node ID 60b83f83f317d9f1566a497878af3dc163c75b8f # Parent d183ff55442f46e9a46c749e1a2c995fc66414ec mod_c2s: Rename variable no avoid name clash [luacheck] diff -r d183ff55442f -r 60b83f83f317 plugins/mod_c2s.lua --- a/plugins/mod_c2s.lua Mon Mar 06 15:22:00 2017 +0100 +++ b/plugins/mod_c2s.lua Mon Mar 06 15:24:33 2017 +0100 @@ -169,27 +169,27 @@ session.send(""); function session.send() return false; end - local reason = (reason and (reason.name or reason.text or reason.condition)) or reason; - session.log("debug", "c2s stream for %s closed: %s", session.full_jid or ("<"..session.ip..">"), reason or "session closed"); + local reason_text = (reason and (reason.name or reason.text or reason.condition)) or reason; + session.log("debug", "c2s stream for %s closed: %s", session.full_jid or ("<"..session.ip..">"), reason_text or "session closed"); -- Authenticated incoming stream may still be sending us stanzas, so wait for from remote local conn = session.conn; - if reason == nil and not session.notopen and session.type == "c2s" then + if reason_text == nil and not session.notopen and session.type == "c2s" then -- Grace time to process data from authenticated cleanly-closed stream add_task(stream_close_timeout, function () if not session.destroyed then session.log("warn", "Failed to receive a stream close response, closing connection anyway..."); - sm_destroy_session(session, reason); + sm_destroy_session(session, reason_text); conn:close(); end end); else - sm_destroy_session(session, reason); + sm_destroy_session(session, reason_text); conn:close(); end else - local reason = (reason and (reason.name or reason.text or reason.condition)) or reason; - sm_destroy_session(session, reason); + local reason_text = (reason and (reason.name or reason.text or reason.condition)) or reason; + sm_destroy_session(session, reason_text); end end