# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1226267281 0
# Node ID eb4ac201aad20d0a38b28998787d4cc6f3abf9c5
# Parent  23585c323daad9f3642d0d94e76acdfdfeb54e85# Parent  6526df1a727707b16a3c4caa584917a22892c61d
Merge from waqas

diff -r 23585c323daa -r eb4ac201aad2 core/stanza_router.lua
--- a/core/stanza_router.lua	Sun Nov 09 21:46:42 2008 +0000
+++ b/core/stanza_router.lua	Sun Nov 09 21:48:01 2008 +0000
@@ -33,6 +33,7 @@
 function core_process_stanza(origin, stanza)
 	log("debug", "Received["..origin.type.."]: "..tostring(st.reply(st.reply(stanza))))
 
+	if not stanza.attr.xmlns then stanza.attr.xmlns = "jabber:client"; end -- FIXME Hack. This should be removed when we fix namespace handling.
 	-- TODO verify validity of stanza (as well as JID validity)
 	if stanza.name == "iq" and not(#stanza.tags == 1 and stanza.tags[1].attr.xmlns) then
 		if stanza.attr.type == "set" or stanza.attr.type == "get" then
diff -r 23585c323daa -r eb4ac201aad2 lxmppd.cfg.dist
--- a/lxmppd.cfg.dist	Sun Nov 09 21:46:42 2008 +0000
+++ b/lxmppd.cfg.dist	Sun Nov 09 21:48:01 2008 +0000
@@ -26,5 +26,6 @@
 		"private";
 		"version";
 		"dialback";
+		"uptime";
 	};
 }
diff -r 23585c323daa -r eb4ac201aad2 plugins/mod_uptime.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/mod_uptime.lua	Sun Nov 09 21:48:01 2008 +0000
@@ -0,0 +1,25 @@
+
+local st = require "util.stanza"
+local send = require "core.sessionmanager".send_to_session
+
+local jid_split = require "util.jid".split;
+local t_concat = table.concat;
+
+local start_time = os.time();
+
+add_iq_handler({"c2s", "s2sin"}, "jabber:iq:last", 
+	function (origin, stanza)
+		if stanza.tags[1].name == "query" then
+			if stanza.attr.type == "get" then
+				local node, host, resource = jid_split(stanza.attr.to);
+				if node or resource then
+					-- TODO
+				else
+					origin.send(st.reply(stanza):tag("query", {xmlns = "jabber:iq:last", seconds = tostring(os.difftime(os.time(), start_time))}));
+					return true;
+				end
+			end
+		end
+	end);
+
+