Commit graph

10798 commits

Author SHA1 Message Date
Seth Hall
bcadb67731 First commit of binpac based AYIYA analyzer.
- ayiya-analyzer.pac needs work to do something with the actual packet.

- Lots more cleanup to do, but it parses the protocol at least.
2012-04-21 14:42:20 -04:00
Seth Hall
6e2205aa68 Fix problem with extracting FTP passwords.
- Added "ftpuser" as another anonymous username.

- Problem discovered by Patrik Lundin.
2012-04-21 14:33:14 -04:00
Daniel Thayer
faa89913de Don't print the various "weird" events to stderr
Fixes #805.
2012-04-19 13:45:20 -05:00
Robin Sommer
4b70adcb4b Tweaking DataSeries support. 2012-04-19 10:42:09 -07:00
Robin Sommer
18aa41c62b Extending log post-processor call to include the name of the writer. 2012-04-19 10:41:01 -07:00
Robin Sommer
3f1811afd2 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Changes related to ICMPv6 Neighbor Discovery messages.
2012-04-19 10:02:07 -07:00
Jon Siwek
4062fc1776 Merge branch 'master' into topic/tunnels
Conflicts:
	doc/scripts/DocSourcesList.cmake
	scripts/base/init-bare.bro
	src/ConnCompressor.cc
	src/Sessions.cc

Just trying to bring topic/gregor/tunnel up to date in this new branch.
Compiles, but untested.
2012-04-18 16:59:49 -05:00
Robin Sommer
1fba55f4f3 Removing an unnecessary const cast. 2012-04-18 14:59:42 -07:00
Jon Siwek
b933184b25 Changes related to ICMPv6 Neighbor Discovery messages.
- The 'icmp_conn' record now contains an 'hlim' field since hop limit
  in the IP header is an interesting field for at least these ND
  messages.

- Changed 'icmp_router_advertisement' event parameters.
  'router_lifetime' is now an interval. Fix 'reachable_time' and
  'retrans_timer' using wrong internal Val type for intervals.
  Made more of the known router advertisement flags available through
  boolean parameters.

- Changed 'icmp_neighbor_advertisement' event parameters to add
  more of the known boolean flags.
2012-04-18 13:13:56 -05:00
Bernhard Amann
a2f1af12fa Merge remote-tracking branch 'origin/master' into topic/bernhard/input-threads 2012-04-18 09:28:49 -07:00
Robin Sommer
5350cab371 Merge remote-tracking branch 'origin/topic/icmp6'
* origin/topic/icmp6:
  Fixes for IPv6 truncation and ICMP/ICMP6 analysis.
  Change ICMPv6 checksum calculation to use IP_Hdr wrapper.
  Update IPv6 atomic fragment unit test to filter output of ICMPv6.
  Add more data to icmp events
  More code cleanup
  Add more icmpv6 events, and general code cleanup
  Fix compile failure after merge from master
  Significant edit pass over ICMPv6 code.
  Porting Matti's branch to git.

Closes #808.
2012-04-17 19:02:59 -07:00
Robin Sommer
94c666f305 Updating submodule(s).
[nomail]
2012-04-17 17:42:38 -07:00
Robin Sommer
b3596f28d7 Updating submodule(s).
[nomail]
2012-04-17 17:41:37 -07:00
Robin Sommer
eae55caa84 Merge remote-tracking branch 'origin/topic/seth/64bit-binpac-updates'
* origin/topic/seth/64bit-binpac-updates:
  Small updates for the bittorrent analyzer to support 64bit types in binpac.

Closes #761.
2012-04-17 17:40:27 -07:00
Robin Sommer
ecfdf7d33c Merge remote-tracking branch 'origin/topic/jsiwek/ipv6-configure-checks'
* origin/topic/jsiwek/ipv6-configure-checks:
  Add more support for <netinet/ip6.h>'s that lack some structure definitions.

