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

stream: fix test code spelling

Browse Source 
Thanks to Josh Soref.
pull/8840/head
Victor Julien 2 years ago
parent 77862d503a
commit 74f5d080e6
2 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File

40
src/stream-tcp-reassemble.c
Unescape Escape View File

@ -2213,9 +2213,9 @@ static int VALIDATE(TcpStream *stream, uint8_t *data, uint32_t data_len)
#define MISSED_ADD_PAYLOAD(seq, seg, seglen) \
StreamTcpUTAddPayload(&tv, ra_ctx, &ssn, stream, (seq), (uint8_t *)(seg), (seglen));
int UTHCheckGapAtPostion(TcpStream *stream, int pos, uint64_t offset, uint32_t len);
int UTHCheckGapAtPosition(TcpStream *stream, int pos, uint64_t offset, uint32_t len);
int UTHCheckGapAtPostion(TcpStream *stream, int pos, uint64_t offset, uint32_t len)
int UTHCheckGapAtPosition(TcpStream *stream, int pos, uint64_t offset, uint32_t len)
{
int cnt = 0;
uint64_t last_re = 0;
@ -2235,10 +2235,10 @@ int UTHCheckGapAtPostion(TcpStream *stream, int pos, uint64_t offset, uint32_t l
return 0;
}
int UTHCheckDataAtPostion(
int UTHCheckDataAtPosition(
TcpStream *stream, int pos, uint64_t offset, const char *data, uint32_t len);
int UTHCheckDataAtPostion(
int UTHCheckDataAtPosition(
TcpStream *stream, int pos, uint64_t offset, const char *data, uint32_t len)
{
int cnt = 0;
@ -2278,11 +2278,11 @@ static int StreamTcpReassembleTest25 (void)
{
MISSED_START(6);
MISSED_ADD_PAYLOAD(10, "BB", 2);
FAIL_IF_NOT(UTHCheckGapAtPostion(stream, 0, 0, 3) == 1);
FAIL_IF_NOT(UTHCheckDataAtPostion(stream, 1, 3, "BB", 2) == 1);
FAIL_IF_NOT(UTHCheckGapAtPosition(stream, 0, 0, 3) == 1);
FAIL_IF_NOT(UTHCheckDataAtPosition(stream, 1, 3, "BB", 2) == 1);
MISSED_ADD_PAYLOAD(12, "CC", 2);
FAIL_IF_NOT(UTHCheckGapAtPostion(stream, 0, 0, 3) == 1);
FAIL_IF_NOT(UTHCheckDataAtPostion(stream, 1, 3, "BBCC", 4) == 1);
FAIL_IF_NOT(UTHCheckGapAtPosition(stream, 0, 0, 3) == 1);
FAIL_IF_NOT(UTHCheckDataAtPosition(stream, 1, 3, "BBCC", 4) == 1);
MISSED_STEP(7, "AAA", 3, "AAABBCC", 7);
MISSED_END;
PASS;
@ -2300,9 +2300,9 @@ static int StreamTcpReassembleTest26 (void)
MISSED_START(9);
MISSED_STEP(10, "AAA", 3, "AAA", 3);
MISSED_ADD_PAYLOAD(15, "CC", 2);
FAIL_IF_NOT(UTHCheckDataAtPostion(stream, 0, 0, "AAA", 3) == 1);
FAIL_IF_NOT(UTHCheckGapAtPostion(stream, 1, 3, 2) == 1);
FAIL_IF_NOT(UTHCheckDataAtPostion(stream, 2, 5, "CC", 2) == 1);
FAIL_IF_NOT(UTHCheckDataAtPosition(stream, 0, 0, "AAA", 3) == 1);
FAIL_IF_NOT(UTHCheckGapAtPosition(stream, 1, 3, 2) == 1);
FAIL_IF_NOT(UTHCheckDataAtPosition(stream, 2, 5, "CC", 2) == 1);
MISSED_STEP(13, "BB", 2, "AAABBCC", 7);
MISSED_END;
}
@ -2335,15 +2335,15 @@ static int StreamTcpReassembleTest28 (void)
{
MISSED_START(6);
MISSED_ADD_PAYLOAD(10, "AAA", 3);
FAIL_IF_NOT(UTHCheckGapAtPostion(stream, 0, 0, 3) == 1);
FAIL_IF_NOT(UTHCheckDataAtPostion(stream, 1, 3, "AAA", 3) == 1);
FAIL_IF_NOT(UTHCheckGapAtPosition(stream, 0, 0, 3) == 1);
FAIL_IF_NOT(UTHCheckDataAtPosition(stream, 1, 3, "AAA", 3) == 1);
MISSED_ADD_PAYLOAD(13, "BB", 2);
FAIL_IF_NOT(UTHCheckGapAtPostion(stream, 0, 0, 3) == 1);
FAIL_IF_NOT(UTHCheckDataAtPostion(stream, 1, 3, "AAABB", 5) == 1);
FAIL_IF_NOT(UTHCheckGapAtPosition(stream, 0, 0, 3) == 1);
FAIL_IF_NOT(UTHCheckDataAtPosition(stream, 1, 3, "AAABB", 5) == 1);
ssn.state = TCP_TIME_WAIT;
MISSED_ADD_PAYLOAD(15, "CC", 2);
FAIL_IF_NOT(UTHCheckGapAtPostion(stream, 0, 0, 3) == 1);
FAIL_IF_NOT(UTHCheckDataAtPostion(stream, 1, 3, "AAABBCC", 7) == 1);
FAIL_IF_NOT(UTHCheckGapAtPosition(stream, 0, 0, 3) == 1);
FAIL_IF_NOT(UTHCheckDataAtPosition(stream, 1, 3, "AAABBCC", 7) == 1);
MISSED_END;
}
@ -2361,9 +2361,9 @@ static int StreamTcpReassembleTest29 (void)
MISSED_STEP(10, "AAA", 3, "AAA", 3);
ssn.state = TCP_TIME_WAIT;
MISSED_ADD_PAYLOAD(15, "CC", 2);
FAIL_IF_NOT(UTHCheckDataAtPostion(stream, 0, 0, "AAA", 3) == 1);
FAIL_IF_NOT(UTHCheckGapAtPostion(stream, 1, 3, 2) == 1);
FAIL_IF_NOT(UTHCheckDataAtPostion(stream, 2, 5, "CC", 2) == 1);
FAIL_IF_NOT(UTHCheckDataAtPosition(stream, 0, 0, "AAA", 3) == 1);
FAIL_IF_NOT(UTHCheckGapAtPosition(stream, 1, 3, 2) == 1);
FAIL_IF_NOT(UTHCheckDataAtPosition(stream, 2, 5, "CC", 2) == 1);
MISSED_END;
}

62
src/tests/stream-tcp-inline.c
Unescape Escape View File

@ -73,8 +73,8 @@ static int VALIDATE(TcpStream *stream, uint8_t *data, uint32_t data_len)
INLINE_ADD_PAYLOAD((rseq), (seg), (seglen), (packet), (packetlen)); \
FAIL_IF(!(VALIDATE(stream, (uint8_t *)(buf), (buflen))));
int UTHCheckGapAtPostion(TcpStream *stream, int pos, uint64_t offset, uint32_t len);
int UTHCheckDataAtPostion(
int UTHCheckGapAtPosition(TcpStream *stream, int pos, uint64_t offset, uint32_t len);
int UTHCheckDataAtPosition(
TcpStream *stream, int pos, uint64_t offset, const char *data, uint32_t len);
/** \test full overlap */
@ -109,8 +109,8 @@ static int StreamTcpInlineTest04(void)
{
INLINE_START(0);
INLINE_ADD_PAYLOAD(3, "ABCDE", 5, "ABCDE", 5);
FAIL_IF_NOT(UTHCheckGapAtPostion(stream, 0, 0, 2) == 1);
FAIL_IF_NOT(UTHCheckDataAtPostion(stream, 1, 2, "ABCDE", 5) == 1);
FAIL_IF_NOT(UTHCheckGapAtPosition(stream, 0, 0, 2) == 1);
FAIL_IF_NOT(UTHCheckDataAtPosition(stream, 1, 2, "ABCDE", 5) == 1);
INLINE_STEP(1, "xxxxx", 5, "xxABCDE", 7, "xxABC", 5);
INLINE_END;
}
@ -120,12 +120,12 @@ static int StreamTcpInlineTest05(void)
{
INLINE_START(0);
INLINE_ADD_PAYLOAD(8, "ABCDE", 5, "ABCDE", 5);
FAIL_IF_NOT(UTHCheckGapAtPostion(stream, 0, 0, 7) == 1);
FAIL_IF_NOT(UTHCheckDataAtPostion(stream, 1, 7, "ABCDE", 5) == 1);
FAIL_IF_NOT(UTHCheckGapAtPosition(stream, 0, 0, 7) == 1);
FAIL_IF_NOT(UTHCheckDataAtPosition(stream, 1, 7, "ABCDE", 5) == 1);
INLINE_ADD_PAYLOAD(1, "xxxxx", 5, "xxxxx", 5);
FAIL_IF_NOT(UTHCheckDataAtPostion(stream, 0, 0, "xxxxx", 5) == 1);
FAIL_IF_NOT(UTHCheckGapAtPostion(stream, 1, 5, 2) == 1);
FAIL_IF_NOT(UTHCheckDataAtPostion(stream, 2, 7, "ABCDE", 5) == 1);
FAIL_IF_NOT(UTHCheckDataAtPosition(stream, 0, 0, "xxxxx", 5) == 1);
FAIL_IF_NOT(UTHCheckGapAtPosition(stream, 1, 5, 2) == 1);
FAIL_IF_NOT(UTHCheckDataAtPosition(stream, 2, 7, "ABCDE", 5) == 1);
INLINE_END;
}
@ -134,29 +134,29 @@ static int StreamTcpInlineTest06(void)
{
INLINE_START(0);
INLINE_ADD_PAYLOAD(2, "A", 1, "A", 1);
FAIL_IF_NOT(UTHCheckGapAtPostion(stream, 0, 0, 1) == 1);
FAIL_IF_NOT(UTHCheckDataAtPostion(stream, 1, 1, "A", 1) == 1);
FAIL_IF_NOT(UTHCheckGapAtPosition(stream, 0, 0, 1) == 1);
FAIL_IF_NOT(UTHCheckDataAtPosition(stream, 1, 1, "A", 1) == 1);
INLINE_ADD_PAYLOAD(4, "A", 1, "A", 1);
FAIL_IF_NOT(UTHCheckGapAtPostion(stream, 0, 0, 1) == 1);
FAIL_IF_NOT(UTHCheckDataAtPostion(stream, 1, 1, "A", 1) == 1);
FAIL_IF_NOT(UTHCheckGapAtPostion(stream, 2, 2, 1) == 1);
FAIL_IF_NOT(UTHCheckDataAtPostion(stream, 3, 3, "A", 1) == 1);
FAIL_IF_NOT(UTHCheckGapAtPosition(stream, 0, 0, 1) == 1);
FAIL_IF_NOT(UTHCheckDataAtPosition(stream, 1, 1, "A", 1) == 1);
FAIL_IF_NOT(UTHCheckGapAtPosition(stream, 2, 2, 1) == 1);
FAIL_IF_NOT(UTHCheckDataAtPosition(stream, 3, 3, "A", 1) == 1);
INLINE_ADD_PAYLOAD(6, "A", 1, "A", 1);
FAIL_IF_NOT(UTHCheckGapAtPostion(stream, 0, 0, 1) == 1);
FAIL_IF_NOT(UTHCheckDataAtPostion(stream, 1, 1, "A", 1) == 1);
FAIL_IF_NOT(UTHCheckGapAtPostion(stream, 2, 2, 1) == 1);
FAIL_IF_NOT(UTHCheckDataAtPostion(stream, 3, 3, "A", 1) == 1);
FAIL_IF_NOT(UTHCheckGapAtPostion(stream, 4, 4, 1) == 1);
FAIL_IF_NOT(UTHCheckDataAtPostion(stream, 5, 5, "A", 1) == 1);
FAIL_IF_NOT(UTHCheckGapAtPosition(stream, 0, 0, 1) == 1);
FAIL_IF_NOT(UTHCheckDataAtPosition(stream, 1, 1, "A", 1) == 1);
FAIL_IF_NOT(UTHCheckGapAtPosition(stream, 2, 2, 1) == 1);
FAIL_IF_NOT(UTHCheckDataAtPosition(stream, 3, 3, "A", 1) == 1);
FAIL_IF_NOT(UTHCheckGapAtPosition(stream, 4, 4, 1) == 1);
FAIL_IF_NOT(UTHCheckDataAtPosition(stream, 5, 5, "A", 1) == 1);
INLINE_ADD_PAYLOAD(8, "A", 1, "A", 1);
FAIL_IF_NOT(UTHCheckGapAtPostion(stream, 0, 0, 1) == 1);
FAIL_IF_NOT(UTHCheckDataAtPostion(stream, 1, 1, "A", 1) == 1);
FAIL_IF_NOT(UTHCheckGapAtPostion(stream, 2, 2, 1) == 1);
FAIL_IF_NOT(UTHCheckDataAtPostion(stream, 3, 3, "A", 1) == 1);
FAIL_IF_NOT(UTHCheckGapAtPostion(stream, 4, 4, 1) == 1);
FAIL_IF_NOT(UTHCheckDataAtPostion(stream, 5, 5, "A", 1) == 1);
FAIL_IF_NOT(UTHCheckGapAtPostion(stream, 6, 6, 1) == 1);
FAIL_IF_NOT(UTHCheckDataAtPostion(stream, 7, 7, "A", 1) == 1);
FAIL_IF_NOT(UTHCheckGapAtPosition(stream, 0, 0, 1) == 1);
FAIL_IF_NOT(UTHCheckDataAtPosition(stream, 1, 1, "A", 1) == 1);
FAIL_IF_NOT(UTHCheckGapAtPosition(stream, 2, 2, 1) == 1);
FAIL_IF_NOT(UTHCheckDataAtPosition(stream, 3, 3, "A", 1) == 1);
FAIL_IF_NOT(UTHCheckGapAtPosition(stream, 4, 4, 1) == 1);
FAIL_IF_NOT(UTHCheckDataAtPosition(stream, 5, 5, "A", 1) == 1);
FAIL_IF_NOT(UTHCheckGapAtPosition(stream, 6, 6, 1) == 1);
FAIL_IF_NOT(UTHCheckDataAtPosition(stream, 7, 7, "A", 1) == 1);
INLINE_STEP(1, "xxxxxxxxx", 9, "xAxAxAxAx", 9, "xAxAxAxAx", 9);
INLINE_END;
}
@ -166,8 +166,8 @@ static int StreamTcpInlineTest07(void)
{
INLINE_START(0);
INLINE_ADD_PAYLOAD(3, "ABCDE", 5, "ABCDE", 5);
FAIL_IF_NOT(UTHCheckGapAtPostion(stream, 0, 0, 2) == 1);
FAIL_IF_NOT(UTHCheckDataAtPostion(stream, 1, 2, "ABCDE", 5) == 1);
FAIL_IF_NOT(UTHCheckGapAtPosition(stream, 0, 0, 2) == 1);
FAIL_IF_NOT(UTHCheckDataAtPosition(stream, 1, 2, "ABCDE", 5) == 1);
INLINE_STEP(1, "XXABC", 5, "XXABCDE", 7, "XXABC", 5);
INLINE_END;
}

Write Preview
Loading…
Cancel
Save