Merge with backout

[prosody.git] / plugins / mod_ping.lua

diff --git a/plugins/mod_ping.lua b/plugins/mod_ping.lua
index 53a808cd1e95879056fe9d121190287d80c11279..61b717a211476773d47520a0a2ad5722e1dc5bce 100644 (file)
--- a/plugins/mod_ping.lua
+++ b/plugins/mod_ping.lua
@@ -1,31 +1,21 @@
--- 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
 
-\r
-local st = require "util.stanza";\r
-\r
-module:add_feature("urn:xmpp:ping");\r
-\r
-module:add_iq_handler({"c2s", "s2sin"}, "urn:xmpp:ping",\r
-       function(session, stanza)\r
-               if stanza.attr.type == "get" then\r
-                       session.send(st.reply(stanza));\r
-               end\r
-       end);\r
+module:hook("iq/bare/urn:xmpp:ping:ping", ping_handler);
+module:hook("iq/host/urn:xmpp:ping:ping", ping_handler);