Commit graph

3795 commits

Author SHA1 Message Date
Robin Sommer
26ff8e1dab Merge remote branch 'origin/topic/seth/notice-email-delay'
* origin/topic/seth/notice-email-delay:
  The hostname notice email extension works now.
  Fixed more bugs with delayed emails.
  Working around a problem with setting default container types.
  Ugh, still major failure.  I'm just cutting the timeout handling for now.
  Fixed a small bug major problem with email delay timeout catching.
  Initial fixes for the problem of async actions with notice email extensions.

Closes #727.
2011-12-19 07:10:28 -08:00
Robin Sommer
0a3e160a8d Merge remote branch 'origin/topic/seth/dns-updates'
* origin/topic/seth/dns-updates:
  Fixed some bugs with capturing data in the base DNS script.
  Some updates to the base DNS script.

Closes #702.
2011-12-18 15:20:00 -08:00
Robin Sommer
719557a05b Merge remote branch 'origin/fastpath'
* origin/fastpath:
  Enable warnings for malformed Broxygen xref roles.
  Broxygen fix for function parameter recognition; better than 80b2451.
  Allow Broxygen markup "##<" for more general use.
2011-12-18 15:10:49 -08:00
Robin Sommer
84e6caed2c Merge remote branch 'origin/master'
* origin/master:
  Cleanup some misc Broxygen css/js stuff.
  Add search box to Broxygen docs (fixes #726).

Some markup for the tracker to close the recently addresses tickets:

Closes #726.
Closes #433.
Closes #311.
Closes #664.
2011-12-16 02:41:43 -08:00
Robin Sommer
3c2fa085d4 Adapting diff-all so that it expands globs in both current and
baseline directory.

This way, it now spots if a Baseline file isn't produced anymore.

Closes #677.
2011-12-07 10:03:44 -08:00
Robin Sommer
9d5f79a0fa Updating submodule(s).
[nomail]
2011-12-06 11:49:49 -08:00
Robin Sommer
b449d5652d Merge remote-tracking branch 'remotes/origin/topic/robin/broccoli-connrec'
* remotes/origin/topic/robin/broccoli-connrec:
  Adapting attribute serialization when talking to Broccoli.
2011-12-03 15:57:39 -08:00
Robin Sommer
6943b3c4b1 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Changes to Broxygen master script package index
2011-12-03 15:56:32 -08:00
Robin Sommer
89f4e44f6a Updating submodule(s).
[nomail]
2011-12-02 17:11:44 -08:00
Robin Sommer
e8a25ee68f Updating CHANGES and VERSION. 2011-12-01 15:49:10 -08:00
Robin Sommer
ebd15cf12e Fixing ASCII logger to escape the unset-field place-holder if written
out literally.
2011-11-29 17:01:47 -08:00
Robin Sommer
5fae0482a9 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Add Broxygen links to notice frameworks docs.
  Fix order of include directories.
  vector entries also have to be atomic.
2011-11-29 15:37:47 -08:00
Robin Sommer
5fbebe1e22 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix small bug: sets that are written to logfiles may only contain atomic types. (trying to write sets of records, etc. leads to a bro segfault)
2011-11-16 08:40:09 -08:00
Robin Sommer
fa76330afb Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Binary packaging script tweaks.
  More default "weird" tuning for the "SYN_with_data" notice.
  Tiny bugfix for http file extraction along with test.
2011-11-15 07:53:36 -08:00
Robin Sommer
8935663981 Updating CHANGES and VERSION. 2011-11-07 05:44:38 -08:00
Robin Sommer
9aef0c0f5a Fixing packet filter test.
Adapting the IPv6 one as well, though I believe that's already
broken anyway ...
2011-11-03 17:42:06 -07:00
Robin Sommer
41a443677b Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  No longer write to the PacketFilter::LOG stream if not reading traffic.
2011-11-03 15:27:23 -07:00
Robin Sommer
3b1f13b861 Merge remote-tracking branch 'origin/topic/jsiwek/compiler-warnings'
* origin/topic/jsiwek/compiler-warnings:
  Fixing compiler warnings (addresses #388)
2011-11-03 15:18:11 -07:00
Robin Sommer
e75fb1dd8b Updating submodule(s). 2011-10-27 17:46:28 -07:00
Robin Sommer
38876ac899 Updating submodule(s). 2011-10-27 13:00:33 -07:00
Robin Sommer
9762591993 Updating submodule(s). 2011-10-27 11:57:11 -07:00
Robin Sommer
bf9a4345b5 Updating submodule(s). 2011-10-26 17:25:48 -07:00
Robin Sommer
5b79d2b15f Baseline updates.
Also a small tweak to the genDocSourcesList.sh as I was seein
non-consistent output order.
2011-10-26 15:27:03 -07:00
Robin Sommer
3ec7cc168f Updating submodule(s). 2011-10-26 14:50:59 -07:00
Robin Sommer
ec2a8d7904 Merge remote-tracking branch 'origin/topic/robin/pp-alarms'
* origin/topic/robin/pp-alarms:
  Removing debugging code.
  Now actually pretty-printing the notices.
  Small fixes, and new option to specify a different dest address.
  A new notice script that pretty-prints alarms in the summary email.
  Adding a dummy log writer WRITER_NONE that just discards everything.
2011-10-26 14:44:46 -07:00
Robin Sommer
351b0b2aaa Adding instructions to local.bro how to do ACTION_ALARM by default. 2011-10-26 14:30:50 -07:00
Robin Sommer
0b2efd71b1 Updating CHANGES and VERSION. 2011-10-26 13:48:52 -07:00
Robin Sommer
e620d33efc Updating submodule(s). 2011-10-25 20:23:22 -07:00
Robin Sommer
f61fcf219a Fixing bug in log managers predicate evaluation. 2011-10-25 19:08:56 -07:00
Robin Sommer
e78a3c35e5 Updating submodule(s). 2011-10-25 18:17:25 -07:00
Robin Sommer
fc9f5be313 Updating submodule(s). 2011-10-25 18:16:18 -07:00
Robin Sommer
5e5e29f345 Fixing crash with unknown debug streams.
Closes #643.
2011-10-21 10:48:46 -07:00
Robin Sommer
90d2136fd1 Filtering some potentially high-volume DNS weirds. 2011-10-06 18:10:15 -07:00
Robin Sommer
7e5254ee2f Merge remote-tracking branch 'origin/topic/jsiwek/comphash-func-determinism2'
Closes #636.

* origin/topic/jsiwek/comphash-func-determinism2:
  Make CompHash computation/recovery for functions deterministic
2011-10-06 17:07:32 -07:00
Robin Sommer
25fe7e91db Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Add check for optional HTTP::Info status_code.
  Changing some external testing scripts.

Conflicts:
	scripts/base/protocols/http/main.bro
2011-10-05 16:24:33 -07:00
Robin Sommer
91ed9ffa8f Fixing a bunch of memory leaks.
Courtesy of perftools. Most are not really relevant but cleanup  the
perftools output. There was a big one in the logging code as well
though.
2011-09-29 22:53:07 -07:00
Robin Sommer
a84a422240 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Various unit test cleanup.
2011-09-28 16:54:23 -07:00
Robin Sommer
a2edff9385 Updating baselines. 2011-09-22 19:52:11 -07:00
Robin Sommer
622f5d6953 Merge remote-tracking branch 'origin/topic/jsiwek/leak-fixes'
* origin/topic/jsiwek/leak-fixes:
  Memory leak fixes.

Closes #616.
2011-09-15 17:15:51 -07:00
Robin Sommer
2a2edb3eb4 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Remove malloc.c (closes #557).
2011-09-15 16:03:12 -07:00
Robin Sommer
5beeca44a9 Updating CHANGES. 2011-09-15 14:59:11 -07:00
Robin Sommer
db8ab89c3a Merge remote branch 'origin/topic/jsiwek/misc-doc-fixes'
* origin/topic/jsiwek/misc-doc-fixes:
  More tweaks to generated script docs.
  Various changes to documentation framework.

Closes #598.
2011-09-08 09:07:20 -07:00
Robin Sommer
c2501cec51 Merge remote branch 'origin/topic/gilbert/rand-pool'
* origin/topic/gilbert/rand-pool:
  Updating tests.
  Updated uid pools to use integer values instead of strings.
  Updating tests.
  Test no longer relevant.  Need a way to generate and test collisions.
  A few minor tweaks to make code less braindead.  Fixed-length piece of pool name now only used to hash when determinism is not required; otherwise, whole pool name is used.  Note that collisions between pool name hashes will lead to sensitivity to initialization order within the UID generator.
  Testing long (>32 character) pool names.
  Simple test to verify various pools are not affecting each other.
  Some working code.  Adds UID pools classified by string.  Just compiles and runs; need to go back through and make sure this code is actually doing what I want it to do.

Note, I've removed the collision detection. Seems unlikely to occur
and even if, it's not really that bad.
2011-09-07 16:17:59 -07:00
Robin Sommer
f868af101c Potential fix for #588. 2011-09-07 11:08:33 -07:00
Robin Sommer
8e5681d34a Updating submodule(s). 2011-09-04 09:46:04 -07:00
Robin Sommer
03d41818e0 Fix for the CompHash fix. 2011-08-19 19:01:14 -07:00
Robin Sommer
2636ec4679 Fixing key size calculation in composite hash code. 2011-08-18 14:12:32 -07:00
Robin Sommer
b7d421dbc4 Updating CHANGES. 2011-08-18 10:41:15 -07:00
Robin Sommer
1ca9def9e6 Merge remote-tracking branch 'origin/topic/jsiwek/autodoc-fixes'
* origin/topic/jsiwek/autodoc-fixes:
  Update doc sources and touch up a few script comments.
  Fixes for script auto-documentation.

Conflicts:
	scripts/base/frameworks/logging/main.bro
2011-08-13 12:09:13 -07:00
Robin Sommer
1289e115c1 A set of new/changed tests regarding the new policy script organisation.
* test-all.bro renamed to test-all-policy.bro because it lists
      only the optional scripts now.

    * A new test that checks that the default config loads everything
      in base/*/

    * A new test that runs bare mode but loads all optional policy
      scripts (which fails horribly right now ...)

    * A new loaded_scripts test for the bare mode.
2011-08-08 18:29:35 -07:00