Software `/` code `/` prosody-modules

Annotate

mod_smacks/mod_smacks.lua @ 845:1c14edca74a4

mod_password_policy: Fix inverted length check.

author	Waqas Hussain <waqas20@gmail.com>
date	Sat, 06 Oct 2012 19:25:53 +0500
parent	812:0095b74a3685
child	891:e089160c424b

rev	line source
160 9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	1 local st = require "util.stanza";
345 445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	2 local uuid_generate = require "util.uuid".generate;
160 9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	3
9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	4 local t_insert, t_remove = table.insert, table.remove;
220 263858d40ceb mod_smacks: Fix the logic for handling outgoing stanzas and ack requests Matthew Wild <mwild1@gmail.com> parents: 202 diff changeset	5 local math_min = math.min;
345 445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	6 local os_time = os.time;
160 9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	7 local tonumber, tostring = tonumber, tostring;
201 bc24f58a0d39 mod_smacks: Use filters for catching incoming stanzas (more reliable and efficient), also add some logic to make compatible with the stream resumption module (coming soon) Matthew Wild <mwild1@gmail.com> parents: 200 diff changeset	8 local add_filter = require "util.filters".add_filter;
257 08fa42e1ab06 mod_smacks: Fixes for monkey-patched sessionmanager.destroy to handle stream resumption, and to fall back to stock destroy() if the session is not smacks-enabled. Matthew Wild <mwild1@gmail.com> parents: 256 diff changeset	9 local timer = require "util.timer";
593 db2a40cbd6ef Add a <delay> to stanzas that are queued (and don't have one already), so clients can show them with the original timestamp. Thijs Alkemade <thijsalkemade@gmail.com> parents: 592 diff changeset	10 local datetime = require "util.datetime";
160 9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	11
594 6da21a0bb018 mod_smacks: Drop back to urn:xmpp:sm:2 for now Matthew Wild <mwild1@gmail.com> parents: 593 diff changeset	12 local xmlns_sm = "urn:xmpp:sm:2";
345 445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	13 local xmlns_errors = "urn:ietf:params:xml:ns:xmpp-stanzas";
593 db2a40cbd6ef Add a <delay> to stanzas that are queued (and don't have one already), so clients can show them with the original timestamp. Thijs Alkemade <thijsalkemade@gmail.com> parents: 592 diff changeset	14 local xmlns_delay = "urn:xmpp:delay";
160 9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	15
9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	16 local sm_attr = { xmlns = xmlns_sm };
9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	17
641 06a78cba6499 mod_smacks: get_option+_number Matthew Wild <mwild1@gmail.com> parents: 640 diff changeset	18 local resume_timeout = module:get_option_number("smacks_hibernation_time", 300);
576 44b69c3d5351 mod_smacks: Fix smacks on s2s connections, but disable it by default. Kim Alvefur <zash@zash.se> parents: 478 diff changeset	19 local s2s_smacks = module:get_option_boolean("smacks_enabled_s2s", false);
642 842a8a3b0d81 mod_smacks: Make smacks_max_unacked_stanzas configurable Matthew Wild <mwild1@gmail.com> parents: 641 diff changeset	20 local max_unacked_stanzas = module:get_option_number("smacks_max_unacked_stanzas", 0);
754 713c6791fbcc mod_smacks: Import prosody.core_process_stanza() Kim Alvefur <zash@zash.se> parents: 642 diff changeset	21 local core_process_stanza = prosody.core_process_stanza;
757 92c6f84ec446 mod_smacks: Use require to import (thanks a lot, autocomplete) Kim Alvefur <zash@zash.se> parents: 756 diff changeset	22 local sessionmanager = require"core.sessionmanager";
200 64a573203c20 mod_smacks: Better logic for deciding what is a stanza and what is not, and deciding when to send ack requests Matthew Wild <mwild1@gmail.com> parents: 160 diff changeset	23
640 d87131b29bbd mod_smacks: Remove dependency on connlisteners (use sessions table shared by mod_c2s directly) Matthew Wild <mwild1@gmail.com> parents: 625 diff changeset	24 local c2s_sessions = module:shared("/*/c2s/sessions");
345 445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	25 local session_registry = {};
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	26
591 36003cae2370 mod_smacks: Consolidate logic for deciding whether to advertise or allow smacks for a given session, and fix an issue with not allowing s2s connections to enable smacks because of not binding a resource... (thanks xnyphs) Matthew Wild <mwild1@gmail.com> parents: 590 diff changeset	27 local function can_do_smacks(session, advertise_only)
36003cae2370 mod_smacks: Consolidate logic for deciding whether to advertise or allow smacks for a given session, and fix an issue with not allowing s2s connections to enable smacks because of not binding a resource... (thanks xnyphs) Matthew Wild <mwild1@gmail.com> parents: 590 diff changeset	28 if session.smacks then return false, "unexpected-request", "Stream management is already enabled"; end
36003cae2370 mod_smacks: Consolidate logic for deciding whether to advertise or allow smacks for a given session, and fix an issue with not allowing s2s connections to enable smacks because of not binding a resource... (thanks xnyphs) Matthew Wild <mwild1@gmail.com> parents: 590 diff changeset	29
36003cae2370 mod_smacks: Consolidate logic for deciding whether to advertise or allow smacks for a given session, and fix an issue with not allowing s2s connections to enable smacks because of not binding a resource... (thanks xnyphs) Matthew Wild <mwild1@gmail.com> parents: 590 diff changeset	30 local session_type = session.type;
595 7693724881b3 Fix a typo in mod_smacks (type -> session_type). Thijs Alkemade <thijsalkemade@gmail.com> parents: 594 diff changeset	31 if session_type == "c2s" then
591 36003cae2370 mod_smacks: Consolidate logic for deciding whether to advertise or allow smacks for a given session, and fix an issue with not allowing s2s connections to enable smacks because of not binding a resource... (thanks xnyphs) Matthew Wild <mwild1@gmail.com> parents: 590 diff changeset	32 if not(advertise_only) and not(session.resource) then -- Fail unless we're only advertising sm
592 f9c73c1249cd Update smacks to urn:xmpp:sm:3. Fix typo in can_do_smacks. Thijs Alkemade <thijsalkemade@gmail.com> parents: 591 diff changeset	33 return false, "unexpected-request", "Client must bind a resource before enabling stream management";
591 36003cae2370 mod_smacks: Consolidate logic for deciding whether to advertise or allow smacks for a given session, and fix an issue with not allowing s2s connections to enable smacks because of not binding a resource... (thanks xnyphs) Matthew Wild <mwild1@gmail.com> parents: 590 diff changeset	34 end
36003cae2370 mod_smacks: Consolidate logic for deciding whether to advertise or allow smacks for a given session, and fix an issue with not allowing s2s connections to enable smacks because of not binding a resource... (thanks xnyphs) Matthew Wild <mwild1@gmail.com> parents: 590 diff changeset	35 return true;
595 7693724881b3 Fix a typo in mod_smacks (type -> session_type). Thijs Alkemade <thijsalkemade@gmail.com> parents: 594 diff changeset	36 elseif s2s_smacks and (session_type == "s2sin" or session_type == "s2sout") then
591 36003cae2370 mod_smacks: Consolidate logic for deciding whether to advertise or allow smacks for a given session, and fix an issue with not allowing s2s connections to enable smacks because of not binding a resource... (thanks xnyphs) Matthew Wild <mwild1@gmail.com> parents: 590 diff changeset	37 return true;
36003cae2370 mod_smacks: Consolidate logic for deciding whether to advertise or allow smacks for a given session, and fix an issue with not allowing s2s connections to enable smacks because of not binding a resource... (thanks xnyphs) Matthew Wild <mwild1@gmail.com> parents: 590 diff changeset	38 end
36003cae2370 mod_smacks: Consolidate logic for deciding whether to advertise or allow smacks for a given session, and fix an issue with not allowing s2s connections to enable smacks because of not binding a resource... (thanks xnyphs) Matthew Wild <mwild1@gmail.com> parents: 590 diff changeset	39 return false, "service-unavailable", "Stream management is not available for this stream";
36003cae2370 mod_smacks: Consolidate logic for deciding whether to advertise or allow smacks for a given session, and fix an issue with not allowing s2s connections to enable smacks because of not binding a resource... (thanks xnyphs) Matthew Wild <mwild1@gmail.com> parents: 590 diff changeset	40 end
36003cae2370 mod_smacks: Consolidate logic for deciding whether to advertise or allow smacks for a given session, and fix an issue with not allowing s2s connections to enable smacks because of not binding a resource... (thanks xnyphs) Matthew Wild <mwild1@gmail.com> parents: 590 diff changeset	41
263 41f1cac40560 mod_smacks: Fixed to use the correct events API. Waqas Hussain <waqas20@gmail.com> parents: 258 diff changeset	42 module:hook("stream-features",
41f1cac40560 mod_smacks: Fixed to use the correct events API. Waqas Hussain <waqas20@gmail.com> parents: 258 diff changeset	43 function (event)
591 36003cae2370 mod_smacks: Consolidate logic for deciding whether to advertise or allow smacks for a given session, and fix an issue with not allowing s2s connections to enable smacks because of not binding a resource... (thanks xnyphs) Matthew Wild <mwild1@gmail.com> parents: 590 diff changeset	44 if can_do_smacks(event.origin, true) then
589 57ac609444c4 mod_smacks: Only advertise stream features when a stream is authenticated, and doesn't already have smacks enabled Matthew Wild <mwild1@gmail.com> parents: 588 diff changeset	45 event.features:tag("sm", sm_attr):tag("optional"):up():up();
57ac609444c4 mod_smacks: Only advertise stream features when a stream is authenticated, and doesn't already have smacks enabled Matthew Wild <mwild1@gmail.com> parents: 588 diff changeset	46 end
160 9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	47 end);
9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	48
9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	49 module:hook("s2s-stream-features",
263 41f1cac40560 mod_smacks: Fixed to use the correct events API. Waqas Hussain <waqas20@gmail.com> parents: 258 diff changeset	50 function (event)
591 36003cae2370 mod_smacks: Consolidate logic for deciding whether to advertise or allow smacks for a given session, and fix an issue with not allowing s2s connections to enable smacks because of not binding a resource... (thanks xnyphs) Matthew Wild <mwild1@gmail.com> parents: 590 diff changeset	51 if can_do_smacks(event.origin, true) then
576 44b69c3d5351 mod_smacks: Fix smacks on s2s connections, but disable it by default. Kim Alvefur <zash@zash.se> parents: 478 diff changeset	52 event.features:tag("sm", sm_attr):tag("optional"):up():up();
44b69c3d5351 mod_smacks: Fix smacks on s2s connections, but disable it by default. Kim Alvefur <zash@zash.se> parents: 478 diff changeset	53 end
160 9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	54 end);
9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	55
345 445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	56 module:hook_stanza("http://etherx.jabber.org/streams", "features",
160 9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	57 function (session, stanza)
591 36003cae2370 mod_smacks: Consolidate logic for deciding whether to advertise or allow smacks for a given session, and fix an issue with not allowing s2s connections to enable smacks because of not binding a resource... (thanks xnyphs) Matthew Wild <mwild1@gmail.com> parents: 590 diff changeset	58 if can_do_smacks(session) and stanza:get_child("sm", xmlns_sm) then
576 44b69c3d5351 mod_smacks: Fix smacks on s2s connections, but disable it by default. Kim Alvefur <zash@zash.se> parents: 478 diff changeset	59 session.sends2s(st.stanza("enable", sm_attr));
160 9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	60 end
345 445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	61 end);
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	62
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	63 local function wrap_session(session, resume)
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	64 -- Overwrite process_stanza() and send()
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	65 local queue;
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	66 if not resume then
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	67 queue = {};
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	68 session.outgoing_stanza_queue = queue;
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	69 session.last_acknowledged_stanza = 0;
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	70 else
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	71 queue = session.outgoing_stanza_queue;
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	72 end
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	73
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	74 local _send = session.sends2s or session.send;
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	75 local function new_send(stanza)
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	76 local attr = stanza.attr;
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	77 if attr and not attr.xmlns then -- Stanza in default stream namespace
593 db2a40cbd6ef Add a <delay> to stanzas that are queued (and don't have one already), so clients can show them with the original timestamp. Thijs Alkemade <thijsalkemade@gmail.com> parents: 592 diff changeset	78 local cached_stanza = st.clone(stanza);
db2a40cbd6ef Add a <delay> to stanzas that are queued (and don't have one already), so clients can show them with the original timestamp. Thijs Alkemade <thijsalkemade@gmail.com> parents: 592 diff changeset	79
db2a40cbd6ef Add a <delay> to stanzas that are queued (and don't have one already), so clients can show them with the original timestamp. Thijs Alkemade <thijsalkemade@gmail.com> parents: 592 diff changeset	80 if cached_stanza and cached_stanza:get_child("delay", xmlns_delay) == nil then
db2a40cbd6ef Add a <delay> to stanzas that are queued (and don't have one already), so clients can show them with the original timestamp. Thijs Alkemade <thijsalkemade@gmail.com> parents: 592 diff changeset	81 cached_stanza = cached_stanza:tag("delay", { xmlns = xmlns_delay, from = session.host, stamp = datetime.datetime()});
db2a40cbd6ef Add a <delay> to stanzas that are queued (and don't have one already), so clients can show them with the original timestamp. Thijs Alkemade <thijsalkemade@gmail.com> parents: 592 diff changeset	82 end
db2a40cbd6ef Add a <delay> to stanzas that are queued (and don't have one already), so clients can show them with the original timestamp. Thijs Alkemade <thijsalkemade@gmail.com> parents: 592 diff changeset	83
db2a40cbd6ef Add a <delay> to stanzas that are queued (and don't have one already), so clients can show them with the original timestamp. Thijs Alkemade <thijsalkemade@gmail.com> parents: 592 diff changeset	84 queue[#queue+1] = cached_stanza;
345 445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	85 end
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	86 local ok, err = _send(stanza);
811 e2d940d81613 mod_smacks: Only request ack for stanzas Kim Alvefur <zash@zash.se> parents: 810 diff changeset	87 if ok and #queue > max_unacked_stanzas and not session.awaiting_ack and attr and not attr.xmlns then
345 445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	88 session.awaiting_ack = true;
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	89 return _send(st.stanza("r", sm_attr));
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	90 end
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	91 return ok, err;
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	92 end
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	93
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	94 if session.sends2s then
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	95 session.sends2s = new_send;
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	96 else
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	97 session.send = new_send;
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	98 end
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	99
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	100 if not resume then
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	101 session.handled_stanza_count = 0;
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	102 add_filter(session, "stanzas/in", function (stanza)
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	103 if not stanza.attr.xmlns then
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	104 session.handled_stanza_count = session.handled_stanza_count + 1;
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	105 session.log("debug", "Handled %d incoming stanzas", session.handled_stanza_count);
255 9b9b089407b1 mod_smacks: Fix to reply to stream for s2s sessions Matthew Wild <mwild1@gmail.com> parents: 220 diff changeset	106 end
345 445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	107 return stanza;
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	108 end);
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	109 end
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	110
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	111 return session;
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	112 end
201 bc24f58a0d39 mod_smacks: Use filters for catching incoming stanzas (more reliable and efficient), also add some logic to make compatible with the stream resumption module (coming soon) Matthew Wild <mwild1@gmail.com> parents: 200 diff changeset	113
345 445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	114 module:hook_stanza(xmlns_sm, "enable", function (session, stanza)
591 36003cae2370 mod_smacks: Consolidate logic for deciding whether to advertise or allow smacks for a given session, and fix an issue with not allowing s2s connections to enable smacks because of not binding a resource... (thanks xnyphs) Matthew Wild <mwild1@gmail.com> parents: 590 diff changeset	115 local ok, err, err_text = can_do_smacks(session);
36003cae2370 mod_smacks: Consolidate logic for deciding whether to advertise or allow smacks for a given session, and fix an issue with not allowing s2s connections to enable smacks because of not binding a resource... (thanks xnyphs) Matthew Wild <mwild1@gmail.com> parents: 590 diff changeset	116 if not ok then
590 40b707d7a809 mod_smacks: Handle a client trying to <enable> twice, or trying to <enable> before resource binding (thanks Thijs Alkemade) Matthew Wild <mwild1@gmail.com> parents: 589 diff changeset	117 session.log("warn", "Failed to enable smacks: %s", err_text); -- TODO: XEP doesn't say we can send error text, should it?
40b707d7a809 mod_smacks: Handle a client trying to <enable> twice, or trying to <enable> before resource binding (thanks Thijs Alkemade) Matthew Wild <mwild1@gmail.com> parents: 589 diff changeset	118 session.send(st.stanza("failed", { xmlns = xmlns_sm }):tag(err, { xmlns = xmlns_errors}));
40b707d7a809 mod_smacks: Handle a client trying to <enable> twice, or trying to <enable> before resource binding (thanks Thijs Alkemade) Matthew Wild <mwild1@gmail.com> parents: 589 diff changeset	119 return true;
40b707d7a809 mod_smacks: Handle a client trying to <enable> twice, or trying to <enable> before resource binding (thanks Thijs Alkemade) Matthew Wild <mwild1@gmail.com> parents: 589 diff changeset	120 end
40b707d7a809 mod_smacks: Handle a client trying to <enable> twice, or trying to <enable> before resource binding (thanks Thijs Alkemade) Matthew Wild <mwild1@gmail.com> parents: 589 diff changeset	121
345 445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	122 module:log("debug", "Enabling stream management");
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	123 session.smacks = true;
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	124
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	125 wrap_session(session);
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	126
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	127 local resume_token;
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	128 local resume = stanza.attr.resume;
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	129 if resume == "true" or resume == "1" then
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	130 resume_token = uuid_generate();
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	131 session_registry[resume_token] = session;
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	132 session.resumption_token = resume_token;
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	133 end
576 44b69c3d5351 mod_smacks: Fix smacks on s2s connections, but disable it by default. Kim Alvefur <zash@zash.se> parents: 478 diff changeset	134 (session.sends2s or session.send)(st.stanza("enabled", { xmlns = xmlns_sm, id = resume_token, resume = resume }));
44b69c3d5351 mod_smacks: Fix smacks on s2s connections, but disable it by default. Kim Alvefur <zash@zash.se> parents: 478 diff changeset	135 return true;
44b69c3d5351 mod_smacks: Fix smacks on s2s connections, but disable it by default. Kim Alvefur <zash@zash.se> parents: 478 diff changeset	136 end, 100);
44b69c3d5351 mod_smacks: Fix smacks on s2s connections, but disable it by default. Kim Alvefur <zash@zash.se> parents: 478 diff changeset	137
44b69c3d5351 mod_smacks: Fix smacks on s2s connections, but disable it by default. Kim Alvefur <zash@zash.se> parents: 478 diff changeset	138 module:hook_stanza(xmlns_sm, "enabled", function (session, stanza)
44b69c3d5351 mod_smacks: Fix smacks on s2s connections, but disable it by default. Kim Alvefur <zash@zash.se> parents: 478 diff changeset	139 module:log("debug", "Enabling stream management");
44b69c3d5351 mod_smacks: Fix smacks on s2s connections, but disable it by default. Kim Alvefur <zash@zash.se> parents: 478 diff changeset	140 session.smacks = true;
44b69c3d5351 mod_smacks: Fix smacks on s2s connections, but disable it by default. Kim Alvefur <zash@zash.se> parents: 478 diff changeset	141
44b69c3d5351 mod_smacks: Fix smacks on s2s connections, but disable it by default. Kim Alvefur <zash@zash.se> parents: 478 diff changeset	142 wrap_session(session);
44b69c3d5351 mod_smacks: Fix smacks on s2s connections, but disable it by default. Kim Alvefur <zash@zash.se> parents: 478 diff changeset	143
44b69c3d5351 mod_smacks: Fix smacks on s2s connections, but disable it by default. Kim Alvefur <zash@zash.se> parents: 478 diff changeset	144 -- FIXME Resume?
44b69c3d5351 mod_smacks: Fix smacks on s2s connections, but disable it by default. Kim Alvefur <zash@zash.se> parents: 478 diff changeset	145
345 445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	146 return true;
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	147 end, 100);
160 9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	148
9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	149 module:hook_stanza(xmlns_sm, "r", function (origin, stanza)
9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	150 if not origin.smacks then
9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	151 module:log("debug", "Received ack request from non-smack-enabled session");
9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	152 return;
9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	153 end
9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	154 module:log("debug", "Received ack request, acking for %d", origin.handled_stanza_count);
9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	155 -- Reply with <a>
255 9b9b089407b1 mod_smacks: Fix to reply to stream for s2s sessions Matthew Wild <mwild1@gmail.com> parents: 220 diff changeset	156 (origin.sends2s or origin.send)(st.stanza("a", { xmlns = xmlns_sm, h = tostring(origin.handled_stanza_count) }));
160 9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	157 return true;
9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	158 end);
9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	159
9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	160 module:hook_stanza(xmlns_sm, "a", function (origin, stanza)
9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	161 if not origin.smacks then return; end
200 64a573203c20 mod_smacks: Better logic for deciding what is a stanza and what is not, and deciding when to send ack requests Matthew Wild <mwild1@gmail.com> parents: 160 diff changeset	162 origin.awaiting_ack = nil;
160 9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	163 -- Remove handled stanzas from outgoing_stanza_queue
258 36648205b10a mod_smacks: Add commented log statement for future debugging Matthew Wild <mwild1@gmail.com> parents: 257 diff changeset	164 --log("debug", "ACK: h=%s, last=%s", stanza.attr.h or "", origin.last_acknowledged_stanza or "");
220 263858d40ceb mod_smacks: Fix the logic for handling outgoing stanzas and ack requests Matthew Wild <mwild1@gmail.com> parents: 202 diff changeset	165 local handled_stanza_count = tonumber(stanza.attr.h)-origin.last_acknowledged_stanza;
263858d40ceb mod_smacks: Fix the logic for handling outgoing stanzas and ack requests Matthew Wild <mwild1@gmail.com> parents: 202 diff changeset	166 local queue = origin.outgoing_stanza_queue;
263858d40ceb mod_smacks: Fix the logic for handling outgoing stanzas and ack requests Matthew Wild <mwild1@gmail.com> parents: 202 diff changeset	167 if handled_stanza_count > #queue then
263858d40ceb mod_smacks: Fix the logic for handling outgoing stanzas and ack requests Matthew Wild <mwild1@gmail.com> parents: 202 diff changeset	168 module:log("warn", "The client says it handled %d new stanzas, but we only sent %d :)",
263858d40ceb mod_smacks: Fix the logic for handling outgoing stanzas and ack requests Matthew Wild <mwild1@gmail.com> parents: 202 diff changeset	169 handled_stanza_count, #queue);
345 445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	170 module:log("debug", "Client h: %d, our h: %d", tonumber(stanza.attr.h), origin.last_acknowledged_stanza);
220 263858d40ceb mod_smacks: Fix the logic for handling outgoing stanzas and ack requests Matthew Wild <mwild1@gmail.com> parents: 202 diff changeset	171 for i=1,#queue do
263858d40ceb mod_smacks: Fix the logic for handling outgoing stanzas and ack requests Matthew Wild <mwild1@gmail.com> parents: 202 diff changeset	172 module:log("debug", "Q item %d: %s", i, tostring(queue[i]));
263858d40ceb mod_smacks: Fix the logic for handling outgoing stanzas and ack requests Matthew Wild <mwild1@gmail.com> parents: 202 diff changeset	173 end
263858d40ceb mod_smacks: Fix the logic for handling outgoing stanzas and ack requests Matthew Wild <mwild1@gmail.com> parents: 202 diff changeset	174 end
263858d40ceb mod_smacks: Fix the logic for handling outgoing stanzas and ack requests Matthew Wild <mwild1@gmail.com> parents: 202 diff changeset	175 for i=1,math_min(handled_stanza_count,#queue) do
160 9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	176 t_remove(origin.outgoing_stanza_queue, 1);
9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	177 end
220 263858d40ceb mod_smacks: Fix the logic for handling outgoing stanzas and ack requests Matthew Wild <mwild1@gmail.com> parents: 202 diff changeset	178 origin.last_acknowledged_stanza = origin.last_acknowledged_stanza + handled_stanza_count;
160 9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	179 return true;
9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	180 end);
9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	181
9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	182 --TODO: Optimise... incoming stanzas should be handled by a per-session
9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	183 -- function that has a counter as an upvalue (no table indexing for increments,
9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	184 -- and won't slow non-198 sessions). We can also then remove the .handled flag
9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	185 -- on stanzas
9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	186
9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	187 function handle_unacked_stanzas(session)
9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	188 local queue = session.outgoing_stanza_queue;
9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	189 local error_attr = { type = "cancel" };
9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	190 if #queue > 0 then
202 d11478ae374e mod_smacks: Clean outgoing stanza queue correctly on session close Matthew Wild <mwild1@gmail.com> parents: 201 diff changeset	191 session.outgoing_stanza_queue = {};
160 9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	192 for i=1,#queue do
256 57de4a7840ef mod_smacks: Fixes for storing the unacked stanzas so that they can be properly replayed to clients on stream resume Matthew Wild <mwild1@gmail.com> parents: 255 diff changeset	193 local reply = st.reply(queue[i]);
160 9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	194 if reply.attr.to ~= session.full_jid then
9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	195 reply.attr.type = "error";
9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	196 reply:tag("error", error_attr)
9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	197 :tag("recipient-unavailable", {xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"});
256 57de4a7840ef mod_smacks: Fixes for storing the unacked stanzas so that they can be properly replayed to clients on stream resume Matthew Wild <mwild1@gmail.com> parents: 255 diff changeset	198 core_process_stanza(session, reply);
160 9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	199 end
9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	200 end
9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	201 end
9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	202 end
9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	203
622 ce39df945de1 mod_smacks: Use pre-resource-unbind (0.9 feature) to fix reloadability and multiple host support Matthew Wild <mwild1@gmail.com> parents: 595 diff changeset	204 module:hook("pre-resource-unbind", function (event)
ce39df945de1 mod_smacks: Use pre-resource-unbind (0.9 feature) to fix reloadability and multiple host support Matthew Wild <mwild1@gmail.com> parents: 595 diff changeset	205 local session, err = event.session, event.error;
625 2c07bcf56a36 mod_smacks: Don't hibernate session on graceful stream close Matthew Wild <mwild1@gmail.com> parents: 624 diff changeset	206 if session.smacks and err ~= "session closed" then
257 08fa42e1ab06 mod_smacks: Fixes for monkey-patched sessionmanager.destroy to handle stream resumption, and to fall back to stock destroy() if the session is not smacks-enabled. Matthew Wild <mwild1@gmail.com> parents: 256 diff changeset	207 if not session.resumption_token then
08fa42e1ab06 mod_smacks: Fixes for monkey-patched sessionmanager.destroy to handle stream resumption, and to fall back to stock destroy() if the session is not smacks-enabled. Matthew Wild <mwild1@gmail.com> parents: 256 diff changeset	208 local queue = session.outgoing_stanza_queue;
08fa42e1ab06 mod_smacks: Fixes for monkey-patched sessionmanager.destroy to handle stream resumption, and to fall back to stock destroy() if the session is not smacks-enabled. Matthew Wild <mwild1@gmail.com> parents: 256 diff changeset	209 if #queue > 0 then
08fa42e1ab06 mod_smacks: Fixes for monkey-patched sessionmanager.destroy to handle stream resumption, and to fall back to stock destroy() if the session is not smacks-enabled. Matthew Wild <mwild1@gmail.com> parents: 256 diff changeset	210 module:log("warn", "Destroying session with %d unacked stanzas:", #queue);
08fa42e1ab06 mod_smacks: Fixes for monkey-patched sessionmanager.destroy to handle stream resumption, and to fall back to stock destroy() if the session is not smacks-enabled. Matthew Wild <mwild1@gmail.com> parents: 256 diff changeset	211 for i=1,#queue do
08fa42e1ab06 mod_smacks: Fixes for monkey-patched sessionmanager.destroy to handle stream resumption, and to fall back to stock destroy() if the session is not smacks-enabled. Matthew Wild <mwild1@gmail.com> parents: 256 diff changeset	212 module:log("warn", "::%s", tostring(queue[i]));
08fa42e1ab06 mod_smacks: Fixes for monkey-patched sessionmanager.destroy to handle stream resumption, and to fall back to stock destroy() if the session is not smacks-enabled. Matthew Wild <mwild1@gmail.com> parents: 256 diff changeset	213 end
08fa42e1ab06 mod_smacks: Fixes for monkey-patched sessionmanager.destroy to handle stream resumption, and to fall back to stock destroy() if the session is not smacks-enabled. Matthew Wild <mwild1@gmail.com> parents: 256 diff changeset	214 handle_unacked_stanzas(session);
160 9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	215 end
257 08fa42e1ab06 mod_smacks: Fixes for monkey-patched sessionmanager.destroy to handle stream resumption, and to fall back to stock destroy() if the session is not smacks-enabled. Matthew Wild <mwild1@gmail.com> parents: 256 diff changeset	216 else
586 f733e7599ed6 mod_smacks: Add logging to hibernation and session destruction (thanks darkrain) Matthew Wild <mwild1@gmail.com> parents: 576 diff changeset	217 session.log("debug", "mod_smacks hibernating session for up to %d seconds", resume_timeout);
345 445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	218 local hibernate_time = os_time(); -- Track the time we went into hibernation
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	219 session.hibernating = hibernate_time;
478 db0f065c4e09 mod_smacks: Don't destroy a session that binds the same resource as a hibernating smacks session (thanks xnyhps for tracking down the problem, though I've used a different fix) Matthew Wild <mwild1@gmail.com> parents: 345 diff changeset	220 local resumption_token = session.resumption_token;
257 08fa42e1ab06 mod_smacks: Fixes for monkey-patched sessionmanager.destroy to handle stream resumption, and to fall back to stock destroy() if the session is not smacks-enabled. Matthew Wild <mwild1@gmail.com> parents: 256 diff changeset	221 timer.add_task(resume_timeout, function ()
586 f733e7599ed6 mod_smacks: Add logging to hibernation and session destruction (thanks darkrain) Matthew Wild <mwild1@gmail.com> parents: 576 diff changeset	222 session.log("debug", "mod_smacks hibernation timeout reached...");
478 db0f065c4e09 mod_smacks: Don't destroy a session that binds the same resource as a hibernating smacks session (thanks xnyhps for tracking down the problem, though I've used a different fix) Matthew Wild <mwild1@gmail.com> parents: 345 diff changeset	223 -- We need to check the current resumption token for this resource
db0f065c4e09 mod_smacks: Don't destroy a session that binds the same resource as a hibernating smacks session (thanks xnyhps for tracking down the problem, though I've used a different fix) Matthew Wild <mwild1@gmail.com> parents: 345 diff changeset	224 -- matches the smacks session this timer is for in case it changed
db0f065c4e09 mod_smacks: Don't destroy a session that binds the same resource as a hibernating smacks session (thanks xnyhps for tracking down the problem, though I've used a different fix) Matthew Wild <mwild1@gmail.com> parents: 345 diff changeset	225 -- (for example, the client may have bound a new resource and
db0f065c4e09 mod_smacks: Don't destroy a session that binds the same resource as a hibernating smacks session (thanks xnyhps for tracking down the problem, though I've used a different fix) Matthew Wild <mwild1@gmail.com> parents: 345 diff changeset	226 -- started a new smacks session, or not be using smacks)
810 464ed063a8f2 mod_smacks: Less table indexing! Kim Alvefur <zash@zash.se> parents: 757 diff changeset	227 local curr_session = full_sessions[session.full_jid];
812 0095b74a3685 mod_smacks: Avoid indexing a nil value Kim Alvefur <zash@zash.se> parents: 811 diff changeset	228 if curr_session and curr_session.resumption_token == resumption_token
345 445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	229 -- Check the hibernate time still matches what we think it is,
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	230 -- otherwise the session resumed and re-hibernated.
478 db0f065c4e09 mod_smacks: Don't destroy a session that binds the same resource as a hibernating smacks session (thanks xnyhps for tracking down the problem, though I've used a different fix) Matthew Wild <mwild1@gmail.com> parents: 345 diff changeset	231 and session.hibernating == hibernate_time then
586 f733e7599ed6 mod_smacks: Add logging to hibernation and session destruction (thanks darkrain) Matthew Wild <mwild1@gmail.com> parents: 576 diff changeset	232 session.log("debug", "Destroying session for hibernating too long");
345 445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	233 session_registry[session.resumption_token] = nil;
257 08fa42e1ab06 mod_smacks: Fixes for monkey-patched sessionmanager.destroy to handle stream resumption, and to fall back to stock destroy() if the session is not smacks-enabled. Matthew Wild <mwild1@gmail.com> parents: 256 diff changeset	234 session.resumption_token = nil;
345 445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	235 sessionmanager.destroy_session(session);
586 f733e7599ed6 mod_smacks: Add logging to hibernation and session destruction (thanks darkrain) Matthew Wild <mwild1@gmail.com> parents: 576 diff changeset	236 else
f733e7599ed6 mod_smacks: Add logging to hibernation and session destruction (thanks darkrain) Matthew Wild <mwild1@gmail.com> parents: 576 diff changeset	237 session.log("debug", "Session resumed before hibernation timeout, all is well")
257 08fa42e1ab06 mod_smacks: Fixes for monkey-patched sessionmanager.destroy to handle stream resumption, and to fall back to stock destroy() if the session is not smacks-enabled. Matthew Wild <mwild1@gmail.com> parents: 256 diff changeset	238 end
08fa42e1ab06 mod_smacks: Fixes for monkey-patched sessionmanager.destroy to handle stream resumption, and to fall back to stock destroy() if the session is not smacks-enabled. Matthew Wild <mwild1@gmail.com> parents: 256 diff changeset	239 end);
622 ce39df945de1 mod_smacks: Use pre-resource-unbind (0.9 feature) to fix reloadability and multiple host support Matthew Wild <mwild1@gmail.com> parents: 595 diff changeset	240 return true; -- Postpone destruction for now
160 9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	241 end
258 36648205b10a mod_smacks: Add commented log statement for future debugging Matthew Wild <mwild1@gmail.com> parents: 257 diff changeset	242
160 9a7671720dec mod_smacks: XEP-0198 Stream Management acks. Initial commit - very rough, useful mainly for testing at the moment, most certainly contains bugs :) Matthew Wild <mwild1@gmail.com> parents: diff changeset	243 end
622 ce39df945de1 mod_smacks: Use pre-resource-unbind (0.9 feature) to fix reloadability and multiple host support Matthew Wild <mwild1@gmail.com> parents: 595 diff changeset	244 end);
345 445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	245
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	246 module:hook_stanza(xmlns_sm, "resume", function (session, stanza)
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	247 local id = stanza.attr.previd;
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	248 local original_session = session_registry[id];
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	249 if not original_session then
588 8042558336b6 mod_smacks: Log message when client tries to resume unknown session Matthew Wild <mwild1@gmail.com> parents: 587 diff changeset	250 session.log("debug", "Tried to resume non-existent session with id %s", id);
345 445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	251 session.send(st.stanza("failed", sm_attr)
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	252 :tag("item-not-found", { xmlns = xmlns_errors })
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	253 );
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	254 elseif session.username == original_session.username
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	255 and session.host == original_session.host then
587 322a14acd974 mod_smacks: Add log message on resume Matthew Wild <mwild1@gmail.com> parents: 586 diff changeset	256 session.log("debug", "mod_smacks resuming existing session...");
345 445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	257 -- TODO: All this should move to sessionmanager (e.g. session:replace(new_session))
623 c1f3958695ea mod_smacks: If a resumed session still has a connection open, close that connection before resuming Matthew Wild <mwild1@gmail.com> parents: 622 diff changeset	258 if original_session.conn then
c1f3958695ea mod_smacks: If a resumed session still has a connection open, close that connection before resuming Matthew Wild <mwild1@gmail.com> parents: 622 diff changeset	259 session.log("debug", "mod_smacks closing an old connection for this session");
c1f3958695ea mod_smacks: If a resumed session still has a connection open, close that connection before resuming Matthew Wild <mwild1@gmail.com> parents: 622 diff changeset	260 local conn = original_session.conn;
640 d87131b29bbd mod_smacks: Remove dependency on connlisteners (use sessions table shared by mod_c2s directly) Matthew Wild <mwild1@gmail.com> parents: 625 diff changeset	261 c2s_sessions[conn] = nil;
623 c1f3958695ea mod_smacks: If a resumed session still has a connection open, close that connection before resuming Matthew Wild <mwild1@gmail.com> parents: 622 diff changeset	262 conn:close();
c1f3958695ea mod_smacks: If a resumed session still has a connection open, close that connection before resuming Matthew Wild <mwild1@gmail.com> parents: 622 diff changeset	263 end
345 445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	264 original_session.ip = session.ip;
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	265 original_session.conn = session.conn;
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	266 original_session.send = session.send;
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	267 original_session.stream = session.stream;
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	268 original_session.secure = session.secure;
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	269 original_session.hibernating = nil;
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	270 local filter = original_session.filter;
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	271 local stream = session.stream;
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	272 local log = session.log;
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	273 function original_session.data(data)
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	274 data = filter("bytes/in", data);
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	275 if data then
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	276 local ok, err = stream:feed(data);
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	277 if ok then return; end
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	278 log("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "):gsub("[%z\1-\31]", "_"));
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	279 original_session:close("xml-not-well-formed");
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	280 end
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	281 end
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	282 wrap_session(original_session, true);
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	283 -- Inform xmppstream of the new session (passed to its callbacks)
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	284 stream:set_session(original_session);
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	285 -- Similar for connlisteners
640 d87131b29bbd mod_smacks: Remove dependency on connlisteners (use sessions table shared by mod_c2s directly) Matthew Wild <mwild1@gmail.com> parents: 625 diff changeset	286 c2s_sessions[session.conn] = original_session;
345 445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	287
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	288 session.send(st.stanza("resumed", { xmlns = xmlns_sm,
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	289 h = original_session.handled_stanza_count, previd = id }));
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	290
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	291 -- Fake an <a> with the h of the <resume/> from the client
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	292 original_session:dispatch_stanza(st.stanza("a", { xmlns = xmlns_sm,
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	293 h = stanza.attr.h }));
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	294
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	295 -- Ok, we need to re-send any stanzas that the client didn't see
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	296 -- ...they are what is now left in the outgoing stanza queue
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	297 local queue = original_session.outgoing_stanza_queue;
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	298 for i=1,#queue do
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	299 session.send(queue[i]);
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	300 end
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	301 else
755 bab7c4ace803 mod_smacks: Fix log statement Kim Alvefur <zash@zash.se> parents: 754 diff changeset	302 module:log("warn", "Client %s@%s[%s] tried to resume stream for %s@%s[%s]",
345 445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	303 session.username or "?", session.host or "?", session.type,
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	304 original_session.username or "?", original_session.host or "?", original_session.type);
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	305 session.send(st.stanza("failed", sm_attr)
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	306 :tag("not-authorized", { xmlns = xmlns_errors }));
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	307 end
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	308 return true;
445178d15b51 mod_smacks: Merge mod_fastreconnect (resumption support), fix a number of bugs, refactor the code and add some more comments to explain process Matthew Wild <mwild1@gmail.com> parents: 263 diff changeset	309 end);

prosody-modules

1c14edca74a4

mod_smacks/mod_smacks.lua

Software / code / prosody-modules

Annotate

mod_smacks/mod_smacks.lua @ 845:1c14edca74a4

Software `/` code `/` prosody-modules