net.server_select: Only allow starttls if luasec is available (thanks Nolan)

[prosody.git] / net / xmppcomponent_listener.lua

diff --git a/net/xmppcomponent_listener.lua b/net/xmppcomponent_listener.lua
index ebbcff1ea852ff395ec0145868e3113bba0f0820..0b98b6bce9cd7da66572f6194e3904ee955a8ecb 100644 (file)
--- a/net/xmppcomponent_listener.lua
+++ b/net/xmppcomponent_listener.lua
@@ -1,4 +1,4 @@
--- Prosody IM v0.4
+-- Prosody IM
 -- Copyright (C) 2008-2009 Matthew Wild
 -- Copyright (C) 2008-2009 Waqas Hussain
 -- 
@@ -32,7 +32,7 @@ local xmlns_component = 'jabber:component:accept';
 
 --- Callbacks/data for xmlhandlers to handle streams for us ---
 
-local stream_callbacks = { stream_tag = "http://etherx.jabber.org/streams|stream", default_ns = xmlns_component };
+local stream_callbacks = { default_ns = xmlns_component };
 
 function stream_callbacks.error(session, error, data, data2)
        log("warn", "Error processing component stream: "..tostring(error));
@@ -87,9 +87,14 @@ end
 
 --- Closing a component connection
 local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'};
+local default_stream_attr = { ["xmlns:stream"] = "http://etherx.jabber.org/streams", xmlns = stream_callbacks.default_ns, version = "1.0", id = "" };
 local function session_close(session, reason)
        local log = session.log or log;
        if session.conn then
+               if session.notopen then
+                       session.send("<?xml version='1.0'?>");
+                       session.send(st.stanza("stream:stream", default_stream_attr):top_tag());
+               end
                if reason then
                        if type(reason) == "string" then -- assume stream error
                                log("info", "Disconnecting component, <stream:error> is: %s", reason);
@@ -112,17 +117,17 @@ local function session_close(session, reason)
                        end
                end
                session.send("</stream:stream>");
-               session.conn.close();
-               component_listener.disconnect(session.conn, "stream error");
+               session.conn:close();
+               component_listener.ondisconnect(session.conn, "stream error");
        end
 end
 
 --- Component connlistener
-function component_listener.listener(conn, data)
+function component_listener.onincoming(conn, data)
        local session = sessions[conn];
        if not session then
                local _send = conn.write;
-               session = { type = "component", conn = conn, send = function (data) return _send(tostring(data)); end };
+               session = { type = "component", conn = conn, send = function (data) return _send(conn, tostring(data)); end };
                sessions[conn] = session;
 
                -- Logging functions --
@@ -133,7 +138,7 @@ function component_listener.listener(conn, data)
                
                session.log("info", "Incoming Jabber component connection");
                
-               local parser = lxp.new(init_xmlhandlers(session, stream_callbacks), "|");
+               local parser = lxp.new(init_xmlhandlers(session, stream_callbacks), "\1");
                session.parser = parser;
                
                session.notopen = true;
@@ -152,7 +157,7 @@ function component_listener.listener(conn, data)
        end
 end
        
-function component_listener.disconnect(conn, err)
+function component_listener.ondisconnect(conn, err)
        local session = sessions[conn];
        if session then
                (session.log or log)("info", "component disconnected: %s (%s)", tostring(session.host), tostring(err));
@@ -162,8 +167,8 @@ function component_listener.disconnect(conn, err)
                        hosts[session.host].connected = nil;
                end
                sessions[conn]  = nil;
+               for k in pairs(session) do session[k] = nil; end
                session = nil;
-               collectgarbage("collect");
        end
 end