rule-parser: bump sids within siggroup test

diff --git a/src/detect-engine-siggroup.c b/src/detect-engine-siggroup.c
index 93ca8fa86b066dd149b18da3ca8b10e73bf74222..0b631a6ffbeea38318d236b8580a340c587106a4 100644 (file)
--- a/src/detect-engine-siggroup.c
+++ b/src/detect-engine-siggroup.c
@@ -809,7 +809,7 @@ static int SigGroupHeadTest06(void)
 
     de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(msg:\"SigGroupHead tests\"; content:\"test1\"; "
-                               "content:\"test2\"; content:\"test3\"; sid:0;)");
+                               "content:\"test2\"; content:\"test3\"; sid:1;)");
     if (de_ctx->sig_list == NULL) {
         result = 0;
         goto end;
@@ -818,7 +818,7 @@ static int SigGroupHeadTest06(void)
 
     prev_sig->next = SigInit(de_ctx, "alert tcp any any -> any any "
                              "(msg:\"SigGroupHead tests\"; content:\"test1\"; "
-                             "content:\"test2\"; content:\"test3\"; sid:1;)");
+                             "content:\"test2\"; content:\"test3\"; sid:2;)");
     if (prev_sig->next == NULL) {
         result = 0;
         goto end;
@@ -827,7 +827,7 @@ static int SigGroupHeadTest06(void)
 
     prev_sig->next = SigInit(de_ctx, "alert tcp any any -> any any "
                              "(msg:\"SigGroupHead tests\"; content:\"test1\"; "
-                             "content:\"test2\"; content:\"test3\"; sid:2;)");
+                             "content:\"test2\"; content:\"test3\"; sid:3;)");
     if (prev_sig->next == NULL) {
         result = 0;
         goto end;
@@ -836,7 +836,7 @@ static int SigGroupHeadTest06(void)
 
     prev_sig->next = SigInit(de_ctx, "alert tcp any any -> any any "
                              "(msg:\"SigGroupHead tests\"; content:\"test1\"; "
-                             "content:\"test2\"; content:\"test3\"; sid:3;)");
+                             "content:\"test2\"; content:\"test3\"; sid:4;)");
     if (prev_sig->next == NULL) {
         result = 0;
         goto end;
@@ -845,7 +845,7 @@ static int SigGroupHeadTest06(void)
 
     prev_sig->next = SigInit(de_ctx, "alert tcp any any -> any any "
                              "(msg:\"SigGroupHead tests\"; content:\"test1\"; "
-                             "content:\"test2\"; content:\"test3\"; sid:4;)");
+                             "content:\"test2\"; content:\"test3\"; sid:5;)");
     if (prev_sig->next == NULL) {
         result = 0;
         goto end;
@@ -861,11 +861,11 @@ static int SigGroupHeadTest06(void)
     SigGroupHeadSetSigCnt(sh, 4);
 
     result &= (sh->sig_cnt == 3);
-    result &= (SigGroupHeadContainsSigId(de_ctx, sh, 0) == 1);
-    result &= (SigGroupHeadContainsSigId(de_ctx, sh, 1) == 0);
-    result &= (SigGroupHeadContainsSigId(de_ctx, sh, 2) == 1);
-    result &= (SigGroupHeadContainsSigId(de_ctx, sh, 3) == 0);
-    result &= (SigGroupHeadContainsSigId(de_ctx, sh, 4) == 1);
+    result &= (SigGroupHeadContainsSigId(de_ctx, sh, 1) == 1);
+    result &= (SigGroupHeadContainsSigId(de_ctx, sh, 2) == 0);
+    result &= (SigGroupHeadContainsSigId(de_ctx, sh, 3) == 1);
+    result &= (SigGroupHeadContainsSigId(de_ctx, sh, 4) == 0);
+    result &= (SigGroupHeadContainsSigId(de_ctx, sh, 5) == 1);
 
     SigGroupHeadFree(sh);
 
@@ -893,7 +893,7 @@ static int SigGroupHeadTest07(void)
 
     de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(msg:\"SigGroupHead tests\"; content:\"test1\"; "
-                               "content:\"test2\"; content:\"test3\"; sid:0;)");
+                               "content:\"test2\"; content:\"test3\"; sid:1;)");
     if (de_ctx->sig_list == NULL) {
         result = 0;
         goto end;
@@ -902,7 +902,7 @@ static int SigGroupHeadTest07(void)
 
     prev_sig->next = SigInit(de_ctx, "alert tcp any any -> any any "
                              "(msg:\"SigGroupHead tests\"; content:\"test1\"; "
-                             "content:\"test2\"; content:\"test3\"; sid:1;)");
+                             "content:\"test2\"; content:\"test3\"; sid:2;)");
     if (prev_sig->next == NULL) {
         result = 0;
         goto end;
@@ -911,7 +911,7 @@ static int SigGroupHeadTest07(void)
 
     prev_sig->next = SigInit(de_ctx, "alert tcp any any -> any any "
                              "(msg:\"SigGroupHead tests\"; content:\"test1\"; "
-                             "content:\"test2\"; content:\"test3\"; sid:2;)");
+                             "content:\"test2\"; content:\"test3\"; sid:3;)");
     if (prev_sig->next == NULL) {
         result = 0;
         goto end;
@@ -920,7 +920,7 @@ static int SigGroupHeadTest07(void)
 
     prev_sig->next = SigInit(de_ctx, "alert tcp any any -> any any "
                              "(msg:\"SigGroupHead tests\"; content:\"test1\"; "
-                             "content:\"test2\"; content:\"test3\"; sid:3;)");
+                             "content:\"test2\"; content:\"test3\"; sid:4;)");
     if (prev_sig->next == NULL) {
         result = 0;
         goto end;
@@ -929,7 +929,7 @@ static int SigGroupHeadTest07(void)
 
     prev_sig->next = SigInit(de_ctx, "alert tcp any any -> any any "
                              "(msg:\"SigGroupHead tests\"; content:\"test1\"; "
-                             "content:\"test2\"; content:\"test3\"; sid:4;)");
+                             "content:\"test2\"; content:\"test3\"; sid:5;)");
     if (prev_sig->next == NULL) {
         result = 0;
         goto end;
@@ -945,20 +945,20 @@ static int SigGroupHeadTest07(void)
     SigGroupHeadSetSigCnt(sh, 4);
 
     result &= (sh->sig_cnt == 3);
-    result &= (SigGroupHeadContainsSigId(de_ctx, sh, 0) == 1);
-    result &= (SigGroupHeadContainsSigId(de_ctx, sh, 1) == 0);
-    result &= (SigGroupHeadContainsSigId(de_ctx, sh, 2) == 1);
-    result &= (SigGroupHeadContainsSigId(de_ctx, sh, 3) == 0);
-    result &= (SigGroupHeadContainsSigId(de_ctx, sh, 4) == 1);
+    result &= (SigGroupHeadContainsSigId(de_ctx, sh, 1) == 1);
+    result &= (SigGroupHeadContainsSigId(de_ctx, sh, 2) == 0);
+    result &= (SigGroupHeadContainsSigId(de_ctx, sh, 3) == 1);
+    result &= (SigGroupHeadContainsSigId(de_ctx, sh, 4) == 0);
+    result &= (SigGroupHeadContainsSigId(de_ctx, sh, 5) == 1);
 
     SigGroupHeadClearSigs(sh);
 
     result &= (sh->sig_cnt == 0);
-    result &= (SigGroupHeadContainsSigId(de_ctx, sh, 0) == 0);
     result &= (SigGroupHeadContainsSigId(de_ctx, sh, 1) == 0);
     result &= (SigGroupHeadContainsSigId(de_ctx, sh, 2) == 0);
     result &= (SigGroupHeadContainsSigId(de_ctx, sh, 3) == 0);
     result &= (SigGroupHeadContainsSigId(de_ctx, sh, 4) == 0);
+    result &= (SigGroupHeadContainsSigId(de_ctx, sh, 5) == 0);
 
     SigGroupHeadFree(sh);
 
@@ -985,7 +985,7 @@ static int SigGroupHeadTest08(void)
 
     de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(msg:\"SigGroupHead tests\"; content:\"test1\"; "
-                               "content:\"test2\"; content:\"test3\"; sid:0;)");
+                               "content:\"test2\"; content:\"test3\"; sid:1;)");
     if (de_ctx->sig_list == NULL) {
         result = 0;
         goto end;
@@ -994,7 +994,7 @@ static int SigGroupHeadTest08(void)
 
     prev_sig->next = SigInit(de_ctx, "alert tcp any any -> any any "
                              "(msg:\"SigGroupHead tests\"; content:\"test1\"; "
-                             "content:\"test2\"; content:\"test3\"; sid:1;)");
+                             "content:\"test2\"; content:\"test3\"; sid:2;)");
     if (prev_sig->next == NULL) {
         result = 0;
         goto end;
@@ -1003,7 +1003,7 @@ static int SigGroupHeadTest08(void)
 
     prev_sig->next = SigInit(de_ctx, "alert tcp any any -> any any "
                              "(msg:\"SigGroupHead tests\"; content:\"test1\"; "
-                             "content:\"test2\"; content:\"test3\"; sid:2;)");
+                             "content:\"test2\"; content:\"test3\"; sid:3;)");
     if (prev_sig->next == NULL) {
         result = 0;
         goto end;
@@ -1012,7 +1012,7 @@ static int SigGroupHeadTest08(void)
 
     prev_sig->next = SigInit(de_ctx, "alert tcp any any -> any any "
                              "(msg:\"SigGroupHead tests\"; content:\"test1\"; "
-                             "content:\"test2\"; content:\"test3\"; sid:3;)");
+                             "content:\"test2\"; content:\"test3\"; sid:4;)");
     if (prev_sig->next == NULL) {
         result = 0;
         goto end;
@@ -1021,7 +1021,7 @@ static int SigGroupHeadTest08(void)
 
     prev_sig->next = SigInit(de_ctx, "alert tcp any any -> any any "
                              "(msg:\"SigGroupHead tests\"; content:\"test1\"; "
-                             "content:\"test2\"; content:\"test3\"; sid:4;)");
+                             "content:\"test2\"; content:\"test3\"; sid:5;)");
     if (prev_sig->next == NULL) {
         result = 0;
         goto end;
@@ -1037,22 +1037,22 @@ static int SigGroupHeadTest08(void)
     SigGroupHeadSetSigCnt(src_sh, 4);
 
     result &= (src_sh->sig_cnt == 3);
-    result &= (SigGroupHeadContainsSigId(de_ctx, src_sh, 0) == 1);
-    result &= (SigGroupHeadContainsSigId(de_ctx, src_sh, 1) == 0);
-    result &= (SigGroupHeadContainsSigId(de_ctx, src_sh, 2) == 1);
-    result &= (SigGroupHeadContainsSigId(de_ctx, src_sh, 3) == 0);
-    result &= (SigGroupHeadContainsSigId(de_ctx, src_sh, 4) == 1);
+    result &= (SigGroupHeadContainsSigId(de_ctx, src_sh, 1) == 1);
+    result &= (SigGroupHeadContainsSigId(de_ctx, src_sh, 2) == 0);
+    result &= (SigGroupHeadContainsSigId(de_ctx, src_sh, 3) == 1);
+    result &= (SigGroupHeadContainsSigId(de_ctx, src_sh, 4) == 0);
+    result &= (SigGroupHeadContainsSigId(de_ctx, src_sh, 5) == 1);
 
     SigGroupHeadCopySigs(de_ctx, src_sh, &dst_sh);
 
     SigGroupHeadSetSigCnt(dst_sh, 4);
 
     result &= (dst_sh->sig_cnt == 3);
-    result &= (SigGroupHeadContainsSigId(de_ctx, dst_sh, 0) == 1);
-    result &= (SigGroupHeadContainsSigId(de_ctx, dst_sh, 1) == 0);
-    result &= (SigGroupHeadContainsSigId(de_ctx, dst_sh, 2) == 1);
-    result &= (SigGroupHeadContainsSigId(de_ctx, dst_sh, 3) == 0);
-    result &= (SigGroupHeadContainsSigId(de_ctx, dst_sh, 4) == 1);
+    result &= (SigGroupHeadContainsSigId(de_ctx, dst_sh, 1) == 1);
+    result &= (SigGroupHeadContainsSigId(de_ctx, dst_sh, 2) == 0);
+    result &= (SigGroupHeadContainsSigId(de_ctx, dst_sh, 3) == 1);
+    result &= (SigGroupHeadContainsSigId(de_ctx, dst_sh, 4) == 0);
+    result &= (SigGroupHeadContainsSigId(de_ctx, dst_sh, 5) == 1);
 
     SigGroupHeadFree(src_sh);
     SigGroupHeadFree(dst_sh);
@@ -1079,7 +1079,7 @@ static int SigGroupHeadTest09(void)
 
     de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
                                "(msg:\"SigGroupHead tests\"; content:\"test1\"; "
-                               "content:\"test2\"; content:\"test3\"; sid:0;)");
+                               "content:\"test2\"; content:\"test3\"; sid:1;)");
     if (de_ctx->sig_list == NULL) {
         result = 0;
         goto end;
@@ -1088,7 +1088,7 @@ static int SigGroupHeadTest09(void)
 
     prev_sig->next = SigInit(de_ctx, "alert tcp any any -> any any "
                              "(msg:\"SigGroupHead tests\"; content:\"test1\"; "
-                             "content:\"test2\"; content:\"test3\"; sid:1;)");
+                             "content:\"test2\"; content:\"test3\"; sid:2;)");
     if (prev_sig->next == NULL) {
         result = 0;
         goto end;
@@ -1097,7 +1097,7 @@ static int SigGroupHeadTest09(void)
 
     prev_sig->next = SigInit(de_ctx, "alert tcp any any -> any any "
                              "(msg:\"SigGroupHead tests\"; content:\"test1\"; "
-                             "content:\"test2\"; content:\"test3\"; sid:2;)");
+                             "content:\"test2\"; content:\"test3\"; sid:3;)");
     if (prev_sig->next == NULL) {
         result = 0;
         goto end;
@@ -1106,7 +1106,7 @@ static int SigGroupHeadTest09(void)
 
     prev_sig->next = SigInit(de_ctx, "alert tcp any any -> any any "
                              "(msg:\"SigGroupHead tests\"; content:\"test1\"; "
-                             "content:\"test2\"; content:\"test3\"; sid:3;)");
+                             "content:\"test2\"; content:\"test3\"; sid:4;)");
     if (prev_sig->next == NULL) {
         result = 0;
         goto end;
@@ -1115,7 +1115,7 @@ static int SigGroupHeadTest09(void)
 
     prev_sig->next = SigInit(de_ctx, "alert tcp any any -> any any "
                              "(msg:\"SigGroupHead tests\"; content:\"test1\"; "
-                             "content:\"test2\"; content:\"test3\"; sid:4;)");
+                             "content:\"test2\"; content:\"test3\"; sid:5;)");
     if (prev_sig->next == NULL) {
         result = 0;
         goto end;