Commit graph

3375 commits

Author SHA1 Message Date
Bernhard Amann
92555badd4 cleanup, more sanity tests, a little bit more documentation 2012-03-11 20:43:26 -07:00
Bernhard Amann
faf5c95752 a couple of small fixes ( default values, all null lines) 2012-03-11 19:41:41 -07:00
Robin Sommer
8eaf40ec18 Reverting accidental commit.
Thanks, Seth!
2012-03-08 20:24:12 -08:00
Robin Sommer
f0682bb01a Merge branch 'topic/robin/log-threads' of ssh://git.bro-ids.org/bro into topic/robin/log-threads 2012-03-08 20:24:02 -08:00
Robin Sommer
51009b73bc Finetuning communication CPU usage. 2012-03-08 18:13:17 -08:00
Robin Sommer
1bdd0a5b6b Merge branch 'topic/robin/log-threads' of ssh://git.bro-ids.org/bro into topic/robin/log-threads 2012-03-08 17:42:31 -08:00
Robin Sommer
0208dd2844 Merge remote branch 'origin/master' into topic/robin/log-threads 2012-03-08 17:35:58 -08:00
Robin Sommer
83038d78e0 Adding new leak tests involving remote logging. 2012-03-08 17:35:58 -08:00
Robin Sommer
bf14bd91d7 Removing some no longer needed checks. 2012-03-08 17:30:18 -08:00
Robin Sommer
c0678e7e1f Fixing problem logging remotely when local logging was turned off.
For that, moved the remote logging from the Manager to the
WriterFrontend. That also simplifies the Manager a bit.
2012-03-08 17:30:18 -08:00
Jon Siwek
0b32c980bf Update PacketFilter/Discarder code for IP version independence.
The signatures of script-layer functions 'discarder_check_ip',
'discarder_check_tcp', 'discarder_check_udp', and 'discarder_check_icmp'
were changed to use the more general 'pkt_hdr' type as a parameter
instead of individual header types.
2012-03-08 13:12:04 -06:00
Bernhard Amann
cd78005d09 Merge remote-tracking branch 'origin/master' into topic/bernhard/input-threads 2012-03-07 13:43:48 -08:00
Bernhard Amann
b31230d429 Merge remote-tracking branch 'origin/topic/robin/log-threads' into topic/bernhard/input-threads 2012-03-07 13:43:27 -08:00
Bernhard Amann
7076c64a5e Merge remote-tracking branch 'origin/topic/robin/log-threads' into topic/bernhard/input-threads
(and move a little bit of functionality from ascii reader to backend)

Conflicts:
	src/threading/Manager.cc
