Commit graph

4436 commits

Author SHA1 Message Date
Robin Sommer
be5b0105b0 Updating README with download/git information.
The git instructions were hard to find and this way they will show up
on github.
2013-10-25 15:06:13 -07:00
Robin Sommer
2818bb3dbc Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  make the documentation of the SQLite reader/writer a bit nicer.
  Wrong example file was included - reported by Michael Auger @LM4K
2013-10-25 11:12:51 -07:00
Robin Sommer
15e72d1422 Merge remote-tracking branch 'origin/topic/bernhard/alternative-deadlock-fix'
* origin/topic/bernhard/alternative-deadlock-fix:
  alternative deadlock issue fix.
2013-10-25 11:10:08 -07:00
Bernhard Amann
a09d8e94e0 make the documentation of the SQLite reader/writer a bit nicer. 2013-10-25 10:21:33 -07:00
Bernhard Amann
0fdbdff3c4 Wrong example file was included - reported by Michael Auger @LM4K 2013-10-25 09:57:12 -07:00
Bernhard Amann
2ac0d77f06 alternative deadlock issue fix.
This fix also fixes the deadlock issue without putting any
new strain into the main packet processing path.

Instead of occasionally returning true in MaybeReady sometime,
we occasionally process threads if time_mgr time is not running.

If time_mgr time is running, we have heartbeat messages that will
trigger processing in any case -- processing always checks the
exact state of the Queues.

This fix probably also means that we can remove the communication
loads from all input framework tests and run them all simultaneously.
2013-10-24 23:39:16 -07:00
Robin Sommer
c980d1055e Fix for input readers occasionally dead-locking.
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 ...
2013-10-24 18:21:24 -07:00
Robin Sommer
42c4a51da3 Updating submodule(s).
[nomail]
2013-10-24 16:59:31 -07:00
Robin Sommer
5c80fd169f Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  change temporary workaround to permanent fix.

Conflicts:
	src/input/readers/Ascii.cc
2013-10-24 16:33:11 -07:00
Bernhard Amann
9a58a28da0 change temporary workaround to permanent fix.
According to Howard Hinnant, in use cases like ours you
need to call file->sync() to synchronize the internal ifstream
buffer with the file.

See http://stackoverflow.com/questions/19558376/clang-3-3-xcode-libc-stdgetline-does-not-read-data-after-calling-ifstream
2013-10-24 15:46:16 -07:00
Robin Sommer
a7cebff99d Merge remote-tracking branch 'origin/topic/dnthayer/doc-changes-for-2.2'
* 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
2013-10-24 14:35:21 -07:00
Robin Sommer
8ce3865bd2 Updating baselines for packet filter changes. 2013-10-24 14:31:23 -07:00
Robin Sommer
1f91b2936e Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  rework libc++ patch to use AvailabilityMacros.h instead of Availability.h

Conflicts:
	src/input/readers/Ascii.cc
2013-10-24 14:01:44 -07:00
Robin Sommer
34ba97c1e1 Merge branch 'master' of git.bro.org:bro 2013-10-24 14:00:34 -07:00
Bernhard Amann
c640e29193 rework libc++ patch to use AvailabilityMacros.h instead of Availability.h
AvailabilityMacros.h was introduced in 10.2, Availability is only available in
10.5+ - this increases backwards compatibility.
2013-10-24 13:34:17 -07:00
Seth Hall
ba93d0df08 Intel framework notes added to NEWS 2013-10-24 16:28:10 -04:00
Robin Sommer
26c01468f5 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  temporary osx mavericks libc++ issue workaround.
  Change test of identify_data BIF to ignore charset.
2013-10-24 13:07:49 -07:00
Seth Hall
ccc7b7669d Merge remote-tracking branch 'origin/topic/seth/fix-packetfilter-log'
* origin/topic/seth/fix-packetfilter-log:
  Hack to make sure that the starting BPF filter is logged on clusters.
2013-10-24 15:36:17 -04:00
Bernhard Amann
381adb2a1e temporary osx mavericks libc++ issue workaround.
When using clang3.3 on mavericks with libc++, after the
first std::getline-call encountered eof on an ifstream,
all following std::getline calls on the same ifstream will
also get eof, even if ifstream::clear has been called and
the file has been appended in the meantime.

Seeking to the current position after a clear before trying
to read the line fixes this behavior.

