mod_muc/muc.lib: Don't add messages without a body (such as chat state notifications...

[prosody.git] / core / s2smanager.lua

diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index 6049e12eb5f8305da2dd3022fbaad008458468c9..5777cb8ef16b48a1ed34be63866ed004e4bfaa78 100644 (file)
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -8,21 +8,19 @@
 
 
 
-local hosts = hosts;
-local tostring, pairs, ipairs, getmetatable, newproxy, setmetatable
-    = tostring, pairs, ipairs, getmetatable, newproxy, setmetatable;
+local hosts = prosody.hosts;
+local tostring, pairs, getmetatable, newproxy, setmetatable
+    = tostring, pairs, getmetatable, newproxy, setmetatable;
 
-local fire_event = prosody.events.fire_event;
 local logger_init = require "util.logger".init;
 
 local log = logger_init("s2smanager");
 
-local config = require "core.configmanager";
-
 local prosody = _G.prosody;
 incoming_s2s = {};
 prosody.incoming_s2s = incoming_s2s;
 local incoming_s2s = incoming_s2s;
+local fire_event = prosody.events.fire_event;
 
 module "s2smanager"
 
@@ -40,7 +38,7 @@ function new_incoming(conn)
        return session;
 end
 
-function new_outgoing(from_host, to_host, connect)
+function new_outgoing(from_host, to_host)
        local host_session = { to_host = to_host, from_host = from_host, host = from_host,
                               notopen = true, type = "s2sout_unauthed", direction = "outgoing" };
        hosts[from_host].s2sout[to_host] = host_session;
@@ -49,75 +47,6 @@ function new_outgoing(from_host, to_host, connect)
        return host_session;
 end
 
-function make_authenticated(session, host)
-       if not session.secure then
-               local local_host = session.direction == "incoming" and session.to_host or session.from_host;
-               if config.get(local_host, "core", "s2s_require_encryption") then
-                       session:close({
-                               condition = "policy-violation",
-                               text = "Encrypted server-to-server communication is required but was not "
-                                      ..((session.direction == "outgoing" and "offered") or "used")
-                       });
-               end
-       end
-       if session.type == "s2sout_unauthed" then
-               session.type = "s2sout";
-       elseif session.type == "s2sin_unauthed" then
-               session.type = "s2sin";
-               if host then
-                       if not session.hosts[host] then session.hosts[host] = {}; end
-                       session.hosts[host].authed = true;
-               end
-       elseif session.type == "s2sin" and host then
-               if not session.hosts[host] then session.hosts[host] = {}; end
-               session.hosts[host].authed = true;
-       else
-               return false;
-       end
-       session.log("debug", "connection %s->%s is now authenticated for %s", session.from_host, session.to_host, host);
-       
-       mark_connected(session);
-       
-       return true;
-end
-
--- Stream is authorised, and ready for normal stanzas
-function mark_connected(session)
-       local sendq, send = session.sendq, session.sends2s;
-       
-       local from, to = session.from_host, session.to_host;
-       
-       session.log("info", "%s s2s connection %s->%s complete", session.direction, from, to);
-
-       local event_data = { session = session };
-       if session.type == "s2sout" then
-               prosody.events.fire_event("s2sout-established", event_data);
-               hosts[from].events.fire_event("s2sout-established", event_data);
-       else
-               local host_session = hosts[to];
-               session.send = function(stanza)
-                       return host_session.events.fire_event("route/remote", { from_host = to, to_host = from, stanza = stanza });
-               end;
-
-               prosody.events.fire_event("s2sin-established", event_data);
-               hosts[to].events.fire_event("s2sin-established", event_data);
-       end
-       
-       if session.direction == "outgoing" then
-               if sendq then
-                       session.log("debug", "sending %d queued stanzas across new outgoing connection to %s", #sendq, session.to_host);
-                       for i, data in ipairs(sendq) do
-                               send(data[1]);
-                               sendq[i] = nil;
-                       end
-                       session.sendq = nil;
-               end
-               
-               session.ip_hosts = nil;
-               session.srv_hosts = nil;
-       end
-end
-
 local resting_session = { -- Resting, not dead
                destroyed = true;
                type = "s2s_destroyed";
@@ -158,12 +87,12 @@ function destroy_session(session, reason)
        
        local event_data = { session = session, reason = reason };
        if session.type == "s2sout" then
-               prosody.events.fire_event("s2sout-destroyed", event_data);
+               fire_event("s2sout-destroyed", event_data);
                if hosts[session.from_host] then
                        hosts[session.from_host].events.fire_event("s2sout-destroyed", event_data);
                end
        elseif session.type == "s2sin" then
-               prosody.events.fire_event("s2sin-destroyed", event_data);
+               fire_event("s2sin-destroyed", event_data);
                if hosts[session.to_host] then
                        hosts[session.to_host].events.fire_event("s2sin-destroyed", event_data);
                end