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

13262 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin Sommer
8220d70e88 A few more small tweaks. 2013-05-14 16:19:41 -07:00
Bernhard Amann
d939c2bdfc add tests for sampler 2013-05-13 22:11:17 -07:00
Bernhard Amann
fa58e26aa0 Merge remote-tracking branch 'origin/master' into topic/bernhard/metrics-samples 2013-05-13 21:20:25 -07:00
Bernhard Amann
bb1e2f57b9 Merge remote-tracking branch 'origin/master' into topic/bernhard/thread-cleanup 2013-05-13 21:19:09 -07:00
Bernhard Amann
56ab9285a4 Merge remote-tracking branch 'origin/master' into topic/bernhard/topk 2013-05-13 21:03:23 -07:00
Bernhard Amann
6036872faa fix a few small rough edges (mostly comments that do no longer apply) 2013-05-13 20:40:00 -07:00
Bernhard Amann
8f7619971f fix bug in input-manager regarding enums that a writer reads without 
0-terminating the string
 2013-05-13 20:26:41 -07:00
Bernhard Amann
6c99df508c actually make sqlite work again (tests passed because the writer 
was not actually defined because of the define.)
 2013-05-13 19:27:11 -07:00
Bernhard Amann
2b8c2f2316 add sqlite distribution. 
Note that tests currently still require an external sqlite3
for the command-line client.

However, for that the version does not matter - so I guess while
not completely nice it could be ok...
 2013-05-13 18:41:04 -07:00
Robin Sommer
1459216b20 Merge branch 'topic/robin/file-analysis-merge' of git.bro-ids.org:bro into topic/robin/file-analysis-merge 
Conflicts:
	testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log
	testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log
 2013-05-13 17:01:55 -07:00
Robin Sommer
2aa2641844 Updating submodule(s). 
[nomail]
 2013-05-13 16:51:34 -07:00
Robin Sommer
7610aa31b6 Various smalle tweaks in preparation for merging. 2013-05-13 16:47:00 -07:00
Bernhard Amann
6392acecd2 fix warnings, update baselines, handle rotation 2013-05-12 20:48:17 -07:00
Bernhard Amann
747ba68030 Merge remote branch 'origin/master' into topic/bernhard/sqlite 2013-05-12 20:47:55 -07:00
Robin Sommer
e89e8d7306 Merge remote-tracking branch 'origin/topic/jsiwek/972' 
Closes #972.

* origin/topic/jsiwek/972:
  Allow default function/hook/event parameters.  Addresses #972.
 2013-05-10 19:30:24 -07:00
Robin Sommer
b46d261557 Merge remote-tracking branch 'origin/fastpath' 
* origin/fastpath:
  prevent merge-hook of sumstats unique plugin from damaging source data.
 2013-05-10 19:22:57 -07:00
Jon Siwek
e2a1d4a233 Allow default function/hook/event parameters. Addresses #972. 
And changed the endianness parameter of bytestring_to_count() BIF to
default to false (big endian), mostly just to prove that the BIF parser
doesn't choke on default parameters.
 2013-05-07 14:32:22 -05:00
Bernhard Amann
70f3f4343a prevent merge-hook of sumstats unique plugin from damaging source data. 2013-05-07 11:16:59 -07:00
Scott Runnels
4aa51e7608 Basic cross-referencing UIDs between files, btests, and baselines. 
Also includes appropriate btest-rst-cmd directives with titles.
 2013-05-07 13:33:38 -04:00
Scott Runnels
5734d7fe25 A truly embarassing number of spelling corrections. 2013-05-07 06:01:04 -04:00
Scott Runnels
a93a6535e7 Using redirection with bro-cut. Include initial btests for this document. 2013-05-07 05:56:45 -04:00
Jon Siwek
ec50cad9db Merge branch 'master' into topic/jsiwek/file-analysis 
Conflicts:
	scripts/base/protocols/ftp/main.bro
	src/OpaqueVal.h
	testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log
	testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log
 2013-05-06 10:21:16 -05:00
Scott Runnels
4a7de4a616 Corrected a mis-typed RST include. 2013-05-05 15:24:30 -04:00
Bernhard Amann
663082e2d5 reservoir sampler. untested. 2013-05-05 11:19:53 -07:00
Scott Runnels
8ba9250cf4 Initial start for "Using Bro". 2013-05-05 00:01:12 -04:00
Bernhard Amann
cf6e768ad6 fix opaqueval-related memleak 2013-05-03 23:08:26 -07:00
Bernhard Amann
6acbbe0231 Merge remote-tracking branch 'origin/master' into topic/bernhard/topk 2013-05-03 23:04:22 -07:00
Bernhard Amann
f6e99fce11 fix opaqueval-related memleak. 2013-05-03 23:03:31 -07:00
Bernhard Amann
3e74cdc6e0 Merge remote-tracking branch 'origin/master' into topic/bernhard/hyperloglog 2013-05-03 22:58:02 -07:00
Robin Sommer
69c7363147 Merge remote-tracking branch 'origin/topic/jsiwek/981' 
Closes #981.

