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

PacketQueue postp added to TmEcodes for ipfw and pf_ring to silence compiler warnings

Browse Source
remotes/origin/master-1.0.x
William Metcalf 15 years ago committed by Victor Julien
parent 876057a4da
commit 5580f3d9c2
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File

12
src/source-ipfw.c
Unescape Escape View File

@ -122,18 +122,18 @@ static SCMutex ipfw_socket_lock;
/* IPFW Prototypes */ /* IPFW Prototypes */
TmEcode ReceiveIPFWThreadInit(ThreadVars *, void *, void **); TmEcode ReceiveIPFWThreadInit(ThreadVars *, void *, void **);
TmEcode ReceiveIPFW(ThreadVars *, Packet *, void *, PacketQueue *); TmEcode ReceiveIPFW(ThreadVars *, Packet *, void *, PacketQueue *, PacketQueue *);
void ReceiveIPFWThreadExitStats(ThreadVars *, void *); void ReceiveIPFWThreadExitStats(ThreadVars *, void *);
TmEcode ReceiveIPFWThreadDeinit(ThreadVars *, void *); TmEcode ReceiveIPFWThreadDeinit(ThreadVars *, void *);
TmEcode IPFWSetVerdict(ThreadVars *, IPFWThreadVars *, Packet *); TmEcode IPFWSetVerdict(ThreadVars *, IPFWThreadVars *, Packet *);
TmEcode VerdictIPFW(ThreadVars *, Packet *, void *, PacketQueue *); TmEcode VerdictIPFW(ThreadVars *, Packet *, void *, PacketQueue *, PacketQueue *);
TmEcode VerdictIPFWThreadInit(ThreadVars *, void *, void **); TmEcode VerdictIPFWThreadInit(ThreadVars *, void *, void **);
void VerdictIPFWThreadExitStats(ThreadVars *, void *); void VerdictIPFWThreadExitStats(ThreadVars *, void *);
TmEcode VerdictIPFWThreadDeinit(ThreadVars *, void *); TmEcode VerdictIPFWThreadDeinit(ThreadVars *, void *);
TmEcode DecodeIPFWThreadInit(ThreadVars *, void *, void **); TmEcode DecodeIPFWThreadInit(ThreadVars *, void *, void **);
TmEcode DecodeIPFW(ThreadVars *, Packet *, void *, PacketQueue *); TmEcode DecodeIPFW(ThreadVars *, Packet *, void *, PacketQueue *, PacketQueue *);
/** /**
* \brief Registration Function for RecieveIPFW. * \brief Registration Function for RecieveIPFW.
@ -187,7 +187,7 @@ void TmModuleDecodeIPFWRegister (void) {
* \param pq pointer to the PacketQueue (not used here but part of the api) * \param pq pointer to the PacketQueue (not used here but part of the api)
* \retval TM_ECODE_FAILED on failure and TM_ECODE_OK on success * \retval TM_ECODE_FAILED on failure and TM_ECODE_OK on success
*/ */
TmEcode ReceiveIPFW(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq) { TmEcode ReceiveIPFW(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, PacketQueue *postpq) {
IPFWThreadVars *ptv = (IPFWThreadVars *)data; IPFWThreadVars *ptv = (IPFWThreadVars *)data;
char pkt[IP_MAXPACKET]; char pkt[IP_MAXPACKET];
int pktlen=0; int pktlen=0;
@ -399,7 +399,7 @@ TmEcode ReceiveIPFWThreadDeinit(ThreadVars *tv, void *data) {
* \param data pointer that gets cast into IPFWThreadVars for ptv * \param data pointer that gets cast into IPFWThreadVars for ptv
* \param pq pointer to the PacketQueue * \param pq pointer to the PacketQueue
*/ */
TmEcode DecodeIPFW(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq) TmEcode DecodeIPFW(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, PacketQueue *postpq)
{ {
IPV4Hdr *ip4h = (IPV4Hdr *)p->pkt; IPV4Hdr *ip4h = (IPV4Hdr *)p->pkt;
IPV6Hdr *ip6h = (IPV6Hdr *)p->pkt; IPV6Hdr *ip6h = (IPV6Hdr *)p->pkt;
@ -534,7 +534,7 @@ TmEcode IPFWSetVerdict(ThreadVars *tv, IPFWThreadVars *ptv, Packet *p) {
* \param data pointer that gets cast into IPFWThreadVars for ptv * \param data pointer that gets cast into IPFWThreadVars for ptv
* \param pq pointer for the Packet Queue access (Not used) * \param pq pointer for the Packet Queue access (Not used)
*/ */
TmEcode VerdictIPFW(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq) { TmEcode VerdictIPFW(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, PacketQueue *postpq) {
IPFWThreadVars *ptv = (IPFWThreadVars *)data; IPFWThreadVars *ptv = (IPFWThreadVars *)data;
TmEcode retval = TM_ECODE_OK; TmEcode retval = TM_ECODE_OK;

8
src/source-pfring.c
Unescape Escape View File

@ -45,13 +45,13 @@
#include "util-debug.h" #include "util-debug.h"
#include "util-privs.h" #include "util-privs.h"
TmEcode ReceivePfring(ThreadVars *, Packet *, void *, PacketQueue *); TmEcode ReceivePfring(ThreadVars *, Packet *, void *, PacketQueue *, PacketQueue *);
TmEcode ReceivePfringThreadInit(ThreadVars *, void *, void **); TmEcode ReceivePfringThreadInit(ThreadVars *, void *, void **);
void ReceivePfringThreadExitStats(ThreadVars *, void *); void ReceivePfringThreadExitStats(ThreadVars *, void *);
TmEcode ReceivePfringThreadDeinit(ThreadVars *, void *); TmEcode ReceivePfringThreadDeinit(ThreadVars *, void *);
TmEcode DecodePfringThreadInit(ThreadVars *, void *, void **); TmEcode DecodePfringThreadInit(ThreadVars *, void *, void **);
TmEcode DecodePfring(ThreadVars *, Packet *, void *, PacketQueue *); TmEcode DecodePfring(ThreadVars *, Packet *, void *, PacketQueue *, PacketQueue *);
extern int max_pending_packets; extern int max_pending_packets;
@ -187,7 +187,7 @@ void PfringProcessPacket(void *user, struct pfring_pkthdr *h, u_char *pkt, Packe
* \retval TM_ECODE_OK on success * \retval TM_ECODE_OK on success
* \retval TM_ECODE_FAILED on failure * \retval TM_ECODE_FAILED on failure
*/ */
TmEcode ReceivePfring(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq) { TmEcode ReceivePfring(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, PacketQueue *postpq) {
PfringThreadVars *ptv = (PfringThreadVars *)data; PfringThreadVars *ptv = (PfringThreadVars *)data;
struct pfring_pkthdr hdr; struct pfring_pkthdr hdr;
@ -344,7 +344,7 @@ TmEcode ReceivePfringThreadDeinit(ThreadVars *tv, void *data) {
* \todo Verify that PF_RING only deals with ethernet traffic * \todo Verify that PF_RING only deals with ethernet traffic
* \retval TM_ECODE_OK is always returned * \retval TM_ECODE_OK is always returned
*/ */
TmEcode DecodePfring(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq) TmEcode DecodePfring(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, PacketQueue *postpq)
{ {
DecodeThreadVars *dtv = (DecodeThreadVars *)data; DecodeThreadVars *dtv = (DecodeThreadVars *)data;

Write Preview
Loading…
Cancel
Save