No description
Find a file
Robin Sommer b096168318 Merge branch 'topic/robin/tunnels-merge'
* topic/robin/tunnels-merge: (51 commits)
  Updating baselines and NEWS.
  Remove &synchronized from Tunnel::active table.
  Refactor of interal tunnel analysis code.
  Add state management of NetSessions's IP tunnel map.
  Add "encap_hdr_size" option back in.
  Script-layer tunnel interface cleanup.
  Fix performance problem checking packet encapsulation. (addresses #830)
  Adding a SOCKS test case.
  Updating DataSeries baselines.
  Moving my todos over to the tracker ticket.
  Extend weird names that occur in core packet processing during decapsulation.
  Add Teredo analysis option to reduce false positive decapsulation.
  Just some cleanup/documentation of new tunnel-handling code.
  Memory leak fixes
  Add a config.h definition for IPPROTO_IPV4.
  Add AYIYA tunnel decapsulation unit test.
  Add Teredo-specific events.
  Refactor some of the NetSessions routines that recurse on IP packets.
  Add independent options to toggle the different decapsulation methods
  Add more sanity checks before recursing on encapsulated IP packets.
  ...

Conflicts:
	src/event.bif
2012-06-19 13:21:31 -07:00
aux Merge remote-tracking branch 'origin/topic/jsiwek/tunnels-merge' into topic/robin/tunnels-merge 2012-06-18 15:45:56 -07:00
cmake@2a72c5e08e Checkpointing the merge. Not done yet. 2012-06-11 17:24:18 -07:00
doc Merge branch 'topic/robin/tunnels-merge' 2012-06-19 13:21:31 -07:00
pkg Binary packaging script tweaks. 2011-11-14 15:13:20 -06:00
scripts Merge branch 'topic/robin/tunnels-merge' 2012-06-19 13:21:31 -07:00
src Merge branch 'topic/robin/tunnels-merge' 2012-06-19 13:21:31 -07:00
testing Merge branch 'topic/robin/tunnels-merge' 2012-06-19 13:21:31 -07:00
.gitignore Ignore tmp dir. 2011-10-25 19:59:25 -07:00
.gitmodules Update to use cmake submodule 2011-09-20 10:15:09 -05:00
bro-path-dev.in Fixes for script auto-documentation. 2011-08-08 19:50:45 -05:00
CHANGES Merge branch 'topic/robin/tunnels-merge' 2012-06-19 13:21:31 -07:00
CMakeLists.txt Merge remote-tracking branch 'origin/master' into topic/robin/dataseries 2012-04-17 16:37:37 -07:00
config.h.in Add a config.h definition for IPPROTO_IPV4. 2012-06-05 15:34:30 -05:00
configure Merge remote-tracking branch 'origin/master' into topic/robin/dataseries 2012-05-14 22:17:26 -07:00
COPYING A set of script-reference polishing. 2012-01-09 18:04:34 -08:00
DocSourcesList.cmake Adding target update-doc-sources to top-level Makefile that runs 2012-05-17 12:41:10 -07:00
INSTALL Fix typos and improve INSTALL document 2012-05-14 18:34:25 -05:00
Makefile Adding target update-doc-sources to top-level Makefile that runs 2012-05-17 12:41:10 -07:00
NEWS Updating baselines and NEWS. 2012-06-18 15:58:52 -07:00
README corrected some minor typos 2012-01-11 13:02:12 -06:00
VERSION Merge branch 'topic/robin/tunnels-merge' 2012-06-19 13:21:31 -07:00

============================
Bro Network Security Monitor
============================

Bro is a powerful framework for network analysis and security
monitoring. Please see the INSTALL file for installation instructions
and pointers for getting started. NEWS contains release notes for the
current version, and CHANGES has the complete history of changes.
Please see COPYING for licensing information.

For more documentation, research publications, and community contact
information, please see Bro's home page:

    http://www.bro-ids.org

On behalf of the Bro Development Team,

Vern Paxson & Robin Sommer,
International Computer Science Institute &
Lawrence Berkeley National Laboratory
vern@icir.org / robin@icir.org