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

log-pcap code cleanups

Browse Source 
Code cleanups to make functions static.
pull/1043/head
Victor Julien 12 years ago
parent fd7dd09f4c
commit 1af2f6528b
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File

29
src/log-pcap.c
Unescape Escape View File

@ -1,4 +1,4 @@
/* Copyright (C) 2007-2011 Open Information Security Foundation /* Copyright (C) 2007-2014 Open Information Security Foundation
* *
* You can copy, redistribute or modify this Program under the terms of * You can copy, redistribute or modify this Program under the terms of
* the GNU General Public License version 2 as published by the Free * the GNU General Public License version 2 as published by the Free
@ -20,6 +20,7 @@
* \file * \file
* *
* \author William Metcalf <William.Metcalf@gmail.com> * \author William Metcalf <William.Metcalf@gmail.com>
* \author Victor Julien <victor@inliniac.net>
* *
* Pcap packet logging module. * Pcap packet logging module.
*/ */
@ -69,11 +70,6 @@
#define USE_STREAM_DEPTH_DISABLED 0 #define USE_STREAM_DEPTH_DISABLED 0
#define USE_STREAM_DEPTH_ENABLED 1 #define USE_STREAM_DEPTH_ENABLED 1
TmEcode PcapLog(ThreadVars *, Packet *, void *, PacketQueue *, PacketQueue *);
TmEcode PcapLogDataInit(ThreadVars *, void *, void **);
TmEcode PcapLogDataDeinit(ThreadVars *, void *);
static void PcapLogFileDeInitCtx(OutputCtx *);
typedef struct PcapFileName_ { typedef struct PcapFileName_ {
char *filename; char *filename;
char *dirname; char *dirname;
@ -119,7 +115,12 @@ typedef struct PcapLogData_ {
TAILQ_HEAD(, PcapFileName_) pcap_file_list; TAILQ_HEAD(, PcapFileName_) pcap_file_list;
} PcapLogData; } PcapLogData;
int PcapLogOpenFileCtx(PcapLogData *); static int PcapLogOpenFileCtx(PcapLogData *);
static TmEcode PcapLog(ThreadVars *, Packet *, void *, PacketQueue *, PacketQueue *);
static TmEcode PcapLogDataInit(ThreadVars *, void *, void **);
static TmEcode PcapLogDataDeinit(ThreadVars *, void *);
static void PcapLogFileDeInitCtx(OutputCtx *);
static OutputCtx *PcapLogInitCtx(ConfNode *);
void TmModulePcapLogRegister(void) void TmModulePcapLogRegister(void)
{ {
@ -147,7 +148,7 @@ void TmModulePcapLogRegister(void)
* \param t Thread Variable containing input/output queue, cpu affinity etc. * \param t Thread Variable containing input/output queue, cpu affinity etc.
* \param pl PcapLog thread variable. * \param pl PcapLog thread variable.
*/ */
int PcapLogCloseFile(ThreadVars *t, PcapLogData *pl) static int PcapLogCloseFile(ThreadVars *t, PcapLogData *pl)
{ {
if (pl != NULL) { if (pl != NULL) {
PCAPLOG_PROFILE_START; PCAPLOG_PROFILE_START;
@ -191,7 +192,7 @@ static void PcapFileNameFree(PcapFileName *pf)
* \retval 0 on succces * \retval 0 on succces
* \retval -1 on failure * \retval -1 on failure
*/ */
int PcapLogRotateFile(ThreadVars *t, PcapLogData *pl) static int PcapLogRotateFile(ThreadVars *t, PcapLogData *pl)
{ {
PcapFileName *pf; PcapFileName *pf;
PcapFileName *pfnext; PcapFileName *pfnext;
@ -288,7 +289,7 @@ static int PcapLogOpenHandles(PcapLogData *pl, Packet *p) {
* \retval TM_ECODE_OK on succes * \retval TM_ECODE_OK on succes
* \retval TM_ECODE_FAILED on serious error * \retval TM_ECODE_FAILED on serious error
*/ */
TmEcode PcapLog (ThreadVars *t, Packet *p, void *data, PacketQueue *pq, static TmEcode PcapLog (ThreadVars *t, Packet *p, void *data, PacketQueue *pq,
PacketQueue *postpq) PacketQueue *postpq)
{ {
size_t len; size_t len;
@ -361,7 +362,7 @@ TmEcode PcapLog (ThreadVars *t, Packet *p, void *data, PacketQueue *pq,
return TM_ECODE_OK; return TM_ECODE_OK;
} }
TmEcode PcapLogDataInit(ThreadVars *t, void *initdata, void **data) static TmEcode PcapLogDataInit(ThreadVars *t, void *initdata, void **data)
{ {
if (initdata == NULL) { if (initdata == NULL) {
SCLogDebug("Error getting context for PcapLog. \"initdata\" argument NULL"); SCLogDebug("Error getting context for PcapLog. \"initdata\" argument NULL");
@ -431,7 +432,7 @@ static void ProfileReport(PcapLogData *pl) {
* \retval TM_ECODE_FAILED on failure * \retval TM_ECODE_FAILED on failure
*/ */
TmEcode PcapLogDataDeinit(ThreadVars *t, void *data) static TmEcode PcapLogDataDeinit(ThreadVars *t, void *data)
{ {
PcapLogData *pl = data; PcapLogData *pl = data;
@ -452,7 +453,7 @@ TmEcode PcapLogDataDeinit(ThreadVars *t, void *data)
* \param conf The configuration node for this output. * \param conf The configuration node for this output.
* \retval output_ctx * \retval output_ctx
* */ * */
OutputCtx *PcapLogInitCtx(ConfNode *conf) static OutputCtx *PcapLogInitCtx(ConfNode *conf)
{ {
PcapLogData *pl = SCMalloc(sizeof(PcapLogData)); PcapLogData *pl = SCMalloc(sizeof(PcapLogData));
if (unlikely(pl == NULL)) { if (unlikely(pl == NULL)) {
@ -668,7 +669,7 @@ static void PcapLogFileDeInitCtx(OutputCtx *output_ctx)
* \retval -1 if failure * \retval -1 if failure
* \retval 0 if succesful * \retval 0 if succesful
*/ */
int PcapLogOpenFileCtx(PcapLogData *pl) static int PcapLogOpenFileCtx(PcapLogData *pl)
{ {
char *filename = NULL; char *filename = NULL;

8
src/log-pcap.h
Unescape Escape View File

@ -3,11 +3,9 @@
* \author Breno Silva <breno.silva@gmail.com> * \author Breno Silva <breno.silva@gmail.com>
*/ */
#ifndef __PCAP_LOG_ALERT_H__ #ifndef __PCAP_LOG_H__
#define __PCAP_LOG_ALERT_H__ #define __PCAP_LOG_H__
void TmModulePcapLogRegister (void); void TmModulePcapLogRegister (void);
OutputCtx *PcapLogInitCtx(ConfNode *);
#endif /* __PCAP_LOG_H__ */
#endif /* __PCAP_LOG_ALERT_H__ */

Write Preview
Loading…
Cancel
Save