From 98c88d5170ab08facc8de12ce78c6eb6be681296 Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Fri, 9 May 2014 15:10:54 +0200 Subject: [PATCH] decode: pass ThreadVars to DecodeThreadVarsFree Flow output thread data deinit function which will be called from DecodeThreadVarsFree will need it. --- src/decode.c | 2 +- src/decode.h | 2 +- src/source-af-packet.c | 2 +- src/source-erf-dag.c | 2 +- src/source-erf-file.c | 2 +- src/source-ipfw.c | 2 +- src/source-mpipe.c | 2 +- src/source-napatech.c | 2 +- src/source-nflog.c | 2 +- src/source-nfq.c | 2 +- src/source-pcap-file.c | 2 +- src/source-pcap.c | 2 +- src/source-pfring.c | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/decode.c b/src/decode.c index ad9d7fe5f1..868145e1fb 100644 --- a/src/decode.c +++ b/src/decode.c @@ -485,7 +485,7 @@ DecodeThreadVars *DecodeThreadVarsAlloc(ThreadVars *tv) return dtv; } -void DecodeThreadVarsFree(DecodeThreadVars *dtv) +void DecodeThreadVarsFree(ThreadVars *tv, DecodeThreadVars *dtv) { if (dtv != NULL) { if (dtv->app_tctx != NULL) diff --git a/src/decode.h b/src/decode.h index dd60e78876..b5fa6cbb98 100644 --- a/src/decode.h +++ b/src/decode.h @@ -821,7 +821,7 @@ int PacketCopyDataOffset(Packet *p, int offset, uint8_t *data, int datalen); const char *PktSrcToString(enum PktSrcEnum pkt_src); DecodeThreadVars *DecodeThreadVarsAlloc(ThreadVars *); -void DecodeThreadVarsFree(DecodeThreadVars *); +void DecodeThreadVarsFree(ThreadVars *, DecodeThreadVars *); /* decoder functions */ int DecodeEthernet(ThreadVars *, DecodeThreadVars *, Packet *, uint8_t *, uint16_t, PacketQueue *); diff --git a/src/source-af-packet.c b/src/source-af-packet.c index dd817468ae..d6971ffa40 100644 --- a/src/source-af-packet.c +++ b/src/source-af-packet.c @@ -1914,7 +1914,7 @@ TmEcode DecodeAFPThreadInit(ThreadVars *tv, void *initdata, void **data) TmEcode DecodeAFPThreadDeinit(ThreadVars *tv, void *data) { if (data != NULL) - DecodeThreadVarsFree(data); + DecodeThreadVarsFree(tv, data); SCReturnInt(TM_ECODE_OK); } diff --git a/src/source-erf-dag.c b/src/source-erf-dag.c index 61a367e4df..dbbd077428 100644 --- a/src/source-erf-dag.c +++ b/src/source-erf-dag.c @@ -680,7 +680,7 @@ TmEcode DecodeErfDagThreadDeinit(ThreadVars *tv, void *data) { if (data != NULL) - DecodeThreadVarsFree(data); + DecodeThreadVarsFree(tv, data); SCReturnInt(TM_ECODE_OK); } diff --git a/src/source-erf-file.c b/src/source-erf-file.c index 1a35f4d650..6825e3fc3f 100644 --- a/src/source-erf-file.c +++ b/src/source-erf-file.c @@ -262,7 +262,7 @@ DecodeErfFileThreadInit(ThreadVars *tv, void *initdata, void **data) TmEcode DecodeErfFileThreadDeinit(ThreadVars *tv, void *data) { if (data != NULL) - DecodeThreadVarsFree(data); + DecodeThreadVarsFree(tv, data); SCReturnInt(TM_ECODE_OK); } diff --git a/src/source-ipfw.c b/src/source-ipfw.c index 536c174cd8..6bd50e06e9 100644 --- a/src/source-ipfw.c +++ b/src/source-ipfw.c @@ -496,7 +496,7 @@ TmEcode DecodeIPFWThreadInit(ThreadVars *tv, void *initdata, void **data) TmEcode DecodeIPFWThreadDeinit(ThreadVars *tv, void *data) { if (data != NULL) - DecodeThreadVarsFree(data); + DecodeThreadVarsFree(tv, data); SCReturnInt(TM_ECODE_OK); } diff --git a/src/source-mpipe.c b/src/source-mpipe.c index 061cb1e1ff..f9e8b176da 100644 --- a/src/source-mpipe.c +++ b/src/source-mpipe.c @@ -1020,7 +1020,7 @@ TmEcode DecodeMpipeThreadInit(ThreadVars *tv, void *initdata, void **data) TmEcode DecodeMpipeThreadDeinit(ThreadVars *tv, void *data) { if (data != NULL) - DecodeThreadVarsFree(data); + DecodeThreadVarsFree(tv, data); SCReturnInt(TM_ECODE_OK); } diff --git a/src/source-napatech.c b/src/source-napatech.c index c79c263bae..36604bacf7 100644 --- a/src/source-napatech.c +++ b/src/source-napatech.c @@ -398,7 +398,7 @@ TmEcode NapatechDecodeThreadInit(ThreadVars *tv, void *initdata, void **data) TmEcode NapatechDecodeThreadDeinit(ThreadVars *tv, void *data) { if (data != NULL) - DecodeThreadVarsFree(data); + DecodeThreadVarsFree(tv, data); SCReturnInt(TM_ECODE_OK); } diff --git a/src/source-nflog.c b/src/source-nflog.c index dffa98d255..0ef06f8f7a 100644 --- a/src/source-nflog.c +++ b/src/source-nflog.c @@ -548,7 +548,7 @@ TmEcode DecodeNFLOGThreadInit(ThreadVars *tv, void *initdata, void **data) TmEcode DecodeNFLOGThreadDeinit(ThreadVars *tv, void *data) { if (data != NULL) - DecodeThreadVarsFree(data); + DecodeThreadVarsFree(tv, data); SCReturnInt(TM_ECODE_OK); } diff --git a/src/source-nfq.c b/src/source-nfq.c index 8a6c9f5b2d..629df23d47 100644 --- a/src/source-nfq.c +++ b/src/source-nfq.c @@ -1253,7 +1253,7 @@ TmEcode DecodeNFQThreadInit(ThreadVars *tv, void *initdata, void **data) TmEcode DecodeNFQThreadDeinit(ThreadVars *tv, void *data) { if (data != NULL) - DecodeThreadVarsFree(data); + DecodeThreadVarsFree(tv, data); SCReturnInt(TM_ECODE_OK); } diff --git a/src/source-pcap-file.c b/src/source-pcap-file.c index da0f6ee35c..e780290d61 100644 --- a/src/source-pcap-file.c +++ b/src/source-pcap-file.c @@ -446,7 +446,7 @@ TmEcode DecodePcapFileThreadInit(ThreadVars *tv, void *initdata, void **data) TmEcode DecodePcapFileThreadDeinit(ThreadVars *tv, void *data) { if (data != NULL) - DecodeThreadVarsFree(data); + DecodeThreadVarsFree(tv, data); SCReturnInt(TM_ECODE_OK); } diff --git a/src/source-pcap.c b/src/source-pcap.c index e7c40d2f20..fcc4b05c72 100644 --- a/src/source-pcap.c +++ b/src/source-pcap.c @@ -773,7 +773,7 @@ TmEcode DecodePcapThreadInit(ThreadVars *tv, void *initdata, void **data) TmEcode DecodePcapThreadDeinit(ThreadVars *tv, void *data) { if (data != NULL) - DecodeThreadVarsFree(data); + DecodeThreadVarsFree(tv, data); SCReturnInt(TM_ECODE_OK); } diff --git a/src/source-pfring.c b/src/source-pfring.c index 24c8bc6ecc..1c5084b5e4 100644 --- a/src/source-pfring.c +++ b/src/source-pfring.c @@ -664,7 +664,7 @@ TmEcode DecodePfringThreadInit(ThreadVars *tv, void *initdata, void **data) TmEcode DecodePfringThreadDeinit(ThreadVars *tv, void *data) { if (data != NULL) - DecodeThreadVarsFree(data); + DecodeThreadVarsFree(tv, data); SCReturnInt(TM_ECODE_OK); }