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
