Commit graph

10798 commits

Author SHA1 Message Date
Jon Siwek
11b15cc290 Refactor IP_Hdr routing header handling, add MobileIPv6 Home Address handling.
Packets that use the Home Address Destination option use that option's
address as the connection's originator.
2012-04-05 10:50:35 -05:00
Robin Sommer
aa70ed592d Merge branch 'master' of ssh://git.bro-ids.org/bro 2012-04-04 19:28:36 -07:00
Robin Sommer
c92dc7e6af Reverting SocketComm change tuning I/O behaviour.
Not sure that's right.
2012-04-04 19:27:43 -07:00
Robin Sommer
017622427b Fixing perftools-debug support. 2012-04-04 18:42:15 -07:00
Robin Sommer
d0b68771ef Updating submodule(s).
[nomail]
2012-04-04 18:37:10 -07:00
Robin Sommer
c372eaf7b5 Updating submodule(s).
[nomail]
2012-04-04 18:36:40 -07:00
Robin Sommer
4e49b98bba Updating submodule(s).
[nomail]
2012-04-04 17:57:38 -07:00
Robin Sommer
fb0614b5c6 Adding notice_policy.log canonification for external tests.
These was still producing false positives.
2012-04-04 17:46:13 -07:00
Robin Sommer
077089a047 Merge branch 'topic/robin/log-threads'
* topic/robin/log-threads: (42 commits)
  Two more tweaks to reliably terminate when reading from trace.
  This could be fixing the memory problems finally.
  Fix compile errors due to now-explicit IPAddr ctors and global IPFamily enum.
  Switching log buffer size back to normal
  Teaching cmake to always link in tcmalloc if it finds it.
  Extending queue statistics.
  Small fixes and tweaks.
  Don't assert during shutdown.
  Reverting accidental commit.
  Finetuning communication CPU usage.
  Adding new leak tests involving remote logging.
  Removing some no longer needed checks.
  Fixing problem logging remotely when local logging was turned off.
  Preventing busy looping when no threads have been spawned.
  Prevent manager from busy looping.
  Adding missing includes needed on FreeBSD.
  Updating submodule(s).
  Updating submodule(s).
  A number of bugfixes for the recent threading updates.
  Making exchange of addresses between threads thread-safe.
  ...
2012-04-04 17:32:13 -07:00
Jon Siwek
d8d83f590b Fix handling of IPv6 atomic fragments.
The FragReassembler expire_timer was left uninitialized until after
the first fragment is added, but since the atomic fragment is also
the last, the reassembler thought expire_timer needed to be deleted.
This fix just initializes expire_timer before the first fragment is
added.
2012-04-04 15:27:43 -05:00
Robin Sommer
fe61d02a9f Two more tweaks to reliably terminate when reading from trace. 2012-04-04 10:42:50 -07:00
Robin Sommer
50104d4b08 Merge branch 'topic/robin/log-threads' of ssh://git.bro-ids.org/bro into topic/robin/log-threads 2012-04-03 22:19:16 -07:00
Robin Sommer
c381da9ccf This could be fixing the memory problems finally.
Keeping fingers crossed ...
2012-04-03 22:18:35 -07:00
Robin Sommer
952b6b293a Merging in DataSeries support from topic/gilbert/logging.
I copied the code over manually, no merging, because (1) it needed to
be adapted to the new threading API, and (2) there's more stuff in the
branch that I haven't ported yet.

The DS output generally seems to work, but it has seen no further
testing yet.

Not unit tests yet either.
2012-04-03 22:14:56 -07:00
Robin Sommer
99e3c58494 Fixing threads' DoFinish() method.
It wasn't called reliably. Now, it's always called before the thread
is destroyed (assuming processing has went normally so far).
2012-04-03 22:12:44 -07:00
Bernhard Amann
25affe2c82 fix missing get call for heart beat in benchmark reader. 2012-04-03 00:52:41 +02:00
Bernhard Amann
384fc730d4 fix heart_beat_interval -- initialization in constructor does not work anymore (probably due to change in init ordering?) 2012-04-01 17:13:51 -07:00
Bernhard Amann
fd70560017 Merge remote-tracking branch 'origin/topic/robin/log-threads' into topic/bernhard/input-threads 2012-03-30 11:00:51 -07:00
Jon Siwek
6e7faafdb7 Fix compile errors due to now-explicit IPAddr ctors and global IPFamily enum. 2012-03-30 12:40:31 -05:00
Jon Siwek
256c0af98e Merge branch 'master' into topic/robin/log-threads
Conflicts:
	cmake
2012-03-30 12:02:32 -05:00
Bernhard Amann
e789724935 Merge remote-tracking branch 'origin/topic/bernhard/log-threads-configureable-heartbeat' into topic/bernhard/input-threads
Conflicts:
	src/threading/Manager.h
2012-03-30 09:24:46 -07:00
Bernhard Amann
8e526a7f83 fix memory leak for tables... nearly completely.
There is still a tiny where I have not yet found where the delete could be missing.

For big table imports the memory footprint is significant nevertheless -- with tables of > 200000 entries, memory consumption can apparently reach in excess of 1.5Gb - and on a first glance this seems legitimate.