Closes #810.
2012-04-17 17:38:20 -07:00
Robin Sommer
a7bc12066b Merge remote-tracking branch 'origin/master' into topic/robin/dataseries
Conflicts:
	CMakeLists.txt
	cmake
2012-04-17 16:37:37 -07:00
Jon Siwek
1a5517f170 Merge branch 'master' into topic/seth/64bit-binpac-updates 2012-04-17 11:09:09 -05:00
Robin Sommer
f85e0bfe9a DataSeries TODO list with open issues/questions. 2012-04-16 18:15:05 -07:00
Robin Sommer
fede289d74 Updating submodule(s).
[nomail]
2012-04-16 18:12:25 -07:00
Robin Sommer
1cca1f874c Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Removing QR flag from DNS log in response to question on mailing list.
  Sync up patricia.c/h with pysubnettree repo
2012-04-16 18:09:36 -07:00
Robin Sommer
fe2535b08d Updating baselines for DNS change. 2012-04-16 18:08:16 -07:00
Seth Hall
18f5018a0d Removing QR flag from DNS log in response to question on mailing list. 2012-04-16 17:26:16 -07:00
Robin Sommer
d1c6183620 Starting DataSeries HowTo. 2012-04-16 16:08:18 -07:00
Robin Sommer
91a3ce9518 Additional test output canonification for ds2txt's timestamps. 2012-04-16 15:20:10 -07:00
Robin Sommer
08593c5147 In threads, an internal error now immediately aborts.
Otherwise, the error won't make it back to the main thread for a while
and subsequent code in the thread would still execute.
2012-04-16 15:19:14 -07:00
Robin Sommer
891c532775 DataSeries cleanup. 2012-04-16 15:18:59 -07:00
Bernhard Amann
48e05621c0 update description to current interface.
But this needs to get longer...
2012-04-16 14:49:24 -07:00
Jon Siwek
afae5d9f79 Merge branch 'master' into topic/seth/64bit-binpac-updates
Conflicts:
	aux/binpac
2012-04-16 15:57:08 -05:00
Seth Hall
bfa2720a81 Removing QR flag from DNS log in response to question on mailing list. 2012-04-15 22:52:48 -04:00
Bernhard Amann
1967f6f81c rename a couple of structures and make the names in manager fit the api more.
This should it make easier for other people to understand what is going on without having knowledge of an "internal api * means * in external api" mapping.
2012-04-15 15:11:39 -07:00
Jon Siwek
6aa4f00159 Add more support for <netinet/ip6.h>'s that lack some structure definitions. 2012-04-13 14:59:38 -05:00
Daniel Thayer
c90148d073 Sync up patricia.c/h with pysubnettree repo 2012-04-12 10:28:10 -05:00
Jon Siwek
51bad73e1e Fixes for IPv6 truncation and ICMP/ICMP6 analysis.
- Add more guards against trying to analyze captured packets with a
  truncated IPv6 static header or extension header chain.

- Add back in the ICMP payload tracking for ICMP "connections".

- Fix 'icmp_context' record construction.  Some field assignments
  were mismatched for ICMP and ICMP6.  Source and destination
  addresses were set incorrectly for context packets that don't
  contain a full IP header.  Some fields for ICMP6 weren't filled out.

- Changed ICMP Time Exceeded packets to raise the 'icmp_time_exceeded'
  event instead of 'icmp_error_message'.

- Add unit tests for truncation and the main types of ICMP/ICMP6
  that have specific events.

- Documentation clarifications.
2012-04-11 16:27:31 -05:00
Robin Sommer
86834c941c Adding missing leak groups to a couple tests.
Also activating leak checking for proxy in basic-cluster test.
2012-04-10 16:14:33 -07:00
Bernhard Amann
a5cc98bb5d fix memory leak in tables and vectors that are read into tables 2012-04-10 13:57:09 -07:00
Bernhard Amann
62519f4408 Merge remote-tracking branch 'origin/master' into topic/bernhard/input-threads
Conflicts:
	src/threading/Manager.cc
