Comparison

plugins/mod_c2s.lua @ 5571:ae9672f4079a

mod_c2s: Fix session:close() when a stanza is passed as reason
author Kim Alvefur <zash@zash.se>
date Fri, 10 May 2013 22:29:03 +0200
parent 5518:0220093e34fa
child 5638:c5b7f4858014
child 5757:b5ba004beb0a
comparison
equal deleted inserted replaced
5569:c45997aebaa2 5571:ae9672f4079a
155 end 155 end
156 156
157 session.send("</stream:stream>"); 157 session.send("</stream:stream>");
158 function session.send() return false; end 158 function session.send() return false; end
159 159
160 local reason = (reason and (reason.text or reason.condition)) or reason; 160 local reason = (reason and (reason.name or reason.text or reason.condition)) or reason;
161 session.log("info", "c2s stream for %s closed: %s", session.full_jid or ("<"..session.ip..">"), reason or "session closed"); 161 session.log("info", "c2s stream for %s closed: %s", session.full_jid or ("<"..session.ip..">"), reason or "session closed");
162 162
163 -- Authenticated incoming stream may still be sending us stanzas, so wait for </stream:stream> from remote 163 -- Authenticated incoming stream may still be sending us stanzas, so wait for </stream:stream> from remote
164 local conn = session.conn; 164 local conn = session.conn;
165 if reason == nil and not session.notopen and session.type == "c2s" then 165 if reason == nil and not session.notopen and session.type == "c2s" then