Commit graph

6667 commits

Author SHA1 Message Date
Gregor Maier
2aae4eaf91 New fix for OS X 10.5 compile error wrt llabs() 2011-02-09 15:52:32 -08:00
Gregor Maier
104c7da205 Revert "Fix for OS X 10.5 compile error wrt llabs()"
This reverts commit 3f6aa735e9.

Using abs() does not work if the integer is >2^32 (or <2^32).
Will add a new fix in next commit.
2011-02-09 15:40:36 -08:00
Seth Hall
ffa494e428 Fixed an off-by-one error in join_string_vec 2011-02-09 15:18:12 -05:00
Seth Hall
e0c65cc8f9 Initial functional implementation of logging framework.
The policy/test-logging.bro script has the first usage
of the logging code and is commented to indicate
current problems and limitations.
2011-02-09 12:22:26 -05:00
Robin Sommer
2f7fa3470b Merge remote branch 'origin/topic/seth/fix-compiler-warnings'
* origin/topic/seth/fix-compiler-warnings:
  Fixed problem with PRI macros.
  PRI macros are currently not working for some reason.
  Two more small compile time error fixes.
  Cleaned up the output from running binpac.
  Added line to expect shift/reduce errors in parse.in
  Cleaned up g++ warnings.

Addition: I fixed a few more warnings I was getting, and tweaked some
of the existing changes slightly.
2011-02-09 08:10:41 -08:00
Robin Sommer
bf76811776 Merge remote branch 'remotes/origin/topic/robin/work'
* remotes/origin/topic/robin/work:
  *Now* this passes the test suite.
  Fixes to SSL/TLS analyzer
  Added new TLS ciphers
  Removing some apparently unnecessary lines.
  A few smaller tweaks.
  Prepared the old analyzer for extracting SSL extensions.
  Fixed bug in do_split implementation.
  Removed an accidental debugging printf.
  Readded the other changes to remove CheckString calls from strings.bif.
  Fixed the problem with do_split function which caused it to bail 1 separator early.
  Modification from rmkml to support SSL extensions.
  Updated SSL analyzer and Bro script with lots of new ciphers.
2011-02-08 20:25:13 -08:00
Robin Sommer
53940f0a1c Merge remote branch 'remotes/origin/topic/seth/strings-without-checkstring' into topic/robin/work
* remotes/origin/topic/seth/strings-without-checkstring:
  *Now* this passes the test suite.
  Removing some apparently unnecessary lines.
  A few smaller tweaks.
  Fixed bug in do_split implementation.
  Removed an accidental debugging printf.
  Readded the other changes to remove CheckString calls from strings.bif.
  Fixed the problem with do_split function which caused it to bail 1 separator early.
2011-02-08 19:36:32 -08:00
Seth Hall
b54445b725 Fixed problem with PRI macros.
Thanks Gregor!
2011-02-08 20:28:56 -05:00
Robin Sommer
337379c1b2 Merge remote branch 'origin/topic/seth/ssl-analyzer-work' into topic/robin/work
* origin/topic/seth/ssl-analyzer-work:
  Fixes to SSL/TLS analyzer
  Added new TLS ciphers
  Prepared the old analyzer for extracting SSL extensions.
  Modification from rmkml to support SSL extensions.
  Updated SSL analyzer and Bro script with lots of new ciphers.
2011-02-08 16:26:01 -08:00
Seth Hall
c985aa9d82 Merge remote branch 'origin/topic/robin/optional-fields' into topic/logging-framework 2011-02-08 16:18:26 -05:00
Seth Hall
9c62052953 Merge branch 'topic/logging-framework' of ssh://git.icir.org/bro into topic/logging-framework 2011-02-08 16:15:01 -05:00
Seth Hall
d7786a6576 Checkpoint 2011-02-08 15:49:06 -05:00
Seth Hall
275c6e64cc PRI macros are currently not working for some reason. 2011-02-08 12:47:10 -05:00
Robin Sommer
7f4e13248d Fixing crashes when SSL is not configured correctly. 2011-02-07 22:13:29 -08:00
Robin Sommer
4854ff60e5 A quick hack switching Bro back to 32-bit ints so that Broccoli works. 2011-02-07 22:13:01 -08:00
Robin Sommer
95069f0993 Implementing += operator for record types.
This is per #375.

