Merge remote-tracking branch 'origin/fastpath'

* origin/fastpath:
  Remove an old, unused diff canonifier.
  Improve an error message in ICMP analyzer.
  Fix a warning message
  Fix many errors in the event documentation

CHANGES

@@ -1,4 +1,14 @@
 
+2.0-614 | 2012-06-15 15:19:49 -0700
+
+  * Remove an old, unused diff canonifier. (Jon Siwek)
+
+  * Improve an error message in ICMP analyzer. (Jon Siwek)
+    
+  * Fix a warning message when building docs. (Daniel Thayer)
+    
+  * Fix many errors in the event documentation. (Daniel Thayer)
+    
 2.0-608 | 2012-06-11 15:59:00 -0700
 
   * Add more error handling code to logging of enum vals. Addresses

VERSION

@@ -1 +1 @@
-2.0-608
+2.0-614

scripts/base/frameworks/communication/main.bro

@@ -11,7 +11,8 @@ export {
 	## The communication logging stream identifier.
 	redef enum Log::ID += { LOG };
 	
-	## Which interface to listen on (``0.0.0.0`` or ``[::]`` are wildcards).
+	## Which interface to listen on. The addresses ``0.0.0.0`` and ``[::]``
+	## are wildcards.
 	const listen_interface = 0.0.0.0 &redef;
 	
 	## Which port to listen on.

src/ICMP.cc

@@ -64,7 +64,8 @@ void ICMP_Analyzer::DeliverPacket(int len, const u_char* data,
 			break;
 
 		default:
-			reporter->InternalError("unexpected IP proto in ICMP analyzer");
+			reporter->InternalError("unexpected IP proto in ICMP analyzer: %d",
+			                        ip->NextProto());
 			break;
 		}
 

testing/scripts/doc/example-diff-canonifier.py

@@ -1,15 +0,0 @@
-#!/usr/bin/python
-
-import sys
-import re
-
-# MutableVal derivatives (e.g. sets/tables) don't always generate the same
-# ordering in the reST documentation, so just don't bother diffing
-# the places where example.bro uses them.
-
-RE1 = "\d*/tcp"
-RE2 = "tcp port \d*"
-
-for line in sys.stdin.readlines():
-    if re.search(RE1, line) is None and re.search(RE2, line) is None:
-        print line