PACKET_INITIALIZE is enough for packet init.

remotes/origin/master-1.1.x
Eric Leblond 14 years ago committed by Victor Julien
parent d296223ffe
commit 4071d3cf57

@ -1545,7 +1545,6 @@ int DecodeIPV4DefragTest01(void)
memset(&tv, 0, sizeof(ThreadVars));
memset(&dtv, 0, sizeof(DecodeThreadVars));
memset(&pq, 0, sizeof(PacketQueue));
memset(p, 0, sizeof(Packet));
PACKET_INITIALIZE(p);
FlowInitConfig(FLOW_QUIET);
@ -1682,7 +1681,6 @@ int DecodeIPV4DefragTest02(void)
memset(&tv, 0, sizeof(ThreadVars));
memset(&dtv, 0, sizeof(DecodeThreadVars));
memset(&pq, 0, sizeof(PacketQueue));
memset(p, 0, sizeof(Packet));
PACKET_INITIALIZE(p);
FlowInitConfig(FLOW_QUIET);
@ -1817,7 +1815,6 @@ int DecodeIPV4DefragTest03(void)
memset(&tv, 0, sizeof(ThreadVars));
memset(&dtv, 0, sizeof(DecodeThreadVars));
memset(&pq, 0, sizeof(PacketQueue));
memset(p, 0, sizeof(Packet));
PACKET_INITIALIZE(p);
FlowInitConfig(FLOW_QUIET);

@ -8717,10 +8717,8 @@ static int StreamTcpTest40(void) {
DecodeThreadVars dtv;
memset(&tv, 0, sizeof(ThreadVars));
memset(p, 0, SIZE_OF_PACKET);
PACKET_INITIALIZE(p);
p->pkt = (uint8_t *)(p + 1);
SET_PKT_LEN(p, sizeof(raw_vlan));
memcpy(GET_PKT_DATA(p), raw_vlan, sizeof(raw_vlan));
memset(&dtv, 0, sizeof(DecodeThreadVars));
@ -8778,15 +8776,14 @@ static int StreamTcpTest41(void) {
memset(&dtv, 0, sizeof(DecodeThreadVars));
memset(&tv, 0, sizeof(ThreadVars));
memset(p, 0, SIZE_OF_PACKET);
p->pkt = (uint8_t *)(p + 1);
PACKET_INITIALIZE(p);
if (PacketCopyData(p, raw_ip, sizeof(raw_ip)) == -1) {
PACKET_CLEANUP(p);
SCFree(p);
return 1;
}
PACKET_INITIALIZE(p);
FlowInitConfig(FLOW_QUIET);
DecodeRaw(&tv, &dtv, p, raw_ip, GET_PKT_LEN(p), NULL);

Loading…
Cancel
Save