From ee7b432ab1d450a42fae24b37c79b7fbda7f4e6b Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Wed, 22 Oct 2008 17:36:21 +0100 Subject: Abstract connections with "connection listeners" - Added connlistener for xmppclient - SASL/TLS now use a new session:reset_stream() method - main.lua on its way to being a bit neater --- net/xmppclient_listener.lua | 74 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 net/xmppclient_listener.lua (limited to 'net/xmppclient_listener.lua') diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua new file mode 100644 index 00000000..7d5b3abe --- /dev/null +++ b/net/xmppclient_listener.lua @@ -0,0 +1,74 @@ + +local logger = require "logger"; +local lxp = require "lxp" +local init_xmlhandlers = require "core.xmlhandlers" +local sm_new_session = require "core.sessionmanager".new_session; + +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 sm_streamopened = sessionmanager.streamopened; +local st = stanza; + +local sessions = {}; +local xmppclient = { default_port = 5222 }; + +-- These are session methods -- + +local function session_reset_stream(session) + -- Reset stream + local parser = lxp.new(init_xmlhandlers(session, sm_streamopened), ":"); + session.parser = parser; + + session.notopen = true; + + function session.data(conn, data) + parser:parse(data); + end + return true; +end + +-- End of session methods -- + +function xmppclient.listener(conn, data) + local session = sessions[conn]; + if not session then + session = sm_new_session(conn); + sessions[conn] = session; + + -- Logging functions -- + + local mainlog, log = log; + do + local conn_name = 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("Client connected"); + + session.reset_stream = session_reset_stream; + + session_reset_stream(session); -- Initialise, ready for use + + -- TODO: 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 xmppclient.disconnect(conn) +end + +connlisteners_register("xmppclient", xmppclient); -- cgit v1.2.3