Remove all trailing whitespace

[prosody.git] / plugins / mod_s2s / mod_s2s.lua

diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index c628dc47cfc615d3de96f9a75dca1c356ea957b2..d64a02acacf35e8dc7ebc44639bfea3171168fc5 100644 (file)
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@ -1,7 +1,7 @@
 -- Prosody IM
 -- Copyright (C) 2008-2010 Matthew Wild
 -- Copyright (C) 2008-2010 Waqas Hussain
--- 
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
@@ -155,9 +155,9 @@ 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 };
@@ -173,7 +173,7 @@ function mark_connected(session)
                fire_global_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);
@@ -183,7 +183,7 @@ function mark_connected(session)
                        end
                        session.sendq = nil;
                end
-               
+
                session.ip_hosts = nil;
                session.srv_hosts = nil;
        end
@@ -218,9 +218,9 @@ function make_authenticated(event)
                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
 
@@ -277,9 +277,9 @@ local xmlns_xmpp_streams = "urn:ietf:params:xml:ns:xmpp-streams";
 
 function stream_callbacks.streamopened(session, attr)
        local send = session.sends2s;
-       
+
        session.version = tonumber(attr.version) or 0;
-       
+
        -- TODO: Rename session.secure to session.encrypted
        if session.secure == false then
                session.secure = true;
@@ -298,7 +298,7 @@ function stream_callbacks.streamopened(session, attr)
 
        if session.direction == "incoming" then
                -- Send a reply stream header
-               
+
                -- Validate to/from
                local to, from = nameprep(attr.to), nameprep(attr.from);
                if not to and attr.to then -- COMPAT: Some servers do not reliably set 'to' (especially on stream restarts)
@@ -309,7 +309,7 @@ function stream_callbacks.streamopened(session, attr)
                        session:close({ condition = "improper-addressing", text = "Invalid 'from' address" });
                        return;
                end
-               
+
                -- Set session.[from/to]_host if they have not been set already and if
                -- this session isn't already authenticated
                if session.type == "s2sin_unauthed" and from and not session.from_host then
@@ -324,10 +324,10 @@ function stream_callbacks.streamopened(session, attr)
                        session:close({ condition = "improper-addressing", text = "New stream 'to' attribute does not match original" });
                        return;
                end
-               
+
                -- For convenience we'll put the sanitised values into these variables
                to, from = session.to_host, session.from_host;
-               
+
                session.streamid = uuid_gen();
                (session.log or log)("debug", "Incoming s2s received %s", st.stanza("stream:stream", attr):top_tag());
                if to then
@@ -362,13 +362,13 @@ function stream_callbacks.streamopened(session, attr)
                session:open_stream(session.to_host, session.from_host)
                if session.version >= 1.0 then
                        local features = st.stanza("stream:features");
-                       
+
                        if to then
                                hosts[to].events.fire_event("s2s-stream-features", { origin = session, features = features });
                        else
                                (session.log or log)("warn", "No 'to' on stream header from %s means we can't offer any features", from or "unknown host");
                        end
-                       
+
                        log("debug", "Sending stream features: %s", tostring(features));
                        send(features);
                end
@@ -396,7 +396,7 @@ function stream_callbacks.streamopened(session, attr)
                        end
                end
                session.send_buffer = nil;
-       
+
                -- If server is pre-1.0, don't wait for features, just do dialback
                if session.version < 1.0 then
                        if not session.dialback_verifying then
@@ -489,10 +489,10 @@ local function session_close(session, reason, remote_reason)
 
                session.sends2s("</stream:stream>");
                function session.sends2s() return false; end
-               
+
                local reason = remote_reason or (reason and (reason.text or reason.condition)) or reason;
                session.log("info", "%s s2s stream %s->%s closed: %s", session.direction, session.from_host or "(unknown host)", session.to_host or "(unknown host)", reason or "stream closed");
-               
+
                -- Authenticated incoming stream may still be sending us stanzas, so wait for </stream:stream> from remote
                local conn = session.conn;
                if reason == nil and not session.notopen and session.type == "s2sin" then
@@ -532,16 +532,16 @@ end
 local function initialize_session(session)
        local stream = new_xmpp_stream(session, stream_callbacks);
        session.stream = stream;
-       
+
        session.notopen = true;
-               
+
        function session.reset_stream()
                session.notopen = true;
                session.stream:reset();
        end
 
        session.open_stream = session_open_stream;
-       
+
        local filter = session.filter;
        function session.data(data)
                data = filter("bytes/in", data);
@@ -596,7 +596,7 @@ function listener.onconnect(conn)
                                end
                        end
                end
-       
+
                initialize_session(session);
        else -- Outgoing session connected
                session:open_stream(session.from_host, session.to_host);
@@ -610,7 +610,7 @@ function listener.onincoming(conn, data)
                session.data(data);
        end
 end
-       
+
 function listener.onstatus(conn, status)
        if status == "ssl-handshake-complete" then
                local session = sessions[conn];
@@ -658,7 +658,7 @@ function check_auth_policy(event)
        elseif must_secure and insecure_domains[host] then
                must_secure = false;
        end
-       
+
        if must_secure and (session.cert_chain_status ~= "valid" or session.cert_identity_status ~= "valid") then
                module:log("warn", "Forbidding insecure connection to/from %s", host);
                if session.direction == "incoming" then