This is just a temporary workaround...
2013-10-24 12:26:26 -07:00
Seth Hall
1cfb3a38e0 Add UDP support to the checksum offload detection script. 2013-10-24 15:21:03 -04:00
Seth Hall
af6e44589f Hack to make sure that the starting BPF filter is logged on clusters. 2013-10-24 14:55:37 -04:00
Daniel Thayer
0b5c1a1f28 Add gawk to list of optional packages
BSD and debian-based Linux do not include gawk by default.  Noticed
that a test was failing on these platforms due to the use of a bro-cut
option that requires gawk.
2013-10-24 10:23:17 -05:00
Jon Siwek
eab886fb84 Change test of identify_data BIF to ignore charset.
It may vary with libmagic version.
2013-10-23 16:51:55 -05:00
Daniel Thayer
72a4a90416 Add more script package README files
The text from these README files appears on the "Bro Script Packages"
page after building the documentation.
2013-10-23 16:36:14 -05:00
Daniel Thayer
8a6e7e8036 Add NEWS about new features of broctl and upgrade info 2013-10-23 16:04:54 -05:00
Robin Sommer
08e6b6b4b4 Merge remote-tracking branch 'origin/fastpath'
* 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.
2013-10-23 09:50:47 -07:00
Robin Sommer
02a414d1ba Merge remote-tracking branch 'origin/topic/dnthayer/doc-changes-for-2.2'
* 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
2013-10-23 09:48:22 -07:00
Jon Siwek
7e95755ce5 Fix record coercion tolerance of optional fields.
There were cases where coercing a record value with an uninitialized
field could cause a null pointer dereference even though the field
can validly be unset since it has &optional.
2013-10-23 11:37:23 -05:00
Jon Siwek
34aece4ddd Add NEWS about incompatible local.bro changes, addresses BIT-1047. 2013-10-23 11:30:59 -05:00
Jon Siwek
0938150453 Fix minor formatting problem in NEWS. 2013-10-23 11:22:30 -05:00
Daniel Thayer
4b8171f74a Document which Bro script vars are set by BroControl 2013-10-22 16:40:29 -05:00
Daniel Thayer
1b26c05c2c Add more script package README files
The text from these README files appears on the "Bro Script Packages"
page after building the documentation.
2013-10-22 14:44:59 -05:00
Daniel Thayer
181f180374 Fix doc comment so the text gets included in the HTML 2013-10-22 14:42:23 -05:00
Daniel Thayer
e724e5d392 Do not include documentation of commented-out items
Some documentation of commented-out items was being output to HTML,
which was causing that documentation to be merged with the
documentation of the next item.  Fixed by changing "##" to "#" so
that the doc comments are not included in the HTML.
2013-10-22 13:46:09 -05:00
Daniel Thayer
bb14a44c2f Make RFC links in the docs more consistent 2013-10-22 12:08:19 -05:00
Daniel Thayer
f5d6931f00 Fix typos and formatting in the signature framework docs 2013-10-22 09:37:43 -05:00
Daniel Thayer
5a0e3dda7e Fix typos and formatting in the notice framework docs 2013-10-22 09:16:29 -05:00
Daniel Thayer
9cfedccf37 Fix typos and formatting in the events docs 2013-10-21 16:50:14 -05:00
Daniel Thayer
02d7e16997 Fix typos and formatting in the other policy docs 2013-10-21 02:37:00 -05:00
Daniel Thayer
9374a7d584 Fix typos and formatting in the policy/protocols docs
Also updated a test related to these changes, and adjusted line numbers.
2013-10-21 02:34:28 -05:00
Daniel Thayer
24da7ab839 Fix typos and formatting in the policy/frameworks docs
Also updated some tests related to these changes.
2013-10-21 01:23:08 -05:00
Daniel Thayer
4434d231b2 Correct more typos in init-bare.bro 2013-10-20 21:07:39 -05:00
Daniel Thayer
d367f033dc Fix typos and formatting in init-bare.bro and init-default.bro 2013-10-20 01:32:17 -05:00
Daniel Thayer
023ea4b588 Fix formatting in the protocol BiFs docs 2013-10-18 19:36:37 -05:00
Robin Sommer
8bfb81ca6f Moving the SQLite examples into separate Bro files to turn them into
sphinx-btest tests.

It's hard to make sure these are actually working as expected, but the
tests now at least make sure things parse correctly.
2013-10-18 14:18:33 -07:00
Robin Sommer
1759e0d687 Updating test baseline. 2013-10-18 13:59:56 -07:00
Robin Sommer
615cca8baa Merge remote-tracking branch 'origin/topic/dnthayer/doc-changes-for-2.2'
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
  ...
2013-10-18 13:49:49 -07:00
Robin Sommer
27a8c5e568 Merge remote-tracking branch 'origin/topic/bernhard/input-documentation'
* 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.
2013-10-18 13:19:37 -07:00
Bernhard Amann
613a04d176 and provide a bit of motivation to try the last example. 2013-10-17 16:00:22 -07:00
Bernhard Amann
dc685bbef3 and restructure it a bit 2013-10-17 15:52:00 -07:00