Bernhard Amann
5e01c34943
Merge remote-tracking branch 'origin/master' into topic/bernhard/hyperloglog
2013-05-01 18:04:39 -07:00
Bernhard Amann
9802e2332d
Merge branch 'topic/bernhard/hyperloglog-with-measurement' into topic/bernhard/hyperloglog
2013-04-25 13:46:36 -07:00
Bernhard Amann
32620952d0
Merge remote-tracking branch 'origin/topic/seth/metrics-merge' into topic/bernhard/hyperloglog
2013-04-25 13:45:30 -07:00
Seth Hall
4bddcd2379
Fixed a bug in the vulnerable software script and added a test.
2013-04-25 14:56:14 -04:00
Bernhard Amann
f2967f485b
add persistence test not using predetermined random seeds.
...
This is failing at the moment.
2013-04-24 16:03:40 -07:00
Bernhard Amann
f69db71f57
Merge remote-tracking branch 'origin/master' into topic/bernhard/hyperloglog
2013-04-24 16:01:05 -07:00
Robin Sommer
e986247ff2
Merge remote-tracking branch 'origin/topic/jsiwek/974'
...
Closes #974 .
* origin/topic/jsiwek/974:
Fix schedule statements used outside event handlers (addresses #974 ).
2013-04-23 20:38:21 -07:00
Robin Sommer
f6f00924fc
Merge remote-tracking branch 'origin/topic/jsiwek/973'
...
Closes #973 .
* origin/topic/jsiwek/973:
Fix record coercion for default inner record fields (addresses #973 ).
2013-04-23 20:37:08 -07:00
Robin Sommer
71591d706e
Small tweaks for bytestring_to_count().
...
Closes #968 .
2013-04-23 20:32:57 -07:00
Yun Zheng Hu
3fff71b37a
Add bytestring_to_count function to bro.bif
2013-04-23 20:18:38 -07:00
Bernhard Amann
567fee6439
Merge remote-tracking branch 'origin/topic/seth/metrics-merge' into topic/bernhard/hyperloglog-with-measurement
...
Conflicts:
scripts/base/frameworks/sumstats/plugins/__load__.bro
2013-04-23 15:27:17 -07:00
Jon Siwek
7069f679c3
Fix record coercion for default inner record fields (addresses #973 ).
2013-04-23 09:57:55 -05:00
Seth Hall
60605412ab
Fix a few tests.
2013-04-22 14:14:50 -04:00
Jon Siwek
fa30d4a313
Fix schedule statements used outside event handlers (addresses #974 ).
2013-04-22 13:00:44 -05:00
Bernhard Amann
6e532e8960
update cluster test to also use hll
2013-04-19 09:58:57 -07:00
Bernhard Amann
75f709ec6b
Merge branch 'topic/bernhard/hyperloglog' into topic/bernhard/hyperloglog-with-measurement
2013-04-19 09:53:35 -07:00
Bernhard Amann
8340af55d1
persistence really works.
...
It took me way too long to find this - I got the uint8 serialize/deserialize
wrong :/
2013-04-19 09:52:45 -07:00
Bernhard Amann
dc18a6d6e3
Merge remote-tracking branch 'origin/topic/seth/metrics-merge' into topic/bernhard/hyperloglog-with-measurement
...
and fix up the hll scripts for it.
Conflicts:
scripts/base/frameworks/sumstats/plugins/__load__.bro
testing/btest/scripts/base/frameworks/measurement/basic.bro
2013-04-16 05:25:10 -07:00
Seth Hall
1cac89e4f8
SumStats test checkpoint.
2013-04-16 00:54:41 -04:00
Seth Hall
437815454d
SumStats tests pass.
2013-04-15 15:28:11 -04:00
Seth Hall
fbe967e16a
Checkpoint for SumStats rename.
2013-04-15 15:12:28 -04:00
Bernhard Amann
f10ed9e29a
change plugin after feedback of seth
2013-04-10 10:45:45 -04:00
Bernhard Amann
07d44f3aa0
Merge remote-tracking branch 'origin/topic/seth/metrics-merge' into topic/bernhard/hyperloglog-with-measurement
2013-04-08 10:56:18 +02:00
Bernhard Amann
7eee2f0d17
measurement framework with hll unique
2013-04-08 10:00:34 +02:00
Bernhard Amann
25c0ffc3ab
Merge branch 'topic/bernhard/hyperloglog' into topic/bernhard/hyperloglog-with-measurement
2013-04-08 09:45:10 +02:00
Bernhard Amann
7f5e2b1301
and test results. are those stable accross platforms? Or do we have to do some kind of rounding?
2013-04-08 09:44:24 +02:00
Bernhard Amann
53d6f3aae7
rework cardinality interface to use opaque.
...
I like it better...
2013-04-07 23:05:14 +02:00
Seth Hall
e8b60d1ba8
Updated FTP bruteforce detection and a few other small changes.
2013-04-02 00:55:25 -04:00
Seth Hall
423bf3b3bf
Test updates and cleanup.
2013-04-02 00:30:14 -04:00
Seth Hall
0e3c84e863
Fixed the measurement "sample" plugin.
2013-04-02 00:19:06 -04:00
Bernhard Amann
7aa11291a5
Merge remote-tracking branch 'origin/topic/seth/metrics-merge' into topic/bernhard/hyperloglog-with-measurement
2013-04-02 00:36:35 +02:00
Seth Hall
93eca70e6b
Merge remote-tracking branch 'origin/master' into topic/seth/metrics-merge
2013-04-01 14:16:46 -04:00
Seth Hall
53f9948b02
Measurement framework tests all pass now.
2013-04-01 14:16:37 -04:00
Bernhard Amann
b05eef6541
Merge remote-tracking branch 'origin/master' into topic/bernhard/hyperloglog
...
Conflicts:
src/bro.bif
2013-03-25 08:39:52 -07:00
Yun Zheng Hu
9a88dc500a
Added reverse() function to strings.bif.
...
Closes #969 .
2013-03-23 08:39:04 -07:00
Robin Sommer
4255205026
Merge remote-tracking branch 'origin/topic/jsiwek/table-init-record-idx'
...
Closes #660 .
* origin/topic/jsiwek/table-init-record-idx:
Fix record constructors in table initializer indices. Addresses #660 .
2013-03-22 12:11:29 -07:00
Seth Hall
4e99d3a606
Add support for 802.1ah (Q-in-Q).
2013-03-22 12:38:43 -04:00
Robin Sommer
f412a00ada
Adding a test for extract-certs-pem.pem.
2013-03-17 13:06:24 -07:00
Robin Sommer
d58a02aa01
Merge remote-tracking branch 'origin/topic/bernhard/base64'
...
* origin/topic/bernhard/base64:
and re-enable caching of extracted certs
and add bae64 bif tests.
re-unify classes
and modernize script.
add base64-encode functionality and bif.
Closes #965 .
2013-03-17 13:00:52 -07:00
Seth Hall
5734f9ef71
Merge remote-tracking branch 'origin/master' into topic/seth/software-version-updates2
2013-03-14 09:21:13 -04:00
Seth Hall
09cbaa7ccc
Merge remote-tracking branch 'origin/master' into topic/seth/metrics-merge
...
Conflicts:
testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log
testing/btest/Baseline/scripts.base.frameworks.notice.cluster/manager-1.notice.log
testing/btest/Baseline/scripts.base.frameworks.notice.suppression-cluster/manager-1.notice.log
testing/btest/Baseline/scripts.base.protocols.ftp.gridftp/notice.log
2013-03-13 00:26:55 -04:00
Bernhard Amann
a5161783ef
and add bae64 bif tests.
2013-03-12 09:33:49 -07:00
Bernhard Amann
1fb05da9cd
Fix race-condition in table-event test.
...
Event depended on the input manager receiving all lines from the reader
before the first input event was processed by the scripting layer.
2013-03-07 20:28:18 -08:00
Robin Sommer
f830ed3edf
s/bro-ids.org/bro.org/g
2013-03-07 19:33:04 -08:00
Jon Siwek
2293443ea0
Fix function type-equivalence requiring same param names, addresses #957
2013-03-07 13:02:33 -06:00
Robin Sommer
8a6d68e00f
Merge remote-tracking branch 'origin/topic/bernhard/remove-length'
...
Closes #955 .
* origin/topic/bernhard/remove-length:
forgot to remove the baselines for the now unnecessary bifs
remove the byte_len and length bifs
2013-03-06 16:46:20 -08:00
Robin Sommer
1bd2f26df3
Merge remote-tracking branch 'origin/topic/seth/notice-framework-updates'
...
So much nicer!
Closes #954 .
* origin/topic/seth/notice-framework-updates:
Update notice framework documentation to represent the new reality.
Complete removal of the old table based notice policy mechanism.
Updates for the notices framework.
2013-03-06 16:45:30 -08:00
Robin Sommer
9f99a4a942
Merge remote-tracking branch 'origin/topic/jsiwek/local-container-init'
...
Closes #952 .
* origin/topic/jsiwek/local-container-init:
Fix init of local sets/vectors via curly brace initializer lists.
2013-03-06 15:11:10 -08:00
Robin Sommer
d931079021
Merge remote-tracking branch 'origin/topic/jsiwek/ticket946'
...
Closes #946 .
* origin/topic/jsiwek/ticket946:
Fix memory leaks resulting from 'when' and 'return when' statements.
Fix three bugs with 'when' and 'return when' statements. Addresses #946
2013-03-06 15:09:24 -08:00
Bernhard Amann
a005d77369
forgot to remove the baselines for the now unnecessary bifs
2013-03-06 14:14:55 -08:00
