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

Fix broken ICMPv4 unittests on big endian, fix broken ID macro on ICMPv6.

Browse Source
remotes/origin/master-1.1.x
Victor Julien 16 years ago
parent f5a2017f3c
commit e0afe96920
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File

25
src/decode-icmpv4.c
Unescape Escape View File

@ -33,6 +33,7 @@
#include "flow.h"
#include "util-unittest.h"
#include "util-unittest-helper.h"
#include "util-debug.h"
/**
@ -318,8 +319,8 @@ static int DecodeICMPV4test01(void) {
p->src.family = AF_INET;
p->dst.family = AF_INET;
p->src.addr_data32[0] = 0x01020304;
p->dst.addr_data32[0] = 0x04030201;
p->src.addr_data32[0] = UTHSetIPv4Address("4.3.2.1");;
p->dst.addr_data32[0] = UTHSetIPv4Address("1.2.3.4");;
ip4h.ip_src.s_addr = p->src.addr_data32[0];
ip4h.ip_dst.s_addr = p->dst.addr_data32[0];
@ -369,8 +370,8 @@ static int DecodeICMPV4test02(void) {
p->src.family = AF_INET;
p->dst.family = AF_INET;
p->src.addr_data32[0] = 0x01020304;
p->dst.addr_data32[0] = 0x04030201;
p->src.addr_data32[0] = UTHSetIPv4Address("4.3.2.1");;
p->dst.addr_data32[0] = UTHSetIPv4Address("1.2.3.4");;
ip4h.ip_src.s_addr = p->src.addr_data32[0];
ip4h.ip_dst.s_addr = p->dst.addr_data32[0];
@ -418,8 +419,8 @@ static int DecodeICMPV4test03(void) {
p->src.family = AF_INET;
p->dst.family = AF_INET;
p->src.addr_data32[0] = 0x01020304;
p->dst.addr_data32[0] = 0x04030201;
p->src.addr_data32[0] = UTHSetIPv4Address("4.3.2.1");;
p->dst.addr_data32[0] = UTHSetIPv4Address("1.2.3.4");;
ip4h.ip_src.s_addr = p->src.addr_data32[0];
ip4h.ip_dst.s_addr = p->dst.addr_data32[0];
@ -490,8 +491,8 @@ static int DecodeICMPV4test04(void) {
p->src.family = AF_INET;
p->dst.family = AF_INET;
p->src.addr_data32[0] = 0x01020304;
p->dst.addr_data32[0] = 0x04030201;
p->src.addr_data32[0] = UTHSetIPv4Address("4.3.2.1");;
p->dst.addr_data32[0] = UTHSetIPv4Address("1.2.3.4");;
ip4h.ip_src.s_addr = p->src.addr_data32[0];
ip4h.ip_dst.s_addr = p->dst.addr_data32[0];
@ -595,8 +596,8 @@ static int ICMPV4InvalidType07(void) {
p->src.family = AF_INET;
p->dst.family = AF_INET;
p->src.addr_data32[0] = 0x01020304;
p->dst.addr_data32[0] = 0x04030201;
p->src.addr_data32[0] = UTHSetIPv4Address("4.3.2.1");;
p->dst.addr_data32[0] = UTHSetIPv4Address("1.2.3.4");;
ip4h.ip_src.s_addr = p->src.addr_data32[0];
ip4h.ip_dst.s_addr = p->dst.addr_data32[0];
@ -639,8 +640,8 @@ static int DecodeICMPV4test08(void) {
p->src.family = AF_INET;
p->dst.family = AF_INET;
p->src.addr_data32[0] = 0x01020304;
p->dst.addr_data32[0] = 0x04030201;
p->src.addr_data32[0] = UTHSetIPv4Address("4.3.2.1");;
p->dst.addr_data32[0] = UTHSetIPv4Address("1.2.3.4");;
ip4h.ip_src.s_addr = p->src.addr_data32[0];
ip4h.ip_dst.s_addr = p->dst.addr_data32[0];

4
src/decode-icmpv6.c
Unescape Escape View File

@ -669,7 +669,7 @@ static int ICMPV6EchoReqTest01(void)
SCLogDebug("ID: %u seq: %u", ICMPV6_GET_ID(p), ICMPV6_GET_SEQ(p));
if (ICMPV6_GET_TYPE(p) != 128 || ICMPV6_GET_CODE(p) != 0 ||
ICMPV6_GET_ID(p) != 61477 || ICMPV6_GET_SEQ(p) != 29987) {
ICMPV6_GET_ID(p) != 9712 || ICMPV6_GET_SEQ(p) != 29987) {
SCLogDebug("ICMPv6 Echo request decode failed");
retval = 0;
goto end;
@ -723,7 +723,7 @@ static int ICMPV6EchoRepTest01(void)
ICMPV6_GET_CODE(p),ICMPV6_GET_ID(p), ICMPV6_GET_SEQ(p));
if (ICMPV6_GET_TYPE(p) != 129 || ICMPV6_GET_CODE(p) != 0 ||
ICMPV6_GET_ID(p) != 61477 || ICMPV6_GET_SEQ(p) != 29987) {
ICMPV6_GET_ID(p) != 9712 || ICMPV6_GET_SEQ(p) != 29987) {
SCLogDebug("ICMPv6 Echo reply decode failed");
retval = 0;
goto end;

4
src/decode-icmpv6.h
Unescape Escape View File

@ -79,10 +79,8 @@
/** If message is informational */
/** macro for icmpv6 "id" access */
/* #define ICMPV6_GET_ID(p) (p)->icmpv6h->icmpv6b.icmpv6i.id */
#define ICMPV6_GET_ID(p) (p)->icmpv6vars.id
#define ICMPV6_GET_ID(p) (ntohs((p)->icmpv6vars.id))
/** macro for icmpv6 "seq" access */
/* #define ICMPV6_GET_SEQ(p) (p)->icmpv6h->icmpv6b.icmpv6i.seq */
#define ICMPV6_GET_SEQ(p) (ntohs((p)->icmpv6vars.seq))
/** If message is Error */

Write Preview
Loading…
Cancel
Save