Commit graph

3787 commits

Author SHA1 Message Date
Robin Sommer
759faa255c Merge remote-tracking branch 'origin/topic/jsiwek/modbus-fixes'
* origin/topic/jsiwek/modbus-fixes:
  Remove byte count parameter from modbus events carrying register arrays
  Adjust modbus register array parsing.
  Adjustments to modbus test cases.

Closes #917.
2012-11-13 20:01:23 -08:00
Robin Sommer
590f764440 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix lookup_hostname BIF (and memory leak in it).

Thanks!
2012-11-08 16:22:34 -08:00
Robin Sommer
6c70b11cea Fixing/extending modbus tests. 2012-11-05 17:10:28 -08:00
Robin Sommer
a6216969e6 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Script in base for detecting cases of checksum offloading.
2012-11-05 13:59:30 -08:00
Robin Sommer
4fab70ecce Merge remote-tracking branch 'vlad/topic/vladg/dns_txt_queries'
* vlad/topic/vladg/dns_txt_queries:
  Add detection rate threshold for MHR.
  Make sure lookup_hostname_txt isn't checking lookup_hostname's cache for answers.
  A couple of lookup_hostname_txt fixes.

Reverting the earlier function-join during merging.
2012-11-05 13:40:24 -08:00
Robin Sommer
dfebb82238 Merge remote-tracking branch 'vlad/topic/vladg/dns_txt_queries'
* vlad/topic/vladg/dns_txt_queries:
  DNS TXT support

I've tweaked it a little bit, still seems to work ...

I'd like to add a test for this but I'n not quite sure how to do that.
We'd have to hardcode a destination server that then'd be contacted
each time the test-suite runs.
2012-11-01 10:38:36 -07:00
Robin Sommer
55006240ae Merge remote-tracking branch 'origin/topic/dnthayer/installing-bro'
* origin/topic/dnthayer/installing-bro:
  Add version-specific upgrade info
  Move upgrade instructions to INSTALL document
  Reorganize install documentation

Closes #910.
2012-10-31 14:32:00 -07:00
Robin Sommer
b85baed95e Merge remote-tracking branch 'origin/topic/dnthayer/alarms-mail'
* origin/topic/dnthayer/alarms-mail:
  Rename the alarm summary mail variable
  Change alarm summary email interval to 24hrs

Closes #824.
2012-10-31 14:28:49 -07:00
Robin Sommer
9ec2bfe59f Merge remote-tracking branch 'origin/topic/seth/pppoe'
Looks like the code in this function is getting ready for some
refactoring. Leaving that for another time though ...

Closes #909.

* origin/topic/seth/pppoe:
  Adding a test for PPPoE support.
  Adding PPPoE support to Bro.
2012-10-24 16:05:17 -07:00
Robin Sommer
ae38aad2bb Adding missing &redef for some TCP options.
Reported by Carsten Langer.

Closes #905.
Closes #906.
Closes #907.
2012-10-24 15:41:27 -07:00
Robin Sommer
7ddbca8b35 Merge remote-tracking branch 'origin/topic/jsiwek/subnet-literal-const'
* origin/topic/jsiwek/subnet-literal-const:
  Add parsing rules for IPv4/IPv6 subnet literal constants, addresses #888

Closes #888.
2012-10-24 15:37:49 -07:00
Robin Sommer
5716545cfa Merge remote-tracking branch 'origin/topic/seth/strptime'
* origin/topic/seth/strptime:
  Added a BiF to wrap the strptime function.

Closes #904.
2012-10-19 15:13:25 -07:00
Robin Sommer
b9811e87e5 Merge remote-tracking branch 'origin/topic/jsiwek/ipv6-sigs'
* origin/topic/jsiwek/ipv6-sigs:
  Add IPv6 support to signature header conditions.

Closes #774.
Closes #880.
2012-10-19 15:06:00 -07:00
Robin Sommer
c7b39efe85 Merge remote-tracking branch 'origin/topic/jsiwek/gridftp'
* origin/topic/jsiwek/gridftp:
  Change how "gridftp" gets added to service field of connection records.

