diff -r caf260adc453 -r 7c8d0a2fc004 client.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client.lua Tue Aug 04 18:25:56 2009 +0100 @@ -0,0 +1,56 @@ +local verse = require "verse2"; +local stream = verse.stream_mt; + +local jid_split = require "jid".split; +local lxp = require "lxp"; +local st = require "util.stanza"; +local init_xmlhandlers = require "xmlhandlers"; + + +local stream_callbacks = { stream_tag = "http://etherx.jabber.org/streams|stream", + default_ns = "jabber:client" }; + +function stream_callbacks.streamopened(stream, attr) + if not stream:event("opened") then + stream.notopen = nil; + end + return true; +end + +function stream_callbacks.streamclosed(stream) + return stream:event("closed"); +end + +function stream_callbacks.handlestanza(stream, stanza) + return stream:event("stanza", stanza); +end + +local function reset_stream(stream) + -- Reset stream + local parser = lxp.new(init_xmlhandlers(stream, stream_callbacks), "|"); + stream.parser = parser; + + stream.notopen = true; + + function stream.data(conn, data) + local ok, err = parser:parse(data); + if ok then return; end + stream:debug("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " ")); + stream:close("xml-not-well-formed"); + end + + return true; +end + +function stream:connect_client(jid, pass) + self.jid, self.password = jid, pass; + self.username, self.host, self.resource = jid_split(jid); + + reset_stream(self); + self:hook("incoming-raw", function (data) return self.data(self.conn, data); end); + + -- Initialise connection + self:connect(self.connect_host or self.host, self.connect_port or 5222); + self:send(st.stanza("stream:stream", { to = self.host, ["xmlns:stream"]='http://etherx.jabber.org/streams' }):top_tag()); +end +