2012-03-07 13:42:49 -08:00
Jon Siwek
76ef36e048 Add a few comments to IP.h 2012-03-07 14:17:56 -06:00
Jon Siwek
65307764f4 Fix some IPv6 header related bugs.
- IPv6 payload length calculation didn't count main 40 byte IPv6 header.
- Fix how IPv6 headers that use TLV options are built.
- Fix ip6_hdr_chain$ext_order starting index at 1 instead of 0.
2012-03-07 12:40:01 -06:00
Jon Siwek
9d590456b0 Add IPv6 fragment reassembly. 2012-03-06 16:08:28 -06:00
Robin Sommer
1811391cff Merge remote-tracking branch 'origin/topic/jsiwek/coverage-tweaks' 2012-03-05 16:53:09 -08:00
Robin Sommer
d8d567980c Merge remote-tracking branch 'origin/master' into fastpath 2012-03-05 16:52:29 -08:00
Jon Siwek
a0e07018f4 Merge branch 'master' into topic/jsiwek/ipv6-ext-headers 2012-03-05 09:31:53 -06:00
Jon Siwek
eb9f686bb2 Add handling for IPv6 extension header chains (addresses #531)
- The script-layer 'pkt_hdr' type is extended with a new 'ip6' field
  representing the full IPv6 header chain.

- The 'new_packet' event is now raised for IPv6 packets (addresses #523)

- A new event called 'ipv6_ext_header' is raised for any IPv6 packet
  containing extension headers.

- A new event called 'esp_packet' is raised for any packets using ESP
  ('new_packet' and 'ipv6_ext_header' events provide connection info,
  but that info can't be provided here since the upper-layer payload
  is encrypted).

- The 'unknown_protocol' weird is now raised more reliably when Bro
  sees a transport protocol or IPv6 extension header it can't handle.
  (addresses #522)

Still need to do IPv6 fragment reassembly and needs more testing.
2012-03-02 20:20:57 -06:00
Daniel Thayer
9d1e51a91e More code cleanup 2012-03-02 13:52:45 -06:00
Jon Siwek
fef671e4a6 Fix a BRO_PROFILER_FILE/mkstemp portability issue. (addresses #794) 2012-03-02 12:40:25 -06:00
Daniel Thayer
6eb9f63e17 Add more icmpv6 events, and general code cleanup 2012-03-02 12:29:18 -06:00
Robin Sommer
035de0216e Merge remote-tracking branch 'origin/topic/jsiwek/coverage-tweaks'
* origin/topic/jsiwek/coverage-tweaks:
  Changes to how script coverage integrates with test suites.

Closes #794.
2012-03-02 09:36:11 -08:00
Daniel Thayer
e9728d82ab Merge remote-tracking branch 'origin/master' into topic/icmp6 2012-03-02 10:50:05 -06:00
Robin Sommer
fd13f01a24 Merge remote-tracking branch 'origin/master' into topic/robin/log-threads 2012-03-01 16:25:46 -08:00
Robin Sommer
554a29b3ed Preventing busy looping when no threads have been spawned. 2012-03-01 16:04:34 -08:00
Robin Sommer
6429d1248a Prevent manager from busy looping.
I saw this with the new threading code but I'm wondering if it also
helps with the "high CPU usage with low traffiv volume" problem.
2012-03-01 16:00:30 -08:00
Jon Siwek
ef5e9caaf4 Changes to how script coverage integrates with test suites.
- BRO_PROFILER_FILE now passes .X* templated filenames to mkstemp
  for generating unique coverage state files.  All test suites
  now use this so each Bro instance writes to a unique coverage file.
- Rearranging Makefile targets.  The general rule is that if the
  all/brief target fails out due to a test failure, then the dependent
  coverage target won't run, but can still be invoked directly later.
  (e.g. make brief || make coverage)
2012-03-01 13:00:44 -06:00
Robin Sommer
fd1cc49d67 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Standardized on the &default function for SSL constants.
2012-03-01 08:31:52 -08:00
Seth Hall
87ad77cc10 Standardized on the &default function for SSL constants. 2012-02-29 22:34:31 -05:00
Robin Sommer
92ed583ee7 Adding btest group "leaks" to leak tests.
This will make it easier to run just the leak tests.
2012-02-29 17:19:38 -08:00
Robin Sommer
9b83591374 Merge remote-tracking branch 'origin/topic/robin/parallel-btest'
* origin/topic/robin/parallel-btest:
  Updating submodule(s).
  Adding group "comm" to communication tests for parallelizing execution with new btest version.

This is in preparation for the merge with the parallel btest branch.

Conflicts:
	cmake
	testing/btest/istate/pybroccoli.py
	testing/btest/scripts/base/frameworks/control/configuration_update.bro
	testing/btest/scripts/base/frameworks/control/id_value.bro
	testing/btest/scripts/base/frameworks/control/shutdown.bro
	testing/btest/scripts/base/frameworks/metrics/basic-cluster.bro
2012-02-29 17:17:25 -08:00
Robin Sommer
bfeca444db Sorting all output for the external tests.
Let's see how this goes. The script keeps comments at the beginning.
2012-02-29 17:09:38 -08:00
Robin Sommer
05cd5278e1 Merge remote-tracking branch 'origin/topic/seth/ssl-cleanup'
* origin/topic/seth/ssl-cleanup:
  Cleaned up dead code from the old SSL analyzers. (Reported by Julien Sentier)
2012-02-29 16:48:40 -08:00
Robin Sommer
56dd7918d0 Adding missing includes needed on FreeBSD. 2012-02-29 16:46:21 -08:00
Robin Sommer
355c447698 Updating submodule(s).
[nomail]
2012-02-29 16:10:40 -08:00
Robin Sommer
6df9004423 Updating submodule(s).
[nomail]
2012-02-29 16:10:40 -08:00
Robin Sommer
df874f0f62 A number of bugfixes for the recent threading updates.
All tests pass now except one:

scripts.base.frameworks.metrics.cluster-intermediate-update

Couldn't figure out yet why that still fails.
2012-02-29 16:10:40 -08:00
Daniel Thayer
6a3d0147a8 Fix compile failure after merge from master 2012-02-29 11:29:28 -06:00
Seth Hall
b3764dcad5 Cleaned up dead code from the old SSL analyzers. (Reported by Julien Sentier) 2012-02-29 09:43:37 -05:00
Daniel Thayer
54d5d38fd3 Merge remote-tracking branch 'origin/master' into topic/icmp6
Conflicts:
	src/Sessions.cc
2012-02-28 18:39:31 -06:00
Robin Sommer
629ec31ec2 Merge remote-tracking branch 'origin/master' into topic/robin/log-threads
Conflicts:
	aux/broccoli
	src/ConnCompressor.cc
2012-02-28 16:00:18 -08:00
Robin Sommer
edc9bb14af Making exchange of addresses between threads thread-safe.
As we can't use the IPAddr class (because it's not thread-safe), this
involved a bit manual address manipulation and also shuffling some
things around a bit.

Not fully working yet, the tests for remote logging still fail.
2012-02-28 15:57:43 -08:00
Bernhard Amann
6e312cfebd Merge remote-tracking branch 'origin/topic/robin/log-threads' into topic/bernhard/input-threads 2012-02-27 23:00:45 -08:00
Bernhard Amann
417542f283 Merge branch 'topic/bernhard/log-threads' into topic/bernhard/input-threads
Seems to work -- all test pass.
But there are thread-safety issues at the moment, because the constructors of IPAddr and IPPrefix are not thread-safe, but needed by workers.

Conflicts:
	src/logging/Manager.cc
2012-02-27 22:59:08 -08:00
Robin Sommer
14916b43f6 Readding deleted functions.
These are needed in debug mode in turns out.
2012-02-27 21:39:56 -08:00
Robin Sommer
0639487aad Updating submodule(s).
[nomail]
2012-02-27 21:34:44 -08:00
Robin Sommer
36d46efa68 Merge remote-tracking branch 'origin/topic/jsiwek/broccoli-ipv6'
* origin/topic/jsiwek/broccoli-ipv6:
  Update/add tests for broccoli IPv6 addr/subnet support (addresses #448)
2012-02-27 21:15:41 -08:00