# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1602691330 -7200
# Node ID c4002aae4ad3a989c7eb67b04c4a904325fcb259
# Parent  af93644dd5de848d6c51f9c49011b77443bd2a60
mod_s2s_keepalive: Use timestamp as iq @id

RFC 6120 implies that the id attribute must be unique within a stream.

This should fix problems with remote servers that enforce uniqueness and
don't answer duplicated ids.

If it doesn't do that, then at least you can get a guesstimate at
round-trip time from the difference between the result iq stanza and the
timestamp it was logged without having to go look for when it was sent,
or needing to keep state.

diff -r af93644dd5de -r c4002aae4ad3 mod_s2s_keepalive/mod_s2s_keepalive.lua
--- a/mod_s2s_keepalive/mod_s2s_keepalive.lua	Wed Oct 14 17:58:22 2020 +0200
+++ b/mod_s2s_keepalive/mod_s2s_keepalive.lua	Wed Oct 14 18:02:10 2020 +0200
@@ -1,5 +1,6 @@
 local st = require "util.stanza";
 local watchdog = require "util.watchdog";
+local dt = require "util.datetime";
 
 local keepalive_servers = module:get_option_set("keepalive_servers");
 local keepalive_interval = module:get_option_number("keepalive_interval", 60);
@@ -14,7 +15,7 @@
 	for remote_domain, session in pairs(s2sout) do
 		if session.type ~= "s2sout_unauthed"
 		and (not(keepalive_servers) or keepalive_servers:contains(remote_domain)) then
-			session.sends2s(st.iq({ to = remote_domain, type = "get", from = host, id = "keepalive" })
+			session.sends2s(st.iq({ to = remote_domain, type = "get", from = host, id = "keepalive:"..dt.timestamp()})
 				:tag("ping", { xmlns = "urn:xmpp:ping" })
 			);
 		end
@@ -32,7 +33,7 @@
 
 	-- ping remotes we only have s2sin from
 	for remote_domain in pairs(ping_hosts) do
-		module:send(st.iq({ to = remote_domain, type = "get", from = host, id = "keepalive" })
+		module:send(st.iq({ to = remote_domain, type = "get", from = host, id = "keepalive:"..dt.timestamp() })
 			:tag("ping", { xmlns = "urn:xmpp:ping" })
 		);
 	end
@@ -60,7 +61,12 @@
 	end);
 end);
 
-module:hook("iq-result/host/keepalive", function (event)
+module:hook("iq-result/host", function (event)
+	local stanza = event.stanza;
+	if not (stanza.attr.id and stanza.attr.id:sub(1, #"keepalive:") == "keepalive:") then
+		return -- not a reply to this module
+	end
+
 	local origin = event.origin;
 	if origin.watchdog_keepalive then
 		origin.watchdog_keepalive:reset();
@@ -71,14 +77,19 @@
 	return true;
 end);
 
-module:hook("iq-error/host/keepalive", function (event)
+module:hook("iq-error/host", function (event)
 	local origin = event.origin;
 	if origin.dummy then return end -- Probably a sendq bounce
 
+	local stanza = event.stanza;
+	if not (stanza.attr.id and stanza.attr.id:sub(1, #"keepalive:") == "keepalive:") then
+		return -- not a reply to this module
+	end
+
 	if origin.type == "s2sin" or origin.type == "s2sout" then
 		-- An error from the remote means connectivity is ok,
 		-- so treat it the same as a result
-		return module:fire_event("iq-result/host/keepalive", event);
+		return module:fire_event("iq-result/host", event);
 	end
 end);