diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/connlisteners.lua | 1 | ||||
| -rw-r--r-- | net/xmppclient_listener.lua | 2 | ||||
| -rw-r--r-- | net/xmppserver_listener.lua | 95 |
3 files changed, 96 insertions, 2 deletions
diff --git a/net/connlisteners.lua b/net/connlisteners.lua index f7321cdc..431d8717 100644 --- a/net/connlisteners.lua +++ b/net/connlisteners.lua @@ -28,7 +28,6 @@ function get(name) if not h then pcall(dofile, "net/"..name:gsub("[^%w%-]", "_").."_listener.lua"); h = listeners[name]; - end return h; end diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua index e722e55b..068557c8 100644 --- a/net/xmppclient_listener.lua +++ b/net/xmppclient_listener.lua @@ -22,7 +22,7 @@ local xmppclient = { default_port = 5222 }; local function session_reset_stream(session) -- Reset stream - local parser = lxp.new(init_xmlhandlers(session, sm_streamopened), ":"); + local parser = lxp.new(init_xmlhandlers(session, sm_streamopened), "|"); session.parser = parser; session.notopen = true; diff --git a/net/xmppserver_listener.lua b/net/xmppserver_listener.lua new file mode 100644 index 00000000..7c5b0d9c --- /dev/null +++ b/net/xmppserver_listener.lua @@ -0,0 +1,95 @@ + +local logger = require "logger"; +local lxp = require "lxp" +local init_xmlhandlers = require "core.xmlhandlers" +local sm_new_session = require "core.sessionmanager".new_session; +local s2s_new_incoming = require "core.s2smanager".new_incoming; +local s2s_streamopened = require "core.s2smanager".streamopened; + +local connlisteners_register = require "net.connlisteners".register; + +local t_insert = table.insert; +local t_concat = table.concat; +local t_concatall = function (t, sep) local tt = {}; for _, s in ipairs(t) do t_insert(tt, tostring(s)); end return t_concat(tt, sep); end +local m_random = math.random; +local format = string.format; +local sm_new_session, sm_destroy_session = sessionmanager.new_session, sessionmanager.destroy_session; --import("core.sessionmanager", "new_session", "destroy_session"); +local st = stanza; + +local sessions = {}; +local xmppserver = { default_port = 5269 }; + +-- These are session methods -- + +local function session_reset_stream(session) + -- Reset stream + local parser = lxp.new(init_xmlhandlers(session, s2s_streamopened), "|"); + session.parser = parser; + + session.notopen = true; + + function session.data(conn, data) + parser:parse(data); + end + return true; +end + +-- End of session methods -- + +function xmppserver.listener(conn, data) + local session = sessions[conn]; + if not session then + session = s2s_new_incoming(conn); + sessions[conn] = session; + + -- Logging functions -- + + local mainlog, log = log; + do + local conn_name = "s2sin"..tostring(conn):match("[a-f0-9]+$"); + log = logger.init(conn_name); + end + local print = function (...) log("info", t_concatall({...}, "\t")); end + session.log = log; + + print("Incoming s2s connection"); + + session.reset_stream = session_reset_stream; + + session_reset_stream(session); -- Initialise, ready for use + + -- FIXME: Below function should be session,stanza - and xmlhandlers should use :method() notation to call, + -- this will avoid the useless indirection we have atm + -- (I'm on a mission, no time to fix now) + session.stanza_dispatch = function (stanza) return core_process_stanza(session, stanza); end + + end + if data then + session.data(conn, data); + end +end + +function xmppserver.disconnect(conn) +end + +function xmppserver.register_outgoing(conn, session) + session.direction = "outgoing"; + sessions[conn] = session; + + session.reset_stream = session_reset_stream; + session_reset_stream(session); -- Initialise, ready for use + + -- FIXME: Below function should be session,stanza - and xmlhandlers should use :method() notation to call, + -- this will avoid the useless indirection we have atm + -- (I'm on a mission, no time to fix now) + session.stanza_dispatch = function (stanza) return core_process_stanza(session, stanza); end +end + +connlisteners_register("xmppserver", xmppserver); + + +-- We need to perform some initialisation when a connection is created +-- We also need to perform that same initialisation at other points (SASL, TLS, ...) + +-- ...and we need to handle data +-- ...and record all sessions associated with connections
\ No newline at end of file |