detect/flowint: improve unittests

In preparation of fixing bug #2288, make sure the unittests setup
the flow in the packet properly.

diff --git a/src/detect-flowint.c b/src/detect-flowint.c
index f2c61620661b8338f27d7e9f12d5f064ff02f7c5..eda0f17774b009a8e3ee4818d85b69a5b2498c17 100644 (file)
--- a/src/detect-flowint.c
+++ b/src/detect-flowint.c
@@ -1128,14 +1128,14 @@ static int DetectFlowintTestPacket01Real(void)
 
     p = UTHBuildPacket((uint8_t *)"GET", 3, IPPROTO_TCP);
     FAIL_IF(p == NULL);
-    p->flow = f;
+    UTHAssignFlow(p, f);
     SigMatchSignatures(&th_v, de_ctx, det_ctx, p);
     FAIL_IF(!PacketAlertCheck(p, 101));
     UTHFreePacket(p);
 
     p = UTHBuildPacket((uint8_t *)"Unauthorized", 12, IPPROTO_TCP);
     FAIL_IF(p == NULL);
-    p->flow = f;
+    UTHAssignFlow(p, f);
     SigMatchSignatures(&th_v, de_ctx, det_ctx, p);
     FAIL_IF(!PacketAlertCheck(p, 102));
     FAIL_IF(!PacketAlertCheck(p, 103));
@@ -1143,7 +1143,7 @@ static int DetectFlowintTestPacket01Real(void)
 
     p = UTHBuildPacket((uint8_t *)"1", 1, IPPROTO_TCP);
     FAIL_IF(p == NULL);
-    p->flow = f;
+    UTHAssignFlow(p, f);
     SigMatchSignatures(&th_v, de_ctx, det_ctx, p);
     SigMatchSignatures(&th_v, de_ctx, det_ctx, p);
     SigMatchSignatures(&th_v, de_ctx, det_ctx, p);
@@ -1152,7 +1152,7 @@ static int DetectFlowintTestPacket01Real(void)
 
     p = UTHBuildPacket((uint8_t *)"X", 1, IPPROTO_TCP);
     FAIL_IF(p == NULL);
-    p->flow = f;
+    UTHAssignFlow(p, f);
     SigMatchSignatures(&th_v, de_ctx, det_ctx, p);
     FAIL_IF(!PacketAlertCheck(p, 105));
     UTHFreePacket(p);
@@ -1201,14 +1201,14 @@ static int DetectFlowintTestPacket02Real(void)
 
     p = UTHBuildPacket((uint8_t *)"GET", 3, IPPROTO_TCP);
     FAIL_IF(p == NULL);
-    p->flow = f;
+    UTHAssignFlow(p, f);
     SigMatchSignatures(&th_v, de_ctx, det_ctx, p);
     FAIL_IF(!PacketAlertCheck(p, 101));
     UTHFreePacket(p);
 
     p = UTHBuildPacket((uint8_t *)"Unauthorized", 12, IPPROTO_TCP);
     FAIL_IF(p == NULL);
-    p->flow = f;
+    UTHAssignFlow(p, f);
     SigMatchSignatures(&th_v, de_ctx, det_ctx, p);
     FAIL_IF(!PacketAlertCheck(p, 102));
     FAIL_IF(!PacketAlertCheck(p, 103));
@@ -1216,7 +1216,7 @@ static int DetectFlowintTestPacket02Real(void)
 
     p = UTHBuildPacket((uint8_t *)"1", 1, IPPROTO_TCP);
     FAIL_IF(p == NULL);
-    p->flow = f;
+    UTHAssignFlow(p, f);
     SigMatchSignatures(&th_v, de_ctx, det_ctx, p);
     SigMatchSignatures(&th_v, de_ctx, det_ctx, p);
     SigMatchSignatures(&th_v, de_ctx, det_ctx, p);
@@ -1225,7 +1225,7 @@ static int DetectFlowintTestPacket02Real(void)
 
     p = UTHBuildPacket((uint8_t *)"X", 1, IPPROTO_TCP);
     FAIL_IF(p == NULL);
-    p->flow = f;
+    UTHAssignFlow(p, f);
     SigMatchSignatures(&th_v, de_ctx, det_ctx, p);
     FAIL_IF(!PacketAlertCheck(p, 105));
     UTHFreePacket(p);
@@ -1272,14 +1272,14 @@ static int DetectFlowintTestPacket03Real(void)
 
     p = UTHBuildPacket((uint8_t *)"GET", 3, IPPROTO_TCP);
     FAIL_IF(p == NULL);
-    p->flow = f;
+    UTHAssignFlow(p, f);
     SigMatchSignatures(&th_v, de_ctx, det_ctx, p);
     FAIL_IF(!PacketAlertCheck(p, 101));
     UTHFreePacket(p);
 
     p = UTHBuildPacket((uint8_t *)"Unauthorized", 12, IPPROTO_TCP);
     FAIL_IF(p == NULL);
-    p->flow = f;
+    UTHAssignFlow(p, f);
     SigMatchSignatures(&th_v, de_ctx, det_ctx, p);
     FAIL_IF(!PacketAlertCheck(p, 102));
     FAIL_IF(PacketAlertCheck(p, 103));
@@ -1287,7 +1287,7 @@ static int DetectFlowintTestPacket03Real(void)
 
     p = UTHBuildPacket((uint8_t *)"1", 1, IPPROTO_TCP);
     FAIL_IF(p == NULL);
-    p->flow = f;
+    UTHAssignFlow(p, f);
     SigMatchSignatures(&th_v, de_ctx, det_ctx, p);
     FAIL_IF(PacketAlertCheck(p, 102));
     FAIL_IF(PacketAlertCheck(p, 103));