Merge from waqas

3 files changed, 27 insertions, 0 deletions

diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index 0a5ff0be..61c2dede 100644
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -33,6 +33,7 @@ local print = print;
 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 --git a/lxmppd.cfg.dist b/lxmppd.cfg.dist
index b523c697..59b85b97 100644
--- a/lxmppd.cfg.dist
+++ b/lxmppd.cfg.dist
@@ -26,5 +26,6 @@ config = {
 		"private";
 		"version";
 		"dialback";
+		"uptime";
 	};
 }
diff --git a/plugins/mod_uptime.lua b/plugins/mod_uptime.lua
new file mode 100644
index 00000000..55e5f168
--- /dev/null
+++ b/plugins/mod_uptime.lua
@@ -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);

+

+