Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'topic/jgras/mac-logging' of https://github.com/J-Gras/bro

Browse source 
Thanks! I've tweaked this a bit further, have a look.

BIT-1613 #merged
This commit is contained in:
Robin Sommer 2016-06-06 15:55:25 -07:00
commit d59bb2e9d1
22 changed files with 1828 additions and 452 deletions
Download patch file Download diff file Expand all files Collapse all files

4
testing/btest/scripts/policy/protocols/conn/mac-logging.bro
View file

@ -4,7 +4,11 @@
# @TEST-EXEC: mv conn.log conn1.log
# @TEST-EXEC: bro -b -C -r $TRACES/radiotap.pcap %INPUT
# @TEST-EXEC: mv conn.log conn2.log
# @TEST-EXEC: bro -b -C -r $TRACES/llc.pcap %INPUT
# @TEST-EXEC: mv conn.log conn3.log
#
# @TEST-EXEC: btest-diff conn1.log
# @TEST-EXEC: btest-diff conn2.log
# @TEST-EXEC: btest-diff conn3.log
@load protocols/conn/mac-logging