Closes #891.
2012-10-19 14:49:38 -07:00
Robin Sommer
5e12a53ae5 Merge remote-tracking branch 'origin/topic/jsiwek/gridftp'
* origin/topic/jsiwek/gridftp:
  Add memory leak unit test for GridFTP.
  Enable GridFTP detection by default.  Track/log SSL client certs.
  Add analyzer for GSI mechanism of GSSAPI FTP AUTH method.
  Add an example of a GridFTP data channel detection script.
2012-10-12 10:43:16 -07:00
Robin Sommer
503412e472 Merge remote-tracking branch 'origin/topic/bernhard/input-end-of-data'
* origin/topic/bernhard/input-end-of-data:
  rename the update_finished event to end_of_data and make it fire in more cases.

Closes #894.
2012-10-12 09:48:58 -07:00
Robin Sommer
c24fa2cd01 Merge remote-tracking branch 'origin/topic/jsiwek/config-options'
* origin/topic/jsiwek/config-options:
  Teach --disable-dataseries/--disable-elasticsearch to ./configure.
  Add --with-curl option to ./configure, addresses #877.

Closes #877.
2012-10-12 09:37:12 -07:00
Robin Sommer
ebec0f4484 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  ...and forgotten debug-output, sorry (was already merged in some other internal repositories before I noticed)
  and another bug in the input framework: config table does not work (is not transmitted to the readers) because the initialization was done the wrong way round.
2012-10-12 09:33:15 -07:00
Robin Sommer
296686d5ca Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix a problem with non-manager cluster nodes applying Notice::policy.
2012-10-08 10:10:53 -07:00
Robin Sommer
14de9e675e Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Redo the "how to upgrade" FAQ.
  Add general FAQ entry about upgrading Bro.
2012-10-03 16:05:01 -07:00
Robin Sommer
1290ed6b95 Merge remote-tracking branch 'origin/topic/jsiwek/delay-teredo-confirm'
* origin/topic/jsiwek/delay-teredo-confirm:
  Add new Tunnel::delay_teredo_confirmation option, default to true.

Closes #890.
2012-10-03 16:01:42 -07:00
Robin Sommer
6ae8ac310a Merge remote-tracking branch 'origin/topic/matthias/libcurl-fix'
* origin/topic/matthias/libcurl-fix:
  Use second granularity for ElasticSearch timeouts.
  Fix compile issues with older versions of libcurl.
2012-10-02 12:07:26 -07:00
Robin Sommer
4d7eabc2a9 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Small but important fix for the input framework. BroStrings were constructed without a final \0 - which means that strings read by the input framework are unusable by basically all internal functions (like to_count).
2012-10-02 12:02:59 -07:00
Robin Sommer
906a34e3b3 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Reliability adjustments to istate tests with network communication.
2012-09-29 14:09:27 -07:00
Robin Sommer
bf62a6e673 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Uncomment some previously-broken tests
  Fix parsing of integers
  Serialize language.when unit test with the "comm" group.
2012-09-25 14:22:23 -07:00
Robin Sommer
958c3d74d6 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix race condition in language/when.bro test
2012-09-24 16:24:49 -07:00
Robin Sommer
73115dd334 Updating CHANGES and VERSION. 2012-09-24 11:15:43 -07:00
Robin Sommer
7e3f06fca3 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix the "-=" operator for intervals
  Fix "!=" operator for subnets
  Add sleeps to configuration_update test for better reliability.
  Fix a segfault when iterating over a set
2012-09-06 23:24:13 -07:00
Robin Sommer
b915db86d5 Updating CHANGES and VERSION. 2012-08-28 16:47:49 -07:00
Robin Sommer
e4b7ffa8ac Updating CHANGES and VERSION. 2012-08-28 16:44:30 -07:00
Robin Sommer
a24abddc5f Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Remove automatic use of gperftools on non-Linux systems.
  Fix uninitialized value for 'is_partial' in TCP analyzer.
  parse 64-bit consts correctly.
  on 32-bit machines only unsigned long longs are 64-bits long. Not just unsigned longs...
2012-08-28 16:35:06 -07:00
Robin Sommer
393ded1efe Set VERSION to 2.1-rc3 so that we don't get confused. 2012-08-28 09:19:33 -07:00
Robin Sommer
20c71cac51 Merge remote-tracking branch 'remotes/origin/topic/bernhard/input-warn-on-invalid-numbers'
* remotes/origin/topic/bernhard/input-warn-on-invalid-numbers:
  ...and another small change to error handling -> now errors in single lines do not kill processing, but simply ignore the line, log it, and continue.
  Ok, this one was a little bit sneaky.
  ok, this one might really be a bit too big for 2.1
