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

threading/modules: declare prototypes static

Browse Source 
Declare registered threading API funcs static where appropriate.
pull/4531/head
Victor Julien 6 years ago
parent 7c83cb585e
commit 3a703c84ad
5 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File

3
src/respond-reject.c
Unescape Escape View File

@ -45,6 +45,7 @@ int RejectSendIPv4TCP(ThreadVars *, Packet *, void *);
int RejectSendIPv4ICMP(ThreadVars *, Packet *, void *); int RejectSendIPv4ICMP(ThreadVars *, Packet *, void *);
int RejectSendIPv6TCP(ThreadVars *, Packet *, void *); int RejectSendIPv6TCP(ThreadVars *, Packet *, void *);
int RejectSendIPv6ICMP(ThreadVars *, Packet *, void *); int RejectSendIPv6ICMP(ThreadVars *, Packet *, void *);
static TmEcode RespondRejectFunc(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq);
void TmModuleRespondRejectRegister (void) void TmModuleRespondRejectRegister (void)
{ {
@ -56,7 +57,7 @@ void TmModuleRespondRejectRegister (void)
tmm_modules[TMM_RESPONDREJECT].cap_flags = 0; /* libnet is not compat with caps */ tmm_modules[TMM_RESPONDREJECT].cap_flags = 0; /* libnet is not compat with caps */
} }
TmEcode RespondRejectFunc(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq) static TmEcode RespondRejectFunc(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq)
{ {
int ret = 0; int ret = 0;

1
src/respond-reject.h
Unescape Escape View File

@ -30,6 +30,5 @@
#define REJECT_DIR_DST 1 #define REJECT_DIR_DST 1
void TmModuleRespondRejectRegister (void); void TmModuleRespondRejectRegister (void);
TmEcode RespondRejectFunc(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq);
#endif /* __RESPOND_REJECT_H__ */ #endif /* __RESPOND_REJECT_H__ */

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

@ -129,22 +129,22 @@ static uint16_t receive_port_num = 0;
static SCMutex ipfw_init_lock; static SCMutex ipfw_init_lock;
/* IPFW Prototypes */ /* IPFW Prototypes */
void *IPFWGetQueue(int number); static void *IPFWGetQueue(int number);
TmEcode ReceiveIPFWThreadInit(ThreadVars *, const void *, void **); static TmEcode ReceiveIPFWThreadInit(ThreadVars *, const void *, void **);
TmEcode ReceiveIPFW(ThreadVars *, Packet *, void *, PacketQueue *); static TmEcode ReceiveIPFW(ThreadVars *, Packet *, void *, PacketQueue *);
TmEcode ReceiveIPFWLoop(ThreadVars *tv, void *data, void *slot); static TmEcode ReceiveIPFWLoop(ThreadVars *tv, void *data, void *slot);
void ReceiveIPFWThreadExitStats(ThreadVars *, void *); static void ReceiveIPFWThreadExitStats(ThreadVars *, void *);
TmEcode ReceiveIPFWThreadDeinit(ThreadVars *, void *); static TmEcode ReceiveIPFWThreadDeinit(ThreadVars *, void *);
TmEcode IPFWSetVerdict(ThreadVars *, IPFWThreadVars *, Packet *); static TmEcode IPFWSetVerdict(ThreadVars *, IPFWThreadVars *, Packet *);
TmEcode VerdictIPFW(ThreadVars *, Packet *, void *, PacketQueue *); static TmEcode VerdictIPFW(ThreadVars *, Packet *, void *, PacketQueue *);
TmEcode VerdictIPFWThreadInit(ThreadVars *, const void *, void **); static TmEcode VerdictIPFWThreadInit(ThreadVars *, const void *, void **);
void VerdictIPFWThreadExitStats(ThreadVars *, void *); static void VerdictIPFWThreadExitStats(ThreadVars *, void *);
TmEcode VerdictIPFWThreadDeinit(ThreadVars *, void *); static TmEcode VerdictIPFWThreadDeinit(ThreadVars *, void *);
TmEcode DecodeIPFWThreadInit(ThreadVars *, const void *, void **); static TmEcode DecodeIPFWThreadInit(ThreadVars *, const void *, void **);
TmEcode DecodeIPFWThreadDeinit(ThreadVars *tv, void *data); static TmEcode DecodeIPFWThreadDeinit(ThreadVars *tv, void *data);
TmEcode DecodeIPFW(ThreadVars *, Packet *, void *, PacketQueue *); static TmEcode DecodeIPFW(ThreadVars *, Packet *, void *, PacketQueue *);
/** /**
* \brief Registration Function for RecieveIPFW. * \brief Registration Function for RecieveIPFW.

22
src/source-nfq.c
Unescape Escape View File

@ -132,20 +132,20 @@ static NFQQueueVars *g_nfq_q;
static uint16_t receive_queue_num = 0; static uint16_t receive_queue_num = 0;
static SCMutex nfq_init_lock; static SCMutex nfq_init_lock;
TmEcode ReceiveNFQLoop(ThreadVars *tv, void *data, void *slot); static TmEcode ReceiveNFQLoop(ThreadVars *tv, void *data, void *slot);
TmEcode ReceiveNFQThreadInit(ThreadVars *, const void *, void **); static TmEcode ReceiveNFQThreadInit(ThreadVars *, const void *, void **);
TmEcode ReceiveNFQThreadDeinit(ThreadVars *, void *); static TmEcode ReceiveNFQThreadDeinit(ThreadVars *, void *);
void ReceiveNFQThreadExitStats(ThreadVars *, void *); static void ReceiveNFQThreadExitStats(ThreadVars *, void *);
TmEcode VerdictNFQ(ThreadVars *, Packet *, void *, PacketQueue *); static TmEcode VerdictNFQ(ThreadVars *, Packet *, void *, PacketQueue *);
TmEcode VerdictNFQThreadInit(ThreadVars *, const void *, void **); static TmEcode VerdictNFQThreadInit(ThreadVars *, const void *, void **);
TmEcode VerdictNFQThreadDeinit(ThreadVars *, void *); static TmEcode VerdictNFQThreadDeinit(ThreadVars *, void *);
TmEcode DecodeNFQ(ThreadVars *, Packet *, void *, PacketQueue *); static TmEcode DecodeNFQ(ThreadVars *, Packet *, void *, PacketQueue *);
TmEcode DecodeNFQThreadInit(ThreadVars *, const void *, void **); static TmEcode DecodeNFQThreadInit(ThreadVars *, const void *, void **);
TmEcode DecodeNFQThreadDeinit(ThreadVars *tv, void *data); static TmEcode DecodeNFQThreadDeinit(ThreadVars *tv, void *data);
TmEcode NFQSetVerdict(Packet *p); static TmEcode NFQSetVerdict(Packet *p);
typedef enum NFQMode_ { typedef enum NFQMode_ {
NFQ_ACCEPT_MODE, NFQ_ACCEPT_MODE,

32
src/source-pcap.c
Unescape Escape View File

@ -90,15 +90,15 @@ typedef struct PcapThreadVars_
LiveDevice *livedev; LiveDevice *livedev;
} PcapThreadVars; } PcapThreadVars;
TmEcode ReceivePcapThreadInit(ThreadVars *, const void *, void **); static TmEcode ReceivePcapThreadInit(ThreadVars *, const void *, void **);
void ReceivePcapThreadExitStats(ThreadVars *, void *); static void ReceivePcapThreadExitStats(ThreadVars *, void *);
TmEcode ReceivePcapThreadDeinit(ThreadVars *, void *); static TmEcode ReceivePcapThreadDeinit(ThreadVars *, void *);
TmEcode ReceivePcapLoop(ThreadVars *tv, void *data, void *slot); static TmEcode ReceivePcapLoop(ThreadVars *tv, void *data, void *slot);
TmEcode ReceivePcapBreakLoop(ThreadVars *tv, void *data); static TmEcode ReceivePcapBreakLoop(ThreadVars *tv, void *data);
TmEcode DecodePcapThreadInit(ThreadVars *, const void *, void **); static TmEcode DecodePcapThreadInit(ThreadVars *, const void *, void **);
TmEcode DecodePcapThreadDeinit(ThreadVars *tv, void *data); static TmEcode DecodePcapThreadDeinit(ThreadVars *tv, void *data);
TmEcode DecodePcap(ThreadVars *, Packet *, void *, PacketQueue *); static TmEcode DecodePcap(ThreadVars *, Packet *, void *, PacketQueue *);
/** protect pcap_compile and pcap_setfilter, as they are not thread safe: /** protect pcap_compile and pcap_setfilter, as they are not thread safe:
* http://seclists.org/tcpdump/2009/q1/62 */ * http://seclists.org/tcpdump/2009/q1/62 */
@ -240,7 +240,7 @@ static void PcapCallbackLoop(char *user, struct pcap_pkthdr *h, u_char *pkt)
/** /**
* \brief Main PCAP reading Loop function * \brief Main PCAP reading Loop function
*/ */
TmEcode ReceivePcapLoop(ThreadVars *tv, void *data, void *slot) static TmEcode ReceivePcapLoop(ThreadVars *tv, void *data, void *slot)
{ {
SCEnter(); SCEnter();
@ -298,7 +298,7 @@ TmEcode ReceivePcapLoop(ThreadVars *tv, void *data, void *slot)
/** /**
* \brief PCAP Break Loop function. * \brief PCAP Break Loop function.
*/ */
TmEcode ReceivePcapBreakLoop(ThreadVars *tv, void *data) static TmEcode ReceivePcapBreakLoop(ThreadVars *tv, void *data)
{ {
SCEnter(); SCEnter();
PcapThreadVars *ptv = (PcapThreadVars *)data; PcapThreadVars *ptv = (PcapThreadVars *)data;
@ -324,7 +324,7 @@ TmEcode ReceivePcapBreakLoop(ThreadVars *tv, void *data)
* *
* \todo Create a general pcap setup function. * \todo Create a general pcap setup function.
*/ */
TmEcode ReceivePcapThreadInit(ThreadVars *tv, const void *initdata, void **data) static TmEcode ReceivePcapThreadInit(ThreadVars *tv, const void *initdata, void **data)
{ {
SCEnter(); SCEnter();
PcapIfaceConfig *pcapconfig = (PcapIfaceConfig *)initdata; PcapIfaceConfig *pcapconfig = (PcapIfaceConfig *)initdata;
@ -500,7 +500,7 @@ TmEcode ReceivePcapThreadInit(ThreadVars *tv, const void *initdata, void **data)
* \param tv pointer to ThreadVars * \param tv pointer to ThreadVars
* \param data pointer that gets cast into PcapThreadVars for ptv * \param data pointer that gets cast into PcapThreadVars for ptv
*/ */
void ReceivePcapThreadExitStats(ThreadVars *tv, void *data) static void ReceivePcapThreadExitStats(ThreadVars *tv, void *data)
{ {
SCEnter(); SCEnter();
PcapThreadVars *ptv = (PcapThreadVars *)data; PcapThreadVars *ptv = (PcapThreadVars *)data;
@ -536,7 +536,7 @@ void ReceivePcapThreadExitStats(ThreadVars *tv, void *data)
* \param tv pointer to ThreadVars * \param tv pointer to ThreadVars
* \param data pointer that gets cast into PcapThreadVars for ptv * \param data pointer that gets cast into PcapThreadVars for ptv
*/ */
TmEcode ReceivePcapThreadDeinit(ThreadVars *tv, void *data) static TmEcode ReceivePcapThreadDeinit(ThreadVars *tv, void *data)
{ {
PcapThreadVars *ptv = (PcapThreadVars *)data; PcapThreadVars *ptv = (PcapThreadVars *)data;
@ -555,7 +555,7 @@ TmEcode ReceivePcapThreadDeinit(ThreadVars *tv, void *data)
* \param data pointer that gets cast into PcapThreadVars for ptv * \param data pointer that gets cast into PcapThreadVars for ptv
* \param pq pointer to the current PacketQueue * \param pq pointer to the current PacketQueue
*/ */
TmEcode DecodePcap(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq) static TmEcode DecodePcap(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq)
{ {
SCEnter(); SCEnter();
DecodeThreadVars *dtv = (DecodeThreadVars *)data; DecodeThreadVars *dtv = (DecodeThreadVars *)data;
@ -598,7 +598,7 @@ TmEcode DecodePcap(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq)
SCReturnInt(TM_ECODE_OK); SCReturnInt(TM_ECODE_OK);
} }
TmEcode DecodePcapThreadInit(ThreadVars *tv, const void *initdata, void **data) static TmEcode DecodePcapThreadInit(ThreadVars *tv, const void *initdata, void **data)
{ {
SCEnter(); SCEnter();
@ -613,7 +613,7 @@ TmEcode DecodePcapThreadInit(ThreadVars *tv, const void *initdata, void **data)
SCReturnInt(TM_ECODE_OK); SCReturnInt(TM_ECODE_OK);
} }
TmEcode DecodePcapThreadDeinit(ThreadVars *tv, void *data) static TmEcode DecodePcapThreadDeinit(ThreadVars *tv, void *data)
{ {
if (data != NULL) if (data != NULL)
DecodeThreadVarsFree(tv, data); DecodeThreadVarsFree(tv, data);

Write Preview
Loading…
Cancel
Save