Commit graph

13262 commits

Author SHA1 Message Date
Robin Sommer
b37f9e38f6 Input framework merge in progress. 2012-05-25 16:16:53 -07:00
Bernhard Amann
658b188dff filters have been called streams for eternity. And I always was too
lazy to change it everywhere...

Fix that.
2012-05-25 16:11:30 -07:00
Daniel Thayer
1059d9aa75 Add more tests for previously-untested BIFs 2012-05-25 17:15:29 -05:00
Robin Sommer
61ce9b5412 Checkpoint - all src/ except src/input 2012-05-25 14:05:50 -07:00
Bernhard Amann
24173807ea reactivate network_time check in threading manager. previously this
line made all input framework tests fail - it works now. Some of the
other recent changes of the threading manager must have fixed that
problem.

This was easy :)
2012-05-25 11:35:56 -07:00
Bernhard Amann
4de6d76488 fix up the executeraw test - now it works for the first time and does not always fail 2012-05-25 11:30:18 -07:00
Bernhard Amann
96a7e068f0 baselines for the autostart removal. 2012-05-25 11:29:57 -07:00
Bernhard Amann
2e452dc29f remove last remnants of autostart, which has been removed for quite a while. 2012-05-25 10:49:17 -07:00
Jon Siwek
8cd36f158b Add Teredo tunnel decapsulation.
Also fix header truncation check for IPv6 No Next header and add an
"ipv6_no_next" weird for such packets that aren't tunneled over Teredo
(which it calls "bubbles" and are used to create mappings in NATs).
2012-05-25 12:37:35 -05:00
Bernhard Amann
976d8f7ba7 Merge remote-tracking branch 'origin/master' into topic/bernhard/input-threads 2012-05-25 10:33:50 -07:00
Bernhard Amann
2034c10e97 make input framework source (hopefully) adhere to the usual indentation
style. No functional changes.
2012-05-25 10:33:22 -07:00
Daniel Thayer
1f53193685 Merge remote-tracking branch 'origin/master' into topic/dnthayer/bif-tests 2012-05-25 11:46:44 -05:00
Robin Sommer
da34266a52 Switching default DS compression to gzip. 2012-05-25 08:36:59 -07:00
Robin Sommer
b5417a32be Some tweaks to the DS doc.
Also including a section with deficiencies.
2012-05-25 08:31:06 -07:00
Robin Sommer
3d2009cacf Updating submodule(s).
[nomail]
2012-05-24 17:43:35 -07:00
Robin Sommer
d2c756cac4 Make tests even quieter. 2012-05-24 17:33:02 -07:00
Robin Sommer
7e961606cd Merge remote-tracking branch 'origin/topic/jsiwek/ipv6-flow-label'
* origin/topic/jsiwek/ipv6-flow-label:
  Improve availability of IPv6 flow label in connection records.

Closes #821.
2012-05-24 17:05:55 -07:00
Robin Sommer
f7261a7851 Merge remote-tracking branch 'origin/topic/jsiwek/ipv6-comm'
* origin/topic/jsiwek/ipv6-comm:
  Enable Bro to communicate with peers over non-global IPv6 addresses.
  Add unit tests for Broccoli SSL and Broccoli IPv6 connectivity.
  Remove AI_ADDRCONFIG getaddrinfo hints flag for listening sockets.
  Undo communication protocol version bump.
  Add support to Bro for connecting with peers over IPv6.

Closes #820.

Conflicts:
	src/bro.bif
2012-05-24 17:01:34 -07:00
Robin Sommer
2933961042 Updating submodule(s).
[nomail]
2012-05-24 16:48:28 -07:00
Robin Sommer
aaa16133a7 Make tests even quieter. 2012-05-24 16:48:15 -07:00
Robin Sommer
d92da36b9b Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Documentation fixes.
  Replace ip6_hdr_chain with ip6_ext_hdr in comments
  Correct various errors in the BIF documentation
2012-05-24 16:46:44 -07:00
Daniel Thayer
03aee9197d Add more tests for previously-untested BIFs 2012-05-24 16:33:19 -05:00
Daniel Thayer
94e850397b Add tests for previously-untested strings BIFs 2012-05-23 16:34:03 -05:00
Jon Siwek
074a0a9dce Documentation fixes. 2012-05-23 14:29:16 -05:00
Jon Siwek
0d7d74e11b Merge branch 'master' into topic/tunnels 2012-05-22 16:05:06 -05:00
Bernhard Amann
82a6f3832a fix two memory leaks which occured when one used filters. 2012-05-22 13:51:50 -07:00
Jon Siwek
5312b21d7b Improve availability of IPv6 flow label in connection records.
Without this change, flow labeling of connections over IPv6 are
only available in the per-packet types of events (e.g. new_packet)
in which header fields can be inspected, but now minimal tracking
of the most recent flow label is done internally and that's available
per-connection for all events that use connection record arguments.

