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

defrag: remove unnecessary NULL check

Browse Source 
CID: 727861
pull/13049/head
Philippe Antoine 1 year ago committed by Victor Julien
parent 9dac5ec23c
commit 85f2f597f1
1 changed files with 88 additions and 155 deletions
Show Stats Download Patch File Download Diff File

243
src/defrag.c
Unescape Escape View File

@ -1084,13 +1084,10 @@ Defrag(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p)
return NULL;
}
if (tv != NULL && dtv != NULL) {
if (af == AF_INET) {
StatsIncr(tv, dtv->counter_defrag_ipv4_fragments);
}
else if (af == AF_INET6) {
StatsIncr(tv, dtv->counter_defrag_ipv6_fragments);
}
if (af == AF_INET) {
StatsIncr(tv, dtv->counter_defrag_ipv4_fragments);
} else if (af == AF_INET6) {
StatsIncr(tv, dtv->counter_defrag_ipv6_fragments);
}
/* return a locked tracker or NULL */
@ -1143,6 +1140,9 @@ void DefragDestroy(void)
#define IP_MF 0x2000
ThreadVars test_tv = { 0 };
DecodeThreadVars test_dtv = { 0 };
/**
* Allocate a test packet. Nothing to fancy, just a simple IP packet
* with some payload of no particular protocol.
@ -1413,10 +1413,6 @@ static int DefragInOrderSimpleTest(void)
Packet *p1 = NULL, *p2 = NULL, *p3 = NULL;
Packet *reassembled = NULL;
int id = 12;
ThreadVars tv;
memset(&tv, 0, sizeof(tv));
DecodeThreadVars dtv;
memset(&dtv, 0, sizeof(dtv));
DefragInit();
@ -1427,10 +1423,10 @@ static int DefragInOrderSimpleTest(void)
p3 = BuildIpv4TestPacket(IPPROTO_ICMP, id, 2, 0, 'C', 3);
FAIL_IF_NULL(p3);
FAIL_IF(Defrag(&tv, &dtv, p1) != NULL);
FAIL_IF(Defrag(&tv, &dtv, p2) != NULL);
FAIL_IF(Defrag(&test_tv, &test_dtv, p1) != NULL);
FAIL_IF(Defrag(&test_tv, &test_dtv, p2) != NULL);
reassembled = Defrag(&tv, &dtv, p3);
reassembled = Defrag(&test_tv, &test_dtv, p3);
FAIL_IF_NULL(reassembled);
FAIL_IF(IPV4_GET_RAW_HLEN(PacketGetIPv4(reassembled)) != 20);
@ -1468,10 +1464,6 @@ static int DefragReverseSimpleTest(void)
Packet *p1 = NULL, *p2 = NULL, *p3 = NULL;
Packet *reassembled = NULL;
int id = 12;
ThreadVars tv;
memset(&tv, 0, sizeof(tv));
DecodeThreadVars dtv;
memset(&dtv, 0, sizeof(dtv));
DefragInit();
@ -1482,9 +1474,9 @@ static int DefragReverseSimpleTest(void)
p3 = BuildIpv4TestPacket(IPPROTO_ICMP, id, 2, 0, 'C', 3);
FAIL_IF_NULL(p3);
FAIL_IF(Defrag(&tv, &dtv, p3) != NULL);
FAIL_IF(Defrag(&tv, &dtv, p2) != NULL);
reassembled = Defrag(&tv, &dtv, p1);
FAIL_IF(Defrag(&test_tv, &test_dtv, p3) != NULL);
FAIL_IF(Defrag(&test_tv, &test_dtv, p2) != NULL);
reassembled = Defrag(&test_tv, &test_dtv, p1);
FAIL_IF_NULL(reassembled);
FAIL_IF(IPV4_GET_RAW_HLEN(PacketGetIPv4(reassembled)) != 20);
@ -1523,10 +1515,6 @@ static int DefragInOrderSimpleIpv6Test(void)
Packet *p1 = NULL, *p2 = NULL, *p3 = NULL;
Packet *reassembled = NULL;
int id = 12;
ThreadVars tv;
memset(&tv, 0, sizeof(tv));
DecodeThreadVars dtv;
memset(&dtv, 0, sizeof(dtv));
DefragInit();
@ -1537,9 +1525,9 @@ static int DefragInOrderSimpleIpv6Test(void)
p3 = BuildIpv6TestPacket(IPPROTO_ICMPV6, id, 2, 0, 'C', 3);
FAIL_IF_NULL(p3);
FAIL_IF(Defrag(&tv, &dtv, p1) != NULL);
FAIL_IF(Defrag(&tv, &dtv, p2) != NULL);
reassembled = Defrag(&tv, &dtv, p3);
FAIL_IF(Defrag(&test_tv, &test_dtv, p1) != NULL);
FAIL_IF(Defrag(&test_tv, &test_dtv, p2) != NULL);
reassembled = Defrag(&test_tv, &test_dtv, p3);
FAIL_IF_NULL(reassembled);
const IPV6Hdr *ip6h = PacketGetIPv6(reassembled);
@ -1575,10 +1563,6 @@ static int DefragReverseSimpleIpv6Test(void)
Packet *p1 = NULL, *p2 = NULL, *p3 = NULL;
Packet *reassembled = NULL;
int id = 12;
ThreadVars tv;
memset(&tv, 0, sizeof(tv));
DecodeThreadVars dtv;
memset(&dtv, 0, sizeof(dtv));
DefragInit();
@ -1592,9 +1576,9 @@ static int DefragReverseSimpleIpv6Test(void)
p3 = BuildIpv6TestPacket(IPPROTO_ICMPV6, id, 2, 0, 'C', 3);
FAIL_IF_NULL(p3);
FAIL_IF(Defrag(&tv, &dtv, p3) != NULL);
FAIL_IF(Defrag(&tv, &dtv, p2) != NULL);
reassembled = Defrag(&tv, &dtv, p1);
FAIL_IF(Defrag(&test_tv, &test_dtv, p3) != NULL);
FAIL_IF(Defrag(&test_tv, &test_dtv, p2) != NULL);
reassembled = Defrag(&test_tv, &test_dtv, p1);
FAIL_IF_NULL(reassembled);
/* 40 bytes in we should find 8 bytes of A. */
@ -1625,10 +1609,6 @@ static int DefragReverseSimpleIpv6Test(void)
static int DefragDoSturgesNovakTest(int policy, uint8_t *expected, size_t expected_len)
{
int i;
ThreadVars tv;
memset(&tv, 0, sizeof(tv));
DecodeThreadVars dtv;
memset(&dtv, 0, sizeof(dtv));
DefragInit();
@ -1703,13 +1683,13 @@ static int DefragDoSturgesNovakTest(int policy, uint8_t *expected, size_t expect
/* Send all but the last. */
for (i = 0; i < 9; i++) {
Packet *tp = Defrag(&tv, &dtv, packets[i]);
Packet *tp = Defrag(&test_tv, &test_dtv, packets[i]);
FAIL_IF_NOT_NULL(tp);
FAIL_IF(ENGINE_ISSET_EVENT(packets[i], IPV4_FRAG_OVERLAP));
}
int overlap = 0;
for (; i < 16; i++) {
Packet *tp = Defrag(&tv, &dtv, packets[i]);
Packet *tp = Defrag(&test_tv, &test_dtv, packets[i]);
FAIL_IF_NOT_NULL(tp);
if (ENGINE_ISSET_EVENT(packets[i], IPV4_FRAG_OVERLAP)) {
overlap++;
@ -1718,7 +1698,7 @@ static int DefragDoSturgesNovakTest(int policy, uint8_t *expected, size_t expect
FAIL_IF_NOT(overlap);
/* And now the last one. */
Packet *reassembled = Defrag(&tv, &dtv, packets[16]);
Packet *reassembled = Defrag(&test_tv, &test_dtv, packets[16]);
FAIL_IF_NULL(reassembled);
FAIL_IF(IPV4_GET_RAW_HLEN(PacketGetIPv4(reassembled)) != 20);
@ -1747,10 +1727,6 @@ static int DefragDoSturgesNovakTest(int policy, uint8_t *expected, size_t expect
static int DefragDoSturgesNovakIpv6Test(int policy, uint8_t *expected, size_t expected_len)
{
int i;
ThreadVars tv;
memset(&tv, 0, sizeof(tv));
DecodeThreadVars dtv;
memset(&dtv, 0, sizeof(dtv));
DefragInit();
@ -1825,13 +1801,13 @@ static int DefragDoSturgesNovakIpv6Test(int policy, uint8_t *expected, size_t ex
/* Send all but the last. */
for (i = 0; i < 9; i++) {
Packet *tp = Defrag(&tv, &dtv, packets[i]);
Packet *tp = Defrag(&test_tv, &test_dtv, packets[i]);
FAIL_IF_NOT_NULL(tp);
FAIL_IF(ENGINE_ISSET_EVENT(packets[i], IPV6_FRAG_OVERLAP));
}
int overlap = 0;
for (; i < 16; i++) {
Packet *tp = Defrag(&tv, &dtv, packets[i]);
Packet *tp = Defrag(&test_tv, &test_dtv, packets[i]);
FAIL_IF_NOT_NULL(tp);
if (ENGINE_ISSET_EVENT(packets[i], IPV6_FRAG_OVERLAP)) {
overlap++;
@ -1840,7 +1816,7 @@ static int DefragDoSturgesNovakIpv6Test(int policy, uint8_t *expected, size_t ex
FAIL_IF_NOT(overlap);
/* And now the last one. */
Packet *reassembled = Defrag(&tv, &dtv, packets[16]);
Packet *reassembled = Defrag(&test_tv, &test_dtv, packets[16]);
FAIL_IF_NULL(reassembled);
FAIL_IF(memcmp(GET_PKT_DATA(reassembled) + 40, expected, expected_len) != 0);
@ -2302,10 +2278,6 @@ static int DefragSturgesNovakLastIpv6Test(void)
static int DefragTimeoutTest(void)
{
int i;
ThreadVars tv;
memset(&tv, 0, sizeof(tv));
DecodeThreadVars dtv;
memset(&dtv, 0, sizeof(dtv));
/* Setup a small number of trackers. */
FAIL_IF_NOT(SCConfSet("defrag.trackers", "16"));
@ -2317,7 +2289,7 @@ static int DefragTimeoutTest(void)
Packet *p = BuildIpv4TestPacket(IPPROTO_ICMP, i, 0, 1, 'A' + i, 16);
FAIL_IF_NULL(p);
Packet *tp = Defrag(&tv, &dtv, p);
Packet *tp = Defrag(&test_tv, &test_dtv, p);
SCFree(p);
FAIL_IF_NOT_NULL(tp);
}
@ -2328,7 +2300,7 @@ static int DefragTimeoutTest(void)
FAIL_IF_NULL(p);
p->ts = SCTIME_ADD_SECS(p->ts, defrag_context->timeout + 1);
Packet *tp = Defrag(&tv, &dtv, p);
Packet *tp = Defrag(&test_tv, &test_dtv, p);
FAIL_IF_NOT_NULL(tp);
DefragTracker *tracker = DefragLookupTrackerFromHash(p);
@ -2354,10 +2326,6 @@ static int DefragNoDataIpv4Test(void)
DefragContext *dc = NULL;
Packet *p = NULL;
int id = 12;
ThreadVars tv;
memset(&tv, 0, sizeof(tv));
DecodeThreadVars dtv;
memset(&dtv, 0, sizeof(dtv));
DefragInit();
@ -2369,7 +2337,7 @@ static int DefragNoDataIpv4Test(void)
FAIL_IF_NULL(p);
/* We do not expect a packet returned. */
FAIL_IF(Defrag(&tv, &dtv, p) != NULL);
FAIL_IF(Defrag(&test_tv, &test_dtv, p) != NULL);
/* The fragment should have been ignored so no fragments should
* have been allocated from the pool. */
@ -2386,10 +2354,6 @@ static int DefragTooLargeIpv4Test(void)
{
DefragContext *dc = NULL;
Packet *p = NULL;
ThreadVars tv;
memset(&tv, 0, sizeof(tv));
DecodeThreadVars dtv;
memset(&dtv, 0, sizeof(dtv));
DefragInit();
@ -2402,7 +2366,7 @@ static int DefragTooLargeIpv4Test(void)
FAIL_IF_NULL(p);
/* We do not expect a packet returned. */
FAIL_IF(Defrag(&tv, &dtv, p) != NULL);
FAIL_IF(Defrag(&test_tv, &test_dtv, p) != NULL);
/* We do expect an event. */
FAIL_IF_NOT(ENGINE_ISSET_EVENT(p, IPV4_FRAG_PKT_TOO_LARGE));
@ -2426,10 +2390,6 @@ static int DefragTooLargeIpv4Test(void)
static int DefragVlanTest(void)
{
Packet *p1 = NULL, *p2 = NULL, *r = NULL;
ThreadVars tv;
memset(&tv, 0, sizeof(tv));
DecodeThreadVars dtv;
memset(&dtv, 0, sizeof(dtv));
DefragInit();
@ -2439,15 +2399,15 @@ static int DefragVlanTest(void)
FAIL_IF_NULL(p2);
/* With no VLAN IDs set, packets should re-assemble. */
FAIL_IF((r = Defrag(&tv, &dtv, p1)) != NULL);
FAIL_IF((r = Defrag(&tv, &dtv, p2)) == NULL);
FAIL_IF((r = Defrag(&test_tv, &test_dtv, p1)) != NULL);
FAIL_IF((r = Defrag(&test_tv, &test_dtv, p2)) == NULL);
SCFree(r);
/* With mismatched VLANs, packets should not re-assemble. */
p1->vlan_id[0] = 1;
p2->vlan_id[0] = 2;
FAIL_IF((r = Defrag(&tv, &dtv, p1)) != NULL);
FAIL_IF((r = Defrag(&tv, &dtv, p2)) != NULL);
FAIL_IF((r = Defrag(&test_tv, &test_dtv, p1)) != NULL);
FAIL_IF((r = Defrag(&test_tv, &test_dtv, p2)) != NULL);
SCFree(p1);
SCFree(p2);
@ -2462,10 +2422,6 @@ static int DefragVlanTest(void)
static int DefragVlanQinQTest(void)
{
Packet *p1 = NULL, *p2 = NULL, *r = NULL;
ThreadVars tv;
memset(&tv, 0, sizeof(tv));
DecodeThreadVars dtv;
memset(&dtv, 0, sizeof(dtv));
DefragInit();
@ -2475,8 +2431,8 @@ static int DefragVlanQinQTest(void)
FAIL_IF_NULL(p2);
/* With no VLAN IDs set, packets should re-assemble. */
FAIL_IF((r = Defrag(&tv, &dtv, p1)) != NULL);
FAIL_IF((r = Defrag(&tv, &dtv, p2)) == NULL);
FAIL_IF((r = Defrag(&test_tv, &test_dtv, p1)) != NULL);
FAIL_IF((r = Defrag(&test_tv, &test_dtv, p2)) == NULL);
SCFree(r);
/* With mismatched VLANs, packets should not re-assemble. */
@ -2484,8 +2440,8 @@ static int DefragVlanQinQTest(void)
p2->vlan_id[0] = 1;
p1->vlan_id[1] = 1;
p2->vlan_id[1] = 2;
FAIL_IF((r = Defrag(&tv, &dtv, p1)) != NULL);
FAIL_IF((r = Defrag(&tv, &dtv, p2)) != NULL);
FAIL_IF((r = Defrag(&test_tv, &test_dtv, p1)) != NULL);
FAIL_IF((r = Defrag(&test_tv, &test_dtv, p2)) != NULL);
SCFree(p1);
SCFree(p2);
@ -2500,10 +2456,6 @@ static int DefragVlanQinQTest(void)
static int DefragVlanQinQinQTest(void)
{
Packet *r = NULL;
ThreadVars tv;
memset(&tv, 0, sizeof(tv));
DecodeThreadVars dtv;
memset(&dtv, 0, sizeof(dtv));
DefragInit();
@ -2513,8 +2465,8 @@ static int DefragVlanQinQinQTest(void)
FAIL_IF_NULL(p2);
/* With no VLAN IDs set, packets should re-assemble. */
FAIL_IF((r = Defrag(&tv, &dtv, p1)) != NULL);
FAIL_IF((r = Defrag(&tv, &dtv, p2)) == NULL);
FAIL_IF((r = Defrag(&test_tv, &test_dtv, p1)) != NULL);
FAIL_IF((r = Defrag(&test_tv, &test_dtv, p2)) == NULL);
SCFree(r);
/* With mismatched VLANs, packets should not re-assemble. */
@ -2524,8 +2476,8 @@ static int DefragVlanQinQinQTest(void)
p2->vlan_id[1] = 2;
p1->vlan_id[2] = 3;
p2->vlan_id[2] = 4;
FAIL_IF((r = Defrag(&tv, &dtv, p1)) != NULL);
FAIL_IF((r = Defrag(&tv, &dtv, p2)) != NULL);
FAIL_IF((r = Defrag(&test_tv, &test_dtv, p1)) != NULL);
FAIL_IF((r = Defrag(&test_tv, &test_dtv, p2)) != NULL);
PacketFree(p1);
PacketFree(p2);
@ -2538,10 +2490,6 @@ static int DefragTrackerReuseTest(void)
int id = 1;
Packet *p1 = NULL;
DefragTracker *tracker1 = NULL, *tracker2 = NULL;
ThreadVars tv;
memset(&tv, 0, sizeof(tv));
DecodeThreadVars dtv;
memset(&dtv, 0, sizeof(dtv));
DefragInit();
@ -2551,14 +2499,14 @@ static int DefragTrackerReuseTest(void)
FAIL_IF_NULL(p1);
/* Get a tracker. It shouldn't look like its already in use. */
tracker1 = DefragGetTracker(&tv, &dtv, p1);
tracker1 = DefragGetTracker(&test_tv, &test_dtv, p1);
FAIL_IF_NULL(tracker1);
FAIL_IF(tracker1->seen_last);
FAIL_IF(tracker1->remove);
DefragTrackerRelease(tracker1);
/* Get a tracker again, it should be the same one. */
tracker2 = DefragGetTracker(&tv, &dtv, p1);
tracker2 = DefragGetTracker(&test_tv, &test_dtv, p1);
FAIL_IF_NULL(tracker2);
FAIL_IF(tracker2 != tracker1);
DefragTrackerRelease(tracker1);
@ -2568,7 +2516,7 @@ static int DefragTrackerReuseTest(void)
* attributes. */
tracker1->remove = 1;
tracker2 = DefragGetTracker(&tv, &dtv, p1);
tracker2 = DefragGetTracker(&test_tv, &test_dtv, p1);
FAIL_IF_NULL(tracker2);
/* DefragGetTracker will have returned tracker1 to the stack,
* the set up a new tracker. Since it pops the stack, it got
@ -2594,10 +2542,6 @@ static int DefragMfIpv4Test(void)
{
int ip_id = 9;
Packet *p = NULL;
ThreadVars tv;
memset(&tv, 0, sizeof(tv));
DecodeThreadVars dtv;
memset(&dtv, 0, sizeof(dtv));
DefragInit();
@ -2606,14 +2550,14 @@ static int DefragMfIpv4Test(void)
Packet *p3 = BuildIpv4TestPacket(IPPROTO_ICMP, ip_id, 1, 0, 'B', 8);
FAIL_IF(p1 == NULL || p2 == NULL || p3 == NULL);
p = Defrag(&tv, &dtv, p1);
p = Defrag(&test_tv, &test_dtv, p1);
FAIL_IF_NOT_NULL(p);
p = Defrag(&tv, &dtv, p2);
p = Defrag(&test_tv, &test_dtv, p2);
FAIL_IF_NOT_NULL(p);
/* This should return a packet as MF=0. */
p = Defrag(&tv, &dtv, p3);
p = Defrag(&test_tv, &test_dtv, p3);
FAIL_IF_NULL(p);
/* Expected IP length is 20 + 8 + 8 = 36 as only 2 of the
@ -2645,10 +2589,6 @@ static int DefragMfIpv6Test(void)
{
int ip_id = 9;
Packet *p = NULL;
ThreadVars tv;
memset(&tv, 0, sizeof(tv));
DecodeThreadVars dtv;
memset(&dtv, 0, sizeof(dtv));
DefragInit();
@ -2657,14 +2597,14 @@ static int DefragMfIpv6Test(void)
Packet *p3 = BuildIpv6TestPacket(IPPROTO_ICMPV6, ip_id, 1, 0, 'B', 8);
FAIL_IF(p1 == NULL || p2 == NULL || p3 == NULL);
p = Defrag(&tv, &dtv, p1);
p = Defrag(&test_tv, &test_dtv, p1);
FAIL_IF_NOT_NULL(p);
p = Defrag(&tv, &dtv, p2);
p = Defrag(&test_tv, &test_dtv, p2);
FAIL_IF_NOT_NULL(p);
/* This should return a packet as MF=0. */
p = Defrag(&tv, &dtv, p3);
p = Defrag(&test_tv, &test_dtv, p3);
FAIL_IF_NULL(p);
/* For IPv6 the expected length is just the length of the payload
@ -2691,10 +2631,6 @@ static int DefragTestBadProto(void)
{
Packet *p1 = NULL, *p2 = NULL, *p3 = NULL;
int id = 12;
ThreadVars tv;
memset(&tv, 0, sizeof(tv));
DecodeThreadVars dtv;
memset(&dtv, 0, sizeof(dtv));
DefragInit();
@ -2705,9 +2641,9 @@ static int DefragTestBadProto(void)
p3 = BuildIpv4TestPacket(IPPROTO_ICMP, id, 2, 0, 'C', 3);
FAIL_IF_NULL(p3);
FAIL_IF_NOT_NULL(Defrag(&tv, &dtv, p1));
FAIL_IF_NOT_NULL(Defrag(&tv, &dtv, p2));
FAIL_IF_NOT_NULL(Defrag(&tv, &dtv, p3));
FAIL_IF_NOT_NULL(Defrag(&test_tv, &test_dtv, p1));
FAIL_IF_NOT_NULL(Defrag(&test_tv, &test_dtv, p2));
FAIL_IF_NOT_NULL(Defrag(&test_tv, &test_dtv, p3));
SCFree(p1);
SCFree(p2);
@ -2723,10 +2659,7 @@ static int DefragTestBadProto(void)
*/
static int DefragTestJeremyLinux(void)
{
ThreadVars tv;
memset(&tv, 0, sizeof(tv));
DecodeThreadVars dtv;
memset(&dtv, 0, sizeof(dtv));
uint8_t expected[] = "AAAAAAAA"
"AAAAAAAA"
"AAAAAAAA"
@ -2753,16 +2686,16 @@ static int DefragTestJeremyLinux(void)
packets[2] = BuildIpv4TestPacket(IPPROTO_ICMP, id, 24 >> 3, 1, 'C', 48);
packets[3] = BuildIpv4TestPacket(IPPROTO_ICMP, id, 88 >> 3, 0, 'D', 14);
Packet *r = Defrag(&tv, &dtv, packets[0]);
Packet *r = Defrag(&test_tv, &test_dtv, packets[0]);
FAIL_IF_NOT_NULL(r);
r = Defrag(&tv, &dtv, packets[1]);
r = Defrag(&test_tv, &test_dtv, packets[1]);
FAIL_IF_NOT_NULL(r);
r = Defrag(&tv, &dtv, packets[2]);
r = Defrag(&test_tv, &test_dtv, packets[2]);
FAIL_IF_NOT_NULL(r);
r = Defrag(&tv, &dtv, packets[3]);
r = Defrag(&test_tv, &test_dtv, packets[3]);
FAIL_IF_NULL(r);
FAIL_IF(memcmp(expected, GET_PKT_DATA(r) + 20, sizeof(expected)) != 0);
@ -2797,16 +2730,16 @@ static int DefragBsdFragmentAfterNoMfIpv4Test(void)
packets[2] = BuildIpv4TestPacket(IPPROTO_ICMP, 0x96, 16 >> 3, 1, 'C', 16);
packets[3] = BuildIpv4TestPacket(IPPROTO_ICMP, 0x96, 0, 1, 'D', 8);
Packet *r = Defrag(NULL, NULL, packets[0]);
Packet *r = Defrag(&test_tv, &test_dtv, packets[0]);
FAIL_IF_NOT_NULL(r);
r = Defrag(NULL, NULL, packets[1]);
r = Defrag(&test_tv, &test_dtv, packets[1]);
FAIL_IF_NOT_NULL(r);
r = Defrag(NULL, NULL, packets[2]);
r = Defrag(&test_tv, &test_dtv, packets[2]);
FAIL_IF_NOT_NULL(r);
r = Defrag(NULL, NULL, packets[3]);
r = Defrag(&test_tv, &test_dtv, packets[3]);
FAIL_IF_NULL(r);
// clang-format off
@ -2842,16 +2775,16 @@ static int DefragBsdFragmentAfterNoMfIpv6Test(void)
packets[2] = BuildIpv6TestPacket(IPPROTO_ICMP, 0x96, 16 >> 3, 1, 'C', 16);
packets[3] = BuildIpv6TestPacket(IPPROTO_ICMP, 0x96, 0, 1, 'D', 8);
Packet *r = Defrag(NULL, NULL, packets[0]);
Packet *r = Defrag(&test_tv, &test_dtv, packets[0]);
FAIL_IF_NOT_NULL(r);
r = Defrag(NULL, NULL, packets[1]);
r = Defrag(&test_tv, &test_dtv, packets[1]);
FAIL_IF_NOT_NULL(r);
r = Defrag(NULL, NULL, packets[2]);
r = Defrag(&test_tv, &test_dtv, packets[2]);
FAIL_IF_NOT_NULL(r);
r = Defrag(NULL, NULL, packets[3]);
r = Defrag(&test_tv, &test_dtv, packets[3]);
FAIL_IF_NULL(r);
// clang-format off
@ -2898,16 +2831,16 @@ static int DefragBsdSubsequentOverlapsStartOfOriginalIpv4Test_2(void)
FAIL_IF_NOT(BuildIpv4TestPacketWithContent(
&packets[3], IPPROTO_ICMP, 6, 32 >> 3, 0, (uint8_t *)"DDCCBBAA", 8));
Packet *r = Defrag(NULL, NULL, packets[0]);
Packet *r = Defrag(&test_tv, &test_dtv, packets[0]);
FAIL_IF_NOT_NULL(r);
r = Defrag(NULL, NULL, packets[1]);
r = Defrag(&test_tv, &test_dtv, packets[1]);
FAIL_IF_NOT_NULL(r);
r = Defrag(NULL, NULL, packets[2]);
r = Defrag(&test_tv, &test_dtv, packets[2]);
FAIL_IF_NOT_NULL(r);
r = Defrag(NULL, NULL, packets[3]);
r = Defrag(&test_tv, &test_dtv, packets[3]);
FAIL_IF_NULL(r);
// clang-format off
@ -2950,16 +2883,16 @@ static int DefragBsdSubsequentOverlapsStartOfOriginalIpv6Test_2(void)
packets[3] =
BuildIpv6TestPacketWithContent(IPPROTO_ICMP, 6, 32 >> 3, 0, (uint8_t *)"DDCCBBAA", 8);
Packet *r = Defrag(NULL, NULL, packets[0]);
Packet *r = Defrag(&test_tv, &test_dtv, packets[0]);
FAIL_IF_NOT_NULL(r);
r = Defrag(NULL, NULL, packets[1]);
r = Defrag(&test_tv, &test_dtv, packets[1]);
FAIL_IF_NOT_NULL(r);
r = Defrag(NULL, NULL, packets[2]);
r = Defrag(&test_tv, &test_dtv, packets[2]);
FAIL_IF_NOT_NULL(r);
r = Defrag(NULL, NULL, packets[3]);
r = Defrag(&test_tv, &test_dtv, packets[3]);
FAIL_IF_NULL(r);
// clang-format off
@ -3002,10 +2935,10 @@ static int DefragBsdSubsequentOverlapsStartOfOriginalIpv4Test(void)
packets[0] = BuildIpv4TestPacket(IPPROTO_ICMP, 1, 8 >> 3, 0, 'E', 24);
packets[1] = BuildIpv4TestPacket(IPPROTO_ICMP, 1, 0, 1, 'M', 24);
Packet *r = Defrag(NULL, NULL, packets[0]);
Packet *r = Defrag(&test_tv, &test_dtv, packets[0]);
FAIL_IF_NOT_NULL(r);
r = Defrag(NULL, NULL, packets[1]);
r = Defrag(&test_tv, &test_dtv, packets[1]);
FAIL_IF_NULL(r);
// clang-format off
@ -3037,10 +2970,10 @@ static int DefragBsdSubsequentOverlapsStartOfOriginalIpv6Test(void)
packets[0] = BuildIpv6TestPacket(IPPROTO_ICMP, 1, 8 >> 3, 0, 'E', 24);
packets[1] = BuildIpv6TestPacket(IPPROTO_ICMP, 1, 0, 1, 'M', 24);
Packet *r = Defrag(NULL, NULL, packets[0]);
Packet *r = Defrag(&test_tv, &test_dtv, packets[0]);
FAIL_IF_NOT_NULL(r);
r = Defrag(NULL, NULL, packets[1]);
r = Defrag(&test_tv, &test_dtv, packets[1]);
FAIL_IF_NULL(r);
// clang-format off
@ -3096,19 +3029,19 @@ static int DefragBsdMissingFragmentIpv4Test(void)
FAIL_IF_NOT(BuildIpv4TestPacketWithContent(
&packets[4], IPPROTO_ICMP, 189, 48 >> 3, 0, (uint8_t *)"DDCCBBAA", 8));
Packet *r = Defrag(NULL, NULL, packets[0]);
Packet *r = Defrag(&test_tv, &test_dtv, packets[0]);
FAIL_IF_NOT_NULL(r);
r = Defrag(NULL, NULL, packets[1]);
r = Defrag(&test_tv, &test_dtv, packets[1]);
FAIL_IF_NOT_NULL(r);
r = Defrag(NULL, NULL, packets[2]);
r = Defrag(&test_tv, &test_dtv, packets[2]);
FAIL_IF_NOT_NULL(r);
r = Defrag(NULL, NULL, packets[3]);
r = Defrag(&test_tv, &test_dtv, packets[3]);
FAIL_IF_NOT_NULL(r);
r = Defrag(NULL, NULL, packets[4]);
r = Defrag(&test_tv, &test_dtv, packets[4]);
FAIL_IF_NOT_NULL(r);
#if 0
@ -3145,19 +3078,19 @@ static int DefragBsdMissingFragmentIpv6Test(void)
packets[4] =
BuildIpv6TestPacketWithContent(IPPROTO_ICMP, 189, 48 >> 3, 0, (uint8_t *)"DDCCBBAA", 8);
Packet *r = Defrag(NULL, NULL, packets[0]);
Packet *r = Defrag(&test_tv, &test_dtv, packets[0]);
FAIL_IF_NOT_NULL(r);
r = Defrag(NULL, NULL, packets[1]);
r = Defrag(&test_tv, &test_dtv, packets[1]);
FAIL_IF_NOT_NULL(r);
r = Defrag(NULL, NULL, packets[2]);
r = Defrag(&test_tv, &test_dtv, packets[2]);
FAIL_IF_NOT_NULL(r);
r = Defrag(NULL, NULL, packets[3]);
r = Defrag(&test_tv, &test_dtv, packets[3]);
FAIL_IF_NOT_NULL(r);
r = Defrag(NULL, NULL, packets[4]);
r = Defrag(&test_tv, &test_dtv, packets[4]);
FAIL_IF_NOT_NULL(r);
#if 0

Write Preview
Loading…
Cancel
Save