Commit graph

6849 commits

Author SHA1 Message Date
Jon Siwek
68227f112d Merge branch 'master' into topic/jsiwek/broxygen 2013-10-03 13:06:23 -05:00
Jon Siwek
5a857a6dfc Initial skeleton of new Broxygen infrastructure.
Doesn't generate any docs, but it's hooked in to all places needed to
gather the necessary stuff w/ significantly less coupling than before.

The gathering now always occurs unconditionally to make documentation
available at runtime and a command line switch (-X) only toggles whether
to output docs to disk (reST format).

Should also improve the treatment of type name aliasing which wasn't a
big problem in practice before, but I think it's more correct now:
there's now a distinct BroType for each alias, but extensible types
(record/enum) will automatically update the types for aliases on redef.

Other misc refactoring of note:

    - Removed a redundant/unused way of declaring event types.

    - Changed type serialization format/process to preserve type name
      information and remove compatibility code (since broccoli will
      have be updated anyway).
2013-10-03 10:42:04 -05:00
Robin Sommer
6734260136 Fixing merge relict. 2013-10-02 11:32:53 -07:00
Robin Sommer
aa08d359cd Updating submodule(s).
[nomail]
2013-10-02 11:05:58 -07:00
Robin Sommer
d127d8d01d Merge remote-tracking branch 'origin/topic/jsiwek/coverity'
* origin/topic/jsiwek/coverity:
  Fix uninitialized (or unused) fields.
  Remove logically dead code.
  Remove dead/unfinished code in unary not expr.
  Fix logic for failed DNS TXT lookups.
  A couple null ptr checks.
  Improve return value checking and error handling.
  Remove unused variable assignments, dead code.
  Prevent division/modulo by zero in scripts.
  Fix unintentional always-false condition.
  Fix invalidated iterator usage.
  Fix DNS_Mgr iterator mismatch.
  Set safe umask when creating script profiler tmp files.
  Fix nesting/indent level whitespace mismatch.
  Add checks to avoid improper negative values use.

BIT-1085 #merged
2013-10-02 11:05:49 -07:00
Robin Sommer
ecd30a3d85 Merge remote-tracking branch 'origin/topic/bernhard/new-ciphers'
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
2013-10-02 10:29:34 -07:00
Bernhard Amann
2b87499fd9 rip out x509 code from ssl analyzer. Note that since at the moment
the file analyzer does not yet re-populate the info record that
means quite a lot of information is simply not available.
2013-10-01 16:25:33 -07:00
Bernhard Amann
ea766d71bb add ciphers to cipher_desc table that were already present
but apparently forgotten.
2013-10-01 16:01:37 -07:00
Robin Sommer
b59b5ca59b Updating submodule(s).
[nomail]
2013-10-01 11:42:33 -07:00
Robin Sommer
6c8cbef997 Updating bifcl usage message. 2013-10-01 11:32:37 -07:00
Robin Sommer
fdeff94bfb Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix getopt() usage.
2013-10-01 11:31:09 -07:00
Jon Siwek
9450515821 Fix getopt() usage.
Using 'char' versus 'int' to store the return value is a problem since
'char' varies in signedness depending on platform/implementation
(works some places, others not).
2013-10-01 13:11:35 -05:00
Jon Siwek
eeaf3e9baf Updating submodule(s).
[nomail]
2013-09-30 10:49:48 -05:00
Robin Sommer
29740ae070 Updating submodule(s).
[nomail]
2013-09-28 11:18:12 -07:00
Robin Sommer
5ddbe9e75f Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix a "make doc" warning
2013-09-28 11:17:10 -07:00
Jon Siwek
8e2ffd4fc9 Merge branch 'master' into topic/jsiwek/coverity 2013-09-27 10:14:35 -05:00
Jon Siwek
775ec6795e Fix uninitialized (or unused) fields. 2013-09-27 10:13:52 -05:00
Daniel Thayer
97503dafe5 Fix a "make doc" warning 2013-09-26 15:32:14 -05:00
Bernhard Amann
497ada12e8 ...and a few more ciphers. 2013-09-26 10:03:17 -07:00
Bernhard Amann
9264e2e7d3 add new tls cipher suites 2013-09-25 22:21:56 -07:00
Seth Hall
706363a295 Fixes for the 2.2 beta. 2013-09-25 16:44:39 -04:00
Jon Siwek
64f3bef96d Remove logically dead code. 2013-09-25 13:37:46 -05:00
Jon Siwek
4072afb363 Remove dead/unfinished code in unary not expr.
The code that looks like it was intended to make it apply to a vector
operand couldn't be reached and making it reachable would still require
changes to other methods for it to work so just removing for now.
2013-09-25 12:49:46 -05:00
Jon Siwek
2203600e05 Fix logic for failed DNS TXT lookups.
A failed request should not evict a previous result from the local
cache/mapping.
2013-09-25 12:04:07 -05:00
Jon Siwek
3c37e818ce A couple null ptr checks. 2013-09-25 11:16:46 -05:00
Jon Siwek
daf5d0d098 Improve return value checking and error handling. 2013-09-24 17:38:22 -05:00
Robin Sommer
4ec6419906 Updating submodule(s).
[nomail]
2013-09-24 13:41:33 -07:00
Robin Sommer
bb4b262813 Updating submodule(s).
[nomail]
2013-09-24 13:24:06 -07:00
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