Software `/` code `/` prosody

Annotate

plugins/mod_c2s.lua @ 6630:6735e2d735d6

mod_c2s, mod_s2s: Collect statistics on number of connections

author	Kim Alvefur <zash@zash.se>
date	Sun, 26 Apr 2015 00:06:11 +0200
parent	6382:57d23c26039b
child	6846:7eb166fa1f26

rev	line source
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	1 -- Prosody IM
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	2 -- Copyright (C) 2008-2010 Matthew Wild
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	3 -- Copyright (C) 2008-2010 Waqas Hussain
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5773 diff changeset	4 --
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	5 -- This project is MIT/X11 licensed. Please see the
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	6 -- COPYING file in the source package for more information.
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	7 --
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	8
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	9 module:set_global();
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	10
4548 e6e5c76ff009 sessionmanager, mod_c2s: Move timeout logic to mod_c2s Matthew Wild <mwild1@gmail.com> parents: 4543 diff changeset	11 local add_task = require "util.timer".add_task;
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	12 local new_xmpp_stream = require "util.xmppstream".new;
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	13 local nameprep = require "util.encodings".stringprep.nameprep;
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	14 local sessionmanager = require "core.sessionmanager";
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	15 local st = require "util.stanza";
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	16 local sm_new_session, sm_destroy_session = sessionmanager.new_session, sessionmanager.destroy_session;
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	17 local uuid_generate = require "util.uuid".generate;
5789 3b05a86631b9 mod_c2s: Port coroutine code to util.async Matthew Wild <mwild1@gmail.com> parents: 5776 diff changeset	18 local runner = require "util.async".runner;
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	19
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	20 local xpcall, tostring, type = xpcall, tostring, type;
5773 c9a712673d8a mod_c2s: Add session:sleep() and session:wake() to pause a session (e.g. while waiting for an external event). Needs a gallon or two of testing. Matthew Wild <mwild1@gmail.com> parents: 5764 diff changeset	21 local t_insert, t_remove = table.insert, table.remove;
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	22
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	23 local xmlns_xmpp_streams = "urn:ietf:params:xml:ns:xmpp-streams";
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	24
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	25 local log = module._log;
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	26
4548 e6e5c76ff009 sessionmanager, mod_c2s: Move timeout logic to mod_c2s Matthew Wild <mwild1@gmail.com> parents: 4543 diff changeset	27 local c2s_timeout = module:get_option_number("c2s_timeout");
4964 c9b8ec3eb1e9 mod_c2s: Don't call ondisconnect manually on close, it is now called by net.server. Replace with inline code for destroying the session, and also waiting for a reply </stream:stream> if there is a chance of further data sent by the client. session.send() on a half-closed stream returns false (and does not deliver the data). Matthew Wild <mwild1@gmail.com> parents: 4852 diff changeset	28 local stream_close_timeout = module:get_option_number("c2s_close_timeout", 5);
5757 b5ba004beb0a mod_c2s: Change default of tcp_keepalives to true, and make it individually configurable through c2s_tcp_keepalives Kim Alvefur <zash@zash.se> parents: 5571 diff changeset	29 local opt_keepalives = module:get_option_boolean("c2s_tcp_keepalives", module:get_option_boolean("tcp_keepalives", true));
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	30
6630 6735e2d735d6 mod_c2s, mod_s2s: Collect statistics on number of connections Kim Alvefur <zash@zash.se> parents: 6382 diff changeset	31 local measure_connections = module:measure("connections", "counter");
6735e2d735d6 mod_c2s, mod_s2s: Collect statistics on number of connections Kim Alvefur <zash@zash.se> parents: 6382 diff changeset	32
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	33 local sessions = module:shared("sessions");
5013 ab693eea0869 mod_admin_adhoc, mod_admin_telnet, mod_bosh, mod_c2s, mod_component, mod_pep, mod_presence, mod_roster, mod_s2s: Import core_post_stanza from the global prosody table. Kim Alvefur <zash@zash.se> parents: 4996 diff changeset	34 local core_process_stanza = prosody.core_process_stanza;
5370 7838acadb0fa mod_announce, mod_auth_anonymous, mod_c2s, mod_c2s, mod_component, mod_iq, mod_message, mod_presence, mod_tls: Access prosody.{hosts,bare_sessions,full_sessions} instead of the old globals Kim Alvefur <zash@zash.se> parents: 5281 diff changeset	35 local hosts = prosody.hosts;
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	36
5773 c9a712673d8a mod_c2s: Add session:sleep() and session:wake() to pause a session (e.g. while waiting for an external event). Needs a gallon or two of testing. Matthew Wild <mwild1@gmail.com> parents: 5764 diff changeset	37 local stream_callbacks = { default_ns = "jabber:client" };
4625 325965bafae1 mod_c2s, mod_s2s: Drop default_port and default_mode from listener objects (default_port is deprecated, and default_mode already defaults to a) Matthew Wild <mwild1@gmail.com>* parents: 4620 diff changeset	38 local listener = {};
5789 3b05a86631b9 mod_c2s: Port coroutine code to util.async Matthew Wild <mwild1@gmail.com> parents: 5776 diff changeset	39 local runner_callbacks = {};
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	40
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	41 --- Stream events handlers
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	42 local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'};
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	43
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	44 function stream_callbacks.streamopened(session, attr)
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	45 local send = session.send;
4551 8f25f3b1c62f mod_c2s: Code reduction Matthew Wild <mwild1@gmail.com> parents: 4548 diff changeset	46 session.host = nameprep(attr.to);
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	47 if not session.host then
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	48 session:close{ condition = "improper-addressing",
4551 8f25f3b1c62f mod_c2s: Code reduction Matthew Wild <mwild1@gmail.com> parents: 4548 diff changeset	49 text = "A valid 'to' attribute is required on stream headers" };
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	50 return;
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	51 end
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	52 session.version = tonumber(attr.version) or 0;
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	53 session.streamid = uuid_generate();
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	54 (session.log or session)("debug", "Client sent opening <stream:stream> to %s", session.host);
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	55
5668 5a9318ac92f6 mod_c2s: Become a shared module and allow being disabled on some virtualhosts Kim Alvefur <zash@zash.se> parents: 5638 diff changeset	56 if not hosts[session.host] or not hosts[session.host].modules.c2s then
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	57 -- We don't serve this host...
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	58 session:close{ condition = "host-unknown", text = "This server does not serve "..tostring(session.host)};
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	59 return;
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	60 end
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	61
6005 98b768a41c9d mod_c2s: Break out stream opening into a separate function Florian Zeitz <florob@babelmonkeys.de> parents: 5859 diff changeset	62 session:open_stream();
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	63
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	64 (session.log or log)("debug", "Sent reply <stream:stream> to client");
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	65 session.notopen = nil;
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	66
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	67 -- If session.secure is false (not nil) then it means we /were/ encrypting
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	68 -- since we now have a new stream header, session is secured
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	69 if session.secure == false then
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	70 session.secure = true;
5859 e327f2d4e09f mod_c2s, mod_s2s: Set session.encrypted as session.secure does not allways mean encrypted (eg consider_bosh_secure) Kim Alvefur <zash@zash.se> parents: 5802 diff changeset	71 session.encrypted = true;
5228 edabb34417b7 mod_c2s: Check if TLS compression is used Kim Alvefur <zash@zash.se> parents: 5120 diff changeset	72
edabb34417b7 mod_c2s: Check if TLS compression is used Kim Alvefur <zash@zash.se> parents: 5120 diff changeset	73 local sock = session.conn:socket();
edabb34417b7 mod_c2s: Check if TLS compression is used Kim Alvefur <zash@zash.se> parents: 5120 diff changeset	74 if sock.info then
5764 969e0a054795 mod_c2s, mod_s2s: Log a message that stream encryption has been enabled with some details Kim Alvefur <zash@zash.se> parents: 5759 diff changeset	75 local info = sock:info();
5801 224644752bf4 mod_c2s, mod_s2s: Log cipher and encryption info in a more compact and (hopefully) less confusing way Kim Alvefur <zash@zash.se> parents: 5789 diff changeset	76 (session.log or log)("info", "Stream encrypted (%s with %s)", info.protocol, info.cipher);
5764 969e0a054795 mod_c2s, mod_s2s: Log a message that stream encryption has been enabled with some details Kim Alvefur <zash@zash.se> parents: 5759 diff changeset	77 session.compressed = info.compression;
969e0a054795 mod_c2s, mod_s2s: Log a message that stream encryption has been enabled with some details Kim Alvefur <zash@zash.se> parents: 5759 diff changeset	78 else
969e0a054795 mod_c2s, mod_s2s: Log a message that stream encryption has been enabled with some details Kim Alvefur <zash@zash.se> parents: 5759 diff changeset	79 (session.log or log)("info", "Stream encrypted");
969e0a054795 mod_c2s, mod_s2s: Log a message that stream encryption has been enabled with some details Kim Alvefur <zash@zash.se> parents: 5759 diff changeset	80 session.compressed = sock.compression and sock:compression(); --COMPAT mw/luasec-hg
5228 edabb34417b7 mod_c2s: Check if TLS compression is used Kim Alvefur <zash@zash.se> parents: 5120 diff changeset	81 end
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	82 end
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	83
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	84 local features = st.stanza("stream:features");
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	85 hosts[session.host].events.fire_event("stream-features", { origin = session, features = features });
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	86 send(features);
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	87 end
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	88
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	89 function stream_callbacks.streamclosed(session)
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	90 session.log("debug", "Received </stream:stream>");
4986 9da430b69f13 mod_c2s: Change 'reason' parameter of session:close() to take nil to mean 'graceful close initiated by us' and false for 'graceful close initiated by client' Matthew Wild <mwild1@gmail.com> parents: 4964 diff changeset	91 session:close(false);
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	92 end
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	93
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	94 function stream_callbacks.error(session, error, data)
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	95 if error == "no-stream" then
6364 4e93e8768c36 mod_c2s, mod_s2s: Log received invalid stream headers Matthew Wild <mwild1@gmail.com> parents: 6279 diff changeset	96 session.log("debug", "Invalid opening stream header (%s)", (data:gsub("^([^\1]+)\1", "{%1}")));
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	97 session:close("invalid-namespace");
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	98 elseif error == "parse-error" then
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	99 (session.log or log)("debug", "Client XML parse error: %s", tostring(data));
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	100 session:close("not-well-formed");
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	101 elseif error == "stream-error" then
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	102 local condition, text = "undefined-condition";
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	103 for child in data:children() do
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	104 if child.attr.xmlns == xmlns_xmpp_streams then
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	105 if child.name ~= "text" then
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	106 condition = child.name;
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	107 else
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	108 text = child:get_text();
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	109 end
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	110 if condition ~= "undefined-condition" and text then
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	111 break;
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	112 end
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	113 end
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	114 end
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	115 text = condition .. (text and (" ("..text..")") or "");
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	116 session.log("info", "Session closed by remote with error: %s", text);
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	117 session:close(nil, text);
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	118 end
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	119 end
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	120
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	121 function stream_callbacks.handlestanza(session, stanza)
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	122 stanza = session.filter("stanzas/in", stanza);
5789 3b05a86631b9 mod_c2s: Port coroutine code to util.async Matthew Wild <mwild1@gmail.com> parents: 5776 diff changeset	123 session.thread:run(stanza);
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	124 end
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	125
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	126 --- Session methods
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	127 local function session_close(session, reason)
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	128 local log = session.log or log;
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	129 if session.conn then
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	130 if session.notopen then
6005 98b768a41c9d mod_c2s: Break out stream opening into a separate function Florian Zeitz <florob@babelmonkeys.de> parents: 5859 diff changeset	131 session:open_stream();
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	132 end
4986 9da430b69f13 mod_c2s: Change 'reason' parameter of session:close() to take nil to mean 'graceful close initiated by us' and false for 'graceful close initiated by client' Matthew Wild <mwild1@gmail.com> parents: 4964 diff changeset	133 if reason then -- nil == no err, initiated by us, false == initiated by client
5518 0220093e34fa mod_c2s: Refactor <stream:error> building to allways tostring() it and only call send once Kim Alvefur <zash@zash.se> parents: 5505 diff changeset	134 local stream_error = st.stanza("stream:error");
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	135 if type(reason) == "string" then -- assume stream error
5518 0220093e34fa mod_c2s: Refactor <stream:error> building to allways tostring() it and only call send once Kim Alvefur <zash@zash.se> parents: 5505 diff changeset	136 stream_error:tag(reason, {xmlns = 'urn:ietf:params:xml:ns:xmpp-streams' });
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	137 elseif type(reason) == "table" then
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	138 if reason.condition then
5518 0220093e34fa mod_c2s: Refactor <stream:error> building to allways tostring() it and only call send once Kim Alvefur <zash@zash.se> parents: 5505 diff changeset	139 stream_error:tag(reason.condition, stream_xmlns_attr):up();
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	140 if reason.text then
5518 0220093e34fa mod_c2s: Refactor <stream:error> building to allways tostring() it and only call send once Kim Alvefur <zash@zash.se> parents: 5505 diff changeset	141 stream_error:tag("text", stream_xmlns_attr):text(reason.text):up();
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	142 end
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	143 if reason.extra then
5518 0220093e34fa mod_c2s: Refactor <stream:error> building to allways tostring() it and only call send once Kim Alvefur <zash@zash.se> parents: 5505 diff changeset	144 stream_error:add_child(reason.extra);
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	145 end
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	146 elseif reason.name then -- a stanza
5518 0220093e34fa mod_c2s: Refactor <stream:error> building to allways tostring() it and only call send once Kim Alvefur <zash@zash.se> parents: 5505 diff changeset	147 stream_error = reason;
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	148 end
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	149 end
5518 0220093e34fa mod_c2s: Refactor <stream:error> building to allways tostring() it and only call send once Kim Alvefur <zash@zash.se> parents: 5505 diff changeset	150 stream_error = tostring(stream_error);
0220093e34fa mod_c2s: Refactor <stream:error> building to allways tostring() it and only call send once Kim Alvefur <zash@zash.se> parents: 5505 diff changeset	151 log("debug", "Disconnecting client, <stream:error> is: %s", stream_error);
0220093e34fa mod_c2s: Refactor <stream:error> building to allways tostring() it and only call send once Kim Alvefur <zash@zash.se> parents: 5505 diff changeset	152 session.send(stream_error);
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	153 end
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5773 diff changeset	154
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	155 session.send("</stream:stream>");
4964 c9b8ec3eb1e9 mod_c2s: Don't call ondisconnect manually on close, it is now called by net.server. Replace with inline code for destroying the session, and also waiting for a reply </stream:stream> if there is a chance of further data sent by the client. session.send() on a half-closed stream returns false (and does not deliver the data). Matthew Wild <mwild1@gmail.com> parents: 4852 diff changeset	156 function session.send() return false; end
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5773 diff changeset	157
5571 ae9672f4079a mod_c2s: Fix session:close() when a stanza is passed as reason Kim Alvefur <zash@zash.se> parents: 5518 diff changeset	158 local reason = (reason and (reason.name or reason.text or reason.condition)) or reason;
5802 5b79710dd5a1 mod_c2s: Move another log message to debug level Kim Alvefur <zash@zash.se> parents: 5801 diff changeset	159 session.log("debug", "c2s stream for %s closed: %s", session.full_jid or ("<"..session.ip..">"), reason or "session closed");
4964 c9b8ec3eb1e9 mod_c2s: Don't call ondisconnect manually on close, it is now called by net.server. Replace with inline code for destroying the session, and also waiting for a reply </stream:stream> if there is a chance of further data sent by the client. session.send() on a half-closed stream returns false (and does not deliver the data). Matthew Wild <mwild1@gmail.com> parents: 4852 diff changeset	160
c9b8ec3eb1e9 mod_c2s: Don't call ondisconnect manually on close, it is now called by net.server. Replace with inline code for destroying the session, and also waiting for a reply </stream:stream> if there is a chance of further data sent by the client. session.send() on a half-closed stream returns false (and does not deliver the data). Matthew Wild <mwild1@gmail.com> parents: 4852 diff changeset	161 -- Authenticated incoming stream may still be sending us stanzas, so wait for </stream:stream> from remote
c9b8ec3eb1e9 mod_c2s: Don't call ondisconnect manually on close, it is now called by net.server. Replace with inline code for destroying the session, and also waiting for a reply </stream:stream> if there is a chance of further data sent by the client. session.send() on a half-closed stream returns false (and does not deliver the data). Matthew Wild <mwild1@gmail.com> parents: 4852 diff changeset	162 local conn = session.conn;
4986 9da430b69f13 mod_c2s: Change 'reason' parameter of session:close() to take nil to mean 'graceful close initiated by us' and false for 'graceful close initiated by client' Matthew Wild <mwild1@gmail.com> parents: 4964 diff changeset	163 if reason == nil and not session.notopen and session.type == "c2s" then
4964 c9b8ec3eb1e9 mod_c2s: Don't call ondisconnect manually on close, it is now called by net.server. Replace with inline code for destroying the session, and also waiting for a reply </stream:stream> if there is a chance of further data sent by the client. session.send() on a half-closed stream returns false (and does not deliver the data). Matthew Wild <mwild1@gmail.com> parents: 4852 diff changeset	164 -- Grace time to process data from authenticated cleanly-closed stream
c9b8ec3eb1e9 mod_c2s: Don't call ondisconnect manually on close, it is now called by net.server. Replace with inline code for destroying the session, and also waiting for a reply </stream:stream> if there is a chance of further data sent by the client. session.send() on a half-closed stream returns false (and does not deliver the data). Matthew Wild <mwild1@gmail.com> parents: 4852 diff changeset	165 add_task(stream_close_timeout, function ()
c9b8ec3eb1e9 mod_c2s: Don't call ondisconnect manually on close, it is now called by net.server. Replace with inline code for destroying the session, and also waiting for a reply </stream:stream> if there is a chance of further data sent by the client. session.send() on a half-closed stream returns false (and does not deliver the data). Matthew Wild <mwild1@gmail.com> parents: 4852 diff changeset	166 if not session.destroyed then
c9b8ec3eb1e9 mod_c2s: Don't call ondisconnect manually on close, it is now called by net.server. Replace with inline code for destroying the session, and also waiting for a reply </stream:stream> if there is a chance of further data sent by the client. session.send() on a half-closed stream returns false (and does not deliver the data). Matthew Wild <mwild1@gmail.com> parents: 4852 diff changeset	167 session.log("warn", "Failed to receive a stream close response, closing connection anyway...");
c9b8ec3eb1e9 mod_c2s: Don't call ondisconnect manually on close, it is now called by net.server. Replace with inline code for destroying the session, and also waiting for a reply </stream:stream> if there is a chance of further data sent by the client. session.send() on a half-closed stream returns false (and does not deliver the data). Matthew Wild <mwild1@gmail.com> parents: 4852 diff changeset	168 sm_destroy_session(session, reason);
c9b8ec3eb1e9 mod_c2s: Don't call ondisconnect manually on close, it is now called by net.server. Replace with inline code for destroying the session, and also waiting for a reply </stream:stream> if there is a chance of further data sent by the client. session.send() on a half-closed stream returns false (and does not deliver the data). Matthew Wild <mwild1@gmail.com> parents: 4852 diff changeset	169 conn:close();
c9b8ec3eb1e9 mod_c2s: Don't call ondisconnect manually on close, it is now called by net.server. Replace with inline code for destroying the session, and also waiting for a reply </stream:stream> if there is a chance of further data sent by the client. session.send() on a half-closed stream returns false (and does not deliver the data). Matthew Wild <mwild1@gmail.com> parents: 4852 diff changeset	170 end
c9b8ec3eb1e9 mod_c2s: Don't call ondisconnect manually on close, it is now called by net.server. Replace with inline code for destroying the session, and also waiting for a reply </stream:stream> if there is a chance of further data sent by the client. session.send() on a half-closed stream returns false (and does not deliver the data). Matthew Wild <mwild1@gmail.com> parents: 4852 diff changeset	171 end);
c9b8ec3eb1e9 mod_c2s: Don't call ondisconnect manually on close, it is now called by net.server. Replace with inline code for destroying the session, and also waiting for a reply </stream:stream> if there is a chance of further data sent by the client. session.send() on a half-closed stream returns false (and does not deliver the data). Matthew Wild <mwild1@gmail.com> parents: 4852 diff changeset	172 else
c9b8ec3eb1e9 mod_c2s: Don't call ondisconnect manually on close, it is now called by net.server. Replace with inline code for destroying the session, and also waiting for a reply </stream:stream> if there is a chance of further data sent by the client. session.send() on a half-closed stream returns false (and does not deliver the data). Matthew Wild <mwild1@gmail.com> parents: 4852 diff changeset	173 sm_destroy_session(session, reason);
c9b8ec3eb1e9 mod_c2s: Don't call ondisconnect manually on close, it is now called by net.server. Replace with inline code for destroying the session, and also waiting for a reply </stream:stream> if there is a chance of further data sent by the client. session.send() on a half-closed stream returns false (and does not deliver the data). Matthew Wild <mwild1@gmail.com> parents: 4852 diff changeset	174 conn:close();
c9b8ec3eb1e9 mod_c2s: Don't call ondisconnect manually on close, it is now called by net.server. Replace with inline code for destroying the session, and also waiting for a reply </stream:stream> if there is a chance of further data sent by the client. session.send() on a half-closed stream returns false (and does not deliver the data). Matthew Wild <mwild1@gmail.com> parents: 4852 diff changeset	175 end
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	176 end
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	177 end
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	178
5097 6c52a7a881cc mod_c2s: When a user gets deleted, drop all their sessions Kim Alvefur <zash@zash.se> parents: 5013 diff changeset	179 module:hook_global("user-deleted", function(event)
6c52a7a881cc mod_c2s: When a user gets deleted, drop all their sessions Kim Alvefur <zash@zash.se> parents: 5013 diff changeset	180 local username, host = event.username, event.host;
6c52a7a881cc mod_c2s: When a user gets deleted, drop all their sessions Kim Alvefur <zash@zash.se> parents: 5013 diff changeset	181 local user = hosts[host].sessions[username];
6c52a7a881cc mod_c2s: When a user gets deleted, drop all their sessions Kim Alvefur <zash@zash.se> parents: 5013 diff changeset	182 if user and user.sessions then
6c52a7a881cc mod_c2s: When a user gets deleted, drop all their sessions Kim Alvefur <zash@zash.se> parents: 5013 diff changeset	183 for jid, session in pairs(user.sessions) do
6c52a7a881cc mod_c2s: When a user gets deleted, drop all their sessions Kim Alvefur <zash@zash.se> parents: 5013 diff changeset	184 session:close{ condition = "not-authorized", text = "Account deleted" };
6c52a7a881cc mod_c2s: When a user gets deleted, drop all their sessions Kim Alvefur <zash@zash.se> parents: 5013 diff changeset	185 end
6c52a7a881cc mod_c2s: When a user gets deleted, drop all their sessions Kim Alvefur <zash@zash.se> parents: 5013 diff changeset	186 end
6c52a7a881cc mod_c2s: When a user gets deleted, drop all their sessions Kim Alvefur <zash@zash.se> parents: 5013 diff changeset	187 end, 200);
6c52a7a881cc mod_c2s: When a user gets deleted, drop all their sessions Kim Alvefur <zash@zash.se> parents: 5013 diff changeset	188
5789 3b05a86631b9 mod_c2s: Port coroutine code to util.async Matthew Wild <mwild1@gmail.com> parents: 5776 diff changeset	189 function runner_callbacks:ready()
3b05a86631b9 mod_c2s: Port coroutine code to util.async Matthew Wild <mwild1@gmail.com> parents: 5776 diff changeset	190 self.data.conn:resume();
3b05a86631b9 mod_c2s: Port coroutine code to util.async Matthew Wild <mwild1@gmail.com> parents: 5776 diff changeset	191 end
3b05a86631b9 mod_c2s: Port coroutine code to util.async Matthew Wild <mwild1@gmail.com> parents: 5776 diff changeset	192
3b05a86631b9 mod_c2s: Port coroutine code to util.async Matthew Wild <mwild1@gmail.com> parents: 5776 diff changeset	193 function runner_callbacks:waiting()
3b05a86631b9 mod_c2s: Port coroutine code to util.async Matthew Wild <mwild1@gmail.com> parents: 5776 diff changeset	194 self.data.conn:pause();
3b05a86631b9 mod_c2s: Port coroutine code to util.async Matthew Wild <mwild1@gmail.com> parents: 5776 diff changeset	195 end
3b05a86631b9 mod_c2s: Port coroutine code to util.async Matthew Wild <mwild1@gmail.com> parents: 5776 diff changeset	196
3b05a86631b9 mod_c2s: Port coroutine code to util.async Matthew Wild <mwild1@gmail.com> parents: 5776 diff changeset	197 function runner_callbacks:error(err)
3b05a86631b9 mod_c2s: Port coroutine code to util.async Matthew Wild <mwild1@gmail.com> parents: 5776 diff changeset	198 (self.data.log or log)("error", "Traceback[c2s]: %s", err);
3b05a86631b9 mod_c2s: Port coroutine code to util.async Matthew Wild <mwild1@gmail.com> parents: 5776 diff changeset	199 end
3b05a86631b9 mod_c2s: Port coroutine code to util.async Matthew Wild <mwild1@gmail.com> parents: 5776 diff changeset	200
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	201 --- Port listener
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	202 function listener.onconnect(conn)
6630 6735e2d735d6 mod_c2s, mod_s2s: Collect statistics on number of connections Kim Alvefur <zash@zash.se> parents: 6382 diff changeset	203 measure_connections(1);
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	204 local session = sm_new_session(conn);
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	205 sessions[conn] = session;
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5773 diff changeset	206
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	207 session.log("info", "Client connected");
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5773 diff changeset	208
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	209 -- Client is using legacy SSL (otherwise mod_tls sets this flag)
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	210 if conn:ssl() then
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	211 session.secure = true;
5859 e327f2d4e09f mod_c2s, mod_s2s: Set session.encrypted as session.secure does not allways mean encrypted (eg consider_bosh_secure) Kim Alvefur <zash@zash.se> parents: 5802 diff changeset	212 session.encrypted = true;
5228 edabb34417b7 mod_c2s: Check if TLS compression is used Kim Alvefur <zash@zash.se> parents: 5120 diff changeset	213
edabb34417b7 mod_c2s: Check if TLS compression is used Kim Alvefur <zash@zash.se> parents: 5120 diff changeset	214 -- Check if TLS compression is used
edabb34417b7 mod_c2s: Check if TLS compression is used Kim Alvefur <zash@zash.se> parents: 5120 diff changeset	215 local sock = conn:socket();
edabb34417b7 mod_c2s: Check if TLS compression is used Kim Alvefur <zash@zash.se> parents: 5120 diff changeset	216 if sock.info then
edabb34417b7 mod_c2s: Check if TLS compression is used Kim Alvefur <zash@zash.se> parents: 5120 diff changeset	217 session.compressed = sock:info"compression";
edabb34417b7 mod_c2s: Check if TLS compression is used Kim Alvefur <zash@zash.se> parents: 5120 diff changeset	218 elseif sock.compression then
edabb34417b7 mod_c2s: Check if TLS compression is used Kim Alvefur <zash@zash.se> parents: 5120 diff changeset	219 session.compressed = sock:compression(); --COMPAT mw/luasec-hg
edabb34417b7 mod_c2s: Check if TLS compression is used Kim Alvefur <zash@zash.se> parents: 5120 diff changeset	220 end
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	221 end
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5773 diff changeset	222
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	223 if opt_keepalives then
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	224 conn:setoption("keepalive", opt_keepalives);
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	225 end
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5773 diff changeset	226
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	227 session.close = session_close;
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5773 diff changeset	228
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	229 local stream = new_xmpp_stream(session, stream_callbacks);
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	230 session.stream = stream;
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	231 session.notopen = true;
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5773 diff changeset	232
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	233 function session.reset_stream()
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	234 session.notopen = true;
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	235 session.stream:reset();
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	236 end
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5773 diff changeset	237
5789 3b05a86631b9 mod_c2s: Port coroutine code to util.async Matthew Wild <mwild1@gmail.com> parents: 5776 diff changeset	238 session.thread = runner(function (stanza)
3b05a86631b9 mod_c2s: Port coroutine code to util.async Matthew Wild <mwild1@gmail.com> parents: 5776 diff changeset	239 core_process_stanza(session, stanza);
3b05a86631b9 mod_c2s: Port coroutine code to util.async Matthew Wild <mwild1@gmail.com> parents: 5776 diff changeset	240 end, runner_callbacks, session);
5773 c9a712673d8a mod_c2s: Add session:sleep() and session:wake() to pause a session (e.g. while waiting for an external event). Needs a gallon or two of testing. Matthew Wild <mwild1@gmail.com> parents: 5764 diff changeset	241
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	242 local filter = session.filter;
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	243 function session.data(data)
5773 c9a712673d8a mod_c2s: Add session:sleep() and session:wake() to pause a session (e.g. while waiting for an external event). Needs a gallon or two of testing. Matthew Wild <mwild1@gmail.com> parents: 5764 diff changeset	244 -- Parse the data, which will store stanzas in session.pending_stanzas
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	245 if data then
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	246 data = filter("bytes/in", data);
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	247 if data then
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	248 local ok, err = stream:feed(data);
5773 c9a712673d8a mod_c2s: Add session:sleep() and session:wake() to pause a session (e.g. while waiting for an external event). Needs a gallon or two of testing. Matthew Wild <mwild1@gmail.com> parents: 5764 diff changeset	249 if not ok then
c9a712673d8a mod_c2s: Add session:sleep() and session:wake() to pause a session (e.g. while waiting for an external event). Needs a gallon or two of testing. Matthew Wild <mwild1@gmail.com> parents: 5764 diff changeset	250 log("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "):gsub("[%z\1-\31]", "_"));
c9a712673d8a mod_c2s: Add session:sleep() and session:wake() to pause a session (e.g. while waiting for an external event). Needs a gallon or two of testing. Matthew Wild <mwild1@gmail.com> parents: 5764 diff changeset	251 session:close("not-well-formed");
c9a712673d8a mod_c2s: Add session:sleep() and session:wake() to pause a session (e.g. while waiting for an external event). Needs a gallon or two of testing. Matthew Wild <mwild1@gmail.com> parents: 5764 diff changeset	252 end
c9a712673d8a mod_c2s: Add session:sleep() and session:wake() to pause a session (e.g. while waiting for an external event). Needs a gallon or two of testing. Matthew Wild <mwild1@gmail.com> parents: 5764 diff changeset	253 end
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	254 end
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	255 end
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	256
4548 e6e5c76ff009 sessionmanager, mod_c2s: Move timeout logic to mod_c2s Matthew Wild <mwild1@gmail.com> parents: 4543 diff changeset	257 if c2s_timeout then
e6e5c76ff009 sessionmanager, mod_c2s: Move timeout logic to mod_c2s Matthew Wild <mwild1@gmail.com> parents: 4543 diff changeset	258 add_task(c2s_timeout, function ()
e6e5c76ff009 sessionmanager, mod_c2s: Move timeout logic to mod_c2s Matthew Wild <mwild1@gmail.com> parents: 4543 diff changeset	259 if session.type == "c2s_unauthed" then
e6e5c76ff009 sessionmanager, mod_c2s: Move timeout logic to mod_c2s Matthew Wild <mwild1@gmail.com> parents: 4543 diff changeset	260 session:close("connection-timeout");
e6e5c76ff009 sessionmanager, mod_c2s: Move timeout logic to mod_c2s Matthew Wild <mwild1@gmail.com> parents: 4543 diff changeset	261 end
e6e5c76ff009 sessionmanager, mod_c2s: Move timeout logic to mod_c2s Matthew Wild <mwild1@gmail.com> parents: 4543 diff changeset	262 end);
e6e5c76ff009 sessionmanager, mod_c2s: Move timeout logic to mod_c2s Matthew Wild <mwild1@gmail.com> parents: 4543 diff changeset	263 end
e6e5c76ff009 sessionmanager, mod_c2s: Move timeout logic to mod_c2s Matthew Wild <mwild1@gmail.com> parents: 4543 diff changeset	264
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	265 session.dispatch_stanza = stream_callbacks.handlestanza;
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	266 end
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	267
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	268 function listener.onincoming(conn, data)
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	269 local session = sessions[conn];
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	270 if session then
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	271 session.data(data);
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	272 end
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	273 end
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	274
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	275 function listener.ondisconnect(conn, err)
6630 6735e2d735d6 mod_c2s, mod_s2s: Collect statistics on number of connections Kim Alvefur <zash@zash.se> parents: 6382 diff changeset	276 measure_connections(-1);
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	277 local session = sessions[conn];
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	278 if session then
4964 c9b8ec3eb1e9 mod_c2s: Don't call ondisconnect manually on close, it is now called by net.server. Replace with inline code for destroying the session, and also waiting for a reply </stream:stream> if there is a chance of further data sent by the client. session.send() on a half-closed stream returns false (and does not deliver the data). Matthew Wild <mwild1@gmail.com> parents: 4852 diff changeset	279 (session.log or log)("info", "Client disconnected: %s", err or "connection closed");
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	280 sm_destroy_session(session, err);
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	281 sessions[conn] = nil;
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	282 end
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	283 end
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	284
5638 c5b7f4858014 mod_c2s, mod_c2s: Send a whitespace on read timeout, to prod TCP into detecting if the connection died Kim Alvefur <zash@zash.se> parents: 5571 diff changeset	285 function listener.onreadtimeout(conn)
c5b7f4858014 mod_c2s, mod_c2s: Send a whitespace on read timeout, to prod TCP into detecting if the connection died Kim Alvefur <zash@zash.se> parents: 5571 diff changeset	286 local session = sessions[conn];
c5b7f4858014 mod_c2s, mod_c2s: Send a whitespace on read timeout, to prod TCP into detecting if the connection died Kim Alvefur <zash@zash.se> parents: 5571 diff changeset	287 if session then
5669 9345c161481f mod_c2s, mod_s2s: Fire an event on read timeouts Kim Alvefur <zash@zash.se> parents: 5668 diff changeset	288 return (hosts[session.host] or prosody).events.fire_event("c2s-read-timeout", { session = session });
5638 c5b7f4858014 mod_c2s, mod_c2s: Send a whitespace on read timeout, to prod TCP into detecting if the connection died Kim Alvefur <zash@zash.se> parents: 5571 diff changeset	289 end
c5b7f4858014 mod_c2s, mod_c2s: Send a whitespace on read timeout, to prod TCP into detecting if the connection died Kim Alvefur <zash@zash.se> parents: 5571 diff changeset	290 end
c5b7f4858014 mod_c2s, mod_c2s: Send a whitespace on read timeout, to prod TCP into detecting if the connection died Kim Alvefur <zash@zash.se> parents: 5571 diff changeset	291
5669 9345c161481f mod_c2s, mod_s2s: Fire an event on read timeouts Kim Alvefur <zash@zash.se> parents: 5668 diff changeset	292 local function keepalive(event)
9345c161481f mod_c2s, mod_s2s: Fire an event on read timeouts Kim Alvefur <zash@zash.se> parents: 5668 diff changeset	293 return event.session.send(' ');
9345c161481f mod_c2s, mod_s2s: Fire an event on read timeouts Kim Alvefur <zash@zash.se> parents: 5668 diff changeset	294 end
9345c161481f mod_c2s, mod_s2s: Fire an event on read timeouts Kim Alvefur <zash@zash.se> parents: 5668 diff changeset	295
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	296 function listener.associate_session(conn, session)
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	297 sessions[conn] = session;
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	298 end
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	299
5669 9345c161481f mod_c2s, mod_s2s: Fire an event on read timeouts Kim Alvefur <zash@zash.se> parents: 5668 diff changeset	300 function module.add_host(module)
9345c161481f mod_c2s, mod_s2s: Fire an event on read timeouts Kim Alvefur <zash@zash.se> parents: 5668 diff changeset	301 module:hook("c2s-read-timeout", keepalive, -1);
6380 4220ffb87b22 net.http, net.http.server, mod_c2s, mod_s2s, mod_component, mod_admin_telnet, mod_net_multiplex: Add ondetach to release connection from 'sessions' table (or equivalent) Matthew Wild <mwild1@gmail.com> parents: 6364 diff changeset	302 end
4220ffb87b22 net.http, net.http.server, mod_c2s, mod_s2s, mod_component, mod_admin_telnet, mod_net_multiplex: Add ondetach to release connection from 'sessions' table (or equivalent) Matthew Wild <mwild1@gmail.com> parents: 6364 diff changeset	303
5669 9345c161481f mod_c2s, mod_s2s: Fire an event on read timeouts Kim Alvefur <zash@zash.se> parents: 5668 diff changeset	304 module:hook("c2s-read-timeout", keepalive, -1);
5668 5a9318ac92f6 mod_c2s: Become a shared module and allow being disabled on some virtualhosts Kim Alvefur <zash@zash.se> parents: 5638 diff changeset	305
5281 815c689f85ad prosody, mod_c2s, mod_s2s: Move closing of c2s and s2s sessions to respective plugins Kim Alvefur <zash@zash.se> parents: 5228 diff changeset	306 module:hook("server-stopping", function(event)
815c689f85ad prosody, mod_c2s, mod_s2s: Move closing of c2s and s2s sessions to respective plugins Kim Alvefur <zash@zash.se> parents: 5228 diff changeset	307 local reason = event.reason;
815c689f85ad prosody, mod_c2s, mod_s2s: Move closing of c2s and s2s sessions to respective plugins Kim Alvefur <zash@zash.se> parents: 5228 diff changeset	308 for _, session in pairs(sessions) do
815c689f85ad prosody, mod_c2s, mod_s2s: Move closing of c2s and s2s sessions to respective plugins Kim Alvefur <zash@zash.se> parents: 5228 diff changeset	309 session:close{ condition = "system-shutdown", text = reason };
815c689f85ad prosody, mod_c2s, mod_s2s: Move closing of c2s and s2s sessions to respective plugins Kim Alvefur <zash@zash.se> parents: 5228 diff changeset	310 end
815c689f85ad prosody, mod_c2s, mod_s2s: Move closing of c2s and s2s sessions to respective plugins Kim Alvefur <zash@zash.se> parents: 5228 diff changeset	311 end, 1000);
815c689f85ad prosody, mod_c2s, mod_s2s: Move closing of c2s and s2s sessions to respective plugins Kim Alvefur <zash@zash.se> parents: 5228 diff changeset	312
815c689f85ad prosody, mod_c2s, mod_s2s: Move closing of c2s and s2s sessions to respective plugins Kim Alvefur <zash@zash.se> parents: 5228 diff changeset	313
815c689f85ad prosody, mod_c2s, mod_s2s: Move closing of c2s and s2s sessions to respective plugins Kim Alvefur <zash@zash.se> parents: 5228 diff changeset	314
5120 bcabea740c00 mod_{admin_telnet,c2s,component,http,net_multiplex,s2s}: Use module:provides() instead of module:add_item(). Waqas Hussain <waqas20@gmail.com> parents: 5097 diff changeset	315 module:provides("net", {
4610 171051f9dd00 mod_c2s: Use module:add_item() to add the net-provider for portmanager Matthew Wild <mwild1@gmail.com> parents: 4551 diff changeset	316 name = "c2s";
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	317 listener = listener;
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	318 default_port = 5222;
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	319 encryption = "starttls";
4626 9df9e87d0339 mod_c2s: Add missing multiplexed service discovery pattern. Kim Alvefur <zash@zash.se> parents: 4625 diff changeset	320 multiplex = {
9df9e87d0339 mod_c2s: Add missing multiplexed service discovery pattern. Kim Alvefur <zash@zash.se> parents: 4625 diff changeset	321 pattern = "^<.:stream.%sxmlns%s=%s(['\"])jabber:client%1.*>";
9df9e87d0339 mod_c2s: Add missing multiplexed service discovery pattern. Kim Alvefur <zash@zash.se> parents: 4625 diff changeset	322 };
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	323 });
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	324
5120 bcabea740c00 mod_{admin_telnet,c2s,component,http,net_multiplex,s2s}: Use module:provides() instead of module:add_item(). Waqas Hussain <waqas20@gmail.com> parents: 5097 diff changeset	325 module:provides("net", {
4610 171051f9dd00 mod_c2s: Use module:add_item() to add the net-provider for portmanager Matthew Wild <mwild1@gmail.com> parents: 4551 diff changeset	326 name = "legacy_ssl";
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	327 listener = listener;
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	328 encryption = "ssl";
4620 e9dc6ae68c69 mod_c2s, mod_s2s: Add multiplex support Matthew Wild <mwild1@gmail.com> parents: 4610 diff changeset	329 multiplex = {
e9dc6ae68c69 mod_c2s, mod_s2s: Add multiplex support Matthew Wild <mwild1@gmail.com> parents: 4610 diff changeset	330 pattern = "^<.:stream.%sxmlns%s=%s(['\"])jabber:client%1.*>";
e9dc6ae68c69 mod_c2s, mod_s2s: Add multiplex support Matthew Wild <mwild1@gmail.com> parents: 4610 diff changeset	331 };
4543 db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	332 });
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	333
db27a4c18b6a mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s Matthew Wild <mwild1@gmail.com> parents: diff changeset	334

prosody

6735e2d735d6

plugins/mod_c2s.lua

Software / code / prosody

Annotate

plugins/mod_c2s.lua @ 6630:6735e2d735d6

Software `/` code `/` prosody