af-packet: packet checks into debug validate check

pull/6600/head
Victor Julien 5 years ago
parent 5e05fedc90
commit 3f8e15f70c

@ -57,6 +57,7 @@
#include "source-af-packet.h" #include "source-af-packet.h"
#include "runmodes.h" #include "runmodes.h"
#include "flow-storage.h" #include "flow-storage.h"
#include "util-validate.h"
#ifdef HAVE_AF_PACKET #ifdef HAVE_AF_PACKET
@ -849,9 +850,11 @@ static TmEcode AFPWritePacket(Packet *p, int version)
static void AFPReleaseDataFromRing(Packet *p) static void AFPReleaseDataFromRing(Packet *p)
{ {
DEBUG_VALIDATE_BUG_ON(PKT_IS_PSEUDOPKT(p));
/* Need to be in copy mode and need to detect early release /* Need to be in copy mode and need to detect early release
where Ethernet header could not be set (and pseudo packet) */ where Ethernet header could not be set (and pseudo packet) */
if ((p->afp_v.copy_mode != AFP_COPY_MODE_NONE) && !PKT_IS_PSEUDOPKT(p)) { if (p->afp_v.copy_mode != AFP_COPY_MODE_NONE) {
AFPWritePacket(p, TPACKET_V2); AFPWritePacket(p, TPACKET_V2);
} }
@ -871,9 +874,11 @@ cleanup:
#ifdef HAVE_TPACKET_V3 #ifdef HAVE_TPACKET_V3
static void AFPReleasePacketV3(Packet *p) static void AFPReleasePacketV3(Packet *p)
{ {
DEBUG_VALIDATE_BUG_ON(PKT_IS_PSEUDOPKT(p));
/* Need to be in copy mode and need to detect early release /* Need to be in copy mode and need to detect early release
where Ethernet header could not be set (and pseudo packet) */ where Ethernet header could not be set (and pseudo packet) */
if ((p->afp_v.copy_mode != AFP_COPY_MODE_NONE) && !PKT_IS_PSEUDOPKT(p)) { if (p->afp_v.copy_mode != AFP_COPY_MODE_NONE) {
AFPWritePacket(p, TPACKET_V3); AFPWritePacket(p, TPACKET_V3);
} }
PacketFreeOrRelease(p); PacketFreeOrRelease(p);
@ -2910,7 +2915,7 @@ TmEcode DecodeAFP(ThreadVars *tv, Packet *p, void *data)
SCEnter(); SCEnter();
DecodeThreadVars *dtv = (DecodeThreadVars *)data; DecodeThreadVars *dtv = (DecodeThreadVars *)data;
BUG_ON(PKT_IS_PSEUDOPKT(p)); DEBUG_VALIDATE_BUG_ON(PKT_IS_PSEUDOPKT(p));
/* update counters */ /* update counters */
DecodeUpdatePacketCounters(tv, dtv, p); DecodeUpdatePacketCounters(tv, dtv, p);

Loading…
Cancel
Save