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

alert-debuglog: minor cleanups

Browse Source 
Clean up log functions after packet logger conversion. No more
PacketQueue arguments.
pull/797/head
Victor Julien 13 years ago
parent cd4796f3ca
commit 73377048fd
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File

16
src/alert-debuglog.c
Unescape Escape View File

@ -160,11 +160,9 @@ static int AlertDebugPrintStreamSegmentCallback(const Packet *p, void *data, uin
return 1; return 1;
} }
static TmEcode AlertDebugLogger(ThreadVars *tv, const Packet *p, void *thread_data)
static TmEcode AlertDebugLogger(ThreadVars *tv, const Packet *p, void *data, PacketQueue *pq, PacketQueue *postpq)
{ {
AlertDebugLogThread *aft = (AlertDebugLogThread *)data; AlertDebugLogThread *aft = (AlertDebugLogThread *)thread_data;
int i; int i;
char timebuf[64]; char timebuf[64];
const char *pkt_src_str = NULL; const char *pkt_src_str = NULL;
@ -329,9 +327,9 @@ static TmEcode AlertDebugLogger(ThreadVars *tv, const Packet *p, void *data, Pac
return TM_ECODE_OK; return TM_ECODE_OK;
} }
static TmEcode AlertDebugLogDecoderEvent(ThreadVars *tv, const Packet *p, void *data, PacketQueue *pq, PacketQueue *postpq) static TmEcode AlertDebugLogDecoderEvent(ThreadVars *tv, const Packet *p, void *thread_data)
{ {
AlertDebugLogThread *aft = (AlertDebugLogThread *)data; AlertDebugLogThread *aft = (AlertDebugLogThread *)thread_data;
int i; int i;
char timebuf[64]; char timebuf[64];
const char *pkt_src_str = NULL; const char *pkt_src_str = NULL;
@ -500,11 +498,11 @@ static int AlertDebugLogCondition(ThreadVars *tv, const Packet *p) {
static int AlertDebugLogLogger(ThreadVars *tv, void *thread_data, const Packet *p) { static int AlertDebugLogLogger(ThreadVars *tv, void *thread_data, const Packet *p) {
if (PKT_IS_IPV4(p)) { if (PKT_IS_IPV4(p)) {
return AlertDebugLogger(tv, p, thread_data, NULL, NULL); return AlertDebugLogger(tv, p, thread_data);
} else if (PKT_IS_IPV6(p)) { } else if (PKT_IS_IPV6(p)) {
return AlertDebugLogger(tv, p, thread_data, NULL, NULL); return AlertDebugLogger(tv, p, thread_data);
} else if (p->events.cnt > 0) { } else if (p->events.cnt > 0) {
return AlertDebugLogDecoderEvent(tv, p, thread_data, NULL, NULL); return AlertDebugLogDecoderEvent(tv, p, thread_data);
} }
return TM_ECODE_OK; return TM_ECODE_OK;
} }

Write Preview
Loading…
Cancel
Save