Bernhard and I tracked it down we believe: the thread queue could
deadlock in certain cases. As a fix we tuned the heuristic for telling
if a queue might have input to occasionaly err on the safe side by
flagging "yes", so that processing will proceed.
It's a bit unfortunate to apply this fix last minute before the
release as it could potentially impact performance if the heuristic
fails to often. We believe the chosen parmaterization should be fine ...
* origin/topic/dnthayer/doc-changes-for-2.2:
Add gawk to list of optional packages
Add more script package README files
Add NEWS about new features of broctl and upgrade info
* origin/fastpath:
Fix record coercion tolerance of optional fields.
Add NEWS about incompatible local.bro changes, addresses BIT-1047.
Fix minor formatting problem in NEWS.
* origin/topic/dnthayer/doc-changes-for-2.2:
Document which Bro script vars are set by BroControl
Add more script package README files
Fix doc comment so the text gets included in the HTML
Do not include documentation of commented-out items
Make RFC links in the docs more consistent
Fix typos and formatting in the signature framework docs
Fix typos and formatting in the notice framework docs
Fix typos and formatting in the events docs
Fix typos and formatting in the other policy docs
Fix typos and formatting in the policy/protocols docs
Fix typos and formatting in the policy/frameworks docs
Correct more typos in init-bare.bro
Fix typos and formatting in init-bare.bro and init-default.bro
Fix formatting in the protocol BiFs docs
Snapshotting the work in this branch. I'll merge it again later as we
get closer to the release.
* origin/topic/dnthayer/doc-changes-for-2.2: (29 commits)
Add README files for base/protocols
Fix incorrect uses of reST directives
Fix typos and formatting in the BiFs docs
Fix typos and formatting in the base/utils docs
Fix typos and formatting in the other protocol docs
Fix typos and formatting in the ssl protocol docs
Fix typos and formatting in the http protocol docs
Fix typos and formatting in the ftp protocol docs
Fix typos and formatting in the dns protocol docs
Fix typos and formatting in the dhcp protocol docs
Adjust line numbers to match changes in conn/main.bro
Fix typos and formatting in the conn protocol docs
Update FreeBSD install instructions
Improvements to file analysis docs
Add README files for most Bro frameworks
Fix typos and formatting in various other framework docs
Fix typos and formatting in the software framework docs
Fix typos and formatting in the sumstats docs
Fix typos and formatting in the packet filter docs
Fix typos and formatting in the logging framework docs
...
* origin/topic/bernhard/input-documentation:
and provide a bit of motivation to try the last example.
and restructure it a bit
First try at sqlite reader/writer documentation
add check that the SQLite reader is only used in MANUAL reading mode
rename the dbname configuration option to tablename.
* origin/fastpath:
Fix more Coverity-reported issues (introduced by internal error audit).
Add check for sqlite3 command to tests that require it
Fix misc. issues reported by Coverity.
* origin/fastpath:
Add check for curl command to active-http.test
I've moved the check from TEST-EXEC to TEST-REQUIRES. I think it's
fine to just skip the test if curl is not available.
* topic/robin/internal-errors-merge:
Reverting one of the my internal errors tweaks.
Renaming InternalAnalyzerError to AnalyzerError.
Pass over the InternalError() changes.
Review usage of Reporter::InternalError, addresses BIT-1045.
BIT-1086 #merged
* origin/topic/bernhard/new-ciphers:
add ciphers to cipher_desc table that were already present but apparently forgotten.
...and a few more ciphers.
add new tls cipher suites
* origin/topic/srunnels/documentation:
Spelling corrections.
Include a better description for detect-MHR.bro
Rewrite the MHR detection description.
Spelling corrections.
Update the lines included from events.bif.bro.
* origin/fastpath:
Add links to Intelligence Framework documentation
update mozilla root ca list
Update Mozilla root CA certs.
Update documentation of required packages
* origin/topic/bernhard/ticket1072:
and const 2 more functions
update hll documentation, make a few functions private and create a new copy constructor.
fix case where hll_error_margin could be undefined (thanks John)
BIT-1072 #merged
* origin/topic/dnthayer/compilerwarn:
Fix compiler warning (time_t is not a pointer type)
Fix cmake warning about ENABLE_PERFTOOLS not being used
Fix another compiler warning
Fix compiler warnings
BIT-1079 #merged
I'm merging in the documentation branch to avoid that it keeps getting
out of sync. We still need to work on this a bit more, I'll summarize
in a mail.
* origin/topic/documentation: (68 commits)
Going over initial parts of the scripting overview.
Adding lines in scripting/index.txt. No other change.
Updating submodule.
Pass over the Using Bro section.
Applying doc updates from BIT-1063. (Anthony Verez)
Breaking lines in using/*.
More doc reorg, and a light pass over the first 3 sections.
Starting to put a new structure in place.
Updating submodule(s).
Updating submodule(s).
Adding some temporary testing/demonstration to front page.
Switching btest to topic/robin/parts branch.
Basic cross-referencing UIDs between files, btests, and baselines.
A truly embarassing number of spelling corrections.
Using redirection with bro-cut. Include initial btests for this document.
Corrected a mis-typed RST include.
Initial start for "Using Bro".
Spelling corrections.
Include Notice Policy shortcuts in the Scripting User Manual.
Notice::policy hooks and tests.
...
Conflicts:
src/3rdparty
* topic/robin/hyperloglog-merge: (35 commits)
Making the confidence configurable.
Renaming HyperLogLog->CardinalityCounter.
Fixing bug introduced during merging.
add clustered leak test for hll. No issues.
make gcc happy
(hopefully) fix refcounting problem in hll/bloom-filter opaque vals. Thanks Robin.
re-use same hash class for all add operations
get hll ready for merging
and forgot a file...
adapt to new structure
fix opaqueval-related memleak.
make it compile on case-sensitive file systems and fix warnings
make error rate configureable
add persistence test not using predetermined random seeds.
update cluster test to also use hll
persistence really works.
well, with this commit synchronizing the data structure should work.. ...if we had consistent hashing.
and also serialize the other things we need
ok, this bug was hard to find.
serialization compiles.
...
Changed two deletes to Unrefs.
* origin/fastpath:
Fix input framework memory leaks.
Fix mem leak in socks analyzer for bad addr types.
Fix bloom filter memory leaks.
Note this is another submodule change, you'll need to init the new
module:
git submodule update --recursive --init
BIT-1059 #merged
* origin/topic/bernhard/3rdparty:
add external 3rdparty submodule
step 1 - delete 3rdparty
