Merge from waqas

diff --git a/plugins/mod_ping.lua b/plugins/mod_ping.lua
new file mode 100644 (file)
index 0000000..c13282f
--- /dev/null
+++ b/plugins/mod_ping.lua
@@ -0,0 +1,11 @@
+\r
+local st = require "util.stanza";\r
+\r
+require "core.discomanager".set("ping", "urn:xmpp:ping");\r
+\r
+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

diff --git a/plugins/mod_selftests.lua b/plugins/mod_selftests.lua
index 4f12850479582e83c771c3f6f5660baabd427107..8aa70952dc68345ee24415bf296272f77c96ab8e 100644 (file)
--- a/plugins/mod_selftests.lua
+++ b/plugins/mod_selftests.lua
@@ -4,7 +4,7 @@ local register_component = require "core.componentmanager".register_component;
 local core_route_stanza = core_route_stanza;
 local socket = require "socket";
 local config = require "core.configmanager";
-local ping_hosts = config.get("*", "mod_selftests", "ping_hosts") or { "jabber.org" };
+local ping_hosts = config.get("*", "mod_selftests", "ping_hosts") or { "coversant.interop.xmpp.org", "djabberd.interop.xmpp.org", "djabberd-trunk.interop.xmpp.org", "ejabberd.interop.xmpp.org", "openfire.interop.xmpp.org" };
 
 local open_pings = {};
 

diff --git a/util/mod_ping.lua b/util/mod_ping.lua
deleted file mode 100644 (file)
index c13282f..0000000
--- a/util/mod_ping.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-\r
-local st = require "util.stanza";\r
-\r
-require "core.discomanager".set("ping", "urn:xmpp:ping");\r
-\r
-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