2012-04-10 22:12:54 +02:00
Jon Siwek
27ba3118c1 Change ICMPv6 checksum calculation to use IP_Hdr wrapper.
So that src/dst addresses used in pseudo-header are correct when
there's certain extension headers (routing/destination).

Add ICMP/ICMPv6 checksum unit tests.
2012-04-10 11:37:08 -05:00
Jon Siwek
958c6c7cf4 Update IPv6 atomic fragment unit test to filter output of ICMPv6.
Since that's not relevant to test.
2012-04-10 11:09:07 -05:00
Daniel Thayer
69c09a209c Merge remote-tracking branch 'origin/master' into topic/icmp6
Conflicts:
	src/net_util.cc
	src/net_util.h
2012-04-10 09:54:07 -05:00
Robin Sommer
cccaad63b3 Merge remote-tracking branch 'origin/topic/jsiwek/mobile-ipv6'
* origin/topic/jsiwek/mobile-ipv6:
  Add support for mobile IPv6 Mobility Header (RFC 6275).
  Refactor IP_Hdr routing header handling, add MobileIPv6 Home Address handling.
  Revert TCP checksumming to cache common data, like it did before.
  Revert "Improve handling of IPv6 Routing Type 0 headers."
  Improve handling of IPv6 routing type 0 extension headers.
2012-04-09 17:49:52 -07:00
Robin Sommer
7131feefbc Working on DataSeries support.
- The option to use integers insteads of double was ignored.

   - Renaming script-level options to remove the ds_ prefix.

   - Log rotation didn't work.

   - A set of simple unit tests.
2012-04-09 17:46:56 -07:00
Robin Sommer
3605dfceeb Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix table expiry for values assigned in bro_init() when reading live.
2012-04-09 16:02:10 -07:00
Jon Siwek
91330f1e1c Add support for mobile IPv6 Mobility Header (RFC 6275).
- Accessible at script-layer through 'mobile_ipv6_message' event.

- All Mobile IPv6 analysis now enabled through --enable-mobile-ipv6
  configure-time option, otherwise the mobility header, routing type 2,
  and Home Address Destination option are ignored.
2012-04-09 14:39:00 -05:00
Daniel Thayer
79a6da285f Merge remote-tracking branch 'origin/master' into topic/icmp6 2012-04-06 15:59:57 -05:00
Jon Siwek
fcd8f9b77e Fix table expiry for values assigned in bro_init() when reading live.
Value assigned in bro_init() to a table with &create_expire
weren't expiring when reading traffic from an interface.  It worked
when reading a pcap file, but I added a test case to show it still
working.
2012-04-06 13:24:27 -05:00
Robin Sommer
f25e2252f9 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix CMake from warning about unused ENABLE_PERFTOOLS_DEBUG variable.
  Fix handling of IPv6 atomic fragments.
2012-04-05 15:33:55 -07:00
Robin Sommer
c63d23f3af Preventing Bro processes that do neither local logging nor request
remote logs from spawning threads.

This applies to the proxy, which was still opening all the log files
with then idle threads.
2012-04-05 15:30:40 -07:00
Jon Siwek
29724415c3 Merge branch 'master' into topic/jsiwek/mobile-ipv6
Conflicts:
	src/IP.cc
2012-04-05 12:05:06 -05:00
Jon Siwek
8e2ce1d350 Fix CMake from warning about unused ENABLE_PERFTOOLS_DEBUG variable.
The variable was never "used" in the case google perftools was not
found, so CMake warned about it being unused since it was manually
specified as a cache variable in the configure script.  There might
be a better way to organize that, but this is a quick/easy hack.
2012-04-05 11:41:14 -05:00
Jon Siwek
f3455f843e Merge branch 'master' into fastpath 2012-04-05 11:41:00 -05:00