Diff

util/xmppstream.lua @ 6068:175590cc7b07

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 10 Apr 2014 13:16:54 +0200
parent 6063:e626ee2fe106
child 6084:3c02a9ed399e
line wrap: on
line diff
--- a/util/xmppstream.lua	Thu Apr 03 23:54:58 2014 +0200
+++ b/util/xmppstream.lua	Thu Apr 10 13:16:54 2014 +0200
@@ -241,6 +241,22 @@
 	local parser = new_parser(handlers, ns_separator, false);
 	local parse = parser.parse;
 
+	function session.open_stream(session, from, to)
+		local send = session.sends2s or session.send;
+
+		local attr = {
+			["xmlns:stream"] = "http://etherx.jabber.org/streams",
+			["xml:lang"] = "en",
+			xmlns = stream_callbacks.default_ns,
+			version = session.version and (session.version > 0 and "1.0" or nil),
+			id = session.streamid or "",
+			from = from or session.host, to = to,
+		};
+		send("<?xml version='1.0'?>");
+		send(st.stanza("stream:stream", attr):top_tag());
+		return true;
+	end
+
 	return {
 		reset = function ()
 			parser = new_parser(handlers, ns_separator, false);