From cedb836d012db47be9984af68512872b2d9d826e Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Mon, 8 Jun 2026 22:46:48 +0200 Subject: [PATCH] output/dns: update for DOH2 change --- src/output-json-dns.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/output-json-dns.c b/src/output-json-dns.c index 03b6aa5ffd..0a99f3eae3 100644 --- a/src/output-json-dns.c +++ b/src/output-json-dns.c @@ -266,9 +266,9 @@ bool AlertJsonDoh2(void *txptr, SCJsonBuilder *js) SCJbRestoreMark(js, &mark); } // then log one DNS tx if any, preferring the answer - void *tx_dns = DetectGetInnerTx(txptr, ALPROTO_DOH2, ALPROTO_DNS, STREAM_TOCLIENT); + void *tx_dns = DetectGetInnerTx(txptr, ALPROTO_DOH2, ALPROTO_DOH2, STREAM_TOCLIENT); if (tx_dns == NULL) { - tx_dns = DetectGetInnerTx(txptr, ALPROTO_DOH2, ALPROTO_DNS, STREAM_TOSERVER); + tx_dns = DetectGetInnerTx(txptr, ALPROTO_DOH2, ALPROTO_DOH2, STREAM_TOSERVER); } bool r2 = false; if (tx_dns) { @@ -287,9 +287,9 @@ static int JsonDoh2Logger(ThreadVars *tv, void *thread_data, const Packet *p, Fl LogDnsLogThread *td = (LogDnsLogThread *)thread_data; LogDnsFileCtx *dnslog_ctx = td->dnslog_ctx; - void *tx_dns = DetectGetInnerTx(txptr, ALPROTO_DOH2, ALPROTO_DNS, STREAM_TOCLIENT); + void *tx_dns = DetectGetInnerTx(txptr, ALPROTO_DOH2, ALPROTO_DOH2, STREAM_TOCLIENT); if (tx_dns == NULL) { - tx_dns = DetectGetInnerTx(txptr, ALPROTO_DOH2, ALPROTO_DNS, STREAM_TOSERVER); + tx_dns = DetectGetInnerTx(txptr, ALPROTO_DOH2, ALPROTO_DOH2, STREAM_TOSERVER); } /* DOH2 is always logged in flow direction, as its driven by the scope of an