From: Charles-Henri Bruyand <charles-henri.bruyand@open-xchange.com>
Date: Thu, 13 Mar 2025 12:26:57 +0000 (+0100)
Subject: dnsdist: protobuf, also set outgoingQueries field
X-Git-Tag: dnsdist-2.0.0-alpha1~12^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03cfe483e79b2225255dd31b6cf7df78b6e8d31d;p=thirdparty%2Fpdns.git

dnsdist: protobuf, also set outgoingQueries field
---

diff --git a/pdns/dnsdistdist/dnsdist-protobuf.cc b/pdns/dnsdistdist/dnsdist-protobuf.cc
index 88824c70fb..6c4c5092d9 100644
--- a/pdns/dnsdistdist/dnsdist-protobuf.cc
+++ b/pdns/dnsdistdist/dnsdist-protobuf.cc
@@ -182,6 +182,7 @@ void DNSDistProtoBufMessage::serialize(std::string& data) const
 
   if (d_dr != nullptr) {
     msg.setPacketCacheHit(d_dr->ids.cacheHit);
+    msg.setOutgoingQueries((d_dr->ids.cacheHit || d_dr->ids.selfGenerated) ? 0 : 1);
   }
   msg.startResponse();
   if (d_queryTime) {
diff --git a/regression-tests.dnsdist/test_Protobuf.py b/regression-tests.dnsdist/test_Protobuf.py
index 8c255d114a..77cc97d941 100644
--- a/regression-tests.dnsdist/test_Protobuf.py
+++ b/regression-tests.dnsdist/test_Protobuf.py
@@ -591,6 +591,8 @@ class TestProtobufCacheHit(DNSDistProtobufTest):
         self.checkProtobufResponse(msg, dnsmessage_pb2.PBDNSMessage.UDP, response)
         self.assertTrue(msg.HasField('packetCacheHit'))
         self.assertFalse(msg.packetCacheHit)
+        self.assertTrue(msg.HasField('outgoingQueries'))
+        self.assertEqual(msg.outgoingQueries, 1)
 
         # now shoud be a cache hit
         (_, receivedResponse) = self.sendUDPQuery(query, response)
@@ -606,6 +608,8 @@ class TestProtobufCacheHit(DNSDistProtobufTest):
         self.checkProtobufResponse(msg, dnsmessage_pb2.PBDNSMessage.UDP, response)
         self.assertTrue(msg.HasField('packetCacheHit'))
         self.assertTrue(msg.packetCacheHit)
+        self.assertTrue(msg.HasField('outgoingQueries'))
+        self.assertEqual(msg.outgoingQueries, 0)
 
 class TestProtobufMetaDOH(DNSDistProtobufTest):