Software / code / prosody
Changeset
236:eb4ac201aad2
Merge from waqas
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 09 Nov 2008 21:48:01 +0000 |
| parents | 233:23585c323daa (current diff) 235:6526df1a7277 (diff) |
| children | 238:a8e0d0faade3 |
| files | |
| diffstat | 3 files changed, 27 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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"; }; }
--- /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); + +
