Changeset

430:f9b43bb9d807

Merge from waqas
author Matthew Wild <mwild1@gmail.com>
date Wed, 26 Nov 2008 21:49:17 +0000
parents 428:e717ecc97d2e (diff) 429:b1d86f89fa27 (current diff)
children 431:3c89a073db53
files
diffstat 3 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/mod_ping.lua	Wed Nov 26 21:49:17 2008 +0000
@@ -0,0 +1,11 @@
+
+local st = require "util.stanza";
+
+require "core.discomanager".set("ping", "urn:xmpp:ping");
+
+add_iq_handler({"c2s", "s2sin"}, "urn:xmpp:ping",
+	function(session, stanza)
+		if stanza.attr.type == "get" then
+			session.send(st.reply(stanza));
+		end
+	end);
--- a/plugins/mod_selftests.lua	Thu Nov 27 02:48:08 2008 +0500
+++ b/plugins/mod_selftests.lua	Wed Nov 26 21:49:17 2008 +0000
@@ -4,7 +4,7 @@
 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 = {};
 
--- a/util/mod_ping.lua	Thu Nov 27 02:48:08 2008 +0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-
-local st = require "util.stanza";
-
-require "core.discomanager".set("ping", "urn:xmpp:ping");
-
-add_iq_handler({"c2s", "s2sin"}, "urn:xmpp:ping",
-	function(session, stanza)
-		if stanza.attr.type == "get" then
-			session.send(st.reply(stanza));
-		end
-	end);