Mercurial > lxmppd-hg-xmllex / file comparison
comparison: net/xmppclient_listener.lua
net/xmppclient_listener.lua
- changeset 2077
- e33658f6052c
- parent 1685
- f5e24a63d233
- child 2103
- 0737b167a997
- child 2167
- e41a6ea7fc0f
equal
deleted
inserted
replaced
| 2076:de2ae849b0b3 | 2077:e33658f6052c |
|---|---|
| 25 local sm_new_session, sm_destroy_session = sessionmanager.new_session, sessionmanager.destroy_session; | 25 local sm_new_session, sm_destroy_session = sessionmanager.new_session, sessionmanager.destroy_session; |
| 26 local sm_streamopened = sessionmanager.streamopened; | 26 local sm_streamopened = sessionmanager.streamopened; |
| 27 local sm_streamclosed = sessionmanager.streamclosed; | 27 local sm_streamclosed = sessionmanager.streamclosed; |
| 28 local st = require "util.stanza"; | 28 local st = require "util.stanza"; |
| 29 | 29 |
| 30 local stream_callbacks = { stream_tag = "http://etherx.jabber.org/streams|stream", | 30 local stream_callbacks = { stream_tag = "http://etherx.jabber.org/streams\1stream", |
| 31 default_ns = "jabber:client", | 31 default_ns = "jabber:client", |
| 32 streamopened = sm_streamopened, streamclosed = sm_streamclosed, handlestanza = core_process_stanza }; | 32 streamopened = sm_streamopened, streamclosed = sm_streamclosed, handlestanza = core_process_stanza }; |
| 33 | 33 |
| 34 function stream_callbacks.error(session, error, data) | 34 function stream_callbacks.error(session, error, data) |
| 35 if error == "no-stream" then | 35 if error == "no-stream" then |
| 51 | 51 |
| 52 -- These are session methods -- | 52 -- These are session methods -- |
| 53 | 53 |
| 54 local function session_reset_stream(session) | 54 local function session_reset_stream(session) |
| 55 -- Reset stream | 55 -- Reset stream |
| 56 local parser = lxp.new(init_xmlhandlers(session, stream_callbacks), "|"); | 56 local parser = lxp.new(init_xmlhandlers(session, stream_callbacks), "\1"); |
| 57 session.parser = parser; | 57 session.parser = parser; |
| 58 | 58 |
| 59 session.notopen = true; | 59 session.notopen = true; |
| 60 | 60 |
| 61 function session.data(conn, data) | 61 function session.data(conn, data) |
| 68 return true; | 68 return true; |
| 69 end | 69 end |
| 70 | 70 |
| 71 | 71 |
| 72 local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'}; | 72 local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'}; |
| 73 local default_stream_attr = { ["xmlns:stream"] = stream_callbacks.stream_tag:gsub("%|[^|]+$", ""), xmlns = stream_callbacks.default_ns, version = "1.0", id = "" }; | 73 local default_stream_attr = { ["xmlns:stream"] = stream_callbacks.stream_tag:match("[^\1]*"), xmlns = stream_callbacks.default_ns, version = "1.0", id = "" }; |
| 74 local function session_close(session, reason) | 74 local function session_close(session, reason) |
| 75 local log = session.log or log; | 75 local log = session.log or log; |
| 76 if session.conn then | 76 if session.conn then |
| 77 if session.notopen then | 77 if session.notopen then |
| 78 session.send("<?xml version='1.0'?>"); | 78 session.send("<?xml version='1.0'?>"); |
