X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_ping.lua;h=0bfcac667d96e332573c7a4be1efb38a46f0f37b;hb=refs%2Fheads%2Fnohangouts-0.8.2;hp=53a808cd1e95879056fe9d121190287d80c11279;hpb=5466de23f56d2121e384f47fe14f32b4ff5ed587;p=prosody.git

diff --git a/plugins/mod_ping.lua b/plugins/mod_ping.lua
index 53a808cd..0bfcac66 100644
--- a/plugins/mod_ping.lua
+++ b/plugins/mod_ping.lua
@@ -1,31 +1,35 @@
--- Prosody IM v0.2
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
+-- Prosody IM
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
--- This program is free software; you can redistribute it and/or
--- modify it under the terms of the GNU General Public License
--- as published by the Free Software Foundation; either version 2
--- of the License, or (at your option) any later version.
--- 
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
--- 
--- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
--- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
 --
 
+local st = require "util.stanza";
+
+module:add_feature("urn:xmpp:ping");
+
+local function ping_handler(event)
+	if event.stanza.attr.type == "get" then
+		event.origin.send(st.reply(event.stanza));
+		return true;
+	end
+end
+
+module:hook("iq/bare/urn:xmpp:ping:ping", ping_handler);
+module:hook("iq/host/urn:xmpp:ping:ping", ping_handler);
+
+-- Ad-hoc command
+
+local datetime = require "util.datetime".datetime;
+
+function ping_command_handler (self, data, state)
+	local now = datetime();
+	return { info = "Pong\n"..now, status = "completed" };
+end
+
+local adhoc_new = module:require "adhoc".new;
+local descriptor = adhoc_new("Ping", "ping", ping_command_handler);
+module:add_item ("adhoc", descriptor);
 
-
-local st = require "util.stanza";
-
-module:add_feature("urn:xmpp:ping");
-
-module:add_iq_handler({"c2s", "s2sin"}, "urn:xmpp:ping",
-	function(session, stanza)
-		if stanza.attr.type == "get" then
-			session.send(st.reply(stanza));
-		end
-	end);