Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-08 01:28:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
11634 commits 385 branches 195 tags 261 MiB
Commit graph

11634 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Jon Siwek
c84394d07f Refactor IPAddr v4 initialization from string. (fixes #775) 
Revived code from old dotted_to_addr function to parse the
dotted address string directly instead of canonicalizing and
passing to inet_pton.
 2012-02-22 15:44:05 -06:00
Jon Siwek
d7dafe2fe2 Refactoring various usages of new IPAddr class. 
Reducing number of places that internal representation was exposed
via GetBytes/CopyIPv6.

Also fixed a bug in remask_addr bif.
 2012-02-22 14:45:44 -06:00
Bernhard Amann
93fac7a4be fix one of the bugs seth found in the input framework. 
(bug in PutTable when the table contained only one element and that element should not be wrapped into a record)
 2012-02-22 10:46:35 -08:00
Bernhard Amann
7e5f733826 raw input reader for seth, which can simply read a file into string-events given a line separator. 2012-02-22 09:44:45 -08:00
Bernhard Amann
531189b5fd try to make ascii reader a little bit more robust to failure - mainly ignore messages after a reader has disabled itself 2012-02-22 08:56:45 -08:00
Robin Sommer
d887eb3178 Merge remote-tracking branch 'origin/fastpath' 
* origin/fastpath:
  GeoIP installation documentation update.
  Decrease strictness of parsing IPv4 strings into addrs. (fixes #775)
  Fix memory leak in DNS manager (fixes #777).

Closes #777.
 2012-02-22 05:28:29 -08:00
Seth Hall
c0839cb945 GeoIP installation documentation update. 2012-02-21 16:13:08 -05:00
Daniel Thayer
96df1bac40 Add test case for FTP over IPv4 2012-02-21 11:18:43 -06:00
Bernhard Amann
d5b413c4e7 reduce number of needed hash operations 2012-02-20 17:13:41 -08:00
Bernhard Amann
edd30da082 better testcase & fix a few bugs (that took way too long to find). 2012-02-20 15:30:21 -08:00
Daniel Thayer
8e32e89ce4 Merge remote-tracking branch 'origin/master' into topic/icmp6 
Conflicts:
	src/ICMP.cc
	src/net_util.cc
	src/net_util.h
 2012-02-20 17:18:55 -06:00
Bernhard Amann
fe5b376d28 ...and update for table event testcase after fix. 2012-02-20 13:23:25 -08:00
Bernhard Amann
4f57817b1a ...forgotten in last commit. 2012-02-20 13:20:29 -08:00
Bernhard Amann
4126b458ca Automatic file re-refresh and streaming works. 
* simple testcase for file refresh (check for changes) and streaming reads
* add events for simple put and delete operations
* fix bugs in table filter events (type for first element was wrong)
* and I think a couple of other small bugs
 2012-02-20 13:18:15 -08:00
Jon Siwek
b66b74e5dc Decrease strictness of parsing IPv4 strings into addrs. (fixes #775) 
IPv4 strings in dotted-decimal format with decimal parts containing
leading zeroes now parse better.
 2012-02-20 14:28:42 -06:00
Jon Siwek
1f7bfbb83c Fix memory leak in DNS manager (fixes #777). 2012-02-20 11:56:21 -06:00
Robin Sommer
52cfec8830 Merge remote-tracking branch 'origin/topic/robin/v6-addr-merge' into topic/robin/v6-addr-merge 2012-02-17 18:40:38 -08:00