decode: pass ThreadVars to DecodeThreadVarsFree

Flow output thread data deinit function which will be called from DecodeThreadVarsFree will need it.
12 years ago · 98c88d5170
parent de034f1867
commit 98c88d5170
13 changed files with 13 additions and 13 deletions
--- 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)
--- 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 *);
--- 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);
 }

--- 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);
 }

--- 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);
 }

--- 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);
 }

--- 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);
 }

--- 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);
 }

--- 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);
 }

--- 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);
 }

--- 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);
 }

--- 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);
 }

--- 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);
 }