Skip to content

Commit b80d5f7

Browse files
catenacybervictorjulien
authored andcommitted
detect/doh2: prefilter does not use dns engine progress
to update HTTP2 tx progress Ticket: 8454 (cherry picked from commit 898446a)
1 parent e71c54a commit b80d5f7

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

src/detect-engine-prefilter.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,13 @@ void DetectRunPrefilterTx(DetectEngineThreadCtx *det_ctx,
153153
engine->ctx.tx_min_progress, AppProtoToString(engine->alproto), pname,
154154
det_ctx->pmq.rule_id_array_cnt - old);
155155

156-
if (tx->tx_progress > engine->ctx.tx_min_progress && engine->is_last_for_progress) {
156+
if (tx->tx_progress > engine->ctx.tx_min_progress && engine->is_last_for_progress &&
157+
tx->tx_ptr == tx_ptr) {
157158
/* track with an offset of one, so that tx->progress 0 complete is tracked
158159
* as 1, progress 1 as 2, etc. This is to allow 0 to mean: nothing tracked, even
159160
* though a parser may use 0 as a valid value. */
161+
// tx->tx_ptr == tx_ptr ensures we do not use a dns engine progress
162+
// to update a HTTP2 tx detect_progress in case of DOH2
160163
tx->detect_progress = engine->ctx.tx_min_progress + 1;
161164
SCLogDebug("tx->tx_progress %d engine->ctx.tx_min_progress %d "
162165
"engine->is_last_for_progress %d => tx->detect_progress updated to %02x",

0 commit comments

Comments
 (0)