Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-12 11:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

dump_packet & dump_current_packet better detect which file is being dumped to

Browse source
This commit is contained in:
Assaf Morami 2018-05-08 17:36:17 +03:00 • committed by GitHub
parent f35eae2e7e
commit 1953c04581
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/bro.bif
View file

@ -29,7 +29,6 @@ using namespace std;
TableType* var_sizes; TableType* var_sizes;
static iosource::PktDumper* addl_pkt_dumper = 0; static iosource::PktDumper* addl_pkt_dumper = 0;
static StringVal* open_file_dumper;
bro_int_t parse_int(const char*& fmt) bro_int_t parse_int(const char*& fmt)
{ {
@ -3292,16 +3291,15 @@ function dump_current_packet%(file_name: string%) : bool
{ {
addl_pkt_dumper = iosource_mgr->OpenPktDumper(file_name->CheckString(), true); addl_pkt_dumper = iosource_mgr->OpenPktDumper(file_name->CheckString(), true);
{ {
else if ( addl_pkt_dumper && open_file_dumper != file_name) else if ( addl_pkt_dumper && addl_pkt_dumper->Path() != file_name->CheckString())
{ {
addl_pkt_dumper->Close(); addl_pkt_dumper->Close();
addl_pkt_dumper = iosource_mgr->OpenPktDumper(file_name->CheckString(), true); addl_pkt_dumper = iosource_mgr->OpenPktDumper(file_name->CheckString(), true);
} }
// else if (addl_pkt_dumper && open_file_dumper == file_name) do nothing // else if (addl_pkt_dumper && addl_pkt_dumper->Path() == file_name->CheckString()) do nothing
if ( addl_pkt_dumper ) if ( addl_pkt_dumper )
{ {
open_file_dumper = file_name;
addl_pkt_dumper->Dump(pkt); addl_pkt_dumper->Dump(pkt);
} }
@ -3376,17 +3374,15 @@ function dump_packet%(pkt: pcap_packet, file_name: string%) : bool
{ {
addl_pkt_dumper = iosource_mgr->OpenPktDumper(file_name->CheckString(), true); addl_pkt_dumper = iosource_mgr->OpenPktDumper(file_name->CheckString(), true);
{ {
else if ( addl_pkt_dumper && open_file_dumper != file_name) else if ( addl_pkt_dumper && addl_pkt_dumper->Path() != file_name->CheckString())
{ {
addl_pkt_dumper->Close(); addl_pkt_dumper->Close();
addl_pkt_dumper = iosource_mgr->OpenPktDumper(file_name->CheckString(), true); addl_pkt_dumper = iosource_mgr->OpenPktDumper(file_name->CheckString(), true);
} }
// else if (addl_pkt_dumper && open_file_dumper == file_name) do nothing // else if (addl_pkt_dumper && addl_pkt_dumper->Path() == file_name->CheckString()) do nothing
if ( addl_pkt_dumper ) if ( addl_pkt_dumper )
{ {
open_file_dumper = file_name;
pkt_timeval ts; pkt_timeval ts;
uint32 caplen, len, link_type; uint32 caplen, len, link_type;
u_char *data; u_char *data;