From: Lukáš Ondráček <lukas.ondracek@nic.cz>
Date: Mon, 2 Dec 2024 17:00:27 +0000 (+0100)
Subject: daemon/defer: change address mismatch assert to warning
X-Git-Tag: v6.0.10~6^2~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4352943d02d186736348e69a1a2ae5a24219f1e7;p=thirdparty%2Fknot-resolver.git

daemon/defer: change address mismatch assert to warning
---

diff --git a/daemon/defer.h b/daemon/defer.h
index b0a94fb50..5a26faa67 100644
--- a/daemon/defer.h
+++ b/daemon/defer.h
@@ -50,14 +50,14 @@ static inline void defer_sample_addr(const union kr_sockaddr *addr, bool stream)
 
 	if (defer_sample_state.addr.ip.sa_family != AF_UNSPEC) {
 		// TODO: this costs performance, so only in some debug mode?
-		if (kr_fails_assert(kr_sockaddr_cmp(&addr->ip, &defer_sample_state.addr.ip) == kr_ok())) {
-			kr_log_error(DEFER, "%s != %s\n",
+		if (kr_sockaddr_cmp(&addr->ip, &defer_sample_state.addr.ip) != kr_ok()) {
+			char defer_addr[KR_STRADDR_MAXLEN + 1] = { 0 };
+			strncpy(defer_addr, kr_straddr(&defer_sample_state.addr.ip), sizeof(defer_addr) - 1);
+			kr_log_warning(DEFER, "Sampling address mismatch: %s != %s\n",
 				kr_straddr(&addr->ip),
-				kr_straddr(&defer_sample_state.addr.ip));
-			abort(); // TODO change this to warning or remove before releasing
+				defer_addr);
 			return;
 		}
-
 	}
 
 	switch (addr->ip.sa_family) {