From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Tue, 22 Jul 2025 10:11:48 +0000 (+0200)
Subject: rec: add a reserved/alignment byte in EDNS record
X-Git-Tag: rec-5.4.0-alpha0^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F15888%2Fhead;p=thirdparty%2Fpdns.git

rec: add a reserved/alignment byte in EDNS record

Signed-off-by: Otto Moerbeek <otto.moerbeek@open-xchange.com>
---

diff --git a/pdns/protozero-trace.hh b/pdns/protozero-trace.hh
index a66328655..a915dc331 100644
--- a/pdns/protozero-trace.hh
+++ b/pdns/protozero-trace.hh
@@ -714,11 +714,11 @@ inline KeyValueList KeyValueList::decode(protozero::pbf_reader& reader)
 
 struct EDNSOTTraceRecord
 {
-  // 1 byte version 16 bytes traceid, optional 8 bytes spanid
-  static constexpr size_t fullSize = 1 + 16 + 8;
-  static constexpr size_t sizeNoSpanID = 1 + 16;
-  static constexpr size_t traceIDOffset = 1;
-  static constexpr size_t spanIDOffset = 1 + 16;
+  // 1 byte version, 1 byte reserved/alignment, 16 bytes traceid, optional 8 bytes spanid
+  static constexpr size_t fullSize = 1 + 1 + 16 + 8;
+  static constexpr size_t sizeNoSpanID = 1 + 1 + 16;
+  static constexpr size_t traceIDOffset = 1 + 1;
+  static constexpr size_t spanIDOffset = 1 + 1 + 16;
 
   EDNSOTTraceRecord(uint8_t* arg) :
     data(arg) {}