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

decode: pass ThreadVars to DecodeThreadVarsFree

Browse Source 
Flow output thread data deinit function which will be called from
DecodeThreadVarsFree will need it.
pull/1058/head
Victor Julien 12 years ago
parent de034f1867
commit 98c88d5170
13 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File

2
src/decode.c
Unescape Escape View File

@ -485,7 +485,7 @@ DecodeThreadVars *DecodeThreadVarsAlloc(ThreadVars *tv)
return dtv; return dtv;
} }
void DecodeThreadVarsFree(DecodeThreadVars *dtv) void DecodeThreadVarsFree(ThreadVars *tv, DecodeThreadVars *dtv)
{ {
if (dtv != NULL) { if (dtv != NULL) {
if (dtv->app_tctx != NULL) if (dtv->app_tctx != NULL)

2
src/decode.h
Unescape Escape View File

@ -821,7 +821,7 @@ int PacketCopyDataOffset(Packet *p, int offset, uint8_t *data, int datalen);
const char *PktSrcToString(enum PktSrcEnum pkt_src); const char *PktSrcToString(enum PktSrcEnum pkt_src);
DecodeThreadVars *DecodeThreadVarsAlloc(ThreadVars *); DecodeThreadVars *DecodeThreadVarsAlloc(ThreadVars *);
void DecodeThreadVarsFree(DecodeThreadVars *); void DecodeThreadVarsFree(ThreadVars *, DecodeThreadVars *);
/* decoder functions */ /* decoder functions */
int DecodeEthernet(ThreadVars *, DecodeThreadVars *, Packet *, uint8_t *, uint16_t, PacketQueue *); int DecodeEthernet(ThreadVars *, DecodeThreadVars *, Packet *, uint8_t *, uint16_t, PacketQueue *);

2
src/source-af-packet.c
Unescape Escape View File

@ -1914,7 +1914,7 @@ TmEcode DecodeAFPThreadInit(ThreadVars *tv, void *initdata, void **data)
TmEcode DecodeAFPThreadDeinit(ThreadVars *tv, void *data) TmEcode DecodeAFPThreadDeinit(ThreadVars *tv, void *data)
{ {
if (data != NULL) if (data != NULL)
DecodeThreadVarsFree(data); DecodeThreadVarsFree(tv, data);
SCReturnInt(TM_ECODE_OK); SCReturnInt(TM_ECODE_OK);
} }

2
src/source-erf-dag.c
Unescape Escape View File

@ -680,7 +680,7 @@ TmEcode
DecodeErfDagThreadDeinit(ThreadVars *tv, void *data) DecodeErfDagThreadDeinit(ThreadVars *tv, void *data)
{ {
if (data != NULL) if (data != NULL)
DecodeThreadVarsFree(data); DecodeThreadVarsFree(tv, data);
SCReturnInt(TM_ECODE_OK); SCReturnInt(TM_ECODE_OK);
} }

2
src/source-erf-file.c
Unescape Escape View File

@ -262,7 +262,7 @@ DecodeErfFileThreadInit(ThreadVars *tv, void *initdata, void **data)
TmEcode DecodeErfFileThreadDeinit(ThreadVars *tv, void *data) TmEcode DecodeErfFileThreadDeinit(ThreadVars *tv, void *data)
{ {
if (data != NULL) if (data != NULL)
DecodeThreadVarsFree(data); DecodeThreadVarsFree(tv, data);
SCReturnInt(TM_ECODE_OK); SCReturnInt(TM_ECODE_OK);
} }

2
src/source-ipfw.c
Unescape Escape View File

@ -496,7 +496,7 @@ TmEcode DecodeIPFWThreadInit(ThreadVars *tv, void *initdata, void **data)
TmEcode DecodeIPFWThreadDeinit(ThreadVars *tv, void *data) TmEcode DecodeIPFWThreadDeinit(ThreadVars *tv, void *data)
{ {
if (data != NULL) if (data != NULL)
DecodeThreadVarsFree(data); DecodeThreadVarsFree(tv, data);
SCReturnInt(TM_ECODE_OK); SCReturnInt(TM_ECODE_OK);
} }

2
src/source-mpipe.c
Unescape Escape View File

@ -1020,7 +1020,7 @@ TmEcode DecodeMpipeThreadInit(ThreadVars *tv, void *initdata, void **data)
TmEcode DecodeMpipeThreadDeinit(ThreadVars *tv, void *data) TmEcode DecodeMpipeThreadDeinit(ThreadVars *tv, void *data)
{ {
if (data != NULL) if (data != NULL)
DecodeThreadVarsFree(data); DecodeThreadVarsFree(tv, data);
SCReturnInt(TM_ECODE_OK); SCReturnInt(TM_ECODE_OK);
} }

2
src/source-napatech.c
Unescape Escape View File

@ -398,7 +398,7 @@ TmEcode NapatechDecodeThreadInit(ThreadVars *tv, void *initdata, void **data)
TmEcode NapatechDecodeThreadDeinit(ThreadVars *tv, void *data) TmEcode NapatechDecodeThreadDeinit(ThreadVars *tv, void *data)
{ {
if (data != NULL) if (data != NULL)
DecodeThreadVarsFree(data); DecodeThreadVarsFree(tv, data);
SCReturnInt(TM_ECODE_OK); SCReturnInt(TM_ECODE_OK);
} }

2
src/source-nflog.c
Unescape Escape View File

@ -548,7 +548,7 @@ TmEcode DecodeNFLOGThreadInit(ThreadVars *tv, void *initdata, void **data)
TmEcode DecodeNFLOGThreadDeinit(ThreadVars *tv, void *data) TmEcode DecodeNFLOGThreadDeinit(ThreadVars *tv, void *data)
{ {
if (data != NULL) if (data != NULL)
DecodeThreadVarsFree(data); DecodeThreadVarsFree(tv, data);
SCReturnInt(TM_ECODE_OK); SCReturnInt(TM_ECODE_OK);
} }

2
src/source-nfq.c
Unescape Escape View File

@ -1253,7 +1253,7 @@ TmEcode DecodeNFQThreadInit(ThreadVars *tv, void *initdata, void **data)
TmEcode DecodeNFQThreadDeinit(ThreadVars *tv, void *data) TmEcode DecodeNFQThreadDeinit(ThreadVars *tv, void *data)
{ {
if (data != NULL) if (data != NULL)
DecodeThreadVarsFree(data); DecodeThreadVarsFree(tv, data);
SCReturnInt(TM_ECODE_OK); SCReturnInt(TM_ECODE_OK);
} }

2
src/source-pcap-file.c
Unescape Escape View File

@ -446,7 +446,7 @@ TmEcode DecodePcapFileThreadInit(ThreadVars *tv, void *initdata, void **data)
TmEcode DecodePcapFileThreadDeinit(ThreadVars *tv, void *data) TmEcode DecodePcapFileThreadDeinit(ThreadVars *tv, void *data)
{ {
if (data != NULL) if (data != NULL)
DecodeThreadVarsFree(data); DecodeThreadVarsFree(tv, data);
SCReturnInt(TM_ECODE_OK); SCReturnInt(TM_ECODE_OK);
} }

2
src/source-pcap.c
Unescape Escape View File

@ -773,7 +773,7 @@ TmEcode DecodePcapThreadInit(ThreadVars *tv, void *initdata, void **data)
TmEcode DecodePcapThreadDeinit(ThreadVars *tv, void *data) TmEcode DecodePcapThreadDeinit(ThreadVars *tv, void *data)
{ {
if (data != NULL) if (data != NULL)
DecodeThreadVarsFree(data); DecodeThreadVarsFree(tv, data);
SCReturnInt(TM_ECODE_OK); SCReturnInt(TM_ECODE_OK);
} }

2
src/source-pfring.c
Unescape Escape View File

@ -664,7 +664,7 @@ TmEcode DecodePfringThreadInit(ThreadVars *tv, void *initdata, void **data)
TmEcode DecodePfringThreadDeinit(ThreadVars *tv, void *data) TmEcode DecodePfringThreadDeinit(ThreadVars *tv, void *data)
{ {
if (data != NULL) if (data != NULL)
DecodeThreadVarsFree(data); DecodeThreadVarsFree(tv, data);
SCReturnInt(TM_ECODE_OK); SCReturnInt(TM_ECODE_OK);
} }

Write Preview
Loading…
Cancel
Save