dnsdist: Handle cross-protocol I/O errors for DoQ queries

diff --git a/pdns/dnsdistdist/doq.cc b/pdns/dnsdistdist/doq.cc
index a90d90e5e1df83e57b302df035a96ac5a868f693..894a99deda85a0727634c72a596f3a53a9f353d4 100644 (file)
--- a/pdns/dnsdistdist/doq.cc
+++ b/pdns/dnsdistdist/doq.cc
@@ -193,8 +193,21 @@ public:
     return handleResponse(now, std::move(response));
   }
 
-  void notifyIOError(const struct timeval& now, TCPResponse&& response) override
+  void notifyIOError([[maybe_unused]] const struct timeval& now, TCPResponse&& response) override
   {
+    if (!response.d_idstate.doqu) {
+      return;
+    }
+
+    auto unit = std::move(response.d_idstate.doqu);
+    if (unit->dsc == nullptr) {
+      return;
+    }
+
+    /* this will signal an error */
+    unit->response.clear();
+    unit->ids = std::move(response.d_idstate);
+    sendBackDOQUnit(std::move(unit), "Cross-protocol error");
   }
 };