detect/engine: use alert queue from det_ctx

Task #4943

diff --git a/src/detect-engine-iponly.c b/src/detect-engine-iponly.c
index d0647f09d67351f640829c6dd79dabd6f8694630..c55b68ee9a108b2baaf3a985d343d9db2914d8e6 100644 (file)
--- a/src/detect-engine-iponly.c
+++ b/src/detect-engine-iponly.c
@@ -1133,7 +1133,7 @@ void IPOnlyMatchPacket(ThreadVars *tv,
                             }
                         }
                     }
-                    PacketAlertAppend(det_ctx, s, p, 0, 0);
+                    AlertQueueAppend(det_ctx, s, p, 0, 0);
                 }
             }
         }

diff --git a/src/detect.c b/src/detect.c
index 9d68f9a0198ccea8f2312365a618a19babf75621..57a2316d5890265da851d5d343f84e28d16692aa 100644 (file)
--- a/src/detect.c
+++ b/src/detect.c
@@ -804,7 +804,7 @@ static inline void DetectRulePacketRules(
 #endif
         DetectRunPostMatch(tv, det_ctx, p, s);
 
-        PacketAlertAppend(det_ctx, s, p, 0, alert_flags);
+        AlertQueueAppend(det_ctx, s, p, 0, alert_flags);
 next:
         DetectVarProcessList(det_ctx, pflow, p);
         DetectReplaceFree(det_ctx);
@@ -1491,7 +1491,7 @@ static void DetectRunTx(ThreadVars *tv,
 
                 const uint8_t alert_flags = (PACKET_ALERT_FLAG_STATE_MATCH | PACKET_ALERT_FLAG_TX);
                 SCLogDebug("%p/%"PRIu64" sig %u (%u) matched", tx.tx_ptr, tx.tx_id, s->id, s->num);
-                PacketAlertAppend(det_ctx, s, p, tx.tx_id, alert_flags);
+                AlertQueueAppend(det_ctx, s, p, tx.tx_id, alert_flags);
             }
             DetectVarProcessList(det_ctx, p->flow, p);
             RULE_PROFILING_END(det_ctx, s, r, p);
@@ -1637,7 +1637,8 @@ static void DetectRunFrames(ThreadVars *tv, DetectEngineCtx *de_ctx, DetectEngin
                     det_ctx->frame_id = frame->id;
                     SCLogDebug(
                             "%p/%" PRIi64 " sig %u (%u) matched", frame, frame->id, s->id, s->num);
-                    PacketAlertAppend(det_ctx, s, p, 0, alert_flags); // TODO tx id frame field
+                    // TODO tx id frame field
+                    AlertQueueAppend(det_ctx, s, p, 0, alert_flags);
                 }
             }
             DetectVarProcessList(det_ctx, p->flow, p);