Record types can now get additional fields later via '+='. The added
fields must however either be &optional or have a &default value.

Example:

    type Foo: record {
        a: count;
        b: count &optional;
    };

    redef record Foo += {
        c: count &default=42;
        d: count &optional;
    };

    global f: Foo = [$a=21];

    print f;

Output:

    [a=21, b=<uninitialized>, c=42, d=<uninitialized>]
2011-02-07 16:06:27 -08:00
Robin Sommer
cdb20e61b7 Teaching bifcl to accept scoped IDs. 2011-02-07 15:00:19 -08:00
Robin Sommer
f43766650f Fixing hashing records with optional strings. 2011-02-07 14:46:49 -08:00
Robin Sommer
0dbbee46ae Teaching bifcl to accept scoped IDs. 2011-02-07 14:46:28 -08:00
Seth Hall
205d84b651 Merge remote branch 'origin/topic/robin/optional-fields' into topic/logging-framework 2011-02-06 00:24:11 -05:00
Robin Sommer
4d12ac861d Smarter way to increase the parent/child pipe's socket buffer. (Craig
Leres).

This is from #383.
2011-02-04 17:58:19 -08:00
Robin Sommer
51b3efbb1a Fixing bug with defining bro_int_t and bro_uint_t as 64-bit in some
platforms.
2011-02-04 17:39:38 -08:00
Robin Sommer
7abd8f177f Fixing a problem with records having optional fields when used as
table/set indices.

This addresses #367. In principle, the fix is quite straightford.
However, it turns out that sometimes record fields lost their
attributes on assignment, and then the hashing can't decide anymore
whether a field is optional or not. So that needed to be fixed as
well.
2011-02-02 18:06:02 -08:00
Seth Hall
65687d86d8 *Now* this passes the test suite.
I got the last fix wrong and I was still misunderstanding
one behavior of the existing do_split function.  When a
separator match goes to the last character of the string,
a blank string element should be appended to the
string_array to indicate that a successful split occurred.
2011-01-31 12:19:11 -05:00
Seth Hall
1ccfca09ac Fixes to SSL/TLS analyzer
Analyzer can cope with zero length client and server
certificates.  It does still generate a weird though.
Extended cipherspec_size weirds are not thrown anymore,
they are incredibly overwhelming and should be handled
completely at the scripting in my opinion.

Integrated and expanded on patch Rmkml from ticket #209
that fixes problem with not parsing or expecting SSL
extensions.  SSL extensions still are not extracted
and passed to script land, but the analyzer doesn't
fail anymore.
2011-01-28 16:24:07 -05:00
Seth Hall
c8076619ce Added new TLS ciphers 2011-01-28 16:18:57 -05:00
Seth Hall
d2628d30fa Logging framework core functionality now implemented. 2011-01-26 15:29:20 -05:00
Robin Sommer
50181edd84 Significant edit pass over ICMPv6 code.
Matti, more per mail.
2011-01-25 17:57:34 -08:00
Robin Sommer
8974265d39 Fixing bug in SMB analyzer. 2011-01-24 15:29:40 -08:00
Seth Hall
6418283371 Two more small compile time error fixes. 2011-01-24 13:43:49 -05:00
Seth Hall
0fe30453cf Removing some apparently unnecessary lines. 2011-01-21 20:59:51 -05:00
Seth Hall
4df961aa60 Log specific event and debug log printing is working!
This is mostly a code checkpoint though.
2011-01-21 16:46:06 -05:00
Robin Sommer
2951e9c97c Merge remote branch 'origin/topic/small_remote_connection_fix'
Closes #86.

