Commit graph

9176 commits

Author SHA1 Message Date
Jon Siwek
4614dbe911 Updating submodule(s).
[nomail]
2018-06-28 09:29:45 -05:00
Jon Siwek
e2d5ca5f95 Merge remote-tracking branch 'origin/topic/dnthayer/ticket1947'
* origin/topic/dnthayer/ticket1947:
  Fix some typos and formatting in NEWS
  Add pattern operators to the documentation of operators
  Fix minor typos in broker reference documentation
  Fix a broken link and some typos in broker documentation
  Fix reST formatting in documentation of "count" type
  Add documentation for some new Bro features
2018-06-27 20:27:34 -05:00
Jon Siwek
06e7f18a32 Prevent double-wrapping Broker::Data in published event args
In the following example, the republication of "arg" would result in
literally sending it as a Broker::Data record instead of the broker data
that it was already wrapping.

Sender:

    Broker::publish("topic", my_event, "hello")

Receiver:

    event my_event(arg: any)
        {
        Broker::publish("topic", my_event, arg)
        }
2018-06-27 19:17:54 -05:00
Daniel Thayer
8849e214ca Fix some typos and formatting in NEWS 2018-06-27 14:33:07 -05:00
Daniel Thayer
cfe8e8f04b Merge remote-tracking branch 'origin/master' into topic/dnthayer/ticket1947 2018-06-27 14:17:44 -05:00
Daniel Thayer
bd74b4525b Add pattern operators to the documentation of operators 2018-06-27 14:00:56 -05:00
Johanna Amann
ea040265c0 Merge remote-tracking branch 'origin/master' into topic/johanna/config-cluster 2018-06-27 11:32:47 -07:00
Daniel Thayer
ceefb6edaf Fix minor typos in broker reference documentation 2018-06-27 13:00:09 -05:00
Johanna Amann
d6990119db Continue work on config framework clusterization.
This does not currently work.
2018-06-27 10:47:17 -07:00
Vern Paxson
9bdb24a719 d'oh there's isalpha. I looked earlier for isletter :-P 2018-06-26 20:47:12 -07:00
Vern Paxson
4bd8f3a5d5 fix for handling [:(lower|upper):] in case-insensitive patterns 2018-06-26 20:43:48 -07:00
Jon Siwek
e33a3a9c02 Fix typo in NEWS 2018-06-26 18:10:07 -05:00
Jon Siwek
a97567ef38 Add memory leak unit test for pattern operations 2018-06-26 18:00:51 -05:00
Vern Paxson
80b3b82b54 implemented /re/i for case-insensitive patterns 2018-06-26 15:59:41 -07:00
Jon Siwek
daf8e3ad77 Merge remote-tracking branch 'origin/topic/vern/pattern-leaks'
* origin/topic/vern/pattern-leaks:
  whoops - patterns ops broke count bitwise ops
  fixed 3 leaks in creating pattern values
2018-06-26 17:29:41 -05:00
Jon Siwek
5968f91c4f Merge remote-tracking branch 'origin/topic/vern/pattern-ops'
* origin/topic/vern/pattern-ops:
  Update submodules to correct checkouts.
  test suite updates for &/| pattern operators
  documentation for &/| for patterns
  side-porting changes for supporting &/| pattern ops
  basic code implemented, but there's a memory problem somehwere :-(
2018-06-26 17:19:38 -05:00
Jon Siwek
fb5c32062b Merge remote-tracking branch 'origin/topic/vern/deprecations'
* origin/topic/vern/deprecations:
  deprecate merge_patterns()
  deprecate boolean scalar+vector operations
  bug fix (and typo fix) for vector+scalar boolean operations
  deprecate mixing scalars and vectors
  deprecate && / || operators for patterns
  fixed typos in NEWS
2018-06-26 17:03:49 -05:00
Daniel Thayer
57128af3ab Fix a broken link and some typos in broker documentation 2018-06-26 15:34:57 -05:00
Jon Siwek
ac495e729b Fix deprecated actor_system_config field usages 2018-06-26 15:05:53 -05:00
Daniel Thayer
884d3d2abd Fix reST formatting in documentation of "count" type 2018-06-26 14:43:41 -05:00
Daniel Thayer
fef351b9c1 Add documentation for some new Bro features
Add documentation for the type-based "switch" statement,
the "as" operator, the "is" operator, and bitwise operators.
2018-06-26 14:38:24 -05:00
Vern Paxson
bd5414d8d5 whoops - patterns ops broke count bitwise ops 2018-06-26 10:57:24 -07:00
Vern Paxson
2fa1ea77e4 fixed 3 leaks in creating pattern values 2018-06-26 10:43:06 -07:00
Jon Siwek
9c0303804d Remove header self-inclusions 2018-06-26 11:46:40 -05:00
Daniel Thayer
f57611c2f0 Fix travis-job script to not fail when all tests succeed
Fixed by calling the "showdiag" function only when external tests fail.
2018-06-26 08:30:49 -05:00
Jon Siwek
a33d2d13bf Reorganize private broker/Manager members 2018-06-25 16:41:55 -05:00
Jon Siwek
0200b5bd88 Move internal broker/Manager classes out of header 2018-06-25 16:35:25 -05:00
Jon Siwek
0ae022205e Reduce proliferation of including broker header files
This change should roughly halve compilation time
2018-06-25 16:35:25 -05:00
Jon Siwek
0907921178 Merge remote-tracking branch 'origin/topic/dnthayer/travis-ci-docker'
* origin/topic/dnthayer/travis-ci-docker:
  Use docker containers to run Bro tests on Travis CI
  Travis CI fewer failures and improved output messages
