Commit graph

6667 commits

Author SHA1 Message Date
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
cb64bb6874 Porting Matti's branch to git.
No changes.
2011-01-13 14:58:53 -08: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
Robin Sommer
06bd8baef6 Fix for portmapper analyzer segfaulting when parsing portmap dump
replies. (Gregor Maier)

Closes #332.
2011-01-10 12:19:13 -08:00
Robin Sommer
f228e32679 Keep buffering state across file rotation (Justin Azoff)
Closes #207. From there:

    When files are rotated they lose their buffered flag, this is
    because File::Open only does a SetBuf? when it opens the file
    itself, but Rotate calls rotate_file to open the file.
2011-01-10 11:59:12 -08:00
Robin Sommer
6345129eaf A few smaller tweaks. 2011-01-06 19:17:44 -08:00
Robin Sommer
dbca5be43c Applying Seth's patch from #265 adding entropy BiFs. 2011-01-06 17:16:10 -08:00
Jon Siwek
3f6aa735e9 Fix for OS X 10.5 compile error wrt llabs()
GCC < 4.1.0 possibly has a problem w/ choosing an llabs()
unambigiously from stdlib.h and cstdlib

See also http://gcc.gnu.org/bugzilla/show_bug.cgi?id=13943
2011-01-06 17:06:51 -06:00
Gregor Maier
763a446182 Some small tweaks to the HTTP analyzer
From ticket #339 http://tracker.icir.org/bro/ticket/339 :

* Fixing a couple of minor issues in the HTTP analyzer, that made the
  analyzer raise a ProtocolViolation() on strange but seemingly legal
  HTTP traffic. Well, the traffic might not necessarily be adhering the
  RFC, but the server has understood it.

* Also stops parsing when the message is interrupted to prevent further
  parsing and ProtocolViolation() generation.

* skip_http_entity_data: check return value of  FindAnalyzer, since it
  can be NULL

In addition:
* http-headers.bro now loads http.bro

Testsuite changes:
* Added a new weird (empty_http_request). This shows up once in the medium
  testsuite.
* no change when running short testsuite
2010-12-13 19:11:05 -08:00
Seth Hall
266acde342 Removed an accidental debugging printf. 2010-12-09 16:01:19 -05:00
Seth Hall
61c99176ad Readded the other changes to remove CheckString calls from strings.bif. 2010-12-09 15:59:08 -05:00
Seth Hall
a598bdb555 Fixed the problem with do_split function which caused it to bail 1 separator early. 2010-12-09 15:23:54 -05:00
Robin Sommer
c6631d1483 Reversing the null-byte change to strings.bif once more.
I'm actually not sure how that got back in again, but it did ...
Must have been during the merges.
2010-12-08 04:46:10 -08:00
Robin Sommer
dc5d3560f7 Merge with Subversion repository as of r7137. Incorporated change:
* Fix for packet processing resumption when a remote Bro dies
      during state synchronization (Robin Sommer).
2010-12-08 04:10:26 -08:00
Robin Sommer
c690a8b2f3 Merge remote branch 'origin/fastpath' 2010-12-08 04:01:40 -08:00
Seth Hall
846237a280 Applied Gregor's patch from ticket #247 to fix compile
time errors with OpenSSL support.
2010-12-06 15:43:32 -05:00
Jon Siwek
e89182dcc0 Changes to make running bro from build dir easier.
The 'bro-path-dev' script is configured at make time to echo the
right paths to policy files.
2010-12-06 11:30:52 -06:00
Jon Siwek
1442af616f Merge branch 'master' into topic/cmake-port
Resolved Conflicts:
	CMakeLists.txt
	INSTALL
	aux/binpac
	aux/bro-aux
	aux/broccoli
	aux/broctl
	cmake/CheckTypes.cmake
	cmake/FindBIND.cmake
	cmake/OSSpecific.cmake
	cmake/OpenSSLTests.cmake
	cmake/PCAPTests.cmake
	src/CMakeLists.txt
