# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1261529975 0
# Node ID 1a1bd8cd4bdb78243c5b49744b7f4f0654d07047
# Parent  afd037420977c9bc0fea7e3c0450f81848c93013
plugins.ping: Don't handle all errors as successful pongs, call callback with nil time and 3rd parameter a table with error info

diff -r afd037420977 -r 1a1bd8cd4bdb plugins/ping.lua
--- a/plugins/ping.lua	Tue Dec 22 01:57:02 2009 +0000
+++ b/plugins/ping.lua	Wed Dec 23 00:59:35 2009 +0000
@@ -1,3 +1,4 @@
+require "util.xstanza";
 
 local xmlns_ping = "urn:xmpp:ping";
 
@@ -6,6 +7,13 @@
 		local t = socket.gettime();
 		stream:send_iq(verse.iq{ to = jid, type = "get" }:tag("ping", { xmlns = xmlns_ping }), 
 			function (reply)
+				if reply.attr.type == "error" then
+					local type, condition, text = reply:get_error();
+					if condition ~= "service-unavailable" and condition ~= "feature-not-implemented" then
+						callback(nil, jid, { type = type, condition = condition, text = text });
+						return;
+					end
+				end
 				callback(socket.gettime()-t, jid);
 			end);
 	end