Commit graph

3375 commits

Author SHA1 Message Date
Jon Siwek
9fb0065696 Merge branch 'master' into topic/tunnels
Conflicts:
	scripts/base/init-bare.bro
	src/Conn.cc
	src/Conn.h
	src/Sessions.cc
	src/Sessions.h
	src/const.bif
	src/types.bif
2012-05-31 16:13:14 -05:00
Jon Siwek
eeb1609768 Change Input::update_finished lookup to happen at init time.
Also going through the internal_handler() function will set the
event as "used" (i.e. it's marked as being raised somewhere) and
fixes the core.check-unused-event-handlers test failure
(addresses #823).
2012-05-31 15:32:28 -05:00
Daniel Thayer
2c62b98b5b Improve tests for to_port and type_name BIFs 2012-05-31 15:19:11 -05:00
Daniel Thayer
5f16a29aea Improve tests for sort, order, and system_env BIFs 2012-05-31 12:49:59 -05:00
Jon Siwek
60875adfc5 Fix format specifier on RemoteSerializer::Connect.
This caused 32-bit systems to show a warning at compile-time, and
fail when connecting to peers.
2012-05-31 11:31:01 -05:00
Robin Sommer
be0316ee29 Fixes for running tests in parallel. 2012-05-30 19:26:43 -07:00
Robin Sommer
f34ebb7b60 Updating submodule(s).
[nomail]
2012-05-30 19:12:54 -07:00
Robin Sommer
c0e0481af2 Merge branch 'topic/robin/input-threads-merge'
* topic/robin/input-threads-merge: (130 commits)
  And now it even compiles after my earlier changes.
  A set of input framework refactoring, cleanup, and polishing.
  another small memory leak in ascii reader:
  and another small memory leak when using streaming reads.
  fix another memory lead (when updating tables).
  Input framework merge in progress.
  filters have been called streams for eternity. And I always was too lazy to change it everywhere...
  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.
  fix up the executeraw test - now it works for the first time and does not always fail
  baselines for the autostart removal.
  remove last remnants of autostart, which has been removed for quite a while.
  make input framework source (hopefully) adhere to the usual indentation style. No functional changes.
  fix two memory leaks which occured when one used filters.
  update description to current interface.
  rename a couple of structures and make the names in manager fit the api more.
  fix memory leak in tables and vectors that are read into tables
  fix missing get call for heart beat in benchmark reader.
  fix heart_beat_interval -- initialization in constructor does not work anymore (probably due to change in init ordering?)
  fix memory leak for tables... nearly completely.
  fix a couple more leaks. But - still leaking quite a lot with tables.
  ...
2012-05-30 19:12:18 -07:00
Robin Sommer
e9354284eb Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Remove unnecessary assert in ICMP analyzer (addresses #822).
  Improve script debugger backtrace and print commands.
2012-05-30 17:06:36 -07:00
Robin Sommer
14ea780176 And now it even compiles after my earlier changes. 2012-05-30 16:45:19 -07:00
Robin Sommer
b2b8df0ddd Merge remote-tracking branch 'origin/topic/bernhard/input-threads-merge' into topic/robin/input-threads-merge
* origin/topic/bernhard/input-threads-merge:
  another small memory leak in ascii reader:
2012-05-30 16:39:35 -07:00
Robin Sommer
fc907c0090 A set of input framework refactoring, cleanup, and polishing. 2012-05-30 16:38:08 -07:00
Daniel Thayer
17155a103d Fix the join_string_vec BIF and add more tests 2012-05-30 16:50:43 -05:00
Daniel Thayer
6869e1aadc Add more tests for previously-untested BIFs 2012-05-30 16:30:50 -05:00
Bernhard Amann
65b50ab2da another small memory leak in ascii reader:
on re-read istream instance was re-created but not freed before.
2012-05-30 10:16:05 -07:00
Jon Siwek
0aecca979e Remove unnecessary assert in ICMP analyzer (addresses #822).
The ICMP/ICMPv6 analyzers function correctly when full packets have
not been captured, but everything up to and including the ICMP header
is there (e.g. the functions that inspect ICMP error message context
correctly check the caplen to see if more info can be extracted).

The "Should have been caught earlier already." comment may have referred
to NetSessions::CheckHeaderTrunc, which works as intended to catch cases
where the ICMP header is not there in full, but then the assert was
still not correctly formulated for that...

Also changed the ICMP checksum calculation to not occur when the full
packet has not been captured, which seems consistent with what the UDP
analysis does.
2012-05-29 17:29:11 -05:00
Jon Siwek
0c5afc59f7 Improve script debugger backtrace and print commands.
Stack trace context descriptions are no longer limited to 1024 chars
and better error messages are relayed when the arguments to print
commands fail to parse (e.g. an "unknown identifier" was given).
2012-05-29 14:51:45 -05:00
Daniel Thayer
15689ce005 Add more tests for previously-untested BIFs 2012-05-29 14:04:36 -05:00
Bernhard Amann
1416d5404d and another small memory leak when using streaming reads. 2012-05-29 10:35:56 -07:00
Bernhard Amann
f4864c69af fix another memory lead (when updating tables).
Adjust twotables testcase - now it is faster. Shorten the output
-- because of threading, the results did not always come out in
the same order (it depends on which thread manages to sneak in
the results into the queue earlier).
2012-05-29 09:21:16 -07:00
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