2012-08-27 12:43:36 -07:00
Robin Sommer
352d4bd5e2 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Ok, this one is not really necessary for 2.1 and more of a nice-to-have
  another small bug found while searching for something else...
  Fix two little bugs:
  sorry. the patch for the set_separator.
  make set_separators different from , work for input framework.
  Bug found bei Keith & Seth: input framework was not handling counts and ints out of 32-bit-range correctly.
2012-08-27 09:31:17 -07:00
Robin Sommer
70f1403f14 Updating submodule(s).
[nomail]
2012-08-24 13:19:05 -07:00
Robin Sommer
6dd43ea017 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Update documentation for builtin types
  Adding an identifier to the SMTP blocklist notices for duplicate suppression.
  Doc fixes for signature 'eval' conditions.
  Remove orphaned unit tests.
  Add type checking for signature 'eval' condition functions.
2012-08-23 12:00:10 -07:00
Robin Sommer
42355bf6f1 Merge remote-tracking branch 'origin/topic/bernhard/input-allow_invalid_types'
* origin/topic/bernhard/input-allow_invalid_types:
  to be sure - add a small assertion
  add an option to the input framework that allows the user to chose to not die upon encountering files/functions.

That's the last feature for 2.1!
2012-08-22 16:11:28 -07:00
Robin Sommer
2eff64944b Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Add test serialization to "leak" unit tests that use communication.
  Change to metrics/basic-cluster unit test for reliability.
  Minor tweak to coverage.bare-mode-errors unit test.
  Fixed ack tracking which could overflow quickly in some situations.
2012-08-22 16:06:17 -07:00
Robin Sommer
d877a04c79 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  single-line documentation addition to main input framework script.
  add testcase for input of set. Sets can be imported by not specifying $val in the add_table call.
2012-08-22 08:45:32 -07:00
Robin Sommer
0c70711841 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Tweak to rotate-custom.bro unit test.
  Ignore small mem leak every rotation interval for dataseries logs.
2012-08-21 15:46:42 -07:00
Robin Sommer
434d6a84d8 Linking ES docs into logging document. 2012-08-21 08:42:09 -07:00
Robin Sommer
0f663ca813 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Add the Stream record to Log:active_streams to make more dynamic logging possible.
  Fix portability of printing to files returned by open("/dev/stderr").
  Fix mime type diff canonifier to also skip mime_desc columns
  Unit test tweaks/fixes.
  Fix memory leak of serialized IDs when compiled with --enable-debug.

One tweak to the open() change: make sure we don't try to rotate the
special files.
2012-08-20 20:08:30 -07:00
Robin Sommer
4da209d3b1 Installing a handler for running out of memory in "new".
Bro will now print an error message in that case rather than abort
with an uncaught exception.
2012-08-16 11:49:51 -07:00
Robin Sommer
4c3be63919 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fixed more potential problems with deadlocked ES threads and signals from libcurl.
  Fix some problems in logs-to-elasticsearch.bro
2012-08-16 11:44:16 -07:00
Robin Sommer
0006644e65 Merge branch 'master' of ssh://git.bro-ids.org/bro 2012-08-03 10:59:59 -07:00
Robin Sommer
9829cf9a29 Fixing little typo with big impact. 2012-08-03 10:45:45 -07:00
Robin Sommer
01d91602ca Updating CHANGES and VERSION. 2012-08-01 09:57:19 -07:00
Robin Sommer
de3eba7062 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Improve log filter compatibility with remote logging.

Closes #842.
2012-07-30 11:49:08 -07:00
Robin Sommer
38c2ee6894 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Add missing breaks to switch cases in ElasticSearch::HTTPReceive().
2012-07-30 09:13:49 -07:00
Robin Sommer
4ba038070f Tweaking writer API for failed rotations.
There are now two FinishedRotation() methods, one that triggers
post-processing and one that doesn't. There's also insurance built in
against a writer not calling either (or both), in which case we abort
with an internal error.
2012-07-28 16:38:22 -07:00