Merge Tobias->trunk

[prosody.git] / net / xmppcomponent_listener.lua

diff --git a/net/xmppcomponent_listener.lua b/net/xmppcomponent_listener.lua
index a96a1cffd57eac0d948bb4f596d64a8635ebfc23..90293559a30e0c1df8c71034c1b6ceda3ed51507 100644 (file)
--- a/net/xmppcomponent_listener.lua
+++ b/net/xmppcomponent_listener.lua
@@ -10,18 +10,19 @@
 local hosts = _G.hosts;
 
 local t_concat = table.concat;
+local tostring = tostring;
+local type = type;
+local pairs = pairs;
 
 local lxp = require "lxp";
 local logger = require "util.logger";
 local config = require "core.configmanager";
 local connlisteners = require "net.connlisteners";
-local cm_register_component = require "core.componentmanager".register_component;
-local cm_deregister_component = require "core.componentmanager".deregister_component;
 local uuid_gen = require "util.uuid".generate;
 local jid_split = require "util.jid".split;
 local sha1 = require "util.hashes".sha1;
 local st = require "util.stanza";
-local init_xmlhandlers = require "core.xmlhandlers";
+local new_xmpp_stream = require "util.xmppstream".new;
 
 local sessions = {};
 
@@ -31,7 +32,7 @@ local component_listener = { default_port = 5347; default_mode = "*a"; default_i
 
 local xmlns_component = 'jabber:component:accept';
 
---- Callbacks/data for xmlhandlers to handle streams for us ---
+--- Callbacks/data for xmppstream to handle streams for us ---
 
 local stream_callbacks = { default_ns = xmlns_component };
 
@@ -44,7 +45,7 @@ function stream_callbacks.error(session, error, data, data2)
                session:close("invalid-namespace");
        elseif error == "parse-error" then
                session.log("warn", "External component %s XML parse error: %s", tostring(session.host), tostring(data));
-               session:close("xml-not-well-formed");
+               session:close("not-well-formed");
        elseif error == "stream-error" then
                local condition, text = "undefined-condition";
                for child in data:children() do
@@ -164,51 +165,48 @@ local function session_close(session, reason)
 end
 
 --- Component connlistener
-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(conn, tostring(data)); end };
-               sessions[conn] = session;
-
-               -- Logging functions --
-               
-               local conn_name = "jcp"..tostring(conn):match("[a-f0-9]+$");
-               session.log = logger.init(conn_name);
-               session.close = session_close;
-               
-               session.log("info", "Incoming Jabber component connection");
-               
-               local parser = lxp.new(init_xmlhandlers(session, stream_callbacks), "\1");
-               session.parser = parser;
-               
+function component_listener.onconnect(conn)
+       local _send = conn.write;
+       local session = { type = "component", conn = conn, send = function (data) return _send(conn, tostring(data)); end };
+
+       -- Logging functions --
+       local conn_name = "jcp"..tostring(conn):match("[a-f0-9]+$");
+       session.log = logger.init(conn_name);
+       session.close = session_close;
+       
+       session.log("info", "Incoming Jabber component connection");
+       
+       local stream = new_xmpp_stream(session, stream_callbacks);
+       session.stream = stream;
+       
+       session.notopen = true;
+       
+       function session.reset_stream()
                session.notopen = true;
-               
-               function session.data(conn, data)
-                       local ok, err = parser:parse(data);
-                       if ok then return; end
-                       log("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "):gsub("[%z\1-\31]", "_"));
-                       session:close("xml-not-well-formed");
-               end
-               
-               session.dispatch_stanza = stream_callbacks.handlestanza;
-               
+               session.stream:reset();
        end
-       if data then
-               session.data(conn, data);
+
+       function session.data(conn, data)
+               local ok, err = stream:feed(data);
+               if ok then return; end
+               log("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "):gsub("[%z\1-\31]", "_"));
+               session:close("not-well-formed");
        end
-end
        
+       session.dispatch_stanza = stream_callbacks.handlestanza;
+
+       sessions[conn] = session;
+end
+function component_listener.onincoming(conn, data)
+       local session = sessions[conn];
+       session.data(conn, data);
+end
 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));
-               if hosts[session.host] then
-                       log("debug", "Deregistering component");
-                       cm_deregister_component(session.host);
-                       hosts[session.host].connected = nil;
-               end
-               sessions[conn]  = nil;
+               if session.on_destroy then session:on_destroy(err); end
+               sessions[conn] = nil;
                for k in pairs(session) do
                        if k ~= "log" and k ~= "close" then
                                session[k] = nil;