Commit graph

19601 commits

Author SHA1 Message Date
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
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
Jon Siwek
bbe078e06c Changed configure wrapper to create config.status 2011-01-20 12:37:38 -06:00
Robin Sommer
0a3f84681a Updating submodules. 2011-01-19 18:12:41 -08:00
Robin Sommer
814cb0f091 Merge remote branch 'origin/topic/jsiwek/macports-fink-fix'
Conflicts:
	aux/broccoli
	aux/broctl
2011-01-19 18:09:58 -08:00
Robin Sommer
420d8ac4b7 Merge remote branch 'origin/topic/jsiwek/packaging'
* origin/topic/jsiwek/packaging:
  Changed behavior of how binary packaging installs config files.
2011-01-19 18:07:38 -08: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
127ed569a6 Merge commit 'b8ab0ebc22'
* commit 'b8ab0ebc22':
  Removing expire timer from http_sessions.
2011-01-19 16:38:34 -08:00
Jon Siwek
5247a64eaa Changed behavior of how binary packaging installs config files.
The pre/post install scripts for RPMs should not perform any logic
to backup config files, instead relying on the standard logic
that RPMs normally do.

For Mac packages, when an existing config file differs from the package's
version, the previous version is always kept and an alert is displayed to
the user explaining the situation.
2011-01-19 16:56:30 -06:00
Jon Siwek
6ea8def6f6 MacPorts & Fink paths now prepended to default search prefixes 2011-01-19 14:57:06 -06:00
Robin Sommer
fc5a143bbe Removing noisy output about doing incremental serialization.
Addresses #292.
2011-01-19 12:27:15 -08:00
Robin Sommer
b67e4e5765 Loading scan.bro in portmappter.bro, per #330. 2011-01-19 11:53:31 -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
Robin Sommer
bbbe32e443 Working around not being able to do lookup_addr() for IPv6
addresses. Rather than crashing, we warn the user once and then
always time out the call. This addresses #291, and a #355 is new
ticket scheduling fixing the actual problem to later.
2011-01-19 11:12:41 -08:00
Robin Sommer
ffaa20602c IPv6 UDP checksum calculation was broken. (Matti Mantere) 2011-01-19 10:08:42 -08:00
Seth Hall
ceb1bc8ee0 Reworded BRO_DNS_FAKE message. 2011-01-19 12:10:34 -05:00
Seth Hall
c7a5bf071d Prepared the old analyzer for extracting SSL extensions. 2011-01-19 11:46:35 -05:00
Seth Hall
7ffbac68a4 Merge branch 'master' into topic/seth/ssl-analyzer-work 2011-01-19 10:49:19 -05:00
Seth Hall
3d9461eca1 Added a BRO_DNS_FAKE message to the help output. 2011-01-19 10:35:27 -05:00
Seth Hall
f3b148b019 Checkpoint for logging framework 2011-01-19 09:36:06 -05:00
Seth Hall
9cfef93522 Fixed bug in do_split implementation.
Test suite succeeds!
2011-01-18 14:40:37 -05:00
Robin Sommer
aa0691ba21 Updating submodule(s). 2011-01-15 16:45:18 -08:00
Robin Sommer
de06588f27 Merge remote branch 'origin/topic/jsiwek/packaging'
* origin/topic/jsiwek/packaging:
  Changes for packaging
  Changes to CMake logic for binary packaging
  Changes for CPack binary packaging
  Fix package configuration macro returning from sub-project too early
  Add warning when building and installing are done by different users
  Fix for PackageMaker not accepting non-numeric versions
  Fix for OS X 10.5 compile error wrt llabs()
  Prefer static libraries for some dependencies on OS X
  Added OS X configures options for SDK & minimum version
  Changes to allow source packaging via CPack
2011-01-15 14:17:54 -08:00
Jon Siwek
1d8ad8e946 Changes for packaging
- Added 'dist' target to top-level Makefile for doing source packages
- Added 'make-*-packages' scripts for generating binary packages
- Fixes for the ConfigurePackaging CMake script
  - No longer fails when package version doesn't include a patch-level
  - Now considers the case when a package doesn't install any
    config files and the INSTALLED_CONFIG_FILES var is empty
2011-01-14 22:25:10 -06:00
Jon Siwek
8d4f487add Changes to CMake logic for binary packaging
- pre/post install scripts now track configuration files that may
  be clobbered on package install/upgrade through the
  INSTALLED_CONFIG_FILES CMake variable and attempts to make backups
  when the distribution's file differs from the existing file.
2011-01-13 21:58:25 -06:00
Robin Sommer
cb64bb6874 Porting Matti's branch to git.
No changes.
2011-01-13 14:58:53 -08:00
Jon Siwek
7936782057 Changes for CPack binary packaging 2011-01-12 16:26:25 -06:00
Gregor Maier
a5632aff4e TCP Reassembler hotfix for conns > 2GB.
The TCP Reassembler does not deliver any data to analyzers after the
first 2GB due to signed integer overflow (Actually it will deliver again
between 4--6GB, etc.) This happens silently, i.e., without content_gap
events or Undelivered calls.

See Comments in TCP_Reassembler.cc for more details.

As a hotfix that seems to work I disabled the seq_to_skip features. It
wasn't used by any analyzer or policy script (Note, that seq_to_skip is
different from skip_deliveries).

See also ticket #348
2011-01-12 09:38:13 -08:00