From: Jason Ish <jason.ish@oisf.net>
Date: Fri, 12 Jan 2024 15:26:22 +0000 (-0600)
Subject: defrag: use uint8_t in unit tests
X-Git-Tag: suricata-8.0.0-beta1~1438
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdd17de73d6507a02729e069d31c590a760fb9b7;p=thirdparty%2Fsuricata.git

defrag: use uint8_t in unit tests
---

diff --git a/src/defrag.c b/src/defrag.c
index a3dff4e1b5..8634d14126 100644
--- a/src/defrag.c
+++ b/src/defrag.c
@@ -1147,7 +1147,7 @@ error:
 }
 
 static Packet *BuildIpv6TestPacket(
-        uint8_t proto, uint32_t id, uint16_t off, int mf, const char content, int content_len)
+        uint8_t proto, uint32_t id, uint16_t off, int mf, const uint8_t content, int content_len)
 {
     Packet *p = NULL;
     uint8_t *pcontent;
@@ -1434,8 +1434,7 @@ static int DefragReverseSimpleIpv6Test(void)
     PASS;
 }
 
-static int DefragDoSturgesNovakTest(int policy, u_char *expected,
-        size_t expected_len)
+static int DefragDoSturgesNovakTest(int policy, uint8_t *expected, size_t expected_len)
 {
     int i;
     ThreadVars tv;
@@ -1551,7 +1550,7 @@ static int DefragDoSturgesNovakTest(int policy, u_char *expected,
     PASS;
 }
 
-static int DefragDoSturgesNovakIpv6Test(int policy, u_char *expected, size_t expected_len)
+static int DefragDoSturgesNovakIpv6Test(int policy, uint8_t *expected, size_t expected_len)
 {
     int i;
     ThreadVars tv;
@@ -1672,7 +1671,7 @@ static int DefragDoSturgesNovakIpv6Test(int policy, u_char *expected, size_t exp
  * and uses these to diagram the input fragments and the resulting
  * policies. We build test cases for the papers scenario but assign
  * specific values to each segment.
-*/
+ */
 #define D_1   'A', 'A', 'A', 'A', 'A', 'A', 'A', 'A'
 #define D_2   'B', 'B', 'B', 'B', 'B', 'B', 'B', 'B'
 #define D_3   'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C'
@@ -1695,7 +1694,7 @@ static int
 DefragSturgesNovakBsdTest(void)
 {
     /* Expected data. */
-    u_char expected[] = {
+    uint8_t expected[] = {
         D_1,
         D_1,
         D_1,
@@ -1730,7 +1729,7 @@ DefragSturgesNovakBsdTest(void)
 static int DefragSturgesNovakBsdIpv6Test(void)
 {
     /* Expected data. */
-    u_char expected[] = {
+    uint8_t expected[] = {
         D_1,
         D_1,
         D_1,
@@ -1764,7 +1763,7 @@ static int DefragSturgesNovakBsdIpv6Test(void)
 static int DefragSturgesNovakLinuxIpv4Test(void)
 {
     /* Expected data. */
-    u_char expected[] = {
+    uint8_t expected[] = {
         D_1,
         D_1,
         D_1,
@@ -1799,7 +1798,7 @@ static int DefragSturgesNovakLinuxIpv4Test(void)
 static int DefragSturgesNovakLinuxIpv6Test(void)
 {
     /* Expected data. */
-    u_char expected[] = {
+    uint8_t expected[] = {
         D_1,
         D_1,
         D_1,
@@ -1833,7 +1832,7 @@ static int DefragSturgesNovakLinuxIpv6Test(void)
 static int DefragSturgesNovakWindowsIpv4Test(void)
 {
     /* Expected data. */
-    u_char expected[] = {
+    uint8_t expected[] = {
         D_1,
         D_1,
         D_1,
@@ -1868,7 +1867,7 @@ static int DefragSturgesNovakWindowsIpv4Test(void)
 static int DefragSturgesNovakWindowsIpv6Test(void)
 {
     /* Expected data. */
-    u_char expected[] = {
+    uint8_t expected[] = {
         D_1,
         D_1,
         D_1,
@@ -1902,7 +1901,7 @@ static int DefragSturgesNovakWindowsIpv6Test(void)
 static int DefragSturgesNovakSolarisTest(void)
 {
     /* Expected data. */
-    u_char expected[] = {
+    uint8_t expected[] = {
         D_1,
         D_1,
         D_1,
@@ -1937,7 +1936,7 @@ static int DefragSturgesNovakSolarisTest(void)
 static int DefragSturgesNovakSolarisIpv6Test(void)
 {
     /* Expected data. */
-    u_char expected[] = {
+    uint8_t expected[] = {
         D_1,
         D_1,
         D_1,
@@ -1971,7 +1970,7 @@ static int DefragSturgesNovakSolarisIpv6Test(void)
 static int DefragSturgesNovakFirstTest(void)
 {
     /* Expected data. */
-    u_char expected[] = {
+    uint8_t expected[] = {
         D_1,
         D_1,
         D_1,
@@ -2006,7 +2005,7 @@ static int DefragSturgesNovakFirstTest(void)
 static int DefragSturgesNovakFirstIpv6Test(void)
 {
     /* Expected data. */
-    u_char expected[] = {
+    uint8_t expected[] = {
         D_1,
         D_1,
         D_1,
@@ -2040,7 +2039,7 @@ static int
 DefragSturgesNovakLastTest(void)
 {
     /* Expected data. */
-    u_char expected[] = {
+    uint8_t expected[] = {
         D_1,
         D_4,
         D_4,
@@ -2075,7 +2074,7 @@ DefragSturgesNovakLastTest(void)
 static int DefragSturgesNovakLastIpv6Test(void)
 {
     /* Expected data. */
-    u_char expected[] = {
+    uint8_t expected[] = {
         D_1,
         D_4,
         D_4,
@@ -2523,19 +2522,19 @@ static int DefragTestJeremyLinux(void)
     memset(&tv, 0, sizeof(tv));
     DecodeThreadVars dtv;
     memset(&dtv, 0, sizeof(dtv));
-    char expected[] = "AAAAAAAA"
-        "AAAAAAAA"
-        "AAAAAAAA"
-        "CCCCCCCC"
-        "CCCCCCCC"
-        "CCCCCCCC"
-        "CCCCCCCC"
-        "CCCCCCCC"
-        "CCCCCCCC"
-        "BBBBBBBB"
-        "BBBBBBBB"
-        "DDDDDDDD"
-        "DDDDDD";
+    uint8_t expected[] = "AAAAAAAA"
+                         "AAAAAAAA"
+                         "AAAAAAAA"
+                         "CCCCCCCC"
+                         "CCCCCCCC"
+                         "CCCCCCCC"
+                         "CCCCCCCC"
+                         "CCCCCCCC"
+                         "CCCCCCCC"
+                         "BBBBBBBB"
+                         "BBBBBBBB"
+                         "DDDDDDDD"
+                         "DDDDDD";
 
     DefragInit();
     default_policy = DEFRAG_POLICY_LINUX;