Commit graph

4693 commits

Author SHA1 Message Date
Robin Sommer
7706ba1b2f Fix for setting REPO in Makefile.
The basename wasn't sufficient as it could leave the repo URL in.
2013-09-24 13:22:56 -07:00
Robin Sommer
5408931870 Whitespace fix. 2013-09-24 13:17:34 -07:00
Robin Sommer
66a6ec490a Removing :doc: roles so that we can render this with docutils directly. 2013-09-24 13:16:51 -07:00
Jon Siwek
4b24cebad9 Merge branch 'master' into topic/jsiwek/coverity 2013-09-24 09:45:15 -05:00
Robin Sommer
a5a6e35d5e Updating submodule(s).
[nomail]
2013-09-23 20:58:02 -07:00
Robin Sommer
abba39c261 Updating submodule(s).
[nomail]
2013-09-23 20:31:57 -07:00
Robin Sommer
f89b62684f Updating submodule(s).
[nomail]
2013-09-23 20:18:14 -07:00
Jon Siwek
e4e7c78925 Remove unused variable assignments, dead code. 2013-09-23 16:57:31 -05:00
Jon Siwek
9c2a3124e0 Merge branch 'master' into topic/jsiwek/coverity 2013-09-23 14:55:46 -05:00
Jon Siwek
6e71c97bfe Update 'make dist' target. 2013-09-23 14:44:50 -05:00
Robin Sommer
00a3ad03dd Updating submodule(s).
[nomail]
2013-09-23 11:55:12 -07:00
Robin Sommer
e2cada4ca2 Merge branch 'master' of git.bro-ids.org:bro 2013-09-23 11:53:30 -07:00
Robin Sommer
ed2798ae73 Updating NEWS. 2013-09-23 11:49:22 -07:00
Robin Sommer
601cdbc6cf Fixing an always false condition.
Reported by clang.
2013-09-23 11:48:56 -07:00
Robin Sommer
09b7ccba23 Fix required for compiling with clang 3.3. 2013-09-23 11:48:38 -07:00
Jon Siwek
2049025288 Change submodules to fixed URL. 2013-09-23 13:16:13 -05:00
Robin Sommer
b8504a5654 Updating submodule(s).
[nomail]
2013-09-20 15:37:37 -07:00
Robin Sommer
7c1bead09a Updating submodule(s).
[nomail]
2013-09-20 15:10:52 -07:00
Robin Sommer
c7fe809ee5 Updating submodule(s).
[nomail]
2013-09-20 14:55:29 -07:00
Robin Sommer
8d7b9f0627 Updating submodule(s).
[nomail]
2013-09-20 14:52:58 -07:00
Robin Sommer
d070b01828 Updating baselines for doc changes. 2013-09-20 14:38:45 -07:00
Robin Sommer
589a0239be Merge remote-tracking branch 'origin/topic/srunnels/documentation'
* 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.
2013-09-20 14:36:55 -07:00
Jon Siwek
1750e351c4 Prevent division/modulo by zero in scripts.
Integral/floating-point division/modulo by zero in C++ is undefined
behavior, so to prevent such cases in a script from crashing Bro,
they're now reported as an error (with script location information) and
the event handler in which it occurred returns immediately.
2013-09-20 16:36:00 -05:00
Robin Sommer
97cb04aae2 Merge remote-tracking branch 'origin/topic/jsiwek/raw-exec-pgrp'
* origin/topic/jsiwek/raw-exec-pgrp:
  Kill raw input reader's child by process group.

