Mercurial > prosody-modules
comparison mod_smacks/mod_smacks.lua @ 931:e20e94d75fe3
Merge (someone needs to remember to pull...)
author | Marco Cirillo <maranda@lightwitch.org> |
---|---|
date | Tue, 12 Mar 2013 19:09:26 +0100 |
parents | 720b8268778e |
children | fabff75bfc3f |
comparison
equal
deleted
inserted
replaced
930:c08b424583c3 | 931:e20e94d75fe3 |
---|---|
247 | 247 |
248 end | 248 end |
249 end); | 249 end); |
250 | 250 |
251 module:hook_stanza(xmlns_sm, "resume", function (session, stanza) | 251 module:hook_stanza(xmlns_sm, "resume", function (session, stanza) |
252 if session.full_jid then | |
253 session.log("debug", "Tried to resume after resource binding"); | |
254 session.send(st.stanza("failed", sm_attr) | |
255 :tag("unexpected-request", { xmlns = xmlns_errors }) | |
256 ); | |
257 return true; | |
258 end | |
259 | |
252 local id = stanza.attr.previd; | 260 local id = stanza.attr.previd; |
253 local original_session = session_registry[id]; | 261 local original_session = session_registry[id]; |
254 if not original_session then | 262 if not original_session then |
255 session.log("debug", "Tried to resume non-existent session with id %s", id); | 263 session.log("debug", "Tried to resume non-existent session with id %s", id); |
256 session.send(st.stanza("failed", sm_attr) | 264 session.send(st.stanza("failed", sm_attr) |