Commit graph

18601 commits

Author SHA1 Message Date
Jon Siwek
5d1f1e9edb Fix package configuration macro returning from sub-project too early 2011-01-11 19:30:31 -06:00
Jon Siwek
911230b037 Add warning when building and installing are done by different users 2011-01-11 15:59:25 -06: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
Jon Siwek
f5715e7c14 Fix for PackageMaker not accepting non-numeric versions 2011-01-10 12:58:40 -06: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
Jon Siwek
e1ebf81f76 Prefer static libraries for some dependencies on OS X
This makes binary packaging easier because OS X doesn't ship with
all the shared libraries we may link against (libmagic and libGeoIP
in this case)
2011-01-06 16:59:48 -06:00
Jon Siwek
b496d63632 Added OS X configures options for SDK & minimum version 2011-01-06 16:57:25 -06:00
Jon Siwek
fa07bcd233 Changes to allow source packaging via CPack
- Refactored all packaging related stuff into a single CMake module
- Build should no longer fail when optional sources (e.g. broctl)
  do not exist in the source directory, instead a warning is issued
- Additional configure options to change packaging behavior
2011-01-05 12:05:39 -06:00
Robin Sommer
5d41794034 Merge commit 'd8aecb174a'
* commit 'd8aecb174a':
  Escape commands given to CMake's execute_process
2011-01-04 18:12:00 -08:00
Robin Sommer
edfdd9d436 Updating submodule 2010-12-20 12:03:58 -08:00
Robin Sommer
017367d362 Updating submodules 2010-12-20 12:01:26 -08:00
Jon Siwek
4b91c79c03 Merge branch 'fastpath' of git://git.icir.org/bro into fastpath 2010-12-15 11:45:51 -06:00
Jon Siwek
9880fd6281 Merge branch 'master' into fastpath 2010-12-15 11:41:56 -06:00
Jon Siwek
d8aecb174a Escape commands given to CMake's execute_process 2010-12-15 11:40:17 -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
Gregor Maier
b8ab0ebc22 Remvoing expire timer from http_sessions.
The expire timeout for the http_sessions table is unnecessary and it
actually breaks http session semantics for long-lived sessions. The
connection_state_remove() event can take care of cleaning up unanswered
sessions.

If a HTTP transfer exceeds the expire timer, then once the expire timer
fires we get an "unanswered" HTTP request in http.log and once the
reply is done (http_reply_done event), it fails to locate the associated
request (because it expired) and thus results in an "unsolicited" HTTP
reply being logged (althoug they should be one http session).

There was a comment in the expire_function mentioning that without the
expire timer some requests don't show up with the test-suite. However,
after checking back with Robin, I could not reproduce this behavior.
(Actually there's one fewer request in the output without the
expire-timer, but this can be explained by the above observation, so
this is not an error but the way it should be).

This patch results in changes to test-suite output:
  * Timestamps for unanswered HTTP replies differ for unanswered request
    in the "short" test.
  * Medium testcase (note: lines are sorted, they are not in the order)::

	-902189670.828700 <unknown request> (0 "" [40880 (interrupted)])
	-902189670.828700 GET /1998/b142.ps <no reply>
	-902189670.828700 start <<IP>>:<<port>> <<IP>>:80
	+902189670.828700 GET /1998/b142.ps (200 "OK" [40880 (interrupted)] <<a.host.name>>)
2010-12-11 10:51:37 -08:00
Gregor Maier
1ff864c234 Merge branch 'master' into fastpath 2010-12-11 08:46:32 -08:00
Robin Sommer
d24f7a6aad Update submodules 2010-12-10 01:44:25 -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
0ebcf2dff4 Setting executable bit for bro-dev-path.in. 2010-12-09 02:51:11 -08:00
Robin Sommer
3facb6a9ea Merge remote branch 'origin/topic/cmake-port' 2010-12-09 02:00:46 -08:00
Jon Siwek
51d561c156 Fix wrong variable names in bro-path-dev script 2010-12-08 09:51:20 -06:00
Jon Siwek
943b5edee0 Merge branch 'master' into topic/cmake-port 2010-12-08 09:48:21 -06:00
Robin Sommer
007bd744c9 Merge branch 'master' into fastpath 2010-12-08 04:49:06 -08:00
Robin Sommer
a5890e304a Updating modules. 2010-12-08 04:48:38 -08:00
Robin Sommer
690120b757 Merge branch 'master' into fastpath 2010-12-08 04:47:38 -08: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
Robin Sommer
2ad1f61bdb Merge remote branch 'origin/topic/cmake-port' 2010-12-08 03:08:46 -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
f3885f0c89 Updated submodules to master versions 2010-12-06 12:04:40 -06:00
Jon Siwek
f5e6856bd6 Merge branch 'master' into topic/cmake-port
Conflicts:
	aux/binpac
	aux/broctl
2010-12-06 11:58:06 -06:00
Jon Siwek
81b8a4176f Update binpac submodule to point to master version 2010-12-06 11:53:32 -06: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
Robin Sommer
5faaa21fa9 Updating submodules 2010-12-03 17:26:22 -08:00
Jon Siwek
efbd22a33f Allow CMake generators to pass through configure
The default generator is Unix Makefiles for most platforms, but this
lets the builder easily select a different build framework depending
on their platform (e.g. Xcode, CodeBlocks, Eclipse ...)
2010-12-02 14:23:20 -06:00
Jon Siwek
a9113e6f46 Submodule updates 2010-11-30 15:32:57 -06:00
Jon Siwek
a9c9fe7950 Removed some unset()'s that were missed 2010-11-30 15:17:49 -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
jsiwek
ba0ae22da7 More CMake 2.6 compat changes
unset() macro only in later patch-level versions of 2.6
2010-11-30 14:49:20 -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
4cc2419616 Updating modules to master. 2010-11-27 20:39:35 -08:00
Robin Sommer
e47e8f7913 Updating modules to master versions. 2010-11-27 20:29:50 -08:00
Robin Sommer
deacce40e9 Merge remote branch 'origin/topic/robin/cleanup' 2010-11-27 20:10:05 -08:00