Commit graph

6022 commits

Author SHA1 Message Date
Aaron Brown
f29dbb90a5 Allow for logging of the VLAN data about a connection in conn.log 2015-07-22 14:13:17 -04: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
Jon Siwek
871b340ade Fix broker python bindings install location to track --prefix. 2015-07-22 10:58:09 -05:00
Robin Sommer
8ad504ad4f Enabling Broker by default.
This means CAF is now a required dependency. For now, I'm keeping a
switch --disable-broker to turn it off, but I'm thinking that
eventually we should remove that as well.
2015-07-21 18:20:34 -07:00
Robin Sommer
93846d428f Requiring a C++11 compiler, and turning on C++11 support. 2015-07-21 13:19:18 -07:00
Robin Sommer
748450c61f Updating submodule(s).
[nomail]
2015-07-21 12:07:40 -07:00
Robin Sommer
ff21fa42d3 Updating submodule(s).
[nomail]
2015-07-21 09:39:36 -07:00
Robin Sommer
e4c6779a67 Fixing compiler warning. 2015-07-21 08:36:23 -07:00
Robin Sommer
358f3bfe84 Merge branch 'topic/robin/rework-packets-merge' 2015-07-21 08:32:08 -07: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
Robin Sommer
fcf8cef949 Updating submodule(s).
[nomail]
2015-07-20 16:23:10 -07:00
Robin Sommer
c72d191ab5 Refactoring L2 parsing code to reside in the Packet class.
That way it can be reused more easily. This also avoid having to
change the serialization structure for packets, which is a problem as
external sources of packets (via Broccoli) wouldn't have the new
attributes available to send.

Also moving Packet.{h,cc} and Layer2.{h,cc} into iosource/, and
removing header size from properties that packet sources have to
provide, as we can now compute that easily from the link type.

Plus some more cleanup.
2015-07-20 16:21:34 -07:00
Robin Sommer
64a478dbd5 Determining final L3 layer protocol right inside PktSrc. 2015-07-17 21:44:42 -07:00
Robin Sommer
86440e44fc Adding more cross-checks for IP.
This prevents a few more packets from reaching raw_events(), see
baseline update for the corresponding test.
2015-07-17 13:59:12 -07:00
Robin Sommer
fe3579f1b4 Merge branch 'topic/rework-packets' of https://github.com/jsbarber/bro
* 'topic/rework-packets' of https://github.com/jsbarber/bro:
  One more tinker to Packet -- ensure no uninitialized values
  Packet::IP()-created IP_Hdr should not free
  Make enums work for non-C++11 config
  Refactor to make bro use a common Packet object. Do a better job of parsing layer 2 and keeping track of layer 3 proto. Add support for raw packet event, including Layer2 headers.

Conflicts:
	aux/plugins
2015-07-17 12:56:04 -07:00
Johanna Amann
5f07268805 Small changes to iana tls registry. 2015-07-16 16:40:35 -07:00
Robin Sommer
924549bd4d Updating submodule(s).
[nomail]
2015-07-15 13:32:17 -07:00
Robin Sommer
4d6efa4e02 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  (Hopefully) fix race condition between trace and intel file.
2015-07-15 13:31:43 -07:00
Johanna Amann
0d9869a2aa (Hopefully) fix race condition between trace and intel file. 2015-07-15 09:14:36 -07:00
Robin Sommer
70d222135b Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Correct perl package name on freebsd
2015-07-14 08:05:03 -07:00
Robin Sommer
8fb708b9b2 Adding an environemtn variable to btest.cfg for external scripts. 2015-07-13 22:13:10 -07:00
Robin Sommer
31dda41169 Updating submodule(s).
[nomail]
2015-07-10 07:15:40 -07:00
Justin Azoff
8d8dc890dd Correct perl package name on freebsd
Based on feedback on IRC, the correct package name is 'perl5', not 'perl'
2015-07-10 08:35:18 -04:00
Robin Sommer
85b433b13f Adding a weird for when truncated packets lead TCP reassembly to
ignore content.

(Private test suite has a bunch of test cases.)
2015-07-03 11:06:05 -07:00
Robin Sommer
de3932bc42 A bit more cleanup for the new overlap detection. 2015-07-03 09:05:44 -07:00
Robin Sommer
5d30be2083 A set of tests exercising IP defragmentation and TCP reassembly. 2015-07-03 08:40:22 -07:00
Robin Sommer
c1f060be63 Merge branch 'topic/yunzheng/bit-1314'
I've worked on this a bit more:

    - Added tcp_max_old_segments to init-bare.bro.
    - Removed the existing call to Overlap() as that now led to
      duplicate events.
    - Fixed the code checking for overlaps, as it didn't catch all the
      cases.

