Software `/` code `/` prosody

Annotate

core/s2smanager.lua @ 559:fa4a51fe6442

Remove an incorrect line which I didn't add, and fix the proper way. Corrects the sending of stanzas over unauthed s2sout's. Also fixes mod_dialback to send stanzas and not strings.

author	Matthew Wild <mwild1@gmail.com>
date	Fri, 05 Dec 2008 05:23:42 +0000
parent	558:ab3960421356
child	583:5821eaa80baa

rev	line source
519 cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 451 diff changeset	1 -- Prosody IM v0.1
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 451 diff changeset	2 -- Copyright (C) 2008 Matthew Wild
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 451 diff changeset	3 -- Copyright (C) 2008 Waqas Hussain
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 451 diff changeset	4 --
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 451 diff changeset	5 -- This program is free software; you can redistribute it and/or
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 451 diff changeset	6 -- modify it under the terms of the GNU General Public License
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 451 diff changeset	7 -- as published by the Free Software Foundation; either version 2
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 451 diff changeset	8 -- of the License, or (at your option) any later version.
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 451 diff changeset	9 --
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 451 diff changeset	10 -- This program is distributed in the hope that it will be useful,
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 451 diff changeset	11 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 451 diff changeset	12 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 451 diff changeset	13 -- GNU General Public License for more details.
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 451 diff changeset	14 --
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 451 diff changeset	15 -- You should have received a copy of the GNU General Public License
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 451 diff changeset	16 -- along with this program; if not, write to the Free Software
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 451 diff changeset	17 -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 451 diff changeset	18 --
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 451 diff changeset	19
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 451 diff changeset	20
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	21
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	22 local hosts = hosts;
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	23 local sessions = sessions;
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	24 local socket = require "socket";
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	25 local format = string.format;
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: 333 diff changeset	26 local t_insert, t_sort = table.insert, table.sort;
255 43a9683bcd19 Fix for detecting when we are routing a stanza to ourself (I'm sure this has something to do with you, waqas...) Matthew Wild <mwild1@gmail.com> parents: 254 diff changeset	27 local get_traceback = debug.traceback;
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	28 local tostring, pairs, ipairs, getmetatable, print, newproxy, error, tonumber
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	29 = tostring, pairs, ipairs, getmetatable, print, newproxy, error, tonumber;
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	30
434 0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	31 local idna_to_ascii = require "util.encodings".idna.to_ascii;
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	32 local connlisteners_get = require "net.connlisteners".get;
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	33 local wraptlsclient = require "net.server".wraptlsclient;
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	34 local modulemanager = require "core.modulemanager";
244 0e3bda34f958 Missed importing a function in last commit Matthew Wild <mwild1@gmail.com> parents: 243 diff changeset	35 local st = require "stanza";
0e3bda34f958 Missed importing a function in last commit Matthew Wild <mwild1@gmail.com> parents: 243 diff changeset	36 local stanza = st.stanza;
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	37
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	38 local uuid_gen = require "util.uuid".generate;
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	39
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	40 local logger_init = require "util.logger".init;
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	41
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	42 local log = logger_init("s2smanager");
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	43
448 2623519b25b0 Switched from md5 to sha256 for dialback key generation Waqas Hussain <waqas20@gmail.com> parents: 435 diff changeset	44 local sha256_hash = require "util.hashes".sha256;
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	45
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	46 local dialback_secret = "This is very secret!!! Ha!";
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	47
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: 333 diff changeset	48 local dns = require "net.dns";
157 f4e9b6ec34b0 Hack until we get SRV resolving Matthew Wild <mwild1@gmail.com> parents: 148 diff changeset	49
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	50 module "s2smanager"
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	51
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: 333 diff changeset	52 local function compare_srv_priorities(a,b) return a.priority < b.priority or a.weight < b.weight; end
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: 333 diff changeset	53
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	54 function send_to_host(from_host, to_host, data)
260 182f0c895676 Now outgoing s2s sessions are associated with their from_host, fixes #15 Matthew Wild <mwild1@gmail.com> parents: 259 diff changeset	55 local host = hosts[from_host].s2sout[to_host];
190 1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	56 if host then
241 021ccf988f3b Some s2s fixes. Now connect() does not block, and stanzas are not lost when connection is slow Matthew Wild <mwild1@gmail.com> parents: 233 diff changeset	57 -- We have a connection to this host already
559 fa4a51fe6442 Remove an incorrect line which I didn't add, and fix the proper way. Corrects the sending of stanzas over unauthed s2sout's. Also fixes mod_dialback to send stanzas and not strings. Matthew Wild <mwild1@gmail.com> parents: 558 diff changeset	58 if host.type == "s2sout_unauthed" and data.name ~= "db:verify" and ((not data.xmlns) or data.xmlns == "jabber:client" or data.xmlns == "jabber:server") then
558 ab3960421356 Fix for s2s with jabberd2 (we weren't routing db:verify's over s2sout_unauthed) Matthew Wild <mwild1@gmail.com> parents: 544 diff changeset	59 (host.log or log)("debug", "trying to send over unauthed s2sout to "..to_host);
241 021ccf988f3b Some s2s fixes. Now connect() does not block, and stanzas are not lost when connection is slow Matthew Wild <mwild1@gmail.com> parents: 233 diff changeset	60 if not host.notopen and not host.dialback_key then
021ccf988f3b Some s2s fixes. Now connect() does not block, and stanzas are not lost when connection is slow Matthew Wild <mwild1@gmail.com> parents: 233 diff changeset	61 host.log("debug", "dialback had not been initiated");
021ccf988f3b Some s2s fixes. Now connect() does not block, and stanzas are not lost when connection is slow Matthew Wild <mwild1@gmail.com> parents: 233 diff changeset	62 initiate_dialback(host);
021ccf988f3b Some s2s fixes. Now connect() does not block, and stanzas are not lost when connection is slow Matthew Wild <mwild1@gmail.com> parents: 233 diff changeset	63 end
021ccf988f3b Some s2s fixes. Now connect() does not block, and stanzas are not lost when connection is slow Matthew Wild <mwild1@gmail.com> parents: 233 diff changeset	64
021ccf988f3b Some s2s fixes. Now connect() does not block, and stanzas are not lost when connection is slow Matthew Wild <mwild1@gmail.com> parents: 233 diff changeset	65 -- Queue stanza until we are able to send it
559 fa4a51fe6442 Remove an incorrect line which I didn't add, and fix the proper way. Corrects the sending of stanzas over unauthed s2sout's. Also fixes mod_dialback to send stanzas and not strings. Matthew Wild <mwild1@gmail.com> parents: 558 diff changeset	66 if host.sendq then t_insert(host.sendq, tostring(data));
fa4a51fe6442 Remove an incorrect line which I didn't add, and fix the proper way. Corrects the sending of stanzas over unauthed s2sout's. Also fixes mod_dialback to send stanzas and not strings. Matthew Wild <mwild1@gmail.com> parents: 558 diff changeset	67 else host.sendq = { tostring(data) }; end
fa4a51fe6442 Remove an incorrect line which I didn't add, and fix the proper way. Corrects the sending of stanzas over unauthed s2sout's. Also fixes mod_dialback to send stanzas and not strings. Matthew Wild <mwild1@gmail.com> parents: 558 diff changeset	68 host.log("debug", "stanza [%s] queued ", data.name);
255 43a9683bcd19 Fix for detecting when we are routing a stanza to ourself (I'm sure this has something to do with you, waqas...) Matthew Wild <mwild1@gmail.com> parents: 254 diff changeset	69 elseif host.type == "local" or host.type == "component" then
43a9683bcd19 Fix for detecting when we are routing a stanza to ourself (I'm sure this has something to do with you, waqas...) Matthew Wild <mwild1@gmail.com> parents: 254 diff changeset	70 log("error", "Trying to send a stanza to ourselves??")
256 c14ddd0912a2 Print out the stanza also Matthew Wild <mwild1@gmail.com> parents: 255 diff changeset	71 log("error", "Traceback: %s", get_traceback());
258 a93ccd84db83 Yep, s2s definitely works now. This is just a small fix for logging... Matthew Wild <mwild1@gmail.com> parents: 257 diff changeset	72 log("error", "Stanza: %s", tostring(data));
190 1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	73 else
253 f2869ded1d37 Another small fix, for logging in s2smanager Matthew Wild <mwild1@gmail.com> parents: 252 diff changeset	74 (host.log or log)("debug", "going to send stanza to "..to_host.." from "..from_host);
225 bbbd169b326b Just committing this warning, because I want to know if the problem really affects us Matthew Wild <mwild1@gmail.com> parents: 199 diff changeset	75 -- FIXME
260 182f0c895676 Now outgoing s2s sessions are associated with their from_host, fixes #15 Matthew Wild <mwild1@gmail.com> parents: 259 diff changeset	76 if host.from_host ~= from_host then
254 6eb3dea1d68b Another small fix, for logging in s2smanager Matthew Wild <mwild1@gmail.com> parents: 253 diff changeset	77 log("error", "WARNING! This might, possibly, be a bug, but it might not...");
331 830fd67f9378 Quite some changes, to: Matthew Wild <mwild1@gmail.com> parents: 327 diff changeset	78 log("error", "We are going to send from %s instead of %s", tostring(host.from_host), tostring(from_host));
254 6eb3dea1d68b Another small fix, for logging in s2smanager Matthew Wild <mwild1@gmail.com> parents: 253 diff changeset	79 end
260 182f0c895676 Now outgoing s2s sessions are associated with their from_host, fixes #15 Matthew Wild <mwild1@gmail.com> parents: 259 diff changeset	80 host.sends2s(data);
182f0c895676 Now outgoing s2s sessions are associated with their from_host, fixes #15 Matthew Wild <mwild1@gmail.com> parents: 259 diff changeset	81 host.log("debug", "stanza sent over "..host.type);
190 1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	82 end
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	83 else
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	84 log("debug", "opening a new outgoing connection for this stanza");
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	85 local host_session = new_outgoing(from_host, to_host);
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	86 -- Store in buffer
559 fa4a51fe6442 Remove an incorrect line which I didn't add, and fix the proper way. Corrects the sending of stanzas over unauthed s2sout's. Also fixes mod_dialback to send stanzas and not strings. Matthew Wild <mwild1@gmail.com> parents: 558 diff changeset	87 host_session.sendq = { tostring(data) };
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	88 end
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	89 end
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	90
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	91 local open_sessions = 0;
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	92
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	93 function new_incoming(conn)
199 eccf66b42bd7 Added resource priority handling, etc Waqas Hussain <waqas20@gmail.com> parents: 191 diff changeset	94 local session = { conn = conn, type = "s2sin_unauthed", direction = "incoming" };
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	95 if true then
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	96 session.trace = newproxy(true);
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	97 getmetatable(session.trace).__gc = function () open_sessions = open_sessions - 1; print("s2s session got collected, now "..open_sessions.." s2s sessions are allocated") end;
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	98 end
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	99 open_sessions = open_sessions + 1;
343 cae2178b5623 Log sent s2s stanzas Matthew Wild <mwild1@gmail.com> parents: 337 diff changeset	100 local w, log = conn.write, logger_init("s2sin"..tostring(conn):match("[a-f0-9]+$"));
cae2178b5623 Log sent s2s stanzas Matthew Wild <mwild1@gmail.com> parents: 337 diff changeset	101 session.sends2s = function (t) log("debug", "sending: %s", tostring(t)); w(tostring(t)); end
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	102 return session;
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	103 end
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	104
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	105 function new_outgoing(from_host, to_host)
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	106 local host_session = { to_host = to_host, from_host = from_host, notopen = true, type = "s2sout_unauthed", direction = "outgoing" };
260 182f0c895676 Now outgoing s2s sessions are associated with their from_host, fixes #15 Matthew Wild <mwild1@gmail.com> parents: 259 diff changeset	107 hosts[from_host].s2sout[to_host] = host_session;
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	108
434 0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	109 local log;
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	110 do
543 cf6e19ea1cbc Fix logger ids for c2s and s2sout Matthew Wild <mwild1@gmail.com> parents: 519 diff changeset	111 local conn_name = "s2sout"..tostring(host_session):match("[a-f0-9]*$");
434 0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	112 log = logger_init(conn_name);
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	113 host_session.log = log;
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	114 end
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	115
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	116 attempt_connection(host_session);
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	117
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	118 return host_session;
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	119 end
353 e7d776b5ebb9 Remove an old FIXME comment Matthew Wild <mwild1@gmail.com> parents: 351 diff changeset	120
434 0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	121
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	122 function attempt_connection(host_session, err)
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	123 local from_host, to_host = host_session.from_host, host_session.to_host;
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	124 local conn, handler = socket.tcp()
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	125
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	126 local connect_host, connect_port = idna_to_ascii(to_host), 5269;
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	127
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	128 if not err then -- This is our first attempt
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	129 local answer = dns.lookup("_xmpp-server._tcp."..connect_host..".", "SRV");
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: 333 diff changeset	130
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: 333 diff changeset	131 if answer then
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: 333 diff changeset	132 log("debug", to_host.." has SRV records, handling...");
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: 333 diff changeset	133 local srv_hosts = {};
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: 333 diff changeset	134 host_session.srv_hosts = srv_hosts;
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: 333 diff changeset	135 for _, record in ipairs(answer) do
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: 333 diff changeset	136 t_insert(srv_hosts, record.srv);
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: 333 diff changeset	137 end
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: 333 diff changeset	138 t_sort(srv_hosts, compare_srv_priorities);
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: 333 diff changeset	139
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: 333 diff changeset	140 local srv_choice = srv_hosts[1];
434 0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	141 host_session.srv_choice = 1;
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: 333 diff changeset	142 if srv_choice then
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: 333 diff changeset	143 connect_host, connect_port = srv_choice.target or to_host, srv_choice.port or connect_port;
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: 333 diff changeset	144 log("debug", "Best record found, will connect to %s:%d", connect_host, connect_port);
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: 333 diff changeset	145 end
4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: 333 diff changeset	146 end
434 0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	147 elseif host_session.srv_hosts and #host_session.srv_hosts > host_session.srv_choice then -- Not our first attempt, and we also have SRV
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	148 host_session.srv_choice = host_session.srv_choice + 1;
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	149 local srv_choice = host_session.srv_hosts[host_session.srv_choice];
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	150 connect_host, connect_port = srv_choice.target or to_host, srv_choice.port or connect_port;
435 4087aa611de2 Log reason for connection failure Matthew Wild <mwild1@gmail.com> parents: 434 diff changeset	151 host_session.log("debug", "Connection failed (%s). Attempt #%d: This time to %s:%d", tostring(err), host_session.srv_choice, connect_host, connect_port);
434 0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	152 else
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	153 host_session.log("debug", "Out of connection options, can't connect to %s", tostring(host_session.to_host));
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	154 -- We're out of options
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	155 return false;
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	156 end
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	157
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	158 -- Ok, we're going to try to connect
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	159 conn:settimeout(0);
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	160 local success, err = conn:connect(connect_host, connect_port);
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	161 if not success and err ~= "timeout" then
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	162 log("warn", "s2s connect() failed: %s", err);
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	163 end
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	164
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	165 local cl = connlisteners_get("xmppserver");
451 e9f269e5204e No more reading 1 byte at a time from sockets Matthew Wild <mwild1@gmail.com> parents: 448 diff changeset	166 conn = wraptlsclient(cl, conn, connect_host, connect_port, 0, cl.default_mode or 1, hosts[from_host].ssl_ctx );
434 0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	167 host_session.conn = conn;
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	168
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	169 -- Register this outgoing connection so that xmppserver_listener knows about it
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	170 -- otherwise it will assume it is a new incoming connection
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	171 cl.register_outgoing(conn, host_session);
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	172
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	173 local w = conn.write;
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	174 host_session.sends2s = function (t) log("debug", "sending: %s", tostring(t)); w(tostring(t)); end
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	175
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	176 conn.write(format([[<stream:stream xmlns='jabber:server' xmlns:db='jabber:server:dialback' xmlns:stream='http://etherx.jabber.org/streams' from='%s' to='%s' version='1.0'>]], from_host, to_host));
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	177 return true;
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	178 end
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	179
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	180 function streamopened(session, attr)
186 bfa8a30ea488 sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s() Matthew Wild <mwild1@gmail.com> parents: 179 diff changeset	181 local send = session.sends2s;
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	182
544 efde848869c5 Don't send stream:features to incoming s2s connections Matthew Wild <mwild1@gmail.com> parents: 543 diff changeset	183 -- TODO: #29: SASL/TLS on s2s streams
efde848869c5 Don't send stream:features to incoming s2s connections Matthew Wild <mwild1@gmail.com> parents: 543 diff changeset	184 session.version = 0; --tonumber(attr.version) or 0;
efde848869c5 Don't send stream:features to incoming s2s connections Matthew Wild <mwild1@gmail.com> parents: 543 diff changeset	185
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	186 if session.version >= 1.0 and not (attr.to and attr.from) then
360 e918c979ad1a Remove or comment useless prints, or change them to log() Matthew Wild <mwild1@gmail.com> parents: 354 diff changeset	187 --print("to: "..tostring(attr.to).." from: "..tostring(attr.from));
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	188 log("warn", (session.to_host or "(unknown)").." failed to specify 'to' or 'from' hostname as per RFC");
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	189 end
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	190
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	191 if session.direction == "incoming" then
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	192 -- Send a reply stream header
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	193
360 e918c979ad1a Remove or comment useless prints, or change them to log() Matthew Wild <mwild1@gmail.com> parents: 354 diff changeset	194 --for k,v in pairs(attr) do print("", tostring(k), ":::", tostring(v)); end
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	195
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	196 session.to_host = attr.to;
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	197 session.from_host = attr.from;
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	198
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	199 session.streamid = uuid_gen();
360 e918c979ad1a Remove or comment useless prints, or change them to log() Matthew Wild <mwild1@gmail.com> parents: 354 diff changeset	200 (session.log or log)("debug", "incoming s2s received <stream:stream>");
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	201 send("<?xml version='1.0'?>");
354 9b461ae785b1 Remove version=1.0 on s2s stream headers, again. Matthew Wild <mwild1@gmail.com> parents: 353 diff changeset	202 send(stanza("stream:stream", { xmlns='jabber:server', ["xmlns:db"]='jabber:server:dialback', ["xmlns:stream"]='http://etherx.jabber.org/streams', id=session.streamid, from=session.to_host }):top_tag());
331 830fd67f9378 Quite some changes, to: Matthew Wild <mwild1@gmail.com> parents: 327 diff changeset	203 if session.to_host and not hosts[session.to_host] then
830fd67f9378 Quite some changes, to: Matthew Wild <mwild1@gmail.com> parents: 327 diff changeset	204 -- Attempting to connect to a host we don't serve
434 0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	205 session:close({ condition = "host-unknown"; text = "This host does not serve "..session.to_host });
331 830fd67f9378 Quite some changes, to: Matthew Wild <mwild1@gmail.com> parents: 327 diff changeset	206 return;
830fd67f9378 Quite some changes, to: Matthew Wild <mwild1@gmail.com> parents: 327 diff changeset	207 end
345 6a7acfc1c933 Send version=1.0 in s2s stream header. Send s2s stream:features when in 1.0 mode. Matthew Wild <mwild1@gmail.com> parents: 344 diff changeset	208 if session.version >= 1.0 then
6a7acfc1c933 Send version=1.0 in s2s stream header. Send s2s stream:features when in 1.0 mode. Matthew Wild <mwild1@gmail.com> parents: 344 diff changeset	209 send(st.stanza("stream:features")
6a7acfc1c933 Send version=1.0 in s2s stream header. Send s2s stream:features when in 1.0 mode. Matthew Wild <mwild1@gmail.com> parents: 344 diff changeset	210 :tag("dialback", { xmlns='urn:xmpp:features:dialback' }):tag("optional"):up():up());
6a7acfc1c933 Send version=1.0 in s2s stream header. Send s2s stream:features when in 1.0 mode. Matthew Wild <mwild1@gmail.com> parents: 344 diff changeset	211 end
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	212 elseif session.direction == "outgoing" then
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	213 -- If we are just using the connection for verifying dialback keys, we won't try and auth it
190 1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	214 if not attr.id then error("stream response did not give us a streamid!!!"); end
1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	215 session.streamid = attr.id;
1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	216
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	217 if not session.dialback_verifying then
190 1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	218 initiate_dialback(session);
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	219 else
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	220 mark_connected(session);
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	221 end
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	222 end
259 1485d272400d Some more logging fixes Matthew Wild <mwild1@gmail.com> parents: 258 diff changeset	223
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	224 session.notopen = nil;
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	225 end
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	226
190 1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	227 function initiate_dialback(session)
1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	228 -- generate dialback key
1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	229 session.dialback_key = generate_dialback(session.streamid, session.to_host, session.from_host);
1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	230 session.sends2s(format("<db:result from='%s' to='%s'>%s</db:result>", session.from_host, session.to_host, session.dialback_key));
1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	231 session.log("info", "sent dialback key on outgoing s2s stream");
1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	232 end
1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	233
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	234 function generate_dialback(id, to, from)
448 2623519b25b0 Switched from md5 to sha256 for dialback key generation Waqas Hussain <waqas20@gmail.com> parents: 435 diff changeset	235 return sha256_hash(id..to..from..dialback_secret, true);
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	236 end
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	237
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	238 function verify_dialback(id, to, from, key)
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	239 return key == generate_dialback(id, to, from);
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	240 end
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	241
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	242 function make_authenticated(session)
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	243 if session.type == "s2sout_unauthed" then
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	244 session.type = "s2sout";
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	245 elseif session.type == "s2sin_unauthed" then
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	246 session.type = "s2sin";
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	247 else
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	248 return false;
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	249 end
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	250 session.log("info", "connection is now authenticated");
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	251
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	252 mark_connected(session);
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	253
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	254 return true;
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	255 end
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	256
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	257 function mark_connected(session)
186 bfa8a30ea488 sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s() Matthew Wild <mwild1@gmail.com> parents: 179 diff changeset	258 local sendq, send = session.sendq, session.sends2s;
bfa8a30ea488 sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s() Matthew Wild <mwild1@gmail.com> parents: 179 diff changeset	259
bfa8a30ea488 sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s() Matthew Wild <mwild1@gmail.com> parents: 179 diff changeset	260 local from, to = session.from_host, session.to_host;
bfa8a30ea488 sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s() Matthew Wild <mwild1@gmail.com> parents: 179 diff changeset	261
190 1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	262 session.log("debug", session.direction.." s2s connection "..from.."->"..to.." is now complete");
186 bfa8a30ea488 sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s() Matthew Wild <mwild1@gmail.com> parents: 179 diff changeset	263
bfa8a30ea488 sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s() Matthew Wild <mwild1@gmail.com> parents: 179 diff changeset	264 local send_to_host = send_to_host;
190 1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	265 function session.send(data) send_to_host(to, from, data); end
1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	266
186 bfa8a30ea488 sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s() Matthew Wild <mwild1@gmail.com> parents: 179 diff changeset	267
190 1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	268 if session.direction == "outgoing" then
1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	269 if sendq then
269 3cfac0e5e6ca Log how many queued stanzas we send Waqas Hussain <waqas20@gmail.com> parents: 266 diff changeset	270 session.log("debug", "sending "..#sendq.." queued stanzas across new outgoing connection to "..session.to_host);
190 1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	271 for i, data in ipairs(sendq) do
1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	272 send(data);
1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	273 sendq[i] = nil;
1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	274 end
1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	275 session.sendq = nil;
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	276 end
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	277 end
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	278 end
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	279
164 8dc1faa5b1df other half of previous commit Matthew Wild <mwild1@gmail.com> parents: 162 diff changeset	280 function destroy_session(session)
169 92768120b717 Little tweak for more useful logging of closed s2s sessions Matthew Wild <mwild1@gmail.com> parents: 167 diff changeset	281 (session.log or log)("info", "Destroying "..tostring(session.direction).." session "..tostring(session.from_host).."->"..tostring(session.to_host));
331 830fd67f9378 Quite some changes, to: Matthew Wild <mwild1@gmail.com> parents: 327 diff changeset	282
830fd67f9378 Quite some changes, to: Matthew Wild <mwild1@gmail.com> parents: 327 diff changeset	283 -- FIXME: Flush sendq here/report errors to originators
830fd67f9378 Quite some changes, to: Matthew Wild <mwild1@gmail.com> parents: 327 diff changeset	284
164 8dc1faa5b1df other half of previous commit Matthew Wild <mwild1@gmail.com> parents: 162 diff changeset	285 if session.direction == "outgoing" then
260 182f0c895676 Now outgoing s2s sessions are associated with their from_host, fixes #15 Matthew Wild <mwild1@gmail.com> parents: 259 diff changeset	286 hosts[session.from_host].s2sout[session.to_host] = nil;
164 8dc1faa5b1df other half of previous commit Matthew Wild <mwild1@gmail.com> parents: 162 diff changeset	287 end
331 830fd67f9378 Quite some changes, to: Matthew Wild <mwild1@gmail.com> parents: 327 diff changeset	288
164 8dc1faa5b1df other half of previous commit Matthew Wild <mwild1@gmail.com> parents: 162 diff changeset	289 for k in pairs(session) do
8dc1faa5b1df other half of previous commit Matthew Wild <mwild1@gmail.com> parents: 162 diff changeset	290 if k ~= "trace" then
8dc1faa5b1df other half of previous commit Matthew Wild <mwild1@gmail.com> parents: 162 diff changeset	291 session[k] = nil;
8dc1faa5b1df other half of previous commit Matthew Wild <mwild1@gmail.com> parents: 162 diff changeset	292 end
8dc1faa5b1df other half of previous commit Matthew Wild <mwild1@gmail.com> parents: 162 diff changeset	293 end
8dc1faa5b1df other half of previous commit Matthew Wild <mwild1@gmail.com> parents: 162 diff changeset	294 end
8dc1faa5b1df other half of previous commit Matthew Wild <mwild1@gmail.com> parents: 162 diff changeset	295
225 bbbd169b326b Just committing this warning, because I want to know if the problem really affects us Matthew Wild <mwild1@gmail.com> parents: 199 diff changeset	296 return _M;

prosody

fa4a51fe6442

core/s2smanager.lua

Software / code / prosody

Annotate

core/s2smanager.lua @ 559:fa4a51fe6442

Software `/` code `/` prosody