decode: pass ThreadVars to DecodeThreadVarsFree

Flow output thread data deinit function which will be called from
DecodeThreadVarsFree will need it.

diff --git a/src/decode.c b/src/decode.c
index ad9d7fe5f1f15a9eac202ac7041b4bac90981853..868145e1fb89dc4069eba8577caee8783b92b723 100644 (file)
--- 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 dd60e788761cc7188b128c755c5f9e2f7e90a9a8..b5fa6cbb98c3129e61fdd6d289e8e65a15319e39 100644 (file)
--- 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 dd817468aeadcb4cd121fa686ebb20b0b48265f5..d6971ffa402b4adadbab911c2fff88105184fdf7 100644 (file)
--- 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 61a367e4df035ff29420fe73f068d89793ac36af..dbbd0774288e5e376b036cdd80b8505298866c57 100644 (file)
--- 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 1a35f4d650cee79b0516baeb8f28576f3dbdf862..6825e3fc3f5cf4b44aa659b440be80216a13cba1 100644 (file)
--- 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 536c174cd831c05e2e35322ce23999e0470e4d5a..6bd50e06e90c4e65be6dbe8185bbf84d8758b084 100644 (file)
--- 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 061cb1e1ff3e323e5cc155a071704e85f6a69191..f9e8b176da2981d20a41a68a63809c1c62d720cc 100644 (file)
--- 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 c79c263bae184a4554c357050aa4af496ff509f4..36604bacf7bac170d9edf12bc490456b5db77b6b 100644 (file)
--- 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 dffa98d255da65555da81dfa6740b1d9d88581c7..0ef06f8f7a2b96604bb95377fb86e84430d73de2 100644 (file)
--- 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 8a6c9f5b2dff6140ee151f387e62056dad33fa38..629df23d4749df6b3c1b642991e562f4ed39b50a 100644 (file)
--- 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 da0f6ee35cae5635ecf6eb9ed396f63a0bc9758f..e780290d611139f1ad884254139679852cfb5dd9 100644 (file)
--- 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 e7c40d2f20dfbe0fd6c588c8fae168deaa91ebcb..fcc4b05c728c10877cb8ed07fc0f761e4e5bc9a4 100644 (file)
--- 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 24c8bc6ecc8b05dde0ee90386008ac3b9e53a5ec..1c5084b5e45792664e21fa31a9dadaae42eb9fdb 100644 (file)
--- 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);
 }