Commit graph

19585 commits

Author SHA1 Message Date
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
Robin Sommer
a2a7ee8679 Reinserting an accidentally deleted line. 2010-11-27 19:54:58 -08: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
fabc59b2cd Deleteing aux directories in preparation for merge 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
e95adb8055 Another test commit. 2010-11-27 12:00:34 -08:00
Robin Sommer
fb76d7fe26 Removing the linux-include directory from the search path.
I think we don't need this anymore, but still need to verify that.
2010-11-26 15:32:24 -08:00
Robin Sommer
4714af9657 New Makefile wrapper in top-level directory.
This wrapper has a few standard target for convinience, mostly
forwarding them build/Makefile.

Also adding a .gitignore to let git skip the build/ directory.
2010-11-26 15:31:00 -08:00
Robin Sommer
2ee218fec8 Updating CHANGES and VERSION.
I'm starting a new version series, 1.6-dev, to not confuse these
with further commits to SVN.
2010-11-26 15:14:00 -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
818f5f4c0a aux/bro-aux was still pointing to the topic branch. 2010-11-26 12:07:50 -08:00
Robin Sommer
702e2ec0f1 Updating submodules. 2010-11-24 21:32:52 -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
Robin Sommer
c1768336c4 Removing aux/{broctl,binpac,broccoli} in preparation for merge. 2010-11-24 20:33:34 -08:00