Software / code / prosody
Changeset
970:5516f9e66482
sessionmanager, componentmanager: Fix some wacky indentation (thanks greyback!)
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 08 Apr 2009 23:20:22 +0100 |
| parents | 965:8bc06338aac3 |
| children | 971:dd736391bd41 |
| files | core/componentmanager.lua core/sessionmanager.lua |
| diffstat | 2 files changed, 25 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/core/componentmanager.lua Wed Apr 08 20:19:09 2009 +0100 +++ b/core/componentmanager.lua Wed Apr 08 23:20:22 2009 +0100 @@ -73,9 +73,9 @@ end function create_component(host, component) - -- TODO check for host well-formedness - local session = session or { type = "component", host = host, connected = true, s2sout = {}, send = component }; - return session; + -- TODO check for host well-formedness + local session = session or { type = "component", host = host, connected = true, s2sout = {}, send = component }; + return session; end function register_component(host, component, session)
--- a/core/sessionmanager.lua Wed Apr 08 20:19:09 2009 +0100 +++ b/core/sessionmanager.lua Wed Apr 08 23:20:22 2009 +0100 @@ -155,31 +155,29 @@ end function streamopened(session, attr) - local send = session.send; - session.host = attr.to or error("Client failed to specify destination hostname"); - session.host = nameprep(session.host); - session.version = tonumber(attr.version) or 0; - session.streamid = m_random(1000000, 99999999); - (session.log or session)("debug", "Client sent opening <stream:stream> to %s", session.host); - - - 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)); + local send = session.send; + session.host = attr.to or error("Client failed to specify destination hostname"); + session.host = nameprep(session.host); + session.version = tonumber(attr.version) or 0; + session.streamid = m_random(1000000, 99999999); + (session.log or session)("debug", "Client sent opening <stream:stream> to %s", session.host); + + 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)); + + if not hosts[session.host] then + -- We don't serve this host... + session:close{ condition = "host-unknown", text = "This server does not serve "..tostring(session.host)}; + return; + end - if not hosts[session.host] then - -- We don't serve this host... - session:close{ condition = "host-unknown", text = "This server does not serve "..tostring(session.host)}; - return; - end - - - local features = st.stanza("stream:features"); - fire_event("stream-features", session, features); - - send(features); - - (session.log or log)("info", "Sent reply <stream:stream> to client"); - session.notopen = nil; + local features = st.stanza("stream:features"); + fire_event("stream-features", session, features); + + send(features); + + (session.log or log)("info", "Sent reply <stream:stream> to client"); + session.notopen = nil; end function streamclosed(session)
