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

Fixup artifact from automatic renames: rename DetectAddresssHead to DetectAddressHead.

Browse Source
remotes/origin/master-1.0.x
Victor Julien 16 years ago
parent e5b990a8ab
commit d6be6ceb19
5 changed files with 129 additions and 129 deletions
Show Stats Download Patch File Download Diff File

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

@ -84,7 +84,7 @@ void DetectAddressFree(DetectAddress *ag) {
SCLogDebug("- ag %p dst_gh %p", ag, ag->dst_gh);
if (ag->dst_gh != NULL) {
DetectAddresssHeadFree(ag->dst_gh);
DetectAddressHeadFree(ag->dst_gh);
}
ag->dst_gh = NULL;
} else {
@ -139,7 +139,7 @@ void DetectAddressPrintMemory(void) {
printf(" - detect_address_group_free_cnt %" PRIu32 "\n", detect_address_group_free_cnt);
printf(" - outstanding groups %" PRIu32 "\n", detect_address_group_init_cnt - detect_address_group_free_cnt);
printf(" * Address group memory stats done\n");
printf(" * Address group head memory stats (DetectAddresssHead %" PRIuMAX "):\n", (uintmax_t)sizeof(DetectAddresssHead));
printf(" * Address group head memory stats (DetectAddressHead %" PRIuMAX "):\n", (uintmax_t)sizeof(DetectAddressHead));
printf(" - detect_address_group_head_memory %" PRIu32 "\n", detect_address_group_head_memory);
printf(" - detect_address_group_head_init_cnt %" PRIu32 "\n", detect_address_group_head_init_cnt);
printf(" - detect_address_group_head_free_cnt %" PRIu32 "\n", detect_address_group_head_free_cnt);
@ -237,7 +237,7 @@ int DetectAddressAdd(DetectAddress **head, DetectAddress *ag) {
/* helper function for DetectAddress(Group)Insert:
* set & get the head ptr
*/
static int SetHeadPtr(DetectAddresssHead *gh, DetectAddress *newhead) {
static int SetHeadPtr(DetectAddressHead *gh, DetectAddress *newhead) {
if (newhead->flags & ADDRESS_FLAG_ANY)
gh->any_head = newhead;
else if (newhead->family == AF_INET)
@ -252,7 +252,7 @@ static int SetHeadPtr(DetectAddresssHead *gh, DetectAddress *newhead) {
return 0;
}
static DetectAddress *GetHeadPtr(DetectAddresssHead *gh, DetectAddress *new) {
static DetectAddress *GetHeadPtr(DetectAddressHead *gh, DetectAddress *new) {
DetectAddress *head = NULL;
if (new->flags & ADDRESS_FLAG_ANY)
@ -275,7 +275,7 @@ static DetectAddress *GetHeadPtr(DetectAddresssHead *gh, DetectAddress *new) {
* 0: not inserted, memory of new is freed
* 1: inserted
* */
int DetectAddressInsert(DetectEngineCtx *de_ctx, DetectAddresssHead *gh, DetectAddress *new) {
int DetectAddressInsert(DetectEngineCtx *de_ctx, DetectAddressHead *gh, DetectAddress *new) {
DetectAddress *head = NULL;
if (new == NULL)
@ -647,7 +647,7 @@ error:
}
/** \brief setup a single address string */
int DetectAddressSetup(DetectAddresssHead *gh, char *s) {
int DetectAddressSetup(DetectAddressHead *gh, char *s) {
DetectAddress *ad = NULL;
int r = 0;
@ -723,8 +723,8 @@ error:
}
/* XXX error handling */
int DetectAddressParse2(DetectAddresssHead *gh,
DetectAddresssHead *ghn,
int DetectAddressParse2(DetectAddressHead *gh,
DetectAddressHead *ghn,
char *s, int negate) {
int i, x;
int o_set = 0, n_set = 0;
@ -801,7 +801,7 @@ error:
* \todo do the same for IPv6
* \internal
*/
static int DetectAddressIsCompleteIPSpace(DetectAddresssHead *gh) {
static int DetectAddressIsCompleteIPSpace(DetectAddressHead *gh) {
int r = DetectAddressIsCompleteIPSpaceIPv4(gh->ipv4_head);
if (r == 1) {
return 1;
@ -811,7 +811,7 @@ static int DetectAddressIsCompleteIPSpace(DetectAddresssHead *gh) {
}
/** \brief Merge the + and the - list (+ positive match, - 'not' match) */
int DetectAddressMergeNot(DetectAddresssHead *gh, DetectAddresssHead *ghn) {
int DetectAddressMergeNot(DetectAddressHead *gh, DetectAddressHead *ghn) {
DetectAddress *ad;
DetectAddress *ag, *ag2;
int r = 0;
@ -944,14 +944,14 @@ error:
}
/* XXX rename this so 'Group' is out of the name */
int DetectAddressParse(DetectAddresssHead *gh, char *str) {
int DetectAddressParse(DetectAddressHead *gh, char *str) {
int r;
SCLogDebug("gh %p, str %s", gh, str);
DetectAddresssHead *ghn = DetectAddresssHeadInit();
DetectAddressHead *ghn = DetectAddressHeadInit();
if (ghn == NULL) {
SCLogDebug("DetectAddresssHeadInit for ghn failed");
SCLogDebug("DetectAddressHeadInit for ghn failed");
goto error;
}
@ -970,29 +970,29 @@ int DetectAddressParse(DetectAddresssHead *gh, char *str) {
}
/* free the temp negate head */
DetectAddresssHeadFree(ghn);
DetectAddressHeadFree(ghn);
return 0;
error:
DetectAddresssHeadFree(ghn);
DetectAddressHeadFree(ghn);
return -1;
}
DetectAddresssHead *DetectAddresssHeadInit(void) {
DetectAddresssHead *gh = malloc(sizeof(DetectAddresssHead));
DetectAddressHead *DetectAddressHeadInit(void) {
DetectAddressHead *gh = malloc(sizeof(DetectAddressHead));
if (gh == NULL)
return NULL;
memset(gh, 0, sizeof(DetectAddresssHead));
memset(gh, 0, sizeof(DetectAddressHead));
#ifdef DEBUG
detect_address_group_head_init_cnt++;
detect_address_group_head_memory += sizeof(DetectAddresssHead);
detect_address_group_head_memory += sizeof(DetectAddressHead);
#endif
return gh;
}
void DetectAddresssHeadCleanup(DetectAddresssHead *gh) {
void DetectAddressHeadCleanup(DetectAddressHead *gh) {
//SCLogDebug("gh %p", gh);
if (gh != NULL) {
@ -1005,15 +1005,15 @@ void DetectAddresssHeadCleanup(DetectAddresssHead *gh) {
}
}
void DetectAddresssHeadFree(DetectAddresssHead *gh) {
void DetectAddressHeadFree(DetectAddressHead *gh) {
//SCLogDebug("gh %p", gh);
if (gh != NULL) {
DetectAddresssHeadCleanup(gh);
DetectAddressHeadCleanup(gh);
free(gh);
#ifdef DEBUG
detect_address_group_head_free_cnt++;
detect_address_group_head_memory -= sizeof(DetectAddresssHead);
detect_address_group_head_memory -= sizeof(DetectAddressHead);
#endif
}
}
@ -1115,7 +1115,7 @@ void DetectAddressPrint(DetectAddress *gr) {
/** \brief find the group matching address in a group head */
DetectAddress *
DetectAddressLookupInHead(DetectAddresssHead *gh, Address *a) {
DetectAddressLookupInHead(DetectAddressHead *gh, Address *a) {
DetectAddress *g;
//printf("DetectAddressLookupGroup: start %p\n", gh);
@ -2248,14 +2248,14 @@ error:
int AddressTestAddressGroupSetup01 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "1.2.3.4");
if (r == 0) {
result = 1;
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -2263,14 +2263,14 @@ int AddressTestAddressGroupSetup01 (void) {
int AddressTestAddressGroupSetup02 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "1.2.3.4");
if (r == 0 && gh->ipv4_head != NULL) {
result = 1;
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -2278,7 +2278,7 @@ int AddressTestAddressGroupSetup02 (void) {
int AddressTestAddressGroupSetup03 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "1.2.3.4");
if (r == 0 && gh->ipv4_head != NULL) {
@ -2292,7 +2292,7 @@ int AddressTestAddressGroupSetup03 (void) {
}
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -2300,7 +2300,7 @@ int AddressTestAddressGroupSetup03 (void) {
int AddressTestAddressGroupSetup04 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "1.2.3.4");
if (r == 0 && gh->ipv4_head != NULL) {
@ -2321,7 +2321,7 @@ int AddressTestAddressGroupSetup04 (void) {
}
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -2329,7 +2329,7 @@ int AddressTestAddressGroupSetup04 (void) {
int AddressTestAddressGroupSetup05 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "1.2.3.2");
if (r == 0 && gh->ipv4_head != NULL) {
@ -2350,7 +2350,7 @@ int AddressTestAddressGroupSetup05 (void) {
}
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -2358,7 +2358,7 @@ int AddressTestAddressGroupSetup05 (void) {
int AddressTestAddressGroupSetup06 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "1.2.3.2");
if (r == 0 && gh->ipv4_head != NULL) {
@ -2372,7 +2372,7 @@ int AddressTestAddressGroupSetup06 (void) {
}
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -2380,7 +2380,7 @@ int AddressTestAddressGroupSetup06 (void) {
int AddressTestAddressGroupSetup07 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "10.0.0.0/8");
if (r == 0 && gh->ipv4_head != NULL) {
@ -2393,7 +2393,7 @@ int AddressTestAddressGroupSetup07 (void) {
}
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -2401,7 +2401,7 @@ int AddressTestAddressGroupSetup07 (void) {
int AddressTestAddressGroupSetup08 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "10.10.10.10");
if (r == 0 && gh->ipv4_head != NULL) {
@ -2414,7 +2414,7 @@ int AddressTestAddressGroupSetup08 (void) {
}
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -2422,7 +2422,7 @@ int AddressTestAddressGroupSetup08 (void) {
int AddressTestAddressGroupSetup09 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "10.10.10.0/24");
if (r == 0 && gh->ipv4_head != NULL) {
@ -2435,7 +2435,7 @@ int AddressTestAddressGroupSetup09 (void) {
}
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -2443,7 +2443,7 @@ int AddressTestAddressGroupSetup09 (void) {
int AddressTestAddressGroupSetup10 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "10.10.10.10-10.10.11.1");
if (r == 0 && gh->ipv4_head != NULL) {
@ -2456,7 +2456,7 @@ int AddressTestAddressGroupSetup10 (void) {
}
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -2464,7 +2464,7 @@ int AddressTestAddressGroupSetup10 (void) {
int AddressTestAddressGroupSetup11 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "10.10.10.10-10.10.11.1");
if (r == 0) {
@ -2494,7 +2494,7 @@ int AddressTestAddressGroupSetup11 (void) {
}
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -2502,7 +2502,7 @@ int AddressTestAddressGroupSetup11 (void) {
int AddressTestAddressGroupSetup12 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "10.10.10.10-10.10.11.1");
if (r == 0) {
@ -2532,7 +2532,7 @@ int AddressTestAddressGroupSetup12 (void) {
}
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -2540,7 +2540,7 @@ int AddressTestAddressGroupSetup12 (void) {
int AddressTestAddressGroupSetup13 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "0.0.0.0/0");
if (r == 0) {
@ -2570,7 +2570,7 @@ int AddressTestAddressGroupSetup13 (void) {
}
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -2578,7 +2578,7 @@ int AddressTestAddressGroupSetup13 (void) {
int AddressTestAddressGroupSetupIPv414 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "!1.2.3.4");
if (r == 0) {
@ -2603,7 +2603,7 @@ int AddressTestAddressGroupSetupIPv414 (void) {
printf("DetectAddressParse returned %d, expected 0: ", r);
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -2611,7 +2611,7 @@ int AddressTestAddressGroupSetupIPv414 (void) {
int AddressTestAddressGroupSetupIPv415 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "!0.0.0.0");
if (r == 0) {
@ -2627,7 +2627,7 @@ int AddressTestAddressGroupSetupIPv415 (void) {
}
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -2635,7 +2635,7 @@ int AddressTestAddressGroupSetupIPv415 (void) {
int AddressTestAddressGroupSetupIPv416 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "!255.255.255.255");
if (r == 0) {
@ -2651,7 +2651,7 @@ int AddressTestAddressGroupSetupIPv416 (void) {
}
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -2659,14 +2659,14 @@ int AddressTestAddressGroupSetupIPv416 (void) {
int AddressTestAddressGroupSetup14 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "2001::1");
if (r == 0) {
result = 1;
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -2674,14 +2674,14 @@ int AddressTestAddressGroupSetup14 (void) {
int AddressTestAddressGroupSetup15 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "2001::1");
if (r == 0 && gh->ipv6_head != NULL) {
result = 1;
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -2689,7 +2689,7 @@ int AddressTestAddressGroupSetup15 (void) {
int AddressTestAddressGroupSetup16 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "2001::4");
if (r == 0 && gh->ipv6_head != NULL) {
@ -2703,7 +2703,7 @@ int AddressTestAddressGroupSetup16 (void) {
}
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -2711,7 +2711,7 @@ int AddressTestAddressGroupSetup16 (void) {
int AddressTestAddressGroupSetup17 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "2001::4");
if (r == 0 && gh->ipv6_head != NULL) {
@ -2732,7 +2732,7 @@ int AddressTestAddressGroupSetup17 (void) {
}
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -2740,7 +2740,7 @@ int AddressTestAddressGroupSetup17 (void) {
int AddressTestAddressGroupSetup18 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "2001::2");
if (r == 0 && gh->ipv6_head != NULL) {
@ -2761,7 +2761,7 @@ int AddressTestAddressGroupSetup18 (void) {
}
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -2769,7 +2769,7 @@ int AddressTestAddressGroupSetup18 (void) {
int AddressTestAddressGroupSetup19 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "2001::2");
if (r == 0 && gh->ipv6_head != NULL) {
@ -2783,7 +2783,7 @@ int AddressTestAddressGroupSetup19 (void) {
}
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -2791,7 +2791,7 @@ int AddressTestAddressGroupSetup19 (void) {
int AddressTestAddressGroupSetup20 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "2000::/3");
if (r == 0 && gh->ipv6_head != NULL) {
@ -2804,7 +2804,7 @@ int AddressTestAddressGroupSetup20 (void) {
}
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -2812,7 +2812,7 @@ int AddressTestAddressGroupSetup20 (void) {
int AddressTestAddressGroupSetup21 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "2001::4");
if (r == 0 && gh->ipv6_head != NULL) {
@ -2825,7 +2825,7 @@ int AddressTestAddressGroupSetup21 (void) {
}
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -2833,7 +2833,7 @@ int AddressTestAddressGroupSetup21 (void) {
int AddressTestAddressGroupSetup22 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "2000::/3");
if (r == 0 && gh->ipv6_head != NULL) {
@ -2846,7 +2846,7 @@ int AddressTestAddressGroupSetup22 (void) {
}
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -2854,7 +2854,7 @@ int AddressTestAddressGroupSetup22 (void) {
int AddressTestAddressGroupSetup23 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "2001::4-2001::6");
if (r == 0 && gh->ipv6_head != NULL) {
@ -2867,7 +2867,7 @@ int AddressTestAddressGroupSetup23 (void) {
}
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -2875,7 +2875,7 @@ int AddressTestAddressGroupSetup23 (void) {
int AddressTestAddressGroupSetup24 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "2001::4-2001::6");
if (r == 0) {
@ -2936,7 +2936,7 @@ int AddressTestAddressGroupSetup24 (void) {
}
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -2944,7 +2944,7 @@ int AddressTestAddressGroupSetup24 (void) {
int AddressTestAddressGroupSetup25 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "2001::4-2001::6");
if (r == 0) {
@ -3005,7 +3005,7 @@ int AddressTestAddressGroupSetup25 (void) {
}
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -3013,7 +3013,7 @@ int AddressTestAddressGroupSetup25 (void) {
int AddressTestAddressGroupSetup26 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "::/0");
if (r == 0) {
@ -3074,7 +3074,7 @@ int AddressTestAddressGroupSetup26 (void) {
}
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -3082,14 +3082,14 @@ int AddressTestAddressGroupSetup26 (void) {
int AddressTestAddressGroupSetup27 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "[1.2.3.4]");
if (r == 0) {
result = 1;
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -3097,14 +3097,14 @@ int AddressTestAddressGroupSetup27 (void) {
int AddressTestAddressGroupSetup28 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "[1.2.3.4,4.3.2.1]");
if (r == 0) {
result = 1;
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -3112,14 +3112,14 @@ int AddressTestAddressGroupSetup28 (void) {
int AddressTestAddressGroupSetup29 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "[1.2.3.4,4.3.2.1,10.10.10.10]");
if (r == 0) {
result = 1;
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -3127,14 +3127,14 @@ int AddressTestAddressGroupSetup29 (void) {
int AddressTestAddressGroupSetup30 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "[[1.2.3.4,2.3.4.5],4.3.2.1,[10.10.10.10,11.11.11.11]]");
if (r == 0) {
result = 1;
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -3142,14 +3142,14 @@ int AddressTestAddressGroupSetup30 (void) {
int AddressTestAddressGroupSetup31 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "[[1.2.3.4,[2.3.4.5,3.4.5.6]],4.3.2.1,[10.10.10.10,[11.11.11.11,12.12.12.12]]]");
if (r == 0) {
result = 1;
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -3157,14 +3157,14 @@ int AddressTestAddressGroupSetup31 (void) {
int AddressTestAddressGroupSetup32 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "[[1.2.3.4,[2.3.4.5,[3.4.5.6,4.5.6.7]]],4.3.2.1,[10.10.10.10,[11.11.11.11,[12.12.12.12,13.13.13.13]]]]");
if (r == 0) {
result = 1;
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -3172,14 +3172,14 @@ int AddressTestAddressGroupSetup32 (void) {
int AddressTestAddressGroupSetup33 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "![1.1.1.1,[2.2.2.2,[3.3.3.3,4.4.4.4]]]");
if (r == 0) {
result = 1;
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -3187,14 +3187,14 @@ int AddressTestAddressGroupSetup33 (void) {
int AddressTestAddressGroupSetup34 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "[1.0.0.0/8,![1.1.1.1,[1.2.1.1,1.3.1.1]]]");
if (r == 0) {
result = 1;
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -3202,14 +3202,14 @@ int AddressTestAddressGroupSetup34 (void) {
int AddressTestAddressGroupSetup35 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "[1.0.0.0/8,[2.0.0.0/8,![1.1.1.1,2.2.2.2]]]");
if (r == 0) {
result = 1;
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -3217,14 +3217,14 @@ int AddressTestAddressGroupSetup35 (void) {
int AddressTestAddressGroupSetup36 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "[1.0.0.0/8,[2.0.0.0/8,[3.0.0.0/8,!1.1.1.1]]]");
if (r == 0) {
result = 1;
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}
@ -3232,14 +3232,14 @@ int AddressTestAddressGroupSetup36 (void) {
int AddressTestAddressGroupSetup37 (void) {
int result = 0;
DetectAddresssHead *gh = DetectAddresssHeadInit();
DetectAddressHead *gh = DetectAddressHeadInit();
if (gh != NULL) {
int r = DetectAddressParse(gh, "[0.0.0.0/0,::/0]");
if (r == 0) {
result = 1;
}
DetectAddresssHeadFree(gh);
DetectAddressHeadFree(gh);
}
return result;
}

12
src/detect-engine-address.h
Unescape Escape View File

@ -5,11 +5,11 @@
void DetectAddressRegister (void);
void DetectAddressPrintMemory(void);
DetectAddresssHead *DetectAddresssHeadInit(void);
void DetectAddresssHeadFree(DetectAddresssHead *);
void DetectAddresssHeadCleanup(DetectAddresssHead *);
DetectAddressHead *DetectAddressHeadInit(void);
void DetectAddressHeadFree(DetectAddressHead *);
void DetectAddressHeadCleanup(DetectAddressHead *);
int DetectAddressParse(DetectAddresssHead *, char *);
int DetectAddressParse(DetectAddressHead *, char *);
DetectAddress *DetectAddressInit(void);
void DetectAddressFree(DetectAddress *);
@ -18,10 +18,10 @@ void DetectAddressCleanupList (DetectAddress *);
int DetectAddressAdd(DetectAddress **, DetectAddress *);
void DetectAddressPrintList(DetectAddress *);
int DetectAddressInsert(DetectEngineCtx *, DetectAddresssHead *, DetectAddress *);
int DetectAddressInsert(DetectEngineCtx *, DetectAddressHead *, DetectAddress *);
int DetectAddressJoin(DetectEngineCtx *, DetectAddress *, DetectAddress *);
DetectAddress *DetectAddressLookupInHead(DetectAddresssHead *, Address *);
DetectAddress *DetectAddressLookupInHead(DetectAddressHead *, Address *);
DetectAddress *DetectAddressLookupInList(DetectAddress *, DetectAddress *);
/** \brief address only copy of ag */

4
src/detect-parse.c
Unescape Escape View File

@ -521,8 +521,8 @@ void SigFree(Signature *s) {
sm = nsm;
}
DetectAddresssHeadCleanup(&s->src);
DetectAddresssHeadCleanup(&s->dst);
DetectAddressHeadCleanup(&s->src);
DetectAddressHeadCleanup(&s->dst);
if (s->sp != NULL) {
DetectPortCleanupList(s->sp);

22
src/detect.c
Unescape Escape View File

@ -971,7 +971,7 @@ static int DetectEngineLookupDsizeAddSig(DetectEngineCtx *de_ctx, Signature *s,
return 0;
}
static DetectAddress *GetHeadPtr(DetectAddresssHead *head, int family) {
static DetectAddress *GetHeadPtr(DetectAddressHead *head, int family) {
DetectAddress *grhead;
if (head == NULL)
@ -1037,7 +1037,7 @@ int CreateGroupedAddrListCmpMpmMaxlen(DetectAddress *a, DetectAddress *b) {
*
*/
int CreateGroupedAddrList(DetectEngineCtx *de_ctx, DetectAddress *srchead,
int family, DetectAddresssHead *newhead,
int family, DetectAddressHead *newhead,
uint32_t unique_groups,
int (*CompareFunc)(DetectAddress *, DetectAddress *),
uint32_t max_idx)
@ -1369,11 +1369,11 @@ int SigAddressPrepareStage2(DetectEngineCtx *de_ctx) {
for (ds = 0; ds < DSIZE_STATES; ds++) {
for (f = 0; f < FLOW_STATES; f++) {
for (proto = 0; proto < 256; proto++) {
de_ctx->dsize_gh[ds].flow_gh[f].src_gh[proto] = DetectAddresssHeadInit();
de_ctx->dsize_gh[ds].flow_gh[f].src_gh[proto] = DetectAddressHeadInit();
if (de_ctx->dsize_gh[ds].flow_gh[f].src_gh[proto] == NULL) {
goto error;
}
de_ctx->dsize_gh[ds].flow_gh[f].tmp_gh[proto] = DetectAddresssHeadInit();
de_ctx->dsize_gh[ds].flow_gh[f].tmp_gh[proto] = DetectAddressHeadInit();
if (de_ctx->dsize_gh[ds].flow_gh[f].tmp_gh[proto] == NULL) {
goto error;
}
@ -1415,7 +1415,7 @@ int SigAddressPrepareStage2(DetectEngineCtx *de_ctx) {
de_ctx->dsize_gh[ds].flow_gh[f].src_gh[proto], groups,
CreateGroupedAddrListCmpMpmMaxlen, DetectEngineGetMaxSigId(de_ctx));
DetectAddresssHeadFree(de_ctx->dsize_gh[ds].flow_gh[f].tmp_gh[proto]);
DetectAddressHeadFree(de_ctx->dsize_gh[ds].flow_gh[f].tmp_gh[proto]);
de_ctx->dsize_gh[ds].flow_gh[f].tmp_gh[proto] = NULL;
}
}
@ -1538,7 +1538,7 @@ error:
return -1;
}
int BuildDestinationAddressHeads(DetectEngineCtx *de_ctx, DetectAddresssHead *head, int family, int dsize, int flow) {
int BuildDestinationAddressHeads(DetectEngineCtx *de_ctx, DetectAddressHead *head, int family, int dsize, int flow) {
Signature *tmp_s = NULL;
DetectAddress *gr = NULL, *sgr = NULL, *lookup_gr = NULL;
uint32_t max_idx = 0;
@ -1553,7 +1553,7 @@ int BuildDestinationAddressHeads(DetectEngineCtx *de_ctx, DetectAddresssHead *he
//printf(" * Source group: "); DetectAddressPrint(gr); printf("\n");
/* initialize the destination group head */
gr->dst_gh = DetectAddresssHeadInit();
gr->dst_gh = DetectAddressHeadInit();
if (gr->dst_gh == NULL) {
goto error;
}
@ -1709,7 +1709,7 @@ error:
return -1;
}
static int BuildDestinationAddressHeadsWithBothPorts(DetectEngineCtx *de_ctx, DetectAddresssHead *head, int family, int dsize, int flow) {
static int BuildDestinationAddressHeadsWithBothPorts(DetectEngineCtx *de_ctx, DetectAddressHead *head, int family, int dsize, int flow) {
Signature *tmp_s = NULL;
DetectAddress *src_gr = NULL, *dst_gr = NULL, *sig_gr = NULL, *lookup_gr = NULL;
DetectAddress *src_gr_head = NULL, *dst_gr_head = NULL, *sig_gr_head = NULL;
@ -1721,7 +1721,7 @@ static int BuildDestinationAddressHeadsWithBothPorts(DetectEngineCtx *de_ctx, De
//printf(" * Source group: "); DetectAddressPrint(src_gr); printf("\n");
/* initialize the destination group head */
src_gr->dst_gh = DetectAddresssHeadInit();
src_gr->dst_gh = DetectAddressHeadInit();
if (src_gr->dst_gh == NULL) {
goto error;
}
@ -2164,7 +2164,7 @@ int SigAddressCleanupStage1(DetectEngineCtx *de_ctx) {
for (f = 0; f < FLOW_STATES; f++) {
for (proto = 0; proto < 256; proto++) {
/* XXX fix this */
DetectAddresssHeadFree(de_ctx->dsize_gh[ds].flow_gh[f].src_gh[proto]);
DetectAddressHeadFree(de_ctx->dsize_gh[ds].flow_gh[f].src_gh[proto]);
de_ctx->dsize_gh[ds].flow_gh[f].src_gh[proto] = NULL;
}
}
@ -2234,7 +2234,7 @@ void DbgSghContainsSig(DetectEngineCtx *de_ctx, SigGroupHead *sgh, uint32_t sid)
/* just printing */
int SigAddressPrepareStage5(DetectEngineCtx *de_ctx) {
DetectAddresssHead *global_dst_gh = NULL;
DetectAddressHead *global_dst_gh = NULL;
DetectAddress *global_src_gr = NULL, *global_dst_gr = NULL;
int i;

12
src/detect.h
Unescape Escape View File

@ -48,7 +48,7 @@ typedef struct DetectAddress_ {
/* XXX ptr to rules, or PortGroup or whatever */
union {
struct DetectAddresssHead_ *dst_gh;
struct DetectAddressHead_ *dst_gh;
struct DetectPort_ *port;
};
/* signatures that belong in this group */
@ -63,11 +63,11 @@ typedef struct DetectAddress_ {
} DetectAddress;
/** Signature grouping head. Here 'any', ipv4 and ipv6 are split out */
typedef struct DetectAddresssHead_ {
typedef struct DetectAddressHead_ {
DetectAddress *any_head;
DetectAddress *ipv4_head;
DetectAddress *ipv6_head;
} DetectAddresssHead;
} DetectAddressHead;
/*
* DETECT PORT
@ -149,7 +149,7 @@ typedef struct Signature_ {
char *msg;
/** addresses, ports and proto this sig matches on */
DetectAddresssHead src, dst;
DetectAddressHead src, dst;
DetectProto proto;
DetectPort *sp, *dp;
@ -190,8 +190,8 @@ typedef struct DetectEngineIPOnlyCtx_ {
} DetectEngineIPOnlyCtx;
typedef struct DetectEngineLookupFlow_ {
DetectAddresssHead *src_gh[256]; /* a head for each protocol */
DetectAddresssHead *tmp_gh[256];
DetectAddressHead *src_gh[256]; /* a head for each protocol */
DetectAddressHead *tmp_gh[256];
} DetectEngineLookupFlow;
/* Flow status

Write Preview
Loading…
Cancel
Save