diff options
| author | Matthew Wild <mwild1@gmail.com> | 2008-10-03 22:18:08 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2008-10-03 22:18:08 +0100 |
| commit | 6c2578d43b71dfe93757e360d050de015ba455f5 (patch) | |
| tree | a91e170bc3d50e16c59e40e1a3e4c817997d97d1 /core/xmlhandlers.lua | |
| parent | 4ac420e3b0324843b9647aeeb908a65e4c5a8e2e (diff) | |
| download | prosody-6c2578d43b71dfe93757e360d050de015ba455f5.tar.gz prosody-6c2578d43b71dfe93757e360d050de015ba455f5.zip | |
Move stream opening handling from xmlhandlers to sessionmanager
Diffstat (limited to 'core/xmlhandlers.lua')
| -rw-r--r-- | core/xmlhandlers.lua | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/core/xmlhandlers.lua b/core/xmlhandlers.lua index b6050c5a..1ce7527d 100644 --- a/core/xmlhandlers.lua +++ b/core/xmlhandlers.lua @@ -1,4 +1,5 @@ +local sessionmanager_streamopened = require "core.sessionmanager".streamopened; require "util.stanza" local st = stanza; @@ -27,7 +28,6 @@ function init_xmlhandlers(session) local stanza function xml_handlers:StartElement(name, attr) - log("info", "xmlhandlers", "Start element: " .. name); if stanza and #chardata > 0 then -- We have some character data in the buffer stanza:text(t_concat(chardata)); @@ -37,24 +37,7 @@ function init_xmlhandlers(session) if not stanza then if session.notopen then if name == "stream" then - session.host = attr.to or error("Client failed to specify destination hostname"); - session.version = attr.version or 0; - session.streamid = m_random(1000000, 99999999); - print(session, session.host, "Client opened stream"); - send("<?xml version='1.0'?>"); - send(format("<stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams' id='%s' from='%s' version='1.0'>", session.streamid, session.host)); - send("<stream:features>"); - if not session.username then - send("<mechanisms xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>"); - send("<mechanism>PLAIN</mechanism>"); - send("</mechanisms>"); - else - send("<bind xmlns='urn:ietf:params:xml:ns:xmpp-bind'><required/></bind>"); - end - --send [[<register xmlns="http://jabber.org/features/iq-register"/> ]] - send("</stream:features>"); - log("info", "core", "Stream opened successfully"); - session.notopen = nil; + sessionmanager_streamopened(session, attr); return; end error("Client failed to open stream successfully"); |