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

Further develop the address api. Added dynamic group head support.

Browse Source
remotes/origin/master-1.0.x
Victor Julien 17 years ago
parent 3ec5f66729
commit f77c654d13
2 changed files with 610 additions and 411 deletions
Show Stats Download Patch File Download Diff File

515
src/detect-address.c
Unescape Escape View File

@ -27,7 +27,7 @@ void DetectAddressRegister (void) {
} }
/* list head */ /* list head */
static DetectAddressGroup *head = NULL; //static DetectAddressGroup *head = NULL;
/* prototypes */ /* prototypes */
DetectAddressData *DetectAddressParse(char *); DetectAddressData *DetectAddressParse(char *);
@ -56,7 +56,7 @@ void DetectAddressGroupFree(DetectAddressGroup *ag) {
} }
} }
void DetectAddressGroupPrintList(void) { void DetectAddressGroupPrintList(DetectAddressGroup *head) {
DetectAddressGroup *cur; DetectAddressGroup *cur;
printf("list:\n"); printf("list:\n");
@ -68,7 +68,7 @@ void DetectAddressGroupPrintList(void) {
printf("endlist\n"); printf("endlist\n");
} }
void DetectAddressGroupCleanupList (void) { void DetectAddressGroupCleanupList (DetectAddressGroup *head) {
if (head == NULL) if (head == NULL)
return; return;
@ -84,10 +84,35 @@ void DetectAddressGroupCleanupList (void) {
head = NULL; head = NULL;
} }
int DetectAddressGroupInsert(DetectAddressData *new) { static int SetHeadPtr(DetectAddressGroupsHead *gh, DetectAddressGroup *newhead) {
DetectAddressGroup *ag = NULL,*cur = NULL;
if (newhead->ad->family == AF_INET)
gh->ipv4_head = newhead;
else if (newhead->ad->family == AF_INET6)
gh->ipv6_head = newhead;
else
return -1;
return 0;
}
static DetectAddressGroup *GetHeadPtr(DetectAddressGroupsHead *gh, DetectAddressData *new) {
DetectAddressGroup *head = NULL;
if (new->family == AF_INET)
head = gh->ipv4_head;
else if (new->family == AF_INET6)
head = gh->ipv6_head;
return head;
}
int DetectAddressGroupInsert(DetectAddressGroupsHead *gh, DetectAddressData *new) {
DetectAddressGroup *ag = NULL,*cur = NULL,*head = NULL;
int r = 0; int r = 0;
head = GetHeadPtr(gh,new);
/* see if it already exists or overlaps with existing ag's */ /* see if it already exists or overlaps with existing ag's */
if (head != NULL) { if (head != NULL) {
for (cur = head; cur != NULL; cur = cur->next) { for (cur = head; cur != NULL; cur = cur->next) {
@ -139,6 +164,9 @@ int DetectAddressGroupInsert(DetectAddressData *new) {
/* update head if required */ /* update head if required */
if (head == cur) { if (head == cur) {
head = ag; head = ag;
if (SetHeadPtr(gh,head) < 0)
goto error;
} }
return 0; return 0;
@ -150,29 +178,29 @@ int DetectAddressGroupInsert(DetectAddressData *new) {
r = AddressCut(cur->ad,new,&c); r = AddressCut(cur->ad,new,&c);
//printf("ADDRESS_ES: r = %d: ", r); //printf("ADDRESS_ES: r = %d: ", r);
//DetectAddressDataPrint(cur->ad); //DetectAddressDataPrint(cur->ad);
DetectAddressGroupInsert(new); DetectAddressGroupInsert(gh, new);
if (c) DetectAddressGroupInsert(c); if (c) DetectAddressGroupInsert(gh, c);
} else if (r == ADDRESS_EB) { } else if (r == ADDRESS_EB) {
DetectAddressData *c = NULL; DetectAddressData *c = NULL;
r = AddressCut(cur->ad,new,&c); r = AddressCut(cur->ad,new,&c);
//printf("ADDRESS_EB: r = %d: ", r); //printf("ADDRESS_EB: r = %d: ", r);
//DetectAddressDataPrint(cur->ad); //DetectAddressDataPrint(cur->ad);
DetectAddressGroupInsert(new); DetectAddressGroupInsert(gh, new);
if (c) DetectAddressGroupInsert(c); if (c) DetectAddressGroupInsert(gh, c);
} else if (r == ADDRESS_LE) { } else if (r == ADDRESS_LE) {
DetectAddressData *c = NULL; DetectAddressData *c = NULL;
r = AddressCut(cur->ad,new,&c); r = AddressCut(cur->ad,new,&c);
//printf("ADDRESS_LE: r = %d: ", r); //printf("ADDRESS_LE: r = %d: ", r);
//DetectAddressDataPrint(cur->ad); //DetectAddressDataPrint(cur->ad);
DetectAddressGroupInsert(new); DetectAddressGroupInsert(gh, new);
if (c) DetectAddressGroupInsert(c); if (c) DetectAddressGroupInsert(gh, c);
} else if (r == ADDRESS_GE) { } else if (r == ADDRESS_GE) {
DetectAddressData *c = NULL; DetectAddressData *c = NULL;
r = AddressCut(cur->ad,new,&c); r = AddressCut(cur->ad,new,&c);
//printf("ADDRESS_GE: r = %d: ", r); //printf("ADDRESS_GE: r = %d: ", r);
//DetectAddressDataPrint(cur->ad); //DetectAddressDataPrint(cur->ad);
DetectAddressGroupInsert(new); DetectAddressGroupInsert(gh, new);
if (c) DetectAddressGroupInsert(c); if (c) DetectAddressGroupInsert(gh, c);
} }
} }
} else { } else {
@ -181,8 +209,10 @@ int DetectAddressGroupInsert(DetectAddressData *new) {
if (ag == NULL) { if (ag == NULL) {
goto error; goto error;
} }
ag->ad = new; ag->ad = new;
if (SetHeadPtr(gh,head) < 0)
goto error;
} }
return 0; return 0;
@ -190,7 +220,7 @@ error:
return -1; return -1;
} }
int DetectAddressGroupSetup(char *s) { int DetectAddressGroupSetup(DetectAddressGroupsHead *gh, char *s) {
DetectAddressData *ad = NULL; DetectAddressData *ad = NULL;
/* parse the address */ /* parse the address */
@ -199,7 +229,7 @@ int DetectAddressGroupSetup(char *s) {
printf("DetectAddressParse error \"%s\"\n",s); printf("DetectAddressParse error \"%s\"\n",s);
goto error; goto error;
} }
if (DetectAddressGroupInsert(ad) < 0) if (DetectAddressGroupInsert(gh, ad) < 0)
goto error; goto error;
return 0; return 0;
@ -209,6 +239,24 @@ error:
return -1; return -1;
} }
DetectAddressGroupsHead *DetectAddressGroupsHeadInit(void) {
DetectAddressGroupsHead *gh = malloc(sizeof(DetectAddressGroupsHead));
if (gh == NULL) {
return NULL;
}
memset(gh,0,sizeof(DetectAddressGroupsHead));
return gh;
}
void DetectAddressGroupsHeadFree(DetectAddressGroupsHead *gh) {
if (gh != NULL) {
DetectAddressGroupCleanupList(gh->ipv4_head);
DetectAddressGroupCleanupList(gh->ipv6_head);
free(gh);
}
}
int AddressCut(DetectAddressData *a, DetectAddressData *b, DetectAddressData **c) { int AddressCut(DetectAddressData *a, DetectAddressData *b, DetectAddressData **c) {
if (a->family == AF_INET) { if (a->family == AF_INET) {
return AddressCutIPv4(a,b,c); return AddressCutIPv4(a,b,c);
@ -1417,165 +1465,232 @@ error:
int AddressTestAddressGroupSetup01 (void) { int AddressTestAddressGroupSetup01 (void) {
int result = 0; int result = 0;
int r = DetectAddressGroupSetup("1.2.3.4");
DetectAddressGroupsHead *gh = DetectAddressGroupsHeadInit();
if (gh != NULL) {
int r = DetectAddressGroupSetup(gh, "1.2.3.4");
if (r == 0) { if (r == 0) {
result = 1; result = 1;
} }
DetectAddressGroupCleanupList(); DetectAddressGroupsHeadFree(gh);
}
return result; return result;
} }
int AddressTestAddressGroupSetup02 (void) { int AddressTestAddressGroupSetup02 (void) {
int result = 0; int result = 0;
int r = DetectAddressGroupSetup("1.2.3.4");
if (r == 0 && head != NULL) { DetectAddressGroupsHead *gh = DetectAddressGroupsHeadInit();
if (gh != NULL) {
int r = DetectAddressGroupSetup(gh, "1.2.3.4");
if (r == 0 && gh->ipv4_head != NULL) {
result = 1; result = 1;
} }
DetectAddressGroupCleanupList(); DetectAddressGroupsHeadFree(gh);
}
return result; return result;
} }
int AddressTestAddressGroupSetup03 (void) { int AddressTestAddressGroupSetup03 (void) {
int result = 0; int result = 0;
int r = DetectAddressGroupSetup("1.2.3.4");
if (r == 0 && head != NULL) {
DetectAddressGroup *prev_head = head;
r = DetectAddressGroupSetup("1.2.3.3"); DetectAddressGroupsHead *gh = DetectAddressGroupsHeadInit();
if (r == 0 && head != prev_head && head != NULL && head->next == prev_head) { if (gh != NULL) {
int r = DetectAddressGroupSetup(gh, "1.2.3.4");
if (r == 0 && gh->ipv4_head != NULL) {
DetectAddressGroup *prev_head = gh->ipv4_head;
r = DetectAddressGroupSetup(gh, "1.2.3.3");
if (r == 0 && gh->ipv4_head != prev_head &&
gh->ipv4_head != NULL && gh->ipv4_head->next == prev_head)
{
result = 1; result = 1;
} }
} }
DetectAddressGroupCleanupList(); DetectAddressGroupsHeadFree(gh);
}
return result; return result;
} }
int AddressTestAddressGroupSetup04 (void) { int AddressTestAddressGroupSetup04 (void) {
int result = 0; int result = 0;
int r = DetectAddressGroupSetup("1.2.3.4");
if (r == 0 && head != NULL) {
DetectAddressGroup *prev_head = head;
r = DetectAddressGroupSetup("1.2.3.3"); DetectAddressGroupsHead *gh = DetectAddressGroupsHeadInit();
if (r == 0 && head != prev_head && head != NULL && head->next == prev_head) { if (gh != NULL) {
prev_head = head; int r = DetectAddressGroupSetup(gh, "1.2.3.4");
if (r == 0 && gh->ipv4_head != NULL) {
DetectAddressGroup *prev_head = gh->ipv4_head;
r = DetectAddressGroupSetup("1.2.3.2"); r = DetectAddressGroupSetup(gh, "1.2.3.3");
if (r == 0 && head != prev_head && head != NULL && head->next == prev_head) { if (r == 0 && gh->ipv4_head != prev_head &&
gh->ipv4_head != NULL && gh->ipv4_head->next == prev_head)
{
DetectAddressGroup *prev_head = gh->ipv4_head;
r = DetectAddressGroupSetup(gh, "1.2.3.2");
if (r == 0 && gh->ipv4_head != prev_head &&
gh->ipv4_head != NULL && gh->ipv4_head->next == prev_head)
{
result = 1; result = 1;
} }
} }
} }
DetectAddressGroupCleanupList(); DetectAddressGroupsHeadFree(gh);
}
return result; return result;
} }
int AddressTestAddressGroupSetup05 (void) { int AddressTestAddressGroupSetup05 (void) {
int result = 0; int result = 0;
int r = DetectAddressGroupSetup("1.2.3.2");
if (r == 0 && head != NULL) {
DetectAddressGroup *prev_head = head;
r = DetectAddressGroupSetup("1.2.3.3"); DetectAddressGroupsHead *gh = DetectAddressGroupsHeadInit();
if (r == 0 && head == prev_head && head != NULL && head->next != prev_head) { if (gh != NULL) {
prev_head = head; int r = DetectAddressGroupSetup(gh, "1.2.3.2");
if (r == 0 && gh->ipv4_head != NULL) {
DetectAddressGroup *prev_head = gh->ipv4_head;
r = DetectAddressGroupSetup("1.2.3.4"); r = DetectAddressGroupSetup(gh, "1.2.3.3");
if (r == 0 && head == prev_head && head != NULL && head->next != prev_head) { if (r == 0 && gh->ipv4_head == prev_head &&
gh->ipv4_head != NULL && gh->ipv4_head->next != prev_head)
{
DetectAddressGroup *prev_head = gh->ipv4_head;
r = DetectAddressGroupSetup(gh, "1.2.3.4");
if (r == 0 && gh->ipv4_head == prev_head &&
gh->ipv4_head != NULL && gh->ipv4_head->next != prev_head)
{
result = 1; result = 1;
} }
} }
} }
DetectAddressGroupCleanupList(); DetectAddressGroupsHeadFree(gh);
}
return result; return result;
} }
int AddressTestAddressGroupSetup06 (void) { int AddressTestAddressGroupSetup06 (void) {
int result = 0; int result = 0;
int r = DetectAddressGroupSetup("1.2.3.2");
if (r == 0 && head != NULL) {
DetectAddressGroup *prev_head = head;
r = DetectAddressGroupSetup("1.2.3.2"); DetectAddressGroupsHead *gh = DetectAddressGroupsHeadInit();
if (r == 0 && head == prev_head && head != NULL && head->next == NULL) { if (gh != NULL) {
int r = DetectAddressGroupSetup(gh, "1.2.3.2");
if (r == 0 && gh->ipv4_head != NULL) {
DetectAddressGroup *prev_head = gh->ipv4_head;
r = DetectAddressGroupSetup(gh, "1.2.3.2");
if (r == 0 && gh->ipv4_head == prev_head &&
gh->ipv4_head != NULL && gh->ipv4_head->next == NULL)
{
result = 1; result = 1;
} }
} }
DetectAddressGroupCleanupList(); DetectAddressGroupsHeadFree(gh);
}
return result; return result;
} }
int AddressTestAddressGroupSetup07 (void) { int AddressTestAddressGroupSetup07 (void) {
int result = 0; int result = 0;
int r = DetectAddressGroupSetup("10.0.0.0/8");
if (r == 0 && head != NULL) { DetectAddressGroupsHead *gh = DetectAddressGroupsHeadInit();
r = DetectAddressGroupSetup("10.10.10.10"); if (gh != NULL) {
if (r == 0 && head != NULL && head->next != NULL && head->next->next != NULL) { int r = DetectAddressGroupSetup(gh, "10.0.0.0/8");
if (r == 0 && gh->ipv4_head != NULL) {
r = DetectAddressGroupSetup(gh, "10.10.10.10");
if (r == 0 && gh->ipv4_head != NULL &&
gh->ipv4_head->next != NULL &&
gh->ipv4_head->next->next != NULL)
{
result = 1; result = 1;
} }
} }
DetectAddressGroupCleanupList(); DetectAddressGroupsHeadFree(gh);
}
return result; return result;
} }
int AddressTestAddressGroupSetup08 (void) { int AddressTestAddressGroupSetup08 (void) {
int result = 0; int result = 0;
int r = DetectAddressGroupSetup("10.10.10.10");
if (r == 0 && head != NULL) { DetectAddressGroupsHead *gh = DetectAddressGroupsHeadInit();
r = DetectAddressGroupSetup("10.0.0.0/8"); if (gh != NULL) {
if (r == 0 && head != NULL && head->next != NULL && head->next->next != NULL) { int r = DetectAddressGroupSetup(gh, "10.10.10.10");
if (r == 0 && gh->ipv4_head != NULL) {
r = DetectAddressGroupSetup(gh, "10.0.0.0/8");
if (r == 0 && gh->ipv4_head != NULL &&
gh->ipv4_head->next != NULL &&
gh->ipv4_head->next->next != NULL)
{
result = 1; result = 1;
} }
} }
DetectAddressGroupCleanupList(); DetectAddressGroupsHeadFree(gh);
}
return result; return result;
} }
int AddressTestAddressGroupSetup09 (void) { int AddressTestAddressGroupSetup09 (void) {
int result = 0; int result = 0;
int r = DetectAddressGroupSetup("10.10.10.0/24");
if (r == 0 && head != NULL) { DetectAddressGroupsHead *gh = DetectAddressGroupsHeadInit();
r = DetectAddressGroupSetup("10.10.10.10-10.10.11.1"); if (gh != NULL) {
if (r == 0 && head != NULL && head->next != NULL && head->next->next != NULL) { int r = DetectAddressGroupSetup(gh, "10.10.10.0/24");
if (r == 0 && gh->ipv4_head != NULL) {
r = DetectAddressGroupSetup(gh, "10.10.10.10-10.10.11.1");
if (r == 0 && gh->ipv4_head != NULL &&
gh->ipv4_head->next != NULL &&
gh->ipv4_head->next->next != NULL)
{
result = 1; result = 1;
} }
} }
DetectAddressGroupCleanupList(); DetectAddressGroupsHeadFree(gh);
}
return result; return result;
} }
int AddressTestAddressGroupSetup10 (void) { int AddressTestAddressGroupSetup10 (void) {
int result = 0; int result = 0;
int r = DetectAddressGroupSetup("10.10.10.10-10.10.11.1");
if (r == 0 && head != NULL) { DetectAddressGroupsHead *gh = DetectAddressGroupsHeadInit();
r = DetectAddressGroupSetup("10.10.10.0/24"); if (gh != NULL) {
if (r == 0 && head != NULL && head->next != NULL && head->next->next != NULL) { int r = DetectAddressGroupSetup(gh, "10.10.10.10-10.10.11.1");
if (r == 0 && gh->ipv4_head != NULL) {
r = DetectAddressGroupSetup(gh, "10.10.10.0/24");
if (r == 0 && gh->ipv4_head != NULL &&
gh->ipv4_head->next != NULL &&
gh->ipv4_head->next->next != NULL)
{
result = 1; result = 1;
} }
} }
DetectAddressGroupCleanupList(); DetectAddressGroupsHeadFree(gh);
}
return result; return result;
} }
int AddressTestAddressGroupSetup11 (void) { int AddressTestAddressGroupSetup11 (void) {
int result = 0; int result = 0;
int r = DetectAddressGroupSetup("10.10.10.10-10.10.11.1");
DetectAddressGroupsHead *gh = DetectAddressGroupsHeadInit();
if (gh != NULL) {
int r = DetectAddressGroupSetup(gh, "10.10.10.10-10.10.11.1");
if (r == 0) { if (r == 0) {
r = DetectAddressGroupSetup("10.10.10.0/24"); r = DetectAddressGroupSetup(gh, "10.10.10.0/24");
if (r == 0) { if (r == 0) {
r = DetectAddressGroupSetup("0.0.0.0/0"); r = DetectAddressGroupSetup(gh, "0.0.0.0/0");
if (r == 0) { if (r == 0) {
DetectAddressGroup *one = head, *two = one->next, DetectAddressGroup *one = gh->ipv4_head, *two = one->next,
*three = two->next, *four = three->next, *three = two->next, *four = three->next,
*five = four->next; *five = four->next;
@ -1597,19 +1712,23 @@ int AddressTestAddressGroupSetup11 (void) {
} }
} }
DetectAddressGroupCleanupList(); DetectAddressGroupsHeadFree(gh);
}
return result; return result;
} }
int AddressTestAddressGroupSetup12 (void) { int AddressTestAddressGroupSetup12 (void) {
int result = 0; int result = 0;
int r = DetectAddressGroupSetup("10.10.10.10-10.10.11.1");
DetectAddressGroupsHead *gh = DetectAddressGroupsHeadInit();
if (gh != NULL) {
int r = DetectAddressGroupSetup(gh, "10.10.10.10-10.10.11.1");
if (r == 0) { if (r == 0) {
r = DetectAddressGroupSetup("0.0.0.0/0"); r = DetectAddressGroupSetup(gh, "0.0.0.0/0");
if (r == 0) { if (r == 0) {
r = DetectAddressGroupSetup("10.10.10.0/24"); r = DetectAddressGroupSetup(gh, "10.10.10.0/24");
if (r == 0) { if (r == 0) {
DetectAddressGroup *one = head, *two = one->next, DetectAddressGroup *one = gh->ipv4_head, *two = one->next,
*three = two->next, *four = three->next, *three = two->next, *four = three->next,
*five = four->next; *five = four->next;
@ -1631,19 +1750,23 @@ int AddressTestAddressGroupSetup12 (void) {
} }
} }
DetectAddressGroupCleanupList(); DetectAddressGroupsHeadFree(gh);
}
return result; return result;
} }
int AddressTestAddressGroupSetup13 (void) { int AddressTestAddressGroupSetup13 (void) {
int result = 0; int result = 0;
int r = DetectAddressGroupSetup("0.0.0.0/0");
DetectAddressGroupsHead *gh = DetectAddressGroupsHeadInit();
if (gh != NULL) {
int r = DetectAddressGroupSetup(gh, "0.0.0.0/0");
if (r == 0) { if (r == 0) {
r = DetectAddressGroupSetup("10.10.10.10-10.10.11.1"); r = DetectAddressGroupSetup(gh, "10.10.10.10-10.10.11.1");
if (r == 0) { if (r == 0) {
r = DetectAddressGroupSetup("10.10.10.0/24"); r = DetectAddressGroupSetup(gh, "10.10.10.0/24");
if (r == 0) { if (r == 0) {
DetectAddressGroup *one = head, *two = one->next, DetectAddressGroup *one = gh->ipv4_head, *two = one->next,
*three = two->next, *four = three->next, *three = two->next, *four = three->next,
*five = four->next; *five = four->next;
@ -1665,174 +1788,241 @@ int AddressTestAddressGroupSetup13 (void) {
} }
} }
DetectAddressGroupCleanupList(); DetectAddressGroupsHeadFree(gh);
}
return result; return result;
} }
int AddressTestAddressGroupSetup14 (void) { int AddressTestAddressGroupSetup14 (void) {
int result = 0; int result = 0;
int r = DetectAddressGroupSetup("2001::1");
DetectAddressGroupsHead *gh = DetectAddressGroupsHeadInit();
if (gh != NULL) {
int r = DetectAddressGroupSetup(gh, "2001::1");
if (r == 0) { if (r == 0) {
result = 1; result = 1;
} }
DetectAddressGroupCleanupList(); DetectAddressGroupsHeadFree(gh);
}
return result; return result;
} }
int AddressTestAddressGroupSetup15 (void) { int AddressTestAddressGroupSetup15 (void) {
int result = 0; int result = 0;
int r = DetectAddressGroupSetup("2001::1");
if (r == 0 && head != NULL) { DetectAddressGroupsHead *gh = DetectAddressGroupsHeadInit();
if (gh != NULL) {
int r = DetectAddressGroupSetup(gh, "2001::1");
if (r == 0 && gh->ipv6_head != NULL) {
result = 1; result = 1;
} }
DetectAddressGroupCleanupList(); DetectAddressGroupsHeadFree(gh);
}
return result; return result;
} }
int AddressTestAddressGroupSetup16 (void) { int AddressTestAddressGroupSetup16 (void) {
int result = 0; int result = 0;
int r = DetectAddressGroupSetup("2001::4");
if (r == 0 && head != NULL) {
DetectAddressGroup *prev_head = head;
r = DetectAddressGroupSetup("2001::3"); DetectAddressGroupsHead *gh = DetectAddressGroupsHeadInit();
if (r == 0 && head != prev_head && head != NULL && head->next == prev_head) { if (gh != NULL) {
int r = DetectAddressGroupSetup(gh, "2001::4");
if (r == 0 && gh->ipv6_head != NULL) {
DetectAddressGroup *prev_head = gh->ipv6_head;
r = DetectAddressGroupSetup(gh, "2001::3");
if (r == 0 && gh->ipv6_head != prev_head &&
gh->ipv6_head != NULL && gh->ipv6_head->next == prev_head)
{
result = 1; result = 1;
} }
} }
DetectAddressGroupCleanupList(); DetectAddressGroupsHeadFree(gh);
}
return result; return result;
} }
int AddressTestAddressGroupSetup17 (void) { int AddressTestAddressGroupSetup17 (void) {
int result = 0; int result = 0;
int r = DetectAddressGroupSetup("2001::4");
if (r == 0 && head != NULL) {
DetectAddressGroup *prev_head = head;
r = DetectAddressGroupSetup("2001::3"); DetectAddressGroupsHead *gh = DetectAddressGroupsHeadInit();
if (r == 0 && head != prev_head && head != NULL && head->next == prev_head) { if (gh != NULL) {
prev_head = head; int r = DetectAddressGroupSetup(gh, "2001::4");
if (r == 0 && gh->ipv6_head != NULL) {
DetectAddressGroup *prev_head = gh->ipv6_head;
r = DetectAddressGroupSetup(gh, "2001::3");
if (r == 0 && gh->ipv6_head != prev_head &&
gh->ipv6_head != NULL && gh->ipv6_head->next == prev_head)
{
DetectAddressGroup *prev_head = gh->ipv6_head;
r = DetectAddressGroupSetup("2001::2"); r = DetectAddressGroupSetup(gh, "2001::2");
if (r == 0 && head != prev_head && head != NULL && head->next == prev_head) { if (r == 0 && gh->ipv6_head != prev_head &&
gh->ipv6_head != NULL && gh->ipv6_head->next == prev_head)
{
result = 1; result = 1;
} }
} }
} }
DetectAddressGroupCleanupList(); DetectAddressGroupsHeadFree(gh);
}
return result; return result;
} }
int AddressTestAddressGroupSetup18 (void) { int AddressTestAddressGroupSetup18 (void) {
int result = 0; int result = 0;
int r = DetectAddressGroupSetup("2001::2");
if (r == 0 && head != NULL) {
DetectAddressGroup *prev_head = head;
r = DetectAddressGroupSetup("2001::3"); DetectAddressGroupsHead *gh = DetectAddressGroupsHeadInit();
if (r == 0 && head == prev_head && head != NULL && head->next != prev_head) { if (gh != NULL) {
prev_head = head; int r = DetectAddressGroupSetup(gh, "2001::2");
if (r == 0 && gh->ipv6_head != NULL) {
DetectAddressGroup *prev_head = gh->ipv6_head;
r = DetectAddressGroupSetup(gh, "2001::3");
if (r == 0 && gh->ipv6_head == prev_head &&
gh->ipv6_head != NULL && gh->ipv6_head->next != prev_head)
{
DetectAddressGroup *prev_head = gh->ipv6_head;
r = DetectAddressGroupSetup("2001::4"); r = DetectAddressGroupSetup(gh, "2001::4");
if (r == 0 && head == prev_head && head != NULL && head->next != prev_head) { if (r == 0 && gh->ipv6_head == prev_head &&
gh->ipv6_head != NULL && gh->ipv6_head->next != prev_head)
{
result = 1; result = 1;
} }
} }
} }
DetectAddressGroupCleanupList(); DetectAddressGroupsHeadFree(gh);
}
return result; return result;
} }
int AddressTestAddressGroupSetup19 (void) { int AddressTestAddressGroupSetup19 (void) {
int result = 0; int result = 0;
int r = DetectAddressGroupSetup("2001::2");
if (r == 0 && head != NULL) {
DetectAddressGroup *prev_head = head;
r = DetectAddressGroupSetup("2001::2"); DetectAddressGroupsHead *gh = DetectAddressGroupsHeadInit();
if (r == 0 && head == prev_head && head != NULL && head->next == NULL) { if (gh != NULL) {
int r = DetectAddressGroupSetup(gh, "2001::2");
if (r == 0 && gh->ipv6_head != NULL) {
DetectAddressGroup *prev_head = gh->ipv6_head;
r = DetectAddressGroupSetup(gh, "2001::2");
if (r == 0 && gh->ipv6_head == prev_head &&
gh->ipv6_head != NULL && gh->ipv6_head->next == NULL)
{
result = 1; result = 1;
} }
} }
DetectAddressGroupCleanupList(); DetectAddressGroupsHeadFree(gh);
}
return result; return result;
} }
int AddressTestAddressGroupSetup20 (void) { int AddressTestAddressGroupSetup20 (void) {
int result = 0; int result = 0;
int r = DetectAddressGroupSetup("2000::/3");
if (r == 0 && head != NULL) { DetectAddressGroupsHead *gh = DetectAddressGroupsHeadInit();
r = DetectAddressGroupSetup("2001::4"); if (gh != NULL) {
if (r == 0 && head != NULL && head->next != NULL && head->next->next != NULL) { int r = DetectAddressGroupSetup(gh, "2000::/3");
if (r == 0 && gh->ipv6_head != NULL) {
r = DetectAddressGroupSetup(gh, "2001::4");
if (r == 0 && gh->ipv6_head != NULL &&
gh->ipv6_head->next != NULL &&
gh->ipv6_head->next->next != NULL)
{
result = 1; result = 1;
} }
} }
DetectAddressGroupCleanupList(); DetectAddressGroupsHeadFree(gh);
}
return result; return result;
} }
int AddressTestAddressGroupSetup21 (void) { int AddressTestAddressGroupSetup21 (void) {
int result = 0; int result = 0;
int r = DetectAddressGroupSetup("2001::4");
if (r == 0 && head != NULL) { DetectAddressGroupsHead *gh = DetectAddressGroupsHeadInit();
r = DetectAddressGroupSetup("2000::/3"); if (gh != NULL) {
if (r == 0 && head != NULL && head->next != NULL && head->next->next != NULL) { int r = DetectAddressGroupSetup(gh, "2001::4");
if (r == 0 && gh->ipv6_head != NULL) {
r = DetectAddressGroupSetup(gh, "2000::/3");
if (r == 0 && gh->ipv6_head != NULL &&
gh->ipv6_head->next != NULL &&
gh->ipv6_head->next->next != NULL)
{
result = 1; result = 1;
} }
} }
DetectAddressGroupCleanupList(); DetectAddressGroupsHeadFree(gh);
}
return result; return result;
} }
int AddressTestAddressGroupSetup22 (void) { int AddressTestAddressGroupSetup22 (void) {
int result = 0; int result = 0;
int r = DetectAddressGroupSetup("2000::/3");
if (r == 0 && head != NULL) { DetectAddressGroupsHead *gh = DetectAddressGroupsHeadInit();
r = DetectAddressGroupSetup("2001::4-2001::6"); if (gh != NULL) {
if (r == 0 && head != NULL && head->next != NULL && head->next->next != NULL) { int r = DetectAddressGroupSetup(gh, "2000::/3");
if (r == 0 && gh->ipv6_head != NULL) {
r = DetectAddressGroupSetup(gh, "2001::4-2001::6");
if (r == 0 && gh->ipv6_head != NULL &&
gh->ipv6_head->next != NULL &&
gh->ipv6_head->next->next != NULL)
{
result = 1; result = 1;
} }
} }
DetectAddressGroupCleanupList(); DetectAddressGroupsHeadFree(gh);
}
return result; return result;
} }
int AddressTestAddressGroupSetup23 (void) { int AddressTestAddressGroupSetup23 (void) {
int result = 0; int result = 0;
int r = DetectAddressGroupSetup("2001::4-2001::6");
if (r == 0 && head != NULL) { DetectAddressGroupsHead *gh = DetectAddressGroupsHeadInit();
r = DetectAddressGroupSetup("2000::/3"); if (gh != NULL) {
if (r == 0 && head != NULL && head->next != NULL && head->next->next != NULL) { int r = DetectAddressGroupSetup(gh, "2001::4-2001::6");
if (r == 0 && gh->ipv6_head != NULL) {
r = DetectAddressGroupSetup(gh, "2000::/3");
if (r == 0 && gh->ipv6_head != NULL &&
gh->ipv6_head->next != NULL &&
gh->ipv6_head->next->next != NULL)
{
result = 1; result = 1;
} }
} }
DetectAddressGroupCleanupList(); DetectAddressGroupsHeadFree(gh);
}
return result; return result;
} }
int AddressTestAddressGroupSetup24 (void) { int AddressTestAddressGroupSetup24 (void) {
int result = 0; int result = 0;
int r = DetectAddressGroupSetup("2001::4-2001::6");
DetectAddressGroupsHead *gh = DetectAddressGroupsHeadInit();
if (gh != NULL) {
int r = DetectAddressGroupSetup(gh, "2001::4-2001::6");
if (r == 0) { if (r == 0) {
r = DetectAddressGroupSetup("2001::/3"); r = DetectAddressGroupSetup(gh, "2001::/3");
if (r == 0) { if (r == 0) {
r = DetectAddressGroupSetup("::/0"); r = DetectAddressGroupSetup(gh, "::/0");
if (r == 0) { if (r == 0) {
DetectAddressGroup *one = head, *two = one->next, DetectAddressGroup *one = gh->ipv6_head, *two = one->next,
*three = two->next, *four = three->next, *three = two->next, *four = three->next,
*five = four->next; *five = four->next;
if (one->ad->ip[0] == 0x00000000 && if (one->ad->ip[0] == 0x00000000 &&
one->ad->ip[1] == 0x00000000 && one->ad->ip[1] == 0x00000000 &&
one->ad->ip[2] == 0x00000000 && one->ad->ip[2] == 0x00000000 &&
@ -1883,22 +2073,25 @@ int AddressTestAddressGroupSetup24 (void) {
} }
} }
DetectAddressGroupCleanupList(); DetectAddressGroupsHeadFree(gh);
}
return result; return result;
} }
int AddressTestAddressGroupSetup25 (void) { int AddressTestAddressGroupSetup25 (void) {
int result = 0; int result = 0;
int r = DetectAddressGroupSetup("2001::4-2001::6");
DetectAddressGroupsHead *gh = DetectAddressGroupsHeadInit();
if (gh != NULL) {
int r = DetectAddressGroupSetup(gh, "2001::4-2001::6");
if (r == 0) { if (r == 0) {
r = DetectAddressGroupSetup("::/0"); r = DetectAddressGroupSetup(gh, "::/0");
if (r == 0) { if (r == 0) {
r = DetectAddressGroupSetup("2001::/3"); r = DetectAddressGroupSetup(gh, "2001::/3");
if (r == 0) { if (r == 0) {
DetectAddressGroup *one = head, *two = one->next, DetectAddressGroup *one = gh->ipv6_head, *two = one->next,
*three = two->next, *four = three->next, *three = two->next, *four = three->next,
*five = four->next; *five = four->next;
if (one->ad->ip[0] == 0x00000000 && if (one->ad->ip[0] == 0x00000000 &&
one->ad->ip[1] == 0x00000000 && one->ad->ip[1] == 0x00000000 &&
one->ad->ip[2] == 0x00000000 && one->ad->ip[2] == 0x00000000 &&
@ -1949,22 +2142,25 @@ int AddressTestAddressGroupSetup25 (void) {
} }
} }
DetectAddressGroupCleanupList(); DetectAddressGroupsHeadFree(gh);
}
return result; return result;
} }
int AddressTestAddressGroupSetup26 (void) { int AddressTestAddressGroupSetup26 (void) {
int result = 0; int result = 0;
int r = DetectAddressGroupSetup("::/0");
DetectAddressGroupsHead *gh = DetectAddressGroupsHeadInit();
if (gh != NULL) {
int r = DetectAddressGroupSetup(gh, "::/0");
if (r == 0) { if (r == 0) {
r = DetectAddressGroupSetup("2001::4-2001::6"); r = DetectAddressGroupSetup(gh, "2001::4-2001::6");
if (r == 0) { if (r == 0) {
r = DetectAddressGroupSetup("2001::/3"); r = DetectAddressGroupSetup(gh, "2001::/3");
if (r == 0) { if (r == 0) {
DetectAddressGroup *one = head, *two = one->next, DetectAddressGroup *one = gh->ipv6_head, *two = one->next,
*three = two->next, *four = three->next, *three = two->next, *four = three->next,
*five = four->next; *five = four->next;
if (one->ad->ip[0] == 0x00000000 && if (one->ad->ip[0] == 0x00000000 &&
one->ad->ip[1] == 0x00000000 && one->ad->ip[1] == 0x00000000 &&
one->ad->ip[2] == 0x00000000 && one->ad->ip[2] == 0x00000000 &&
@ -2015,7 +2211,8 @@ int AddressTestAddressGroupSetup26 (void) {
} }
} }
DetectAddressGroupCleanupList(); DetectAddressGroupsHeadFree(gh);
}
return result; return result;
} }

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

@ -1,9 +1,6 @@
#ifndef __DETECT_ADDRESS_H__ #ifndef __DETECT_ADDRESS_H__
#define __DETECT_ADDRESS_H__ #define __DETECT_ADDRESS_H__
/* prototypes */
void DetectAddressRegister (void);
/* a is ... than b */ /* a is ... than b */
enum { enum {
ADDRESS_ER = -1, /* error e.g. compare ipv4 and ipv6 */ ADDRESS_ER = -1, /* error e.g. compare ipv4 and ipv6 */
@ -35,10 +32,15 @@ typedef struct DetectAddressGroup_ {
} DetectAddressGroup; } DetectAddressGroup;
typedef struct DetectAddressGroups_ { typedef struct DetectAddressGroupsHead_ {
DetectAddressGroup *ipv4_head; DetectAddressGroup *ipv4_head;
DetectAddressGroup *ipv6_head; DetectAddressGroup *ipv6_head;
} DetectAddressGroups; } DetectAddressGroupsHead;
/* prototypes */
void DetectAddressRegister (void);
DetectAddressGroupsHead *DetectAddressGroupsHeadInit();
void DetectAddressGroupsHeadFree(DetectAddressGroupsHead *);
#endif /* __DETECT_ADDRESS_H__ */ #endif /* __DETECT_ADDRESS_H__ */

Write Preview
Loading…
Cancel
Save