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

output/packet: use unique thread data name

Browse Source
pull/6935/head
Victor Julien 3 years ago
parent dd1dc88c65
commit 008f4aee69
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File

14
src/output-flow.c
Unescape Escape View File

@ -1,4 +1,4 @@
/* Copyright (C) 2007-2013 Open Information Security Foundation /* Copyright (C) 2007-2022 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
@ -32,9 +32,9 @@
/** per thread data for this module, contains a list of per thread /** per thread data for this module, contains a list of per thread
* data for the packet loggers. */ * data for the packet loggers. */
typedef struct OutputLoggerThreadData_ { typedef struct OutputFlowLoggerThreadData_ {
OutputLoggerThreadStore *store; OutputLoggerThreadStore *store;
} OutputLoggerThreadData; } OutputFlowLoggerThreadData;
/* logger instance, a module + a output ctx, /* logger instance, a module + a output ctx,
* it's perfectly valid that have multiple instances of the same * it's perfectly valid that have multiple instances of the same
@ -93,7 +93,7 @@ TmEcode OutputFlowLog(ThreadVars *tv, void *thread_data, Flow *f)
FlowSetEndFlags(f); FlowSetEndFlags(f);
OutputLoggerThreadData *op_thread_data = (OutputLoggerThreadData *)thread_data; OutputFlowLoggerThreadData *op_thread_data = (OutputFlowLoggerThreadData *)thread_data;
OutputFlowLogger *logger = list; OutputFlowLogger *logger = list;
OutputLoggerThreadStore *store = op_thread_data->store; OutputLoggerThreadStore *store = op_thread_data->store;
@ -126,7 +126,7 @@ TmEcode OutputFlowLog(ThreadVars *tv, void *thread_data, Flow *f)
* loggers */ * loggers */
TmEcode OutputFlowLogThreadInit(ThreadVars *tv, void *initdata, void **data) TmEcode OutputFlowLogThreadInit(ThreadVars *tv, void *initdata, void **data)
{ {
OutputLoggerThreadData *td = SCMalloc(sizeof(*td)); OutputFlowLoggerThreadData *td = SCMalloc(sizeof(*td));
if (td == NULL) if (td == NULL)
return TM_ECODE_FAILED; return TM_ECODE_FAILED;
memset(td, 0x00, sizeof(*td)); memset(td, 0x00, sizeof(*td));
@ -168,7 +168,7 @@ TmEcode OutputFlowLogThreadInit(ThreadVars *tv, void *initdata, void **data)
TmEcode OutputFlowLogThreadDeinit(ThreadVars *tv, void *thread_data) TmEcode OutputFlowLogThreadDeinit(ThreadVars *tv, void *thread_data)
{ {
OutputLoggerThreadData *op_thread_data = (OutputLoggerThreadData *)thread_data; OutputFlowLoggerThreadData *op_thread_data = (OutputFlowLoggerThreadData *)thread_data;
if (op_thread_data == NULL) if (op_thread_data == NULL)
return TM_ECODE_OK; return TM_ECODE_OK;
@ -192,7 +192,7 @@ TmEcode OutputFlowLogThreadDeinit(ThreadVars *tv, void *thread_data)
void OutputFlowLogExitPrintStats(ThreadVars *tv, void *thread_data) void OutputFlowLogExitPrintStats(ThreadVars *tv, void *thread_data)
{ {
OutputLoggerThreadData *op_thread_data = (OutputLoggerThreadData *)thread_data; OutputFlowLoggerThreadData *op_thread_data = (OutputFlowLoggerThreadData *)thread_data;
OutputLoggerThreadStore *store = op_thread_data->store; OutputLoggerThreadStore *store = op_thread_data->store;
OutputFlowLogger *logger = list; OutputFlowLogger *logger = list;

14
src/output-packet.c
Unescape Escape View File

@ -1,4 +1,4 @@
/* Copyright (C) 2007-2013 Open Information Security Foundation /* Copyright (C) 2007-2022 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
@ -32,9 +32,9 @@
/** per thread data for this module, contains a list of per thread /** per thread data for this module, contains a list of per thread
* data for the packet loggers. */ * data for the packet loggers. */
typedef struct OutputLoggerThreadData_ { typedef struct OutputPacketLoggerThreadData_ {
OutputLoggerThreadStore *store; OutputLoggerThreadStore *store;
} OutputLoggerThreadData; } OutputPacketLoggerThreadData;
/* logger instance, a module + a output ctx, /* logger instance, a module + a output ctx,
* it's perfectly valid that have multiple instances of the same * it's perfectly valid that have multiple instances of the same
@ -95,7 +95,7 @@ static TmEcode OutputPacketLog(ThreadVars *tv, Packet *p, void *thread_data)
return TM_ECODE_OK; return TM_ECODE_OK;
} }
OutputLoggerThreadData *op_thread_data = (OutputLoggerThreadData *)thread_data; OutputPacketLoggerThreadData *op_thread_data = (OutputPacketLoggerThreadData *)thread_data;
OutputPacketLogger *logger = list; OutputPacketLogger *logger = list;
OutputLoggerThreadStore *store = op_thread_data->store; OutputLoggerThreadStore *store = op_thread_data->store;
@ -127,7 +127,7 @@ static TmEcode OutputPacketLog(ThreadVars *tv, Packet *p, void *thread_data)
* loggers */ * loggers */
static TmEcode OutputPacketLogThreadInit(ThreadVars *tv, const void *initdata, void **data) static TmEcode OutputPacketLogThreadInit(ThreadVars *tv, const void *initdata, void **data)
{ {
OutputLoggerThreadData *td = SCMalloc(sizeof(*td)); OutputPacketLoggerThreadData *td = SCMalloc(sizeof(*td));
if (td == NULL) if (td == NULL)
return TM_ECODE_FAILED; return TM_ECODE_FAILED;
memset(td, 0x00, sizeof(*td)); memset(td, 0x00, sizeof(*td));
@ -169,7 +169,7 @@ static TmEcode OutputPacketLogThreadInit(ThreadVars *tv, const void *initdata, v
static TmEcode OutputPacketLogThreadDeinit(ThreadVars *tv, void *thread_data) static TmEcode OutputPacketLogThreadDeinit(ThreadVars *tv, void *thread_data)
{ {
OutputLoggerThreadData *op_thread_data = (OutputLoggerThreadData *)thread_data; OutputPacketLoggerThreadData *op_thread_data = (OutputPacketLoggerThreadData *)thread_data;
OutputLoggerThreadStore *store = op_thread_data->store; OutputLoggerThreadStore *store = op_thread_data->store;
OutputPacketLogger *logger = list; OutputPacketLogger *logger = list;
@ -191,7 +191,7 @@ static TmEcode OutputPacketLogThreadDeinit(ThreadVars *tv, void *thread_data)
static void OutputPacketLogExitPrintStats(ThreadVars *tv, void *thread_data) static void OutputPacketLogExitPrintStats(ThreadVars *tv, void *thread_data)
{ {
OutputLoggerThreadData *op_thread_data = (OutputLoggerThreadData *)thread_data; OutputPacketLoggerThreadData *op_thread_data = (OutputPacketLoggerThreadData *)thread_data;
OutputLoggerThreadStore *store = op_thread_data->store; OutputLoggerThreadStore *store = op_thread_data->store;
OutputPacketLogger *logger = list; OutputPacketLogger *logger = list;

Write Preview
Loading…
Cancel
Save