Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-07 00:58:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
6267 commits 387 branches 195 tags 259 MiB
Commit graph

12 commits

Author SHA1 Message Date
Johanna Amann
072a3fa28d Merge remote-tracking branch 'origin/topic/seth/radiotap' 
BIT-1526 #merged

* origin/topic/seth/radiotap:
  Improved Radiotap support and a test.
  Fixed RadioTap support (still "Works for Me")
  Initial commit of RadioTap encapsulation support)
 2016-01-20 17:45:25 -08:00
Seth Hall
88f2a066ce Improved Radiotap support and a test. 
Radiotap support should be fully functional now with Radiotap
packets that include IPv4 and IPv6.  Other radiotap packets are
silently ignored.  This includes a test which has 802.11 headers
both with and without QoS data.
 2016-01-19 04:10:44 -05:00
Seth Hall
1d94eadd36 Fixed RadioTap support (still "Works for Me") 2015-10-17 03:09:12 -04:00
Seth Hall
d6c89ae022 Merge branch 'master' into topic/seth/radiotap 
# Conflicts:
#	src/iosource/PktSrc.cc
 2015-10-16 16:59:23 -04:00
Robin Sommer
0494a6d882 Merge remote-tracking branch 'origin/topic/johanna/bit-1463' 
* origin/topic/johanna/bit-1463:
  Refactor oob tests using different approach.
  Add a number of out_of_bound checks to Packet.cc

BIT-1463 #merged
 2015-08-31 14:35:49 -07:00
Johanna Amann
8763e1a485 Refactor oob tests using different approach. 2015-08-31 13:45:00 -07:00
Johanna Amann
fd6f9e470f Add a number of out_of_bound checks to Packet.cc 
Mostly this verifies that we actually have the full headers that we are
trying to read in a packet.

Addresses BIT-1463
 2015-08-31 13:09:18 -07:00
Robin Sommer
8fc44e7e86 CID 1312751: Removing redundant assignment. 2015-08-07 13:10:08 -07:00
Robin Sommer
fb848f795d Merge branch 'master' of https://github.com/aaronmbr/bro 
* 'master' of https://github.com/aaronmbr/bro:
  Copy-paste issue
  Allow for logging of the VLAN data about a connection in conn.log
  Save the inner vlan in the Packet object for Q-in-Q setups
 2015-07-23 13:05:28 -07:00
Aaron Brown
d76c7a2657 Save the inner vlan in the Packet object for Q-in-Q setups 2015-07-22 12:52:10 -04:00
Robin Sommer
f97b2b180c Moving the remaining code from Layer2.* into Packet.* and documenting 
the Packet API.

Plus, some more cleanup, including removing a legacy option
time_machine_profiling.
 2015-07-21 08:30:23 -07:00
Robin Sommer
f69edd1437 Adding missing files. 2015-07-20 16:49:03 -07:00