Seth Hall
b477d2b02d
Measurement framework is ready for testing.
...
- New, expanded API.
- Calculations moved into plugins.
- Scripts using measurement framework ported.
- Updated the script-land queue implementation to make it more generic.
-
2013-04-01 17:04:15 -04: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
Yun Zheng Hu
9a88dc500a
Added reverse() function to strings.bif.
...
Closes #969 .
2013-03-23 08:39:04 -07:00
Robin Sommer
6b0552fa4f
Updating submodule(s).
...
[nomail]
2013-03-22 12:27:19 -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
Robin Sommer
8dca2dd971
Merge remote-tracking branch 'origin/topic/seth/q-in-q'
...
Closes #641 .
* origin/topic/seth/q-in-q:
Add support for 802.1ah (Q-in-Q).
2013-03-22 12:02:21 -07:00
Seth Hall
4e99d3a606
Add support for 802.1ah (Q-in-Q).
2013-03-22 12:38:43 -04:00
Seth Hall
6dc204b385
Checkpoint, don't try running this. It's broken all over the place.
2013-03-19 11:39:58 -04:00
Robin Sommer
9caf6e4884
Merge remote-tracking branch 'origin/fastpath'
...
* origin/fastpath:
fix gcc compile warning in Benchmark reader
fix gcc compile warning in base64 encoder
2013-03-18 12:18:40 -07:00
Bernhard Amann
4aab9921be
fix gcc compile warning in Benchmark reader
2013-03-18 09:04:18 -07:00
Bernhard Amann
873d0549bf
fix gcc compile warning in base64 encoder
2013-03-18 09:01:03 -07:00
Robin Sommer
c39223e226
Fixing potential leak in DNS error case. From Vlad.
...
Closes #967 .
2013-03-17 17:37:06 -07:00
Robin Sommer
c180d04db9
Updating submodule(s).
...
[nomail]
2013-03-17 13:56:17 -07:00
Robin Sommer
6865f0438a
Renaming Base64Decoder to Base64Converter.
...
It nows encodes and decodes.
2013-03-17 13:16:46 -07: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
Robin Sommer
788c0d547d
Merge remote-tracking branch 'origin/topic/seth/software-version-updates2'
...
* origin/topic/seth/software-version-updates2:
Correctly handle DNS lookups for software version ranges.
Improvements to vulnerable software detection.
Update software version parsing and comparison to account for a third numeric subversion.
Closes #938 .
2013-03-17 12:38:25 -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
8778761c07
Checkpoint
2013-03-13 22:55:03 -04:00
Robin Sommer
b4824f4207
Merge remote-tracking branch 'origin/fastpath'
...
* origin/fastpath:
Add check for truncated link frames. Addresses #962 .
Fix large memory allocation in IP fragment reassembly. Addresses #961 .
2013-03-13 07:20:12 -07:00
Bernhard Amann
457ce10e99
and re-enable caching of extracted certs
...
I kind of deleted the line by accident...
2013-03-13 00:34:15 -07: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
a1896fde90
Merge remote-tracking branch 'origin/master' into topic/bernhard/base64
2013-03-12 09:28:07 -07:00
Bernhard Amann
2b28c3a578
re-unify classes
2013-03-12 09:27:59 -07:00
Jon Siwek
90ca2b87c4
Add check for truncated link frames. Addresses #962 .
...
Patch provided by jbaines, modified with a more descriptive Weird name.
2013-03-11 11:58:54 -05:00
Jon Siwek
8d5434ef2d
Fix large memory allocation in IP fragment reassembly. Addresses #961 .
...
Patch by jbaines modified slightly to return earlier so that the
problem packet can't cause any state change in the FragReassembler.
2013-03-11 10:54:51 -05:00
Robin Sommer
0075973249
Updating submodule(s).
...
[nomail]
2013-03-08 09:41:35 -08:00
Robin Sommer
f193fc25f6
Merge remote-tracking branch 'origin/fastpath'
...
* origin/fastpath:
Fix race-condition in table-event test.
2013-03-08 09:19:04 -08: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
74a529d937
Updating submodule(s).
...
[nomail]
2013-03-07 19:33:19 -08:00
Robin Sommer
f830ed3edf
s/bro-ids.org/bro.org/g
2013-03-07 19:33:04 -08:00
Robin Sommer
d3bf552a63
Merge remote-tracking branch 'origin/topic/jsiwek/ticket-957'
...
* origin/topic/jsiwek/ticket-957:
Fix function type-equivalence requiring same param names, addresses #957
Closes #957 .
2013-03-07 13:31:55 -08:00
Robin Sommer
3cd3e26154
Merge remote-tracking branch 'origin/fastpath'
...
* origin/fastpath:
Fix new[]/delete mismatch in RE.cc reported by jbaines, addresses #958 .
Fix compiler warnings.
2013-03-07 13:28:35 -08:00
Jon Siwek
7e4963b22c
Fix new[]/delete mismatch in RE.cc reported by jbaines, addresses #958 .
2013-03-07 14:44:01 -06:00
Jon Siwek
f4d59f8137
Fix compiler warnings.
2013-03-07 14:41:18 -06:00
Jon Siwek
2293443ea0
Fix function type-equivalence requiring same param names, addresses #957
2013-03-07 13:02:33 -06:00
Robin Sommer
8ee4382721
Updating submodule(s).
...
[nomail]
2013-03-06 18:32:43 -08:00
Robin Sommer
a4e40bb402
Merge remote-tracking branch 'origin/topic/bernhard/vector-assignment'
...
Closes #956 .
* origin/topic/bernhard/vector-assignment:
change vector assignment operator and remove unnecessary argument (expr)
2013-03-06 16:50:53 -08: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
Robin Sommer
a15b630cac
Merge remote-tracking branch 'origin/topic/jsiwek/gtp-enhancements'
...
* origin/topic/jsiwek/gtp-enhancements:
Add parsing for GTPv1 extension headers and control messages.
2013-03-06 15:00:45 -08:00
Robin Sommer
c13eae3253
Merge remote-tracking branch 'origin/fastpath'
...
* origin/fastpath:
Fix possible null pointer dereference in identify_data BIF.
Fix build on OpenBSD 5.2.
2013-03-06 14:54:50 -08:00
Bernhard Amann
a005d77369
forgot to remove the baselines for the now unnecessary bifs
2013-03-06 14:14:55 -08:00
Bernhard Amann
8f259f866d
change vector assignment operator and remove unnecessary argument (expr)
2013-03-06 14:08:06 -08:00
Bernhard Amann
986b346e3f
remove the byte_len and length bifs
2013-03-06 13:45:42 -08:00
Bernhard Amann
cfada61672
and modernize script.
...
thanks Seth.
2013-03-06 13:30:13 -08:00