Commit graph

13262 commits

Author SHA1 Message Date
Bernhard Amann
e1bd960926 Unblock SIGFPE, SIGILL, SIGSEGV and SIGBUS for threads.
According to POSIX, behavior is unspecified if a specific thread receives one of those signals (because of e.g. executing an invalid instruction) if the signal is blocked.

This resulted in segfaults in threads not propagating to the main thread.

Adresses #848
2012-07-13 02:20:41 -07:00
Daniel Thayer
56b4209597 Merge remote-tracking branch 'origin/master' into topic/dnthayer/alarms-mail 2012-07-12 12:20:16 -05:00
Seth Hall
5607e86ad3 Reporter warnings and error now print to stderr by default.
- Changed the geoip warnings to Info.
2012-07-12 12:55:34 -04:00
Robin Sommer
5d13e4f949 Merge remote-tracking branch 'origin/topic/seth/socks-fixes'
* origin/topic/seth/socks-fixes:
  Some small fixes to further reduce SOCKS false positive logs.

Closes #847.
2012-07-12 08:16:28 -07:00
Robin Sommer
5eda72142f Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  make pthread_mutex_unlock include the reason for why the unlock fails.
2012-07-12 08:13:02 -07:00
Bernhard Amann
8ff8c66655 make pthread_mutex_unlock include the reason for why the unlock fails. 2012-07-11 20:10:49 -07:00
Seth Hall
a44612788e Some small fixes to further reduce SOCKS false positive logs. 2012-07-11 16:53:46 -04:00
Robin Sommer
f92e47c220 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fixing memory leak.
2012-07-11 08:32:02 -07:00
Seth Hall
b31ef8cde5 Fixing memory leak. 2012-07-11 10:58:57 -04:00
Seth Hall
6e5382da54 Re-adding the needed call to FinishedRotation in the ES writer plugin. 2012-07-10 23:49:31 -04:00
Seth Hall
728888ad45 Merge remote-tracking branch 'origin/master' into topic/seth/elasticsearch 2012-07-10 20:32:42 -04:00
Robin Sommer
e3f6a467a4 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Add sorting canonifier to rotate-custom unit test. (addresses #846)
  Fix compiler warnings
  Fix segfault when there's an error/timeout resolving DNS requests.
2012-07-10 16:26:34 -07:00
Jon Siwek
c4b6499d85 Add sorting canonifier to rotate-custom unit test. (addresses #846)
The output on stderr for this test is the results of many backgrounded
"echo" commands, one for each rotation, so the order in which they
occur may be subject to OS process scheduling and can't be relied upon
2012-07-10 16:27:03 -05:00
Daniel Thayer
7f4b0b52f8 Fix compiler warnings
These changes eliminate 405 of 571 warnings seen on OS X 10.7.4 with clang.
2012-07-10 15:39:05 -05:00
Jon Siwek
c0bbd78ee1 Fix segfault when there's an error/timeout resolving DNS requests.
Addresses #846.
2012-07-10 11:15:48 -05:00
Seth Hall
9b70ee8799 Tiny updates. 2012-07-09 16:50:42 -04:00
Seth Hall
84e91b8b8d Bringing elasticsearch branch up to date with master. 2012-07-09 16:38:05 -04:00
Seth Hall
601d1cf37e Merge remote-tracking branch 'origin/master' into topic/seth/elasticsearch
Conflicts:
	aux/binpac
	aux/bro-aux
	aux/broccoli
	aux/broctl
	scripts/base/frameworks/logging/__load__.bro
	src/logging.bif
2012-07-06 12:01:16 -04:00
Robin Sommer
77261ec0db Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Remove a non-portable test case
2012-07-06 07:36:57 -07:00
Daniel Thayer
1b8673f4b2 Remove a non-portable test case 2012-07-05 17:58:44 -05:00
Robin Sommer
818c76243f Updating submodule(s).
[nomail]
2012-07-05 13:00:41 -07:00
Robin Sommer
658d1d0804 Updating submodule(s).
[nomail]
2012-07-05 12:58:19 -07:00
Robin Sommer
11bc88e41a Updating submodule(s).
[nomail]
2012-07-05 12:33:57 -07:00
Robin Sommer
533d01590a Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix minor typos in input framework doc
  Fix minor typos in dataseries documentation
2012-07-05 12:30:08 -07:00
Daniel Thayer
cee78f8f5d Fix minor typos in input framework doc
Also simplified the opening paragraph, and reformatted input text to fit
on 80-column display for better readability.
2012-07-05 12:59:19 -05:00
Daniel Thayer
8dc1e41876 Fix minor typos in dataseries documentation 2012-07-03 18:20:52 -05:00
Robin Sommer
acb6c0a0a5 Merge branch 'robin/topic/writer-info'
* robin/topic/writer-info:
  Bugfix. Using a custom rotate function was broken.
2012-07-02 16:59:56 -07:00
Robin Sommer
d26a96bd47 Bugfix. Using a custom rotate function was broken. 2012-07-02 16:57:16 -07:00
Robin Sommer
3fcece44cb Tiny bugfix for returning writer name. 2012-07-02 16:36:09 -07:00
Robin Sommer
b3155b7b4b Moving make target update-doc-sources from top-level Makefile to btest
Makefile.
2012-07-02 16:14:24 -07:00
Robin Sommer
5ede1418fc Updating baselines. 2012-07-02 16:12:21 -07:00
Robin Sommer
e64822f2f9 Updating NEWS. 2012-07-02 16:12:09 -07:00
Robin Sommer
ff73f3a040 Fixing merge relicts. 2012-07-02 16:11:42 -07:00
Robin Sommer
ef3da87b3f Updating submodule(s).
[nomail]
2012-07-02 16:02:21 -07:00
Robin Sommer
8afcedad59 Merge remote-tracking branch 'origin/topic/bernhard/reader-info'
* origin/topic/bernhard/reader-info:

Conflicts:
	src/logging/WriterBackend.cc
	src/logging/WriterBackend.h
	src/logging/WriterFrontend.cc
	testing/btest/Baseline/scripts.base.frameworks.input.event/out
	testing/btest/Baseline/scripts.base.frameworks.input.executeraw/out
	testing/btest/Baseline/scripts.base.frameworks.input.raw/out
	testing/btest/Baseline/scripts.base.frameworks.input.rereadraw/out
	testing/btest/Baseline/scripts.base.frameworks.input.tableevent/out
2012-07-02 15:38:38 -07:00
Bernhard Amann
86826770ab Merge remote-tracking branch 'origin/fastpath' into topic/bernhard/reader-info
Conflicts:
	src/logging/WriterBackend.cc
	src/logging/WriterBackend.h
	src/logging/WriterFrontend.cc
	testing/btest/Baseline/scripts.base.frameworks.input.event/out
	testing/btest/Baseline/scripts.base.frameworks.input.executeraw/out
	testing/btest/Baseline/scripts.base.frameworks.input.raw/out
	testing/btest/Baseline/scripts.base.frameworks.input.rereadraw/out
	testing/btest/Baseline/scripts.base.frameworks.input.tableevent/out
2012-07-02 15:33:12 -07:00
Robin Sommer
06d2fd52bd Merge remote-tracking branch 'origin/topic/bernhard/reader-info'
* origin/topic/bernhard/reader-info:
  fix small bug - now configuration actually is passed.
  add mode to readerinfo - no need to have it separately everywhere anymore.
  introduce reader-info struct analogous to writer-info.
  Introduce support for a table of key/value pairs with further configuration options, with the same userinterface as in the logging interface.
  make writer-info work when debugging is enabled

Conflicts:
	testing/btest/Baseline/scripts.base.frameworks.input.event/out
	testing/btest/Baseline/scripts.base.frameworks.input.executeraw/out
	testing/btest/Baseline/scripts.base.frameworks.input.raw/out
	testing/btest/Baseline/scripts.base.frameworks.input.rereadraw/out
	testing/btest/Baseline/scripts.base.frameworks.input.tableevent/out

Closes #841.
2012-07-02 15:33:08 -07:00
Robin Sommer
90763bb2f2 Merge branch 'robin/topic/writer-info'
* robin/topic/writer-info:
  Extending the log writer DoInit() API.
  Reworking log writer API to make it easier to pass additional information to a writer's initialization method.

Conflicts:
	src/logging/WriterBackend.cc
	src/logging/WriterBackend.h
	src/logging/WriterFrontend.cc
2012-07-02 15:20:37 -07:00
Robin Sommer
9183309482 Merge remote-tracking branch 'origin/topic/bernhard/input-crash-search'
* origin/topic/bernhard/input-crash-search:
  for bug-searching:

Closes #840
2012-07-02 15:10:27 -07:00
Robin Sommer
de6e5c951a Merge remote-tracking branch 'origin/topic/jsiwek/icmp6-ndp-options'
* origin/topic/jsiwek/icmp6-ndp-options:
  Extract ICMPv6 NDP options and include in ICMP events (addresses #833).

Closes #833.
2012-07-02 15:00:00 -07:00
Robin Sommer
9f6cf1ad90 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix inconsistencies in random number generation.
  Updating input framework unit tests.
  Add front-end name to InitMessage from WriterFrontend to Backend.
  Small tweak to make test complete quicker.
  Drain events before terminating log/thread managers.
  Fix strict-aliasing warning in RemoteSerializer.cc (fixes #834).
  Fix typos in event documentation
  Fix typos in NEWS for Bro 2.1 beta
2012-07-02 14:51:31 -07:00
Bernhard Amann
f65e3f5b9f fix small bug - now configuration actually is passed. 2012-07-02 11:07:50 -07:00
Bernhard Amann
7f83f157fc add mode to readerinfo - no need to have it separately everywhere anymore.
Disable remoteserialization of readerinfo - in contrast to the logging framework this is not needed here (I think).
2012-07-02 10:41:02 -07:00
Bernhard Amann
b8ad4567fb Merge branch 'topic/bernhard/reader-info' into topic/bernhard/sqlite
Now uses optional dbname configuration option

Conflicts:
	scripts/base/frameworks/logging/__load__.bro
	src/logging.bif
2012-07-02 10:13:54 -07:00
Bernhard Amann
3559a39d59 introduce reader-info struct analogous to writer-info.
All tests still pass.
2012-07-02 10:03:28 -07:00
Jon Siwek
34ead91f99 Fix inconsistencies in random number generation.
The srand()/rand() interface was being intermixed with the
srandom()/random() one.  The later is now used throughout.

Changed the srand() and rand() BIFs to work deterministically if Bro
was given a seed file (addresses #825).  They also now wrap the
system's srandom() and random() instead of srand() and rand() as per
the above.
2012-06-29 16:24:31 -05:00
Jon Siwek
0e48fda6ff Updating input framework unit tests.
Generally tried to make them more reliable and execute quicker.
They all now load the listen script as a trick to make sure input
sources are fully read, but also terminate() at appropriate times
so that they don't take more time than needed.  They're also all
serialized with the 'comm' group so listening on a port doesn't
interfere with the communication tests.
2012-06-29 12:50:57 -05:00
Bernhard Amann
f820ee9f5c Introduce support for a table of key/value pairs with further configuration options,
with the same userinterface as in the logging interface.

Not really tested, but tests still work.
2012-06-28 16:16:48 -07:00
Bernhard Amann
227159fd04 make writer-info work when debugging is enabled 2012-06-28 15:08:35 -07:00
Bernhard Amann
3dd72f6f45 Merge remote-tracking branch 'origin/master' into topic/bernhard/reader-info 2012-06-28 15:08:23 -07:00