* origin/topic/jsiwek/981:
  Table lookups return copy of non-const &default vals (addresses #981).
 2013-05-03 17:44:37 -07:00
Robin Sommer
75cbce8ea4 Merge remote-tracking branch 'origin/fastpath' 
Closes #986

* origin/fastpath:
  Do not allocate one OpaqueType per OpaqueVal.
  Fix memory-leak in OpaqueVal.
 2013-05-03 15:55:22 -07:00
Matthias Vallentin
9ac00f8c79 Do not allocate one OpaqueType per OpaqueVal. 
Instead, we now allocate type information globally in NetVar.cc.

Addresses #986.
 2013-05-03 15:48:06 -07:00
Matthias Vallentin
e78c20c0f8 Fix memory-leak in OpaqueVal. 
Addresses #986.
 2013-05-03 14:26:02 -07:00
Matthias Vallentin
9a319a995e Merge branch 'master' into fastpath 
* master: (84 commits)
  add comment for seth to make us not forget about the copy statements
  fix the fix (thanks seth)
  duct-tape fix of values not propagating after intermediate check in cluster environments.
  Always apply tcp_connection_attempt.
  Fixing coverage.bare-mode-errors test.
  Fixing coverage.bare-mode-errors test.
  Fixing more memory leaks.
  Fixing memory leak in CompHash.
  Fixing more memory leaks.
  Fixing memory leak in CompHash.
  Replacing cluster leak test.
  Updating test for removed metric_* log fields.
  Layout tweaks for the sumstats code, and preliminary updates for NEWS.
  Updating submodule(s).
  Added protocol to the traceroute detection script.
  Added an automatic state limiter for threshold based SumStats.
  Removed some dead code in scan.bro
  Renamed a plugin hook in sumstats framework.
  Move loading variance back to where it should be alphabetically.
  Fix a bug with path building in FTP.  Came up when changing the path utils.
  ...
 2013-05-03 14:07:58 -07:00
Robin Sommer
a1bae68140 Merge remote-tracking branch 'origin/master' into topic/robin/file-analysis-merge 
Conflicts:
	scripts/base/protocols/ftp/main.bro
	testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log
	testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log
 2013-05-03 13:52:26 -07:00
Jon Siwek
6a7a242db9 Table lookups return copy of non-const &default vals (addresses #981). 
This prevents unintentional modifications to the &default value itself.
 2013-05-03 11:22:15 -05:00
Robin Sommer
8992dc6cff Merge remote-tracking branch 'origin/topic/bernhard/metrics-bug' 
* origin/topic/bernhard/metrics-bug:
  add comment for seth to make us not forget about the copy statements
  fix the fix (thanks seth)
  duct-tape fix of values not propagating after intermediate check in cluster environments.
  Fixing coverage.bare-mode-errors test.
 2013-05-02 12:47:36 -07:00
Bernhard Amann
075bfc5b3d synchronize pruned attribute 2013-05-02 12:09:35 -07:00
Bernhard Amann
2cfef36116 add comment for seth to make us not forget about the copy statements 2013-05-02 11:42:34 -07:00
Bernhard Amann
fe779575d5 fix the fix (thanks seth) 2013-05-02 11:38:40 -07:00
Bernhard Amann
d984243a77 duct-tape fix of values not propagating after intermediate check in cluster environments. 2013-05-02 11:34:33 -07:00
Bernhard Amann
1cf506071d make it compile on case-sensitive file systems and fix warnings 2013-05-01 18:12:20 -07:00
Bernhard Amann
5e01c34943 Merge remote-tracking branch 'origin/master' into topic/bernhard/hyperloglog 2013-05-01 18:04:39 -07:00
Robin Sommer
1603da5af3 Always apply tcp_connection_attempt. 
Before this change it was only applied when a connection_attempt()
event handler was defined.
 2013-05-01 18:03:52 -07:00
Robin Sommer
9d483b7e74 Fixing coverage.bare-mode-errors test. 2013-05-01 17:52:16 -07:00
Bernhard Amann
c6e69ddc05 potentially found wrong Ref. 2013-05-01 17:06:45 -07:00
Robin Sommer
9ea5a470e6 Fixing coverage.bare-mode-errors test. 2013-05-01 15:28:45 -07:00
Seth Hall
7d7d30e1f7 Merge remote-tracking branch 'origin/master' into topic/seth/metrics-merge 2013-04-30 10:18:53 -04:00
Bernhard Amann
8680e2da00 Merge remote-tracking branch 'origin/topic/robin/metrics-merge' into topic/bernhard/topk 2013-04-29 22:09:46 -07:00
Bernhard Amann
a194fc874e t merge Merge remote-tracking branch 'origin/master' into topic/bernhard/topk 2013-04-29 22:09:38 -07:00