2018-06-25 11:28:28 -05:00
Vern Paxson
072a25df0f set intersection implemented 2018-06-24 10:43:58 -07:00
Vern Paxson
6449b0ab9e mirroring previous topic/vern/set-ops to get branch up to date, since I'm a n00b 2018-06-23 14:46:47 -07:00
Johanna Amann
610d1ae407 Update submodules to correct checkouts. 2018-06-22 22:01:42 -07:00
Jon Siwek
e93c638f8d Fix null pointer deref in AST traversal
Specifically in the case where parsing bro scripts had failed.
2018-06-22 20:18:36 -05:00
Vern Paxson
762048cb41 test suite updates for &/| pattern operators 2018-06-22 15:29:10 -07:00
Vern Paxson
f340707e2c documentation for &/| for patterns 2018-06-22 15:23:06 -07:00
Vern Paxson
1732b18e7d Merge branch 'topic/vern/pattern-ops' of ssh://git.bro.org/bro into topic/vern/pattern-ops 2018-06-22 15:12:44 -07:00
Vern Paxson
04b7f8276c side-porting changes for supporting &/| pattern ops 2018-06-22 15:12:22 -07:00
Vern Paxson
4afc1d01ec Merge branch 'topic/vern/pattern-ops' of github.com:bro/bro into topic/vern/pattern-ops
Conflicts:
	src/Expr.cc
	src/parse.y
2018-06-22 14:49:24 -07:00
Chung Min Kim
4cdf1e39bb Add code coverage for bro source files after btest test suite
Adds --enable-coverage flag to configure Bro with gcov.
A new directory named /testing/bro-code-coverage/ contains a new
coverage target that as part of `make coverage` in /testing/.
This coverage option creates coverage.log of all important directories in /src/ and
places all generated .gcov files alongside the corresponding source file.
2018-06-22 14:27:46 -07:00
Vern Paxson
9e2c70b90b deprecate merge_patterns() 2018-06-22 14:17:15 -07:00
Vern Paxson
89b7b88e75 deprecate boolean scalar+vector operations 2018-06-22 13:43:51 -07:00
Vern Paxson
b811a8e7a6 bug fix (and typo fix) for vector+scalar boolean operations 2018-06-22 13:40:53 -07:00
Johanna Amann
948bb4b9ec Merge remote-tracking branch 'origin/master' into topic/johanna/config-cluster 2018-06-22 10:43:09 -07:00
Vern Paxson
cff68b4371 deprecate mixing scalars and vectors 2018-06-22 10:03:13 -07:00
Daniel Thayer
ed42e20714 Use docker containers to run Bro tests on Travis CI
The advantage of using docker containers is to build and test Bro in
an environment that more closely resembles the environment where Bro
will actually be used.  The docker containers currently used enable
testing Bro with all the major versions of gcc (versions 4 through 8),
as well as both python 2 and 3.

The "travis-job" script now takes a second parameter which specifies
a Linux distro to use (specifying "travis" will build and test bro
without using docker).
2018-06-22 10:36:49 -05:00
Daniel Thayer
3767d2bee2 Travis CI fewer failures and improved output messages
Improved readability of the output by adding more error checking
and better error and informational messages, and by moving the
unit test diag.log output to just before any external tests are run.

For pull request builds, skip the private tests instead of failing.

Prevent timeouts after 10 minutes of no output by not using the
btest "-b" option.

Decrease build time by not building unneeded components.
2018-06-22 01:01:40 -05:00
Vern Paxson
6c8562bbdd deprecate && / || operators for patterns 2018-06-21 15:50:56 -07:00
Vern Paxson
b864772e8a fixed typos in NEWS 2018-06-21 15:15:05 -07:00
Johanna Amann
2470954795 Fix for ancient reference-counting bug in NFA.cc
This patch fixes a *19 year old* reference-counting bug (which could
lead to a use-after-free, not merely a leak) in the regular expression
code.

Patch by Vern Paxson.
2018-06-21 14:21:36 -07:00
Jon Siwek
e5275b0c92 Merge branch 'topic/vern/bit-ops' of https://github.com/bro/bro
* 'topic/vern/bit-ops' of https://github.com/bro/bro:
  documentation clarification for "p1 | p2"
  documentation for bitwise operators
  document the '|' operator for patterns
  test suite for bitwise operators brief NEWS blurb allow for "counter" operands (does anyone still use these?) for one (but not both) of the bitwise operands
  bitwise operations for "count" types implemented
  Starting branch for supporting bit operations on count's.
2018-06-21 16:05:07 -05:00