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
..
cluster	Merge remote-tracking branch 'origin/topic/jsiwek/ipv6-comm'	2012-05-24 17:01:34 -07:00
communication	Fix a warning message	2012-06-13 12:21:16 -05:00
control	Enable Bro to communicate with peers over non-global IPv6 addresses.	2012-05-17 12:59:20 -05:00
dpd	Merge branch 'master' into topic/tunnels	2012-06-06 14:53:57 -05:00
input	A set of input framework refactoring, cleanup, and polishing.	2012-05-30 16:38:08 -07:00
intel	This completes framework documentation package 4.	2012-01-06 16:36:22 -05:00
logging	Switching default DS compression to gzip.	2012-05-25 08:36:59 -07:00
metrics	Fixing a warning from the documentation generation.	2012-01-06 16:50:20 -05:00
notice	Fixed a problem where cluster workers were still processing notices in some cases.	2012-04-26 10:45:28 -04:00
packet-filter	Checkpoint after pass.	2012-02-15 13:07:08 -08:00
reporter	Add reporter bif/framework documentation.	2011-12-07 16:54:40 -06:00
signatures	Add more signature framework documentation.	2011-12-14 12:50:54 -06:00
software	One more very minor change I forgot to commit.	2012-02-03 16:27:51 -05:00
tunnels	Remove &synchronized from Tunnel::active table.	2012-06-18 17:04:46 -05:00