Commit graph

14939 commits

Author SHA1 Message Date
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
Robin Sommer
888719e922 Adding new aux/btest submodule. 2011-02-08 14:28:15 -08:00
Robin Sommer
0240715821 Adding new aux/btest submodule. 2011-02-08 14:22:23 -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
3942b253cc Adding a test for SSL-based communciation to the istate testsuite. 2011-02-07 21:47:29 -08:00
Robin Sommer
2f30c3d245 Adding some tests for the record-extension feature.
These will go somewhere else eventually, just making sure they don't
get lost.
2011-02-07 16:10:09 -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
Robin Sommer
0d9de7d719 Updating submodule(s). 2011-02-07 14:07:29 -08:00
Robin Sommer
abc365e38f Merge remote branch 'origin/topic/robin/work'
* origin/topic/robin/work:
  Smarter way to increase the parent/child pipe's socket buffer. (Craig Leres).
  Fixing bug with defining bro_int_t and bro_uint_t as 64-bit in some platforms.
2011-02-07 13:44:45 -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
ee6abcba72 Updating submodule(s). 2011-02-03 21:57:11 -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
Robin Sommer
e00acaddd8 Login's confused messages now go through weird.bro. 2011-01-31 16:42:36 -08:00
Robin Sommer
88b31a04d0 Updating submodule(s). 2011-01-31 15:36:01 -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
Robin Sommer
7432761558 Updating submodule(s). 2011-01-31 08:48:41 -08:00
Robin Sommer
7de348da11 Merge remote branch 'origin/topic/jsiwek/missing-config-options'
* origin/topic/jsiwek/missing-config-options:
  Adding more configure options for finding dependencies

Conflicts:
	aux/binpac
2011-01-31 08:48:12 -08: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
Robin Sommer
4b77164e04 Merge remote branch 'origin/fastpath'
* origin/fastpath:
  Fix typo in PCAPTests.cmake
2011-01-28 08:14:34 -08:00
Jon Siwek
da3fb85e5c Adding more configure options for finding dependencies 2011-01-28 10:10:16 -06:00
Jon Siwek
a19391b94b Fix typo in PCAPTests.cmake
With this correction, the configure tests should now be pulling
in the correct user-specified libpcap headers
2011-01-27 11:35:35 -06:00
Seth Hall
d2628d30fa Logging framework core functionality now implemented. 2011-01-26 15:29:20 -05:00
Robin Sommer
91d7c48ced Updating submodule(s). 2011-01-25 17:58:09 -08: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
Robin Sommer
2bf7461d9c Updating submodule(s). 2011-01-24 15:21:39 -08:00
Robin Sommer
f4c6642f4d Merge remote branch 'origin/topic/jsiwek/reconfigure'
* origin/topic/jsiwek/reconfigure:
  Configure wrapper now deletes previous CMake cache
  Fix for the --with-binpac configure option
2011-01-24 14:56:58 -08:00
Seth Hall
6418283371 Two more small compile time error fixes. 2011-01-24 13:43:49 -05:00
Jon Siwek
4817f7de4e Configure wrapper now deletes previous CMake cache 2011-01-24 11:26:29 -06:00
Jon Siwek
4da36217b7 Fix for the --with-binpac configure option
Compiling from existing sources no longer overrides this option.
2011-01-24 11:02:16 -06: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
fa87a81a96 Merge remote branch 'origin/topic/jsiwek/add-config-status'
* origin/topic/jsiwek/add-config-status:
  Changed configure wrapper to create config.status
2011-01-20 16:35:24 -08: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
5035a4346a Fixing inconsistent CHANGES layout. 2011-01-20 13:57:04 -08:00
Robin Sommer
9cea6c5b01 Some small tweaks to the HTTP analyzer.
From ticket #339.
2011-01-20 13:54:54 -08:00