Mercurial > lxmppd-hg-xmllex / file comparison
comparison: net/xmppclient_listener.lua
net/xmppclient_listener.lua
- changeset 403
- da92afa267cf
- parent 333
- 8d15b073fdbe
- child 451
- e9f269e5204e
equal
deleted
inserted
replaced
| 402:50f1c09541cd | 403:da92afa267cf |
|---|---|
| 11 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 | 11 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 |
| 12 local m_random = math.random; | 12 local m_random = math.random; |
| 13 local format = string.format; | 13 local format = string.format; |
| 14 local sm_new_session, sm_destroy_session = sessionmanager.new_session, sessionmanager.destroy_session; --import("core.sessionmanager", "new_session", "destroy_session"); | 14 local sm_new_session, sm_destroy_session = sessionmanager.new_session, sessionmanager.destroy_session; --import("core.sessionmanager", "new_session", "destroy_session"); |
| 15 local sm_streamopened = sessionmanager.streamopened; | 15 local sm_streamopened = sessionmanager.streamopened; |
| 16 local sm_streamclosed = sessionmanager.streamclosed; | |
| 16 local st = stanza; | 17 local st = stanza; |
| 18 | |
| 19 local stream_callbacks = { streamopened = sm_streamopened, streamclosed = sm_streamclosed }; | |
| 17 | 20 |
| 18 local sessions = {}; | 21 local sessions = {}; |
| 19 local xmppclient = { default_port = 5222 }; | 22 local xmppclient = { default_port = 5222 }; |
| 20 | 23 |
| 21 -- These are session methods -- | 24 -- These are session methods -- |
| 22 | 25 |
| 23 local function session_reset_stream(session) | 26 local function session_reset_stream(session) |
| 24 -- Reset stream | 27 -- Reset stream |
| 25 local parser = lxp.new(init_xmlhandlers(session, sm_streamopened), "|"); | 28 local parser = lxp.new(init_xmlhandlers(session, stream_callbacks), "|"); |
| 26 session.parser = parser; | 29 session.parser = parser; |
| 27 | 30 |
| 28 session.notopen = true; | 31 session.notopen = true; |
| 29 | 32 |
| 30 function session.data(conn, data) | 33 function session.data(conn, data) |
| 31 parser:parse(data); | 34 parser:parse(data); |
| 32 end | 35 end |
| 33 return true; | 36 return true; |
| 34 end | 37 end |
| 38 | |
| 39 | |
| 40 local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'}; | |
| 41 local function session_close(session, reason) | |
| 42 local log = session.log or log; | |
| 43 if session.conn then | |
| 44 if reason then | |
| 45 if type(reason) == "string" then -- assume stream error | |
| 46 log("info", "Disconnecting client, <stream:error> is: %s", reason); | |
| 47 session.send(st.stanza("stream:error"):tag(reason, {xmlns = 'urn:ietf:params:xml:ns:xmpp-streams' })); | |
| 48 elseif type(reason) == "table" then | |
| 49 if reason.condition then | |
| 50 local stanza = st.stanza("stream:error"):tag(reason.condition, stream_xmlns_attr):up(); | |
| 51 if reason.text then | |
| 52 stanza:tag("text", stream_xmlns_attr):text(reason.text):up(); | |
| 53 end | |
| 54 if reason.extra then | |
| 55 stanza:add_child(reason.extra); | |
| 56 end | |
| 57 log("info", "Disconnecting client, <stream:error> is: %s", tostring(stanza)); | |
| 58 session.send(stanza); | |
| 59 elseif reason.name then -- a stanza | |
| 60 log("info", "Disconnecting client, <stream:error> is: %s", tostring(reason)); | |
| 61 session.send(reason); | |
| 62 end | |
| 63 end | |
| 64 end | |
| 65 session.send("</stream:stream>"); | |
| 66 session.conn.close(); | |
| 67 xmppclient.disconnect(session.conn, "stream error"); | |
| 68 end | |
| 69 end | |
| 70 | |
| 35 | 71 |
| 36 -- End of session methods -- | 72 -- End of session methods -- |
| 37 | 73 |
| 38 function xmppclient.listener(conn, data) | 74 function xmppclient.listener(conn, data) |
| 39 local session = sessions[conn]; | 75 local session = sessions[conn]; |
| 52 session.log = log; | 88 session.log = log; |
| 53 | 89 |
| 54 print("Client connected"); | 90 print("Client connected"); |
| 55 | 91 |
| 56 session.reset_stream = session_reset_stream; | 92 session.reset_stream = session_reset_stream; |
| 93 session.close = session_close; | |
| 57 | 94 |
| 58 session_reset_stream(session); -- Initialise, ready for use | 95 session_reset_stream(session); -- Initialise, ready for use |
| 59 | 96 |
| 60 -- TODO: Below function should be session,stanza - and xmlhandlers should use :method() notation to call, | 97 -- TODO: Below function should be session,stanza - and xmlhandlers should use :method() notation to call, |
| 61 -- this will avoid the useless indirection we have atm | 98 -- this will avoid the useless indirection we have atm |
| 62 -- (I'm on a mission, no time to fix now) | 99 -- (I'm on a mission, no time to fix now) |
| 63 | 100 |
| 64 -- Debug version -- | 101 -- Debug version -- |
| 65 local function handleerr(err) print("Traceback:", err, debug.traceback()); end | 102 local function handleerr(err) print("Traceback:", err, debug.traceback()); end |
| 66 session.stanza_dispatch = function (stanza) return select(2, xpcall(function () return core_process_stanza(session, stanza); end, handleerr)); end | 103 session.stanza_dispatch = function (stanza) return select(2, xpcall(function () return core_process_stanza(session, stanza); end, handleerr)); end |
| 67 | |
| 68 -- session.stanza_dispatch = function (stanza) return core_process_stanza(session, stanza); end | |
| 69 | |
| 70 end | 104 end |
| 71 if data then | 105 if data then |
| 72 session.data(conn, data); | 106 session.data(conn, data); |
| 73 end | 107 end |
| 74 end | 108 end |
| 75 | 109 |
| 76 function xmppclient.disconnect(conn, err) | 110 function xmppclient.disconnect(conn, err) |
| 77 local session = sessions[conn]; | 111 local session = sessions[conn]; |
| 78 if session then | 112 if session then |
| 79 if session.presence and session.presence.attr.type ~= "unavailable" then | |
| 80 local pres = st.presence{ type = "unavailable" }; | |
| 81 if err == "closed" then err = "connection closed"; end | |
| 82 pres:tag("status"):text("Disconnected: "..err); | |
| 83 session.stanza_dispatch(pres); | |
| 84 end | |
| 85 (session.log or log)("info", "Client disconnected: %s", err); | 113 (session.log or log)("info", "Client disconnected: %s", err); |
| 86 sm_destroy_session(session); | 114 sm_destroy_session(session); |
| 87 sessions[conn] = nil; | 115 sessions[conn] = nil; |
| 88 session = nil; | 116 session = nil; |
| 89 collectgarbage("collect"); | 117 collectgarbage("collect"); |
