aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

detect/bool: Use bool type for unittests

Browse Source
pull/9829/head
Jeff Lucovsky 2 years ago committed by Victor Julien
parent 8f2a3ea7be
commit 84b2d665d6
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File

48
src/detect-engine-address.c
Unescape Escape View File

@ -1842,12 +1842,12 @@ DetectAddress *DetectAddressLookupInHead(const DetectAddressHead *gh, Address *a
#ifdef UNITTESTS
static int UTHValidateDetectAddress(DetectAddress *ad, const char *one, const char *two)
static bool UTHValidateDetectAddress(DetectAddress *ad, const char *one, const char *two)
{
char str1[46] = "", str2[46] = "";
if (ad == NULL)
return FALSE;
return false;
switch(ad->ip.family) {
case AF_INET:
@ -1858,15 +1858,15 @@ static int UTHValidateDetectAddress(DetectAddress *ad, const char *one, const ch
if (strcmp(str1, one) != 0) {
SCLogInfo("%s != %s", str1, one);
return FALSE;
return false;
}
if (strcmp(str2, two) != 0) {
SCLogInfo("%s != %s", str2, two);
return FALSE;
return false;
}
return TRUE;
return true;
break;
case AF_INET6:
@ -1877,19 +1877,19 @@ static int UTHValidateDetectAddress(DetectAddress *ad, const char *one, const ch
if (strcmp(str1, one) != 0) {
SCLogInfo("%s != %s", str1, one);
return FALSE;
return false;
}
if (strcmp(str2, two) != 0) {
SCLogInfo("%s != %s", str2, two);
return FALSE;
return false;
}
return TRUE;
return true;
break;
}
return FALSE;
return false;
}
typedef struct UTHValidateDetectAddressHeadRange_ {
@ -1903,7 +1903,7 @@ static int UTHValidateDetectAddressHead(DetectAddressHead *gh, int nranges, UTHV
int have = 0;
if (gh == NULL)
return FALSE;
return false;
DetectAddress *ad = NULL;
ad = gh->ipv4_head;
@ -1912,17 +1912,17 @@ static int UTHValidateDetectAddressHead(DetectAddressHead *gh, int nranges, UTHV
while (have < expect) {
if (ad == NULL) {
printf("bad head: have %d ranges, expected %d: ", have, expect);
return FALSE;
return false;
}
if (UTHValidateDetectAddress(ad, expectations[have].one, expectations[have].two) == FALSE)
return FALSE;
if (!UTHValidateDetectAddress(ad, expectations[have].one, expectations[have].two))
return false;
ad = ad->next;
have++;
}
return TRUE;
return true;
}
static int AddressTestParse01(void)
@ -4130,7 +4130,7 @@ static int AddressTestAddressGroupSetup38(void)
if (gh != NULL) {
int r = DetectAddressParse(NULL, gh, "![192.168.0.0/16,!192.168.14.0/24]");
if (r == 1) {
if (UTHValidateDetectAddressHead(gh, 3, expectations) == TRUE)
if (UTHValidateDetectAddressHead(gh, 3, expectations))
result = 1;
}
@ -4151,7 +4151,7 @@ static int AddressTestAddressGroupSetup39(void)
if (gh != NULL) {
int r = DetectAddressParse(NULL, gh, "[![192.168.0.0/16,!192.168.14.0/24]]");
if (r == 1) {
if (UTHValidateDetectAddressHead(gh, 3, expectations) == TRUE)
if (UTHValidateDetectAddressHead(gh, 3, expectations))
result = 1;
}
@ -4171,7 +4171,7 @@ static int AddressTestAddressGroupSetup40(void)
if (gh != NULL) {
int r = DetectAddressParse(NULL, gh, "[![192.168.0.0/16,[!192.168.14.0/24]]]");
if (r == 1) {
if (UTHValidateDetectAddressHead(gh, 3, expectations) == TRUE)
if (UTHValidateDetectAddressHead(gh, 3, expectations))
result = 1;
}
@ -4191,7 +4191,7 @@ static int AddressTestAddressGroupSetup41(void)
if (gh != NULL) {
int r = DetectAddressParse(NULL, gh, "[![192.168.0.0/16,![192.168.14.0/24]]]");
if (r == 1) {
if (UTHValidateDetectAddressHead(gh, 3, expectations) == TRUE)
if (UTHValidateDetectAddressHead(gh, 3, expectations))
result = 1;
}
@ -4209,7 +4209,7 @@ static int AddressTestAddressGroupSetup42(void)
if (gh != NULL) {
int r = DetectAddressParse(NULL, gh, "[2001::/3]");
if (r == 0) {
if (UTHValidateDetectAddressHead(gh, 1, expectations) == TRUE)
if (UTHValidateDetectAddressHead(gh, 1, expectations))
result = 1;
}
@ -4228,7 +4228,7 @@ static int AddressTestAddressGroupSetup43(void)
if (gh != NULL) {
int r = DetectAddressParse(NULL, gh, "[2001::/3,!3000::/5]");
if (r == 1) {
if (UTHValidateDetectAddressHead(gh, 2, expectations) == TRUE)
if (UTHValidateDetectAddressHead(gh, 2, expectations))
result = 1;
}
@ -4246,7 +4246,7 @@ static int AddressTestAddressGroupSetup44(void)
if (gh != NULL) {
int r = DetectAddressParse(NULL, gh, "3ffe:ffff:7654:feda:1245:ba98:3210:4562/96");
if (r == 0) {
if (UTHValidateDetectAddressHead(gh, 1, expectations) == TRUE)
if (UTHValidateDetectAddressHead(gh, 1, expectations))
result = 1;
}
@ -4282,7 +4282,7 @@ static int AddressTestAddressGroupSetup46(void)
if (gh != NULL) {
int r = DetectAddressParse(NULL, gh, "[![192.168.0.0/16,![192.168.1.0/24,192.168.3.0/24]]]");
if (r == 1) {
if (UTHValidateDetectAddressHead(gh, 4, expectations) == TRUE)
if (UTHValidateDetectAddressHead(gh, 4, expectations))
result = 1;
}
@ -4305,7 +4305,7 @@ static int AddressTestAddressGroupSetup47(void)
if (gh != NULL) {
int r = DetectAddressParse(NULL, gh, "[![192.168.0.0/16,![192.168.1.0/24,192.168.3.0/24],!192.168.5.0/24]]");
if (r == 1) {
if (UTHValidateDetectAddressHead(gh, 5, expectations) == TRUE)
if (UTHValidateDetectAddressHead(gh, 5, expectations))
result = 1;
}
@ -4327,7 +4327,7 @@ static int AddressTestAddressGroupSetup48(void)
if (gh != NULL) {
int r = DetectAddressParse(NULL, gh, "[192.168.0.0/16,![192.168.1.0/24,192.168.3.0/24],!192.168.5.0/24]");
if (r == 1) {
if (UTHValidateDetectAddressHead(gh, 4, expectations) == TRUE)
if (UTHValidateDetectAddressHead(gh, 4, expectations))
result = 1;
}

Write Preview
Loading…
Cancel
Save