]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
daemon/defer: change address mismatch assert to warning docs-develop-defe-x6j6qe/deployments/5822
authorLukáš Ondráček <lukas.ondracek@nic.cz>
Mon, 2 Dec 2024 17:00:27 +0000 (18:00 +0100)
committerLukáš Ondráček <lukas.ondracek@nic.cz>
Mon, 2 Dec 2024 17:05:19 +0000 (18:05 +0100)
daemon/defer.h

index b0a94fb5053db3ab38bfa264c5271def3aead71e..5a26faa67b6045070ac9d92ade498e2cf9af4e60 100644 (file)
@@ -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) {