From: Victor Julien Date: Mon, 11 Nov 2019 07:16:26 +0000 (+0100) Subject: threading/modules: declare prototypes static X-Git-Tag: suricata-6.0.0-beta1~802 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a703c84ad930143939ef5da9084faeac0dc7574;p=thirdparty%2Fsuricata.git threading/modules: declare prototypes static Declare registered threading API funcs static where appropriate. --- diff --git a/src/respond-reject.c b/src/respond-reject.c index bd686992c9..9fb5795959 100644 --- a/src/respond-reject.c +++ b/src/respond-reject.c @@ -45,6 +45,7 @@ int RejectSendIPv4TCP(ThreadVars *, Packet *, void *); int RejectSendIPv4ICMP(ThreadVars *, Packet *, void *); int RejectSendIPv6TCP(ThreadVars *, Packet *, void *); int RejectSendIPv6ICMP(ThreadVars *, Packet *, void *); +static TmEcode RespondRejectFunc(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq); void TmModuleRespondRejectRegister (void) { @@ -56,7 +57,7 @@ void TmModuleRespondRejectRegister (void) 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; diff --git a/src/respond-reject.h b/src/respond-reject.h index 353929509b..b731b29785 100644 --- a/src/respond-reject.h +++ b/src/respond-reject.h @@ -30,6 +30,5 @@ #define REJECT_DIR_DST 1 void TmModuleRespondRejectRegister (void); -TmEcode RespondRejectFunc(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq); #endif /* __RESPOND_REJECT_H__ */ diff --git a/src/source-ipfw.c b/src/source-ipfw.c index bf7e4db8d1..478256f145 100644 --- a/src/source-ipfw.c +++ b/src/source-ipfw.c @@ -129,22 +129,22 @@ static uint16_t receive_port_num = 0; static SCMutex ipfw_init_lock; /* IPFW Prototypes */ -void *IPFWGetQueue(int number); -TmEcode ReceiveIPFWThreadInit(ThreadVars *, const void *, void **); -TmEcode ReceiveIPFW(ThreadVars *, Packet *, void *, PacketQueue *); -TmEcode ReceiveIPFWLoop(ThreadVars *tv, void *data, void *slot); -void ReceiveIPFWThreadExitStats(ThreadVars *, void *); -TmEcode ReceiveIPFWThreadDeinit(ThreadVars *, void *); - -TmEcode IPFWSetVerdict(ThreadVars *, IPFWThreadVars *, Packet *); -TmEcode VerdictIPFW(ThreadVars *, Packet *, void *, PacketQueue *); -TmEcode VerdictIPFWThreadInit(ThreadVars *, const void *, void **); -void VerdictIPFWThreadExitStats(ThreadVars *, void *); -TmEcode VerdictIPFWThreadDeinit(ThreadVars *, void *); - -TmEcode DecodeIPFWThreadInit(ThreadVars *, const void *, void **); -TmEcode DecodeIPFWThreadDeinit(ThreadVars *tv, void *data); -TmEcode DecodeIPFW(ThreadVars *, Packet *, void *, PacketQueue *); +static void *IPFWGetQueue(int number); +static TmEcode ReceiveIPFWThreadInit(ThreadVars *, const void *, void **); +static TmEcode ReceiveIPFW(ThreadVars *, Packet *, void *, PacketQueue *); +static TmEcode ReceiveIPFWLoop(ThreadVars *tv, void *data, void *slot); +static void ReceiveIPFWThreadExitStats(ThreadVars *, void *); +static TmEcode ReceiveIPFWThreadDeinit(ThreadVars *, void *); + +static TmEcode IPFWSetVerdict(ThreadVars *, IPFWThreadVars *, Packet *); +static TmEcode VerdictIPFW(ThreadVars *, Packet *, void *, PacketQueue *); +static TmEcode VerdictIPFWThreadInit(ThreadVars *, const void *, void **); +static void VerdictIPFWThreadExitStats(ThreadVars *, void *); +static TmEcode VerdictIPFWThreadDeinit(ThreadVars *, void *); + +static TmEcode DecodeIPFWThreadInit(ThreadVars *, const void *, void **); +static TmEcode DecodeIPFWThreadDeinit(ThreadVars *tv, void *data); +static TmEcode DecodeIPFW(ThreadVars *, Packet *, void *, PacketQueue *); /** * \brief Registration Function for RecieveIPFW. diff --git a/src/source-nfq.c b/src/source-nfq.c index 4358a27aec..a083197a83 100644 --- a/src/source-nfq.c +++ b/src/source-nfq.c @@ -132,20 +132,20 @@ static NFQQueueVars *g_nfq_q; static uint16_t receive_queue_num = 0; static SCMutex nfq_init_lock; -TmEcode ReceiveNFQLoop(ThreadVars *tv, void *data, void *slot); -TmEcode ReceiveNFQThreadInit(ThreadVars *, const void *, void **); -TmEcode ReceiveNFQThreadDeinit(ThreadVars *, void *); -void ReceiveNFQThreadExitStats(ThreadVars *, void *); +static TmEcode ReceiveNFQLoop(ThreadVars *tv, void *data, void *slot); +static TmEcode ReceiveNFQThreadInit(ThreadVars *, const void *, void **); +static TmEcode ReceiveNFQThreadDeinit(ThreadVars *, void *); +static void ReceiveNFQThreadExitStats(ThreadVars *, void *); -TmEcode VerdictNFQ(ThreadVars *, Packet *, void *, PacketQueue *); -TmEcode VerdictNFQThreadInit(ThreadVars *, const void *, void **); -TmEcode VerdictNFQThreadDeinit(ThreadVars *, void *); +static TmEcode VerdictNFQ(ThreadVars *, Packet *, void *, PacketQueue *); +static TmEcode VerdictNFQThreadInit(ThreadVars *, const void *, void **); +static TmEcode VerdictNFQThreadDeinit(ThreadVars *, void *); -TmEcode DecodeNFQ(ThreadVars *, Packet *, void *, PacketQueue *); -TmEcode DecodeNFQThreadInit(ThreadVars *, const void *, void **); -TmEcode DecodeNFQThreadDeinit(ThreadVars *tv, void *data); +static TmEcode DecodeNFQ(ThreadVars *, Packet *, void *, PacketQueue *); +static TmEcode DecodeNFQThreadInit(ThreadVars *, const void *, void **); +static TmEcode DecodeNFQThreadDeinit(ThreadVars *tv, void *data); -TmEcode NFQSetVerdict(Packet *p); +static TmEcode NFQSetVerdict(Packet *p); typedef enum NFQMode_ { NFQ_ACCEPT_MODE, diff --git a/src/source-pcap.c b/src/source-pcap.c index a7f9d38ee5..5daab86449 100644 --- a/src/source-pcap.c +++ b/src/source-pcap.c @@ -90,15 +90,15 @@ typedef struct PcapThreadVars_ LiveDevice *livedev; } PcapThreadVars; -TmEcode ReceivePcapThreadInit(ThreadVars *, const void *, void **); -void ReceivePcapThreadExitStats(ThreadVars *, void *); -TmEcode ReceivePcapThreadDeinit(ThreadVars *, void *); -TmEcode ReceivePcapLoop(ThreadVars *tv, void *data, void *slot); -TmEcode ReceivePcapBreakLoop(ThreadVars *tv, void *data); +static TmEcode ReceivePcapThreadInit(ThreadVars *, const void *, void **); +static void ReceivePcapThreadExitStats(ThreadVars *, void *); +static TmEcode ReceivePcapThreadDeinit(ThreadVars *, void *); +static TmEcode ReceivePcapLoop(ThreadVars *tv, void *data, void *slot); +static TmEcode ReceivePcapBreakLoop(ThreadVars *tv, void *data); -TmEcode DecodePcapThreadInit(ThreadVars *, const void *, void **); -TmEcode DecodePcapThreadDeinit(ThreadVars *tv, void *data); -TmEcode DecodePcap(ThreadVars *, Packet *, void *, PacketQueue *); +static TmEcode DecodePcapThreadInit(ThreadVars *, const void *, void **); +static TmEcode DecodePcapThreadDeinit(ThreadVars *tv, void *data); +static TmEcode DecodePcap(ThreadVars *, Packet *, void *, PacketQueue *); /** protect pcap_compile and pcap_setfilter, as they are not thread safe: * 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 */ -TmEcode ReceivePcapLoop(ThreadVars *tv, void *data, void *slot) +static TmEcode ReceivePcapLoop(ThreadVars *tv, void *data, void *slot) { SCEnter(); @@ -298,7 +298,7 @@ TmEcode ReceivePcapLoop(ThreadVars *tv, void *data, void *slot) /** * \brief PCAP Break Loop function. */ -TmEcode ReceivePcapBreakLoop(ThreadVars *tv, void *data) +static TmEcode ReceivePcapBreakLoop(ThreadVars *tv, void *data) { SCEnter(); PcapThreadVars *ptv = (PcapThreadVars *)data; @@ -324,7 +324,7 @@ TmEcode ReceivePcapBreakLoop(ThreadVars *tv, void *data) * * \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(); PcapIfaceConfig *pcapconfig = (PcapIfaceConfig *)initdata; @@ -500,7 +500,7 @@ TmEcode ReceivePcapThreadInit(ThreadVars *tv, const void *initdata, void **data) * \param tv pointer to ThreadVars * \param data pointer that gets cast into PcapThreadVars for ptv */ -void ReceivePcapThreadExitStats(ThreadVars *tv, void *data) +static void ReceivePcapThreadExitStats(ThreadVars *tv, void *data) { SCEnter(); PcapThreadVars *ptv = (PcapThreadVars *)data; @@ -536,7 +536,7 @@ void ReceivePcapThreadExitStats(ThreadVars *tv, void *data) * \param tv pointer to ThreadVars * \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; @@ -555,7 +555,7 @@ TmEcode ReceivePcapThreadDeinit(ThreadVars *tv, void *data) * \param data pointer that gets cast into PcapThreadVars for ptv * \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(); DecodeThreadVars *dtv = (DecodeThreadVars *)data; @@ -598,7 +598,7 @@ TmEcode DecodePcap(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq) SCReturnInt(TM_ECODE_OK); } -TmEcode DecodePcapThreadInit(ThreadVars *tv, const void *initdata, void **data) +static TmEcode DecodePcapThreadInit(ThreadVars *tv, const void *initdata, void **data) { SCEnter(); @@ -613,7 +613,7 @@ TmEcode DecodePcapThreadInit(ThreadVars *tv, const void *initdata, void **data) SCReturnInt(TM_ECODE_OK); } -TmEcode DecodePcapThreadDeinit(ThreadVars *tv, void *data) +static TmEcode DecodePcapThreadDeinit(ThreadVars *tv, void *data) { if (data != NULL) DecodeThreadVarsFree(tv, data);