Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-10 02:28:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
18601 commits 388 branches 195 tags 268 MiB
Commit graph

18601 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Robin Sommer
59773db8a9 Merge remote-tracking branch 'origin/topic/jsiwek/remove-conn-compressor' 
* origin/topic/jsiwek/remove-conn-compressor:
  Remove connection compressor (addresses #559).

Conflicts:
	src/ConnCompressor.cc

Closes #559.
 2012-02-27 21:07:09 -08:00
Robin Sommer
885647686b Merge remote-tracking branch 'origin/topic/jsiwek/iphdr-ctor' 
* origin/topic/jsiwek/iphdr-ctor:
  Refactor IP_Hdr class ctors (addresses #532).

Closes #532.
 2012-02-27 21:00:54 -08:00
Robin Sommer
4558195dab Merge remote-tracking branch 'origin/topic/bernhard/log-threads' into topic/robin/log-threads 
* origin/topic/bernhard/log-threads:
  remove unnecessary error function from manger
 2012-02-27 19:07:06 -08:00
Robin Sommer
d24cdd3ba3 Merge remote-tracking branch 'origin/master' into topic/robin/log-threads 
Conflicts:
	src/LogMgr.h
	src/RemoteSerializer.cc
	src/logging/Manager.cc
	src/logging/writers/Ascii.cc
	src/net_util.cc
 2012-02-27 19:05:47 -08:00
Daniel Thayer
0a659c0907 Merge remote-tracking branch 'origin/master' into topic/icmp6 2012-02-27 13:33:05 -06:00
Jon Siwek
dfad686d7c Refactor IP_Hdr class ctors (addresses #532). 
They now take an explicit flag argument toggling whether the other
pointer argument needs to be released on destruction.
 2012-02-27 12:25:41 -06:00
Jon Siwek
e07470c7f1 Remove connection compressor (addresses #559). 2012-02-27 11:35:25 -06:00
Robin Sommer
ada5f38d04 Merge branch 'master-merge-helper' 
* master-merge-helper:
  possible use after free forbidden
  Suppression of unused code
  Fix of some memory leaks
  removing dead code
  A destructor must free the memory allocated by the constructor
  Good overridance with the good qualifier
  Better use of operators priorities
  protection from bad frees on unallocated strings
 2012-02-24 16:37:45 -08:00
Robin Sommer
d2b2157454 Fixing merge relict. 2012-02-24 15:52:15 -08:00
Julien Sentier
900cc8f2ab possible use after free forbidden 2012-02-24 15:39:50 -08:00
Julien Sentier
d65b2f12c6 Suppression of unused code 2012-02-24 15:39:50 -08:00
Julien Sentier
2e069c9596 Fix of some memory leaks 2012-02-24 15:39:50 -08:00
Julien Sentier
a3e419fee0 removing dead code 2012-02-24 15:39:50 -08:00
Julien Sentier
1df650eb0d A destructor must free the memory allocated by the constructor 2012-02-24 15:39:49 -08:00
Julien Sentier
7dfb5657a2 Good overridance with the good qualifier 2012-02-24 15:39:49 -08:00
Julien Sentier
b84fd05912 Better use of operators priorities 2012-02-24 15:39:49 -08:00
Julien Sentier
c2ee15b09f protection from bad frees on unallocated strings 2012-02-24 15:39:49 -08:00
Robin Sommer
2eeac54857 Merge remote-tracking branch 'origin/fastpath' 
* origin/fastpath:
  Add to_subnet bif (fixes #782).
  Refactor IPAddr v4 initialization from string. (fixes #775)

Closes #782.
Closes #775.
Closes #784.
 2012-02-24 15:26:18 -08:00
Robin Sommer
3323692771 Merge remote-tracking branch 'origin/topic/jsiwek/ipaddr-refactoring' 
* origin/topic/jsiwek/ipaddr-refactoring:
  Refactoring various usages of new IPAddr class.

Conflicts:
	src/bro.bif

Closes #784.
 2012-02-24 15:21:57 -08:00
Robin Sommer
33777f13c5 Merge branch 'master' of ssh://git.bro-ids.org/bro 2012-02-24 15:04:06 -08:00
Robin Sommer
4ef8607e60 Merge remote-tracking branch 'origin/topic/dnthayer/ftp-ipv6' 
* origin/topic/dnthayer/ftp-ipv6:
  Add test case for FTP over IPv4
  Fix IPv6 URLs
  Add a test for FTP over IPv6
  Update FTP EPSV response processing for IPv6
  Fix parsing of FTP EPRT command and EPSV response

Conflicts:
	src/bro.bif

Closes #778.
 2012-02-24 15:00:41 -08:00
Jon Siwek
b552979011 Raise minimum required CMake version to 2.6.3 2012-02-24 13:14:49 -06:00
Jon Siwek
32aabe8432 Add to_subnet bif (fixes #782). 
Also fix IPAddr::Mask/ReverseMask not allowing argument of 0.

And clarified return value of to_addr bif when the input string
does not parse into a valid IP address.
 2012-02-24 12:34:29 -06:00
Bernhard Amann
d553a3c6f6 fix strange bug when using predicates and events at the same time on a tablefilter. 
Testcase is now more involved.
 2012-02-23 15:30:39 -08:00
Jon Siwek
14ccd6436f Update/add tests for broccoli IPv6 addr/subnet support (addresses #448) 2012-02-23 16:55:19 -06:00
Bernhard Amann
d81607c3e9 fix empty field bug in threaded version 2012-02-23 14:36:04 -08:00