BIT-1081 #merged
2013-09-20 14:12:59 -07:00
Jon Siwek
4e2e690bff Fix unintentional always-false condition. 2013-09-20 14:21:03 -05:00
Scott Runnels
261b9e1e97 Spelling corrections. 2013-09-20 13:36:56 -04:00
Scott Runnels
89090ec34a Include a better description for detect-MHR.bro
I added a better more concise and accurate description of what is going
on behind the scenes of detect-MHR.bro to not only bring it into line
with the Files framework but to help make it a bit more clear as to
where the various responsibilities lie.
2013-09-20 13:33:44 -04:00
Scott Runnels
8e3c6ada0f Rewrite the MHR detection description.
Now that the MHR script uses the file analysis framework, the
description needed to be rewritten to reflect the changes.  Robin
commented that he didn't feel the MHR script was a good introductory
script and he might be right, however, I couldn't find one that was
easier to explain.
2013-09-20 13:25:49 -04:00
Jon Siwek
9033b0384b Fix invalidated iterator usage. 2013-09-20 12:11:10 -05:00
Jon Siwek
dbbbea312c Fix DNS_Mgr iterator mismatch.
But not really since the global dns_mgr should be equal to "this" while
in all the member funcs.  Still, better that they always refer to their
own instance instead of the global one.
2013-09-20 11:37:19 -05:00
Scott Runnels
5fede2f73e Spelling corrections.
Apparently I am unable to spell "separate".
2013-09-20 12:22:12 -04:00
Jon Siwek
f9b8de8436 Merge branch 'master' into topic/jsiwek/coverity 2013-09-20 11:03:29 -05:00
Scott Runnels
17bc3955f9 Update the lines included from events.bif.bro.
Previously listed connection_established and connection_finished which
are no longer in place in events.bif.bro.
2013-09-20 11:43:45 -04:00
Jon Siwek
e5a4123b4e Kill raw input reader's child by process group.
This should help on systems where the default shell (e.g. dash on
Ubuntu) fork-execs in order to run commands.  In that case, we were
just killing the shell and the shell would exit without killing
the actual process corresponding to command that was requested.
Setting a process group for the shell exec'd from Bro and killing
by process group should help clean everything up since process group
will be inherited by any procs that shell fork-execs.
2013-09-20 09:38:52 -05:00
Robin Sommer
0316bd77f5 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Add more links in the GeoLocation document
2013-09-19 20:08:22 -07:00
Daniel Thayer
bfbf1f7305 Add more links in the GeoLocation document 2013-09-19 17:34:07 -05:00
Robin Sommer
1e21fc177c Updating submodule(s).
[nomail]
2013-09-19 15:22:30 -07:00
Robin Sommer
fe3c14c9fa Updating submodule(s).
[nomail]
2013-09-19 15:14:53 -07:00
Robin Sommer
d123d95b46 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Add links to Intelligence Framework documentation
  update mozilla root ca list
  Update Mozilla root CA certs.
  Update documentation of required packages
2013-09-19 15:12:46 -07:00
Daniel Thayer
78ef31577b Add links to Intelligence Framework documentation 2013-09-19 16:16:09 -05:00
Bernhard Amann
8b48a476ec update mozilla root ca list 2013-09-19 12:53:45 -07:00
Jon Siwek
1ed210a572 Set safe umask when creating script profiler tmp files. 2013-09-19 13:57:51 -05:00
Jon Siwek
b6350d518a Merge branch 'master' into topic/jsiwek/coverity 2013-09-19 12:58:22 -05:00
Jon Siwek
d05a02e848 Update Mozilla root CA certs. 2013-09-19 12:57:14 -05:00
Jon Siwek
79bd81c8da Fix nesting/indent level whitespace mismatch.
The EndData() doesn't make sense as part of the condition that implies
the state is such that it's not inside data.  It might make sense as
part of an else block, but it also seems fine to unconditionally
EndData() like it currently does.  That way unexpected states (mail !=
0) are dealt with sooner rather than later.
2013-09-19 11:39:52 -05:00
Daniel Thayer
d417bd9f3a Update documentation of required packages 2013-09-18 23:48:54 -05:00
Robin Sommer
3738b4136b Merge remote-tracking branch 'origin/topic/bernhard/ticket950'
* origin/topic/bernhard/ticket950:
  make client and server random available on script-level.

BIT-950 #merged
2013-09-18 15:02:55 -07:00
Robin Sommer
c6de23ebe1 Merge remote-tracking branch 'origin/topic/bernhard/ticket1072'
* 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
2013-09-18 15:00:06 -07:00
Robin Sommer
6e1f01f04c Merge remote-tracking branch 'origin/topic/dnthayer/compilerwarn'
* 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
2013-09-18 14:42:58 -07:00
Robin Sommer
9d3fc1e7ed Updating CHANGES and VERSION. 2013-09-18 14:36:59 -07:00