2010-11-30 15:07:29 -06:00
Jon Siwek
0f854e201b CMake 2.6 compatibility changes
Also removed Mac specific feature of rewriting optional library
install_names.
2010-11-30 13:21:30 -06:00
Robin Sommer
c925bd43d8 Portability fix for Linux: this removes the need for linux-include. 2010-11-27 17:57:04 -08:00
Robin Sommer
121ff3965c Merge remote branch 'origin/topic/robin/svn-merge' into devel 2010-11-27 17:31:26 -08:00
Robin Sommer
ffdd469e01 Merge remote branch 'origin/topic/robin/cleanup' into devel 2010-11-27 17:30:34 -08:00
Robin Sommer
49cd330110 Merge branch 'master' into devel 2010-11-27 17:25:09 -08:00
Robin Sommer
b0cb05de64 Merge with Subversion repository as of r7098. 2010-11-27 12:50:01 -08:00
Robin Sommer
3f0ce359a2 Cleanup of the Bro distribution.
* Deleting a lot of old stuff no longer maintained or needed.

* Updating some of the top-level instructions.
2010-11-26 13:45:54 -08:00
Robin Sommer
610d081c4b Merge with origin/topic/cmake-port.
Needed to readd the broctl/broccoli/binpac submodules manually, as
git seemed to get confused by the existing directories.
2010-11-24 21:02:08 -08:00
Jon Siwek
3c7c068685 Renaming of DATADIR CMake variable.
To POLICYDIR since that's more clear.  Also decided that restricting
it to a subdirectory of prefix isn't much use as an option, so went
back to having it be an absolute path.
2010-11-17 20:38:35 -06:00
Jon Siwek
7737572aab Allow building auxilliary projects along with Bro.
BinPAC, Broccoli, Broctl, and Bro auxilliary tools are included
as git submodules.
2010-11-17 20:38:35 -06:00
Jon Siwek
7eb92d6a2d Style/comment enhancements. 2010-11-17 20:38:35 -06:00
Jon Siwek
737ce489a9 Added CPack packaging and fix Linux compatibility.
- configure wrapper had bash syntax some places; replaced w/ sh syntax
- Added FindOpenSSL module.  The one that ships with CMake does not
  allow for specifying a non-standard location.
- datadir configure option changed to be relative to prefix.  This
  simplifies the packaging from having to consider absolute paths.
- Added macro for changing install_name of shared libs that need to
  ship with precompiled Bro for OS X.  This is only the optional
  libmagic and libGeoIP for now.
2010-11-17 20:38:35 -06:00
Jon Siwek
105d00b9b8 Fix ambiguous call to abs().
Observed on FreeBSD build that the compiler would emit an error claiming

  Val(abs(val.int_val), TYPE_COUNT)

is ambiguous because it can't make a choice between cstdlib's
"int abs(int)" or "long abs(long)" signatures.  And actually, since
we now always use 64 bit integers for bro_int_t, we can use
"long long llabs(long long)".
2010-11-17 20:38:35 -06:00
Jon Siwek
bea41f5c73 Fix preprocessor logic for ethernet header choice.
Checking for netinet/if_ether.h and netinet/ip6.h depended
on including other headers first; observed when trying to
build on FreeBSD.

ARP.h was changed to conform to CMake style config.h generation.
Definitions are not set to 1 like with autotools, so we have
to check for definition, not just that the value is true.
2010-11-17 20:38:35 -06:00
Jon Siwek
c1e0b41275 Make DATADIR (policy file install path) absolute. 2010-11-17 20:38:34 -06:00
Jon Siwek
5765c93bd0 Changes to add install target. 2010-11-17 20:38:34 -06:00
Jon Siwek
b0d78eab40 Removed ClamAV support. 2010-11-17 20:38:34 -06:00
Jon Siwek
049bda7078 Modified .pac file dependencies. 2010-11-17 20:38:34 -06:00
Jon Siwek
e22ec206ca Added support for optional google-perftools. 2010-11-17 20:38:34 -06:00
Jon Siwek
5ea4189011 Added support for optional libGeoIP. 2010-11-17 20:38:34 -06:00
Jon Siwek
bc1a25da37 Added forgotten libz and libmagic include dirs to the search path.
This allows them to be located in a non-standard location.
2010-11-17 20:38:34 -06:00
Jon Siwek
d043aba54d Added support for optional libz. 2010-11-17 20:38:34 -06:00
Jon Siwek
88c77fdc25 Added optional libmagic support. 2010-11-17 20:38:34 -06:00
Jon Siwek
a4231c5725 Removed Endace DAG support. 2010-11-17 20:38:34 -06:00
Jon Siwek
79596c03d5 Added logic to find installed BinPAC or build from source. 2010-11-17 20:38:33 -06:00