Software / code / prosody
Annotate
core/s2smanager.lua @ 415:3cf7deea9971
Added util-src/encodings.c - support for base64, stringprep and idna encodings
| author | Waqas Hussain <waqas20@gmail.com> |
|---|---|
| date | Wed, 26 Nov 2008 01:45:25 +0500 |
| parent | 360:e918c979ad1a |
| child | 434:0d7ba3742f7a |
| rev | line source |
|---|---|
| 148 | 1 |
| 2 local hosts = hosts; | |
| 3 local sessions = sessions; | |
| 4 local socket = require "socket"; | |
| 5 local format = string.format; | |
| 337 | 6 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
|
7 local get_traceback = debug.traceback; |
| 148 | 8 local tostring, pairs, ipairs, getmetatable, print, newproxy, error, tonumber |
| 9 = tostring, pairs, ipairs, getmetatable, print, newproxy, error, tonumber; | |
| 10 | |
| 11 local connlisteners_get = require "net.connlisteners".get; | |
| 12 local wraptlsclient = require "net.server".wraptlsclient; | |
| 13 local modulemanager = require "core.modulemanager"; | |
|
244
0e3bda34f958
Missed importing a function in last commit
Matthew Wild <mwild1@gmail.com>
parents:
243
diff
changeset
|
14 local st = require "stanza"; |
|
0e3bda34f958
Missed importing a function in last commit
Matthew Wild <mwild1@gmail.com>
parents:
243
diff
changeset
|
15 local stanza = st.stanza; |
| 148 | 16 |
| 17 local uuid_gen = require "util.uuid".generate; | |
| 18 | |
| 19 local logger_init = require "util.logger".init; | |
| 20 | |
| 21 local log = logger_init("s2smanager"); | |
| 22 | |
| 23 local md5_hash = require "util.hashes".md5; | |
| 24 | |
| 25 local dialback_secret = "This is very secret!!! Ha!"; | |
| 26 | |
| 337 | 27 local dns = require "net.dns"; |
|
157
f4e9b6ec34b0
Hack until we get SRV resolving
Matthew Wild <mwild1@gmail.com>
parents:
148
diff
changeset
|
28 |
| 148 | 29 module "s2smanager" |
| 30 | |
| 337 | 31 local function compare_srv_priorities(a,b) return a.priority < b.priority or a.weight < b.weight; end |
| 32 | |
| 148 | 33 function send_to_host(from_host, to_host, data) |
|
327
9439362caacc
Fixed s2s manager's send queue to not store recieved stanza objects (as these can chnage after the send call)
Waqas Hussain <waqas20@gmail.com>
parents:
269
diff
changeset
|
34 if data.name then data = tostring(data); end |
|
260
182f0c895676
Now outgoing s2s sessions are associated with their from_host, fixes #15
Matthew Wild <mwild1@gmail.com>
parents:
259
diff
changeset
|
35 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
|
36 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
|
37 -- We have a connection to this host already |
|
344
ed5824e9dd94
Don't attempt to auth connection unless stanzas are being sent across it
Matthew Wild <mwild1@gmail.com>
parents:
343
diff
changeset
|
38 if host.type == "s2sout_unauthed" and ((not data.xmlns) or data.xmlns == "jabber:client" or data.xmlns == "jabber:server") then |
| 337 | 39 (host.log or log)("debug", "trying to send over unauthed s2sout to "..to_host..", authing it now..."); |
|
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
|
40 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
|
41 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
|
42 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
|
43 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
|
44 |
|
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
|
45 -- Queue stanza until we are able to send it |
|
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
|
46 if host.sendq then t_insert(host.sendq, data); |
|
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
|
47 else host.sendq = { data }; end |
|
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
|
48 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
|
49 log("error", "Trying to send a stanza to ourselves??") |
| 256 | 50 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
|
51 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
|
52 else |
|
253
f2869ded1d37
Another small fix, for logging in s2smanager
Matthew Wild <mwild1@gmail.com>
parents:
252
diff
changeset
|
53 (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
|
54 -- FIXME |
|
260
182f0c895676
Now outgoing s2s sessions are associated with their from_host, fixes #15
Matthew Wild <mwild1@gmail.com>
parents:
259
diff
changeset
|
55 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
|
56 log("error", "WARNING! This might, possibly, be a bug, but it might not..."); |
| 331 | 57 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
|
58 end |
|
260
182f0c895676
Now outgoing s2s sessions are associated with their from_host, fixes #15
Matthew Wild <mwild1@gmail.com>
parents:
259
diff
changeset
|
59 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
|
60 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
|
61 end |
| 148 | 62 else |
| 63 log("debug", "opening a new outgoing connection for this stanza"); | |
| 64 local host_session = new_outgoing(from_host, to_host); | |
| 65 -- Store in buffer | |
| 66 host_session.sendq = { data }; | |
| 67 end | |
| 68 end | |
| 69 | |
| 70 local open_sessions = 0; | |
| 71 | |
| 72 function new_incoming(conn) | |
|
199
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
191
diff
changeset
|
73 local session = { conn = conn, type = "s2sin_unauthed", direction = "incoming" }; |
| 148 | 74 if true then |
| 75 session.trace = newproxy(true); | |
| 76 getmetatable(session.trace).__gc = function () open_sessions = open_sessions - 1; print("s2s session got collected, now "..open_sessions.." s2s sessions are allocated") end; | |
| 77 end | |
| 78 open_sessions = open_sessions + 1; | |
| 343 | 79 local w, log = conn.write, logger_init("s2sin"..tostring(conn):match("[a-f0-9]+$")); |
| 80 session.sends2s = function (t) log("debug", "sending: %s", tostring(t)); w(tostring(t)); end | |
| 148 | 81 return session; |
| 82 end | |
| 83 | |
| 84 function new_outgoing(from_host, to_host) | |
| 85 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
|
86 hosts[from_host].s2sout[to_host] = host_session; |
| 148 | 87 local cl = connlisteners_get("xmppserver"); |
| 88 | |
| 89 local conn, handler = socket.tcp() | |
|
353
e7d776b5ebb9
Remove an old FIXME comment
Matthew Wild <mwild1@gmail.com>
parents:
351
diff
changeset
|
90 |
| 337 | 91 local connect_host, connect_port = to_host, 5269; |
| 92 | |
| 93 local answer = dns.lookup("_xmpp-server._tcp."..to_host..".", "SRV"); | |
| 94 | |
| 95 if answer then | |
| 96 log("debug", to_host.." has SRV records, handling..."); | |
| 97 local srv_hosts = {}; | |
| 98 host_session.srv_hosts = srv_hosts; | |
| 99 for _, record in ipairs(answer) do | |
| 100 t_insert(srv_hosts, record.srv); | |
| 101 end | |
| 102 t_sort(srv_hosts, compare_srv_priorities); | |
| 103 | |
| 104 local srv_choice = srv_hosts[1]; | |
| 105 if srv_choice then | |
| 106 connect_host, connect_port = srv_choice.target or to_host, srv_choice.port or connect_port; | |
| 107 log("debug", "Best record found, will connect to %s:%d", connect_host, connect_port); | |
| 108 end | |
| 109 end | |
|
233
23585c323daa
Move some code about so that we don't leave connections hanging if they hit the connection timeout
Matthew Wild <mwild1@gmail.com>
parents:
231
diff
changeset
|
110 |
|
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
|
111 conn:settimeout(0); |
| 337 | 112 local success, err = conn:connect(connect_host, connect_port); |
| 113 if not success and err ~= "timeout" 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
|
114 log("warn", "s2s connect() failed: %s", err); |
|
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
|
115 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
|
116 |
|
349
256f18e2bfd2
Fix for setting the correct host on the socket, seems to fix s2s with XCP
Matthew Wild <mwild1@gmail.com>
parents:
346
diff
changeset
|
117 conn = wraptlsclient(cl, conn, connect_host, connect_port, 0, 1, hosts[from_host].ssl_ctx ); |
|
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
|
118 host_session.conn = conn; |
| 259 | 119 |
|
233
23585c323daa
Move some code about so that we don't leave connections hanging if they hit the connection timeout
Matthew Wild <mwild1@gmail.com>
parents:
231
diff
changeset
|
120 -- Register this outgoing connection so that xmppserver_listener knows about it |
|
23585c323daa
Move some code about so that we don't leave connections hanging if they hit the connection timeout
Matthew Wild <mwild1@gmail.com>
parents:
231
diff
changeset
|
121 -- otherwise it will assume it is a new incoming connection |
|
23585c323daa
Move some code about so that we don't leave connections hanging if they hit the connection timeout
Matthew Wild <mwild1@gmail.com>
parents:
231
diff
changeset
|
122 cl.register_outgoing(conn, host_session); |
| 259 | 123 |
| 343 | 124 local log; |
| 148 | 125 do |
| 126 local conn_name = "s2sout"..tostring(conn):match("[a-f0-9]*$"); | |
| 343 | 127 log = logger_init(conn_name); |
| 128 host_session.log = log; | |
| 148 | 129 end |
| 130 | |
| 131 local w = conn.write; | |
| 343 | 132 host_session.sends2s = function (t) log("debug", "sending: %s", tostring(t)); w(tostring(t)); end |
| 148 | 133 |
| 134 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)); | |
| 135 | |
| 136 return host_session; | |
| 137 end | |
| 138 | |
| 139 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
|
140 local send = session.sends2s; |
| 148 | 141 |
| 142 session.version = tonumber(attr.version) or 0; | |
| 143 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
|
144 --print("to: "..tostring(attr.to).." from: "..tostring(attr.from)); |
| 148 | 145 log("warn", (session.to_host or "(unknown)").." failed to specify 'to' or 'from' hostname as per RFC"); |
| 146 end | |
| 147 | |
| 148 if session.direction == "incoming" then | |
| 149 -- Send a reply stream header | |
| 150 | |
|
360
e918c979ad1a
Remove or comment useless prints, or change them to log()
Matthew Wild <mwild1@gmail.com>
parents:
354
diff
changeset
|
151 --for k,v in pairs(attr) do print("", tostring(k), ":::", tostring(v)); end |
| 148 | 152 |
| 153 session.to_host = attr.to; | |
| 154 session.from_host = attr.from; | |
| 155 | |
| 156 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
|
157 (session.log or log)("debug", "incoming s2s received <stream:stream>"); |
| 148 | 158 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
|
159 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 | 160 if session.to_host and not hosts[session.to_host] then |
| 161 -- Attempting to connect to a host we don't serve | |
|
333
8d15b073fdbe
session:disconnect() -> session:close() for consistency with other Lua APIs
Matthew Wild <mwild1@gmail.com>
parents:
331
diff
changeset
|
162 session:close("host-unknown"); |
| 331 | 163 return; |
| 164 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
|
165 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
|
166 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
|
167 :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
|
168 end |
| 148 | 169 elseif session.direction == "outgoing" then |
| 170 -- 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
|
171 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
|
172 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
|
173 |
| 148 | 174 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
|
175 initiate_dialback(session); |
| 148 | 176 else |
| 177 mark_connected(session); | |
| 178 end | |
| 179 end | |
| 259 | 180 |
| 148 | 181 session.notopen = nil; |
| 182 end | |
| 183 | |
|
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
|
184 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
|
185 -- 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
|
186 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
|
187 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
|
188 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
|
189 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
|
190 |
| 148 | 191 function generate_dialback(id, to, from) |
| 192 return md5_hash(id..to..from..dialback_secret); -- FIXME: See XEP-185 and XEP-220 | |
| 193 end | |
| 194 | |
| 195 function verify_dialback(id, to, from, key) | |
| 196 return key == generate_dialback(id, to, from); | |
| 197 end | |
| 198 | |
| 199 function make_authenticated(session) | |
| 200 if session.type == "s2sout_unauthed" then | |
| 201 session.type = "s2sout"; | |
| 202 elseif session.type == "s2sin_unauthed" then | |
| 203 session.type = "s2sin"; | |
| 204 else | |
| 205 return false; | |
| 206 end | |
| 207 session.log("info", "connection is now authenticated"); | |
| 208 | |
| 209 mark_connected(session); | |
| 210 | |
| 211 return true; | |
| 212 end | |
| 213 | |
| 214 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
|
215 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
|
216 |
|
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
179
diff
changeset
|
217 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
|
218 |
|
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
|
219 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
|
220 |
|
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
179
diff
changeset
|
221 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
|
222 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
|
223 |
|
186
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
179
diff
changeset
|
224 |
|
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
|
225 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
|
226 if sendq then |
|
269
3cfac0e5e6ca
Log how many queued stanzas we send
Waqas Hussain <waqas20@gmail.com>
parents:
266
diff
changeset
|
227 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
|
228 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
|
229 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
|
230 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
|
231 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
|
232 session.sendq = nil; |
| 148 | 233 end |
| 234 end | |
| 235 end | |
| 236 | |
|
164
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
237 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
|
238 (session.log or log)("info", "Destroying "..tostring(session.direction).." session "..tostring(session.from_host).."->"..tostring(session.to_host)); |
| 331 | 239 |
| 240 -- FIXME: Flush sendq here/report errors to originators | |
| 241 | |
|
164
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
242 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
|
243 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
|
244 end |
| 331 | 245 |
|
164
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
246 for k in pairs(session) do |
|
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
247 if k ~= "trace" then |
|
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
248 session[k] = nil; |
|
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
249 end |
|
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
250 end |
|
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
251 end |
|
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
252 |
|
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
|
253 return _M; |