BIT-1314 #merged
GitHub #31 merged

* topic/yunzheng/bit-1314:
  BIT-1314: Added QI test for rexmit_inconsistency
  BIT-1314: Add detection for Quantum Insert attacks
2015-07-03 08:40:12 -07:00
Robin Sommer
46fc3db8cc Merge remote-tracking branch 'origin/topic/jsiwek/mime-multipart-boundary-leniency'
* origin/topic/jsiwek/mime-multipart-boundary-leniency:
  Allow '<' and '>' in MIME multipart boundaries.

BIT-1400 #merged
2015-06-28 12:31:47 -07:00
Robin Sommer
264a824fcc Merge remote-tracking branch 'origin/topic/seth/deflate-missing-headers-fix'
I've changed the dynamic allocation of the unzipbuf back to stack
allocation, hope I'm not not missing the reason for doing that ...

* origin/topic/seth/deflate-missing-headers-fix:
  Fixes an issue with missing zlib headers on deflated HTTP content.

BIT-1399 #merged
2015-06-28 12:23:36 -07:00
Robin Sommer
0ac506fd1a Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Correct the name used in the header identifier
2015-06-25 07:12:08 -07:00
Justin Azoff
5c060f302e Correct the name used in the header identifier 2015-06-24 12:26:54 -04:00
Robin Sommer
408c0d8ac3 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Restore the --load-seeds cmd-line option
2015-06-24 07:51:08 -07:00
Daniel Thayer
368c1463ab Restore the --load-seeds cmd-line option
Also enabled the short options -G/-H for --load-seeds/--save-seeds.
2015-06-23 13:16:31 -05:00
Robin Sommer
b98708bf14 Removing dead code for no longer supported -G switch. 2015-06-19 16:27:08 -07:00
Robin Sommer
ffa254acd0 Merge remote-tracking branch 'origin/topic/seth/modbus_dpd_fix'
* origin/topic/seth/modbus_dpd_fix:
  Call ProtocolConfirmed on modbus
2015-06-19 14:08:13 -07:00
Robin Sommer
d54667803b Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Put cmd-line options in alphabetical order
2015-06-19 09:13:59 -07:00
Seth Hall
7d105935b1 Call ProtocolConfirmed on modbus
After a PDU is successfully parsed from both sides of a
modbus connection we're now declaring the protocol confirmed.

A small extension to the modbus/events test was added to verify
that "modbus" was identified in the service field in conn.log.
2015-06-19 07:00:38 -04:00
Daniel Thayer
6c812bd5d6 Put cmd-line options in alphabetical order
Sorted cmd-line options in alphabetical order to make it easier to
add or remove options (or even to just check if they're listed
correctly in the source code).
2015-06-18 12:39:46 -05:00
Jon Siwek
668f3e38ad Updating submodule(s).
[nomail]
2015-06-11 12:15:33 -05:00
Johanna Amann
af1a663410 Update submodule
[nomail]
2015-06-09 07:31:28 -07:00
Robin Sommer
94c3e32cfa Fixing tiny thing in NEWS. 2015-06-09 07:01:06 -07:00
Johanna Amann
8402ec3b1c Updating submodule(s) and tagging release. 2015-06-08 13:28:17 -07:00
Robin Sommer
582da62d04 Fix reporter errors with GridFTP traffic. 2015-06-08 09:42:06 -07:00
Robin Sommer
659de2b357 Updating submodule(s).
[nomail]
2015-06-07 20:59:24 -07:00
Robin Sommer
795a3b8ad8 PE Analyzer: Change how we calculate the rva_table size. 2015-06-06 08:21:27 -07:00
Jon Siwek
7de83e0cf0 Fix a unit test to check for Broker requirement. 2015-06-05 09:10:50 -05:00
Robin Sommer
74c83058e6 Test for Broker termination. 2015-06-04 14:48:58 -07:00
Robin Sommer
476a5dbc34 Merge remote-tracking branch 'origin/topic/jsiwek/bit-1408'
BIT-1408 #merged

* origin/topic/jsiwek/bit-1408:
  BIT-1408: improve I/O loop and Broker IOSource.
2015-06-04 14:46:30 -07:00
Robin Sommer
45ccf3abda Updating submodule(s).
[nomail]
2015-06-03 09:03:27 -07:00