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

af-packet: ring mode is not optionnal in AFPReadFromRing

Browse Source
pull/57/merge
Eric Leblond 13 years ago committed by Victor Julien
parent 355e981775
commit 0f2b34068c
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File

34
src/source-af-packet.c
Unescape Escape View File

@ -650,16 +650,14 @@ int AFPReadFromRing(AFPThreadVars *ptv)
SCReturnInt(AFP_FAILURE); SCReturnInt(AFP_FAILURE);
} }
if (ptv->flags & AFP_RING_MODE) { p->afp_v.relptr = h.raw;
p->afp_v.relptr = h.raw; p->ReleaseData = AFPReleaseDataFromRing;
p->ReleaseData = AFPReleaseDataFromRing;
p->afp_v.copy_mode = ptv->copy_mode; p->afp_v.copy_mode = ptv->copy_mode;
if (p->afp_v.copy_mode != AFP_COPY_MODE_NONE) { if (p->afp_v.copy_mode != AFP_COPY_MODE_NONE) {
p->afp_v.peer = ptv->mpeer->peer; p->afp_v.peer = ptv->mpeer->peer;
} else { } else {
p->afp_v.peer = NULL; p->afp_v.peer = NULL;
}
} }
from = (void *)h.raw + TPACKET_ALIGN(ptv->tp_hdrlen); from = (void *)h.raw + TPACKET_ALIGN(ptv->tp_hdrlen);
@ -686,17 +684,15 @@ int AFPReadFromRing(AFPThreadVars *ptv)
TmqhOutputPacketpool(ptv->tv, p); TmqhOutputPacketpool(ptv->tv, p);
SCReturnInt(AFP_FAILURE); SCReturnInt(AFP_FAILURE);
} else { } else {
if (ptv->flags & AFP_RING_MODE) { p->afp_v.relptr = h.raw;
p->afp_v.relptr = h.raw;
p->afp_v.copy_mode = ptv->copy_mode;
p->afp_v.copy_mode = ptv->copy_mode; if (p->afp_v.copy_mode != AFP_COPY_MODE_NONE) {
if (p->afp_v.copy_mode != AFP_COPY_MODE_NONE) { p->afp_v.peer = ptv->mpeer->peer;
p->afp_v.peer = ptv->mpeer->peer; } else {
} else { p->afp_v.peer = NULL;
p->afp_v.peer = NULL;
}
p->ReleaseData = AFPReleaseDataFromRing;
} }
p->ReleaseData = AFPReleaseDataFromRing;
} }
} else { } else {
if (PacketCopyData(p, (unsigned char*)h.raw + h.h2->tp_mac, h.h2->tp_snaplen) == -1) { if (PacketCopyData(p, (unsigned char*)h.raw + h.h2->tp_mac, h.h2->tp_snaplen) == -1) {

Write Preview
Loading…
Cancel
Save