Specifically, this adds a "flow_label" field to the "endpoint" record
type, which is used for both the "orig" and "resp" fields of
"connection" records.  The new "connection_flow_label_changed" event
also allows tracking of changes in flow labels: it's raised each time
one direction of the connection starts using a different label.
2012-05-22 15:18:33 -05:00
Bernhard Amann
3b82d69eb3 Merge remote-tracking branch 'origin/master' into topic/bernhard/input-threads
Conflicts:
	src/CMakeLists.txt
	testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log
	testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log
2012-05-18 15:26:36 -07:00
Daniel Thayer
5ab765b4b6 Replace ip6_hdr_chain with ip6_ext_hdr in comments
This fixes some warnings that were appearing when building the documentation.
2012-05-18 11:23:09 -05:00
Daniel Thayer
d8a571ea69 Merge remote-tracking branch 'origin/master' into fastpath 2012-05-18 11:09:02 -05:00
Daniel Thayer
be65ddca37 Correct various errors in the BIF documentation 2012-05-17 16:03:17 -05:00
Robin Sommer
60df9582d3 Merge remote-tracking branch 'origin/fastpath'
Thanks!

* origin/fastpath:
  Fix compile errors.
  Fix mobility checksums unit test.
2012-05-17 14:00:09 -07:00
Jon Siwek
5f3575425d Fix compile errors.
Preprocess out DataSeries.cc based on config.h's USE_DATASERIES value
and one reference to threading::Field needed scoping.
2012-05-17 15:26:28 -05:00
Jon Siwek
2108ea0ac1 Merge branch 'master' into fastpath 2012-05-17 15:21:09 -05:00
Robin Sommer
90a1814a0a Linking in the DS docs. 2012-05-17 12:47:30 -07:00
Jon Siwek
3fedd32f4d Fix mobility checksums unit test.
Was failing because it depended on weirds being sent to stderr.
2012-05-17 14:47:09 -05:00
Robin Sommer
1824808dcc Updating submodule(s).
[nomail]
2012-05-17 12:44:56 -07:00
Robin Sommer
ea2bd659f3 Adding target update-doc-sources to top-level Makefile that runs
genDocSourcesList.sh.
2012-05-17 12:41:10 -07:00
Robin Sommer
7cc863c5fc Fix for when not producing local output; that hung.
* origin/topic/robin/dataseries:
  Moving trace for rotation test into traces directory.
  Fixing a rotation race condition at termination.
  Portability fixes.
  Extending DS docs with some examples.
  Updating doc.
  Fixing pack_scale and time-as-int.
  Adding format specifier to DS spec to print out double as %.6f.
  DataSeries updates and fixes.
  DataSeries tuning.
  Tweaking DataSeries support.
  Extending log post-processor call to include the name of the writer.
  Removing an unnecessary const cast.
  DataSeries TODO list with open issues/questions.
  Starting DataSeries HowTo.
  Additional test output canonification for ds2txt's timestamps.
  In threads, an internal error now immediately aborts.
  DataSeries cleanup.
  Working on DataSeries support.
  Merging in DataSeries support from topic/gilbert/logging.
  Fixing  threads' DoFinish() method.
2012-05-17 12:38:47 -07:00
Jon Siwek
f819a966d8 Merge branch 'master' into topic/jsiwek/ipv6-comm 2012-05-17 14:28:16 -05:00
Jon Siwek
74f3a32321 Enable Bro to communicate with peers over non-global IPv6 addresses.
This usually requires specifying an additional zone identifier
(see RFC 4007).  The connect() and listen() BIFs have been
changed to accept this zone identifier as an argument.
2012-05-17 12:59:20 -05:00
Robin Sommer
e34f27b928 Updating submodule(s).
[nomail]
2012-05-17 09:58:29 -07:00
Robin Sommer
9b3437ffe8 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Add a comment to explain the ICMPv6 error message types
2012-05-17 09:53:43 -07:00
Robin Sommer
502fecd6e9 Merge branch 'topic/robin/dataseries' of ssh://git.bro-ids.org/bro into topic/robin/dataseries 2012-05-16 21:03:32 -07:00
Robin Sommer
122f6ee4c6 Moving trace for rotation test into traces directory. 2012-05-16 18:28:51 -07:00
Robin Sommer
5dae925f67 Fixing a rotation race condition at termination.
Noticed with DS, but could just as well happen with ASCII.
2012-05-16 18:24:55 -07:00
Robin Sommer
99db264775 Portability fixes.
- Fix for time-as-int on 32-bit systems.

    - Skipping ds2txt's index output for test diffing, as it seems
      non-portable.
2012-05-16 18:01:28 -07:00
Robin Sommer
4fe11cf503 Extending DS docs with some examples. 2012-05-16 17:54:38 -07:00
Daniel Thayer
d6fdc10242 Add a comment to explain the ICMPv6 error message types 2012-05-15 10:19:56 -05:00
Robin Sommer
be6567f437 Merge remote-tracking branch 'origin/master' into topic/robin/dataseries 2012-05-14 22:17:26 -07:00