(The reason for this is probably that we use several hash tables to keep the performance impact small).
2012-03-30 09:20:18 -07:00
Bernhard Amann
b7bbda7244 fix a couple more leaks. But - still leaking quite a lot with tables. 2012-03-30 09:20:12 -07:00
Bernhard Amann
7a71a74994 fix largest leak in manager. 2012-03-30 09:20:04 -07:00
Bernhard Amann
1170a87769 make benchmark reader hartbeat inverval aware
fix small memleak on tablereader destruction
make timespread better configureable
2012-03-30 09:19:01 -07:00
Bernhard Amann
b47620e501 add a couple more configuration options 2012-03-30 09:18:44 -07:00
Bernhard Amann
719540414f repair general stupidity 2012-03-30 09:17:45 -07:00
Bernhard Amann
ed5374b6d7 and another option for the benchmark reader (constant addition of lines) 2012-03-30 09:17:35 -07:00
Bernhard Amann
579a10d060 make benchmark reader more configureable 2012-03-30 09:17:25 -07:00
Bernhard Amann
3405cbdfbd Introducing - the check if a thread queue might have data. Without locks. Who needs those anyways. 2012-03-30 09:17:16 -07:00
Bernhard Amann
355b85fcd7 most of the stuff we should need for benchmarking. next: search memory leaks, after 1.5million simulated
inputs we are leaking about 1Gb of ram...
2012-03-30 09:08:08 -07:00
Bernhard Amann
ead30e423d change type of heart_beat_interval to interval (makes much more sese) 2012-03-30 08:40:38 -07:00
Jon Siwek
7d7cadfb56 Revert TCP checksumming to cache common data, like it did before. 2012-03-29 14:41:44 -05:00
Jon Siwek
877cc5b235 Merge branch 'topic/jsiwek/routing0' into topic/jsiwek/mobile-ipv6
Conflicts:
	src/net_util.cc
	src/net_util.h
2012-03-29 14:34:39 -05:00
Jon Siwek
3a4d035603 Revert "Improve handling of IPv6 Routing Type 0 headers."
This reverts commit 256cd592a7.

Conflicts:

	src/IP.cc
	src/Sessions.cc
2012-03-29 14:29:33 -05:00
Bernhard Amann
ef77b1447f Merge remote-tracking branch 'origin/topic/robin/log-threads' into topic/bernhard/log-threads-configureable-heartbeat
Conflicts:
	src/threading/Manager.cc
2012-03-29 09:19:22 -07:00
Bernhard Amann
6a60f484f9 make heart beat interval for threading configureable from scripting layer 2012-03-29 09:03:33 -07:00
Robin Sommer
97652bc144 Updating submodule(s).
[nomail]
2012-03-28 16:15:52 -07:00
Robin Sommer
76af3cf825 Updating submodule(s).
[nomail]
2012-03-28 15:52:13 -07:00
Robin Sommer
c382439079 Switching log buffer size back to normal 2012-03-28 15:43:41 -07:00
Robin Sommer
42066cc1fd Teaching cmake to always link in tcmalloc if it finds it.
Also renaming --enable-perftools to --enable-perftool-debug to
indicate that the switch is only relevant for debugging the heap. It's
not needed to pick up tcmalloc for better performance.

--with-perftools can still (and always) be used to give a hint where
to find the libraries.

With the threading, using tcmalloc improves memory usage on FreeBSD
significantly when running on a trace. If it fixes the live problems,
remains to be seen ...
2012-03-28 15:42:09 -07:00
Robin Sommer
de7300f999 Merge remote-tracking branch 'origin/topic/jsiwek/skip-rh0-segleft'
* origin/topic/jsiwek/skip-rh0-segleft:
  Improve handling of IPv6 Routing Type 0 headers.

Closes #804.
2012-03-28 15:12:01 -07:00
Robin Sommer
1896df3799 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Remove dead tcp_checksum function from net_util
  Change routing0_data_to_addrs BIF to return vector of addresses.
2012-03-28 15:02:33 -07:00
Seth Hall
77694cc884 The app metrics break interval is now configurable. 2012-03-28 16:06:09 -04:00
Seth Hall
df6a180023 Some scripts for collecting connection stats and "app" stats.
- App stats are considered stats for applications on the internet.
  Services like facebook, youtube, etc.
2012-03-28 15:52:20 -04:00
Jon Siwek
8a1d71dc08 Remove dead tcp_checksum function from net_util 2012-03-28 14:14:20 -05:00
Jon Siwek
256cd592a7 Improve handling of IPv6 Routing Type 0 headers.
- For RH0 headers with non-zero segments left, a "routing0_segleft"
  flow_weird event is raised (with a destination indicating the last
  address in the routing header), and an "rh0_segleft" event can also
  be handled if the other contents of the packet header are of interest.
  No further analysis is done as the complexity required to correctly
  identify destination endpoints of connections doesn't seem worth it
  as RH0 has been deprecated by RFC 5095.

- For RH0 headers without any segments left, a "routing0_header"
  flow_weird event is raised, but further analysis still occurs
  as normal.
2012-03-28 13:49:28 -05:00
Seth Hall
47f58e6340 Cluster support for the metrics framework returns and all tests work again. 2012-03-28 14:00:59 -04:00
Seth Hall
6600e62ea3 Ported scripts using metrics framework and added a new smtp script.
- New script measures a couple of aspects of SMTP traffic.

- Existing metrics scripts had a small amount of work done
  to make them work with changes to metrics framework.
2012-03-28 11:39:27 -04:00
Daniel Thayer
169b3c833f Add more data to icmp events 2012-03-27 17:55:39 -05:00