* origin/topic/small_remote_connection_fix:
  Fixed a small problem in the remote serialization code.
2011-01-20 16:31:07 -08:00
Robin Sommer
668824d1b6 A few smaller tweaks. 2011-01-20 14:36:07 -08:00
Robin Sommer
9cea6c5b01 Some small tweaks to the HTTP analyzer.
From ticket #339.
2011-01-20 13:54:54 -08:00
Seth Hall
2be835c4e8 Merge branch 'master' into topic/logging-framework 2011-01-20 16:32:29 -05:00
Seth Hall
05f27c5441 Fixed a small problem in the remote serialization code.
This is from ticket #86.  It needs verified, but everything
seemed to work the same (except for the bug!) with the
change.
2011-01-20 16:30:16 -05:00
Seth Hall
be5027c316 Merge branch 'master' into topic/seth/fix-compiler-warnings 2011-01-20 15:15:13 -05:00
Seth Hall
fbf7d5ccc0 Cleaned up the output from running binpac.
Added an extra dependency to the dce_rpc pac files
and running binpac with the -q (quiet) flag which
requires changes to binpac which will be committed
soon.
2011-01-20 15:10:31 -05:00
Seth Hall
b7b29c6f92 Added line to expect shift/reduce errors in parse.in
This is the resolution that Gregor brought up in
December, 2010 on the bro-dev list.
2011-01-20 15:08:54 -05:00
Seth Hall
ef1650f6a2 Cleaned up g++ warnings. 2011-01-20 15:07:24 -05:00
Robin Sommer
75335b933e Removing global_attrs from parser, per #11, and also record
attributes. Both aren't used anywhere. Along with these goes some
more now unused code.

Closes #11.
2011-01-19 18:00:09 -08:00
Seth Hall
e1ab9b1c69 Pattern construction BiFs will now work if no packets have been read. 2011-01-19 18:00:01 -08:00
Robin Sommer
fa7654ec75 Merge remote branch 'origin/topic/robin/entropy'
* origin/topic/robin/entropy:
  A few smaller tweaks.
  Applying Seth's patch from #265 adding entropy BiFs.
2011-01-19 17:38:29 -08:00
Robin Sommer
8e7d0617a1 Merge remote branch 'remotes/origin/topic/bro_dns_fake_message'
* remotes/origin/topic/bro_dns_fake_message:
  Reworded BRO_DNS_FAKE message.
  Added a BRO_DNS_FAKE message to the help output.

Changed to show on/off rather than the variable's content.
2011-01-19 17:31:00 -08:00
Robin Sommer
3bc2a26ea6 Merge remote branch 'origin/fastpath'
* origin/fastpath:
  Removing noisy output about doing incremental serialization. Addresses #292.
  Loading scan.bro in portmappter.bro, per #330.
  Connection compressor fix from #338.
  Working around not being able to do lookup_addr() for IPv6 addresses.
  IPv6 UDP checksum calculation was broken. (Matti Mantere)
  Fix for portmapper analyzer segfaulting when parsing portmap dump replies. (Gregor Maier)
  Keep buffering state across file rotation (Justin Azoff)
2011-01-19 17:05:04 -08:00
Robin Sommer
1e407b433c Merge branch 'fastpath' of ssh://envoy.icir.org/bro into fastpath 2011-01-19 16:48:25 -08:00
Robin Sommer
eb72ca7771 Revert "Some small tweaks to the HTTP analyzer".
This reverts commit 763a446182.
2011-01-19 16:45:42 -08:00
Robin Sommer
fc5a143bbe Removing noisy output about doing incremental serialization.
Addresses #292.
2011-01-19 12:27:15 -08:00
Robin Sommer
a7df00eca7 Connection compressor fix from #338. This changes starting times of
quite a few connections in the test-suite, but that all seems
legitimate.
2011-01-19 11:28:27 -08:00