Fixing tests.

Part of this involves making the file-analysis tests independent of
specific hash values. I've done that only partially though.

src/AnalyzerTags.h

@@ -1,57 +0,0 @@
-#ifndef ANALYZERTAGS_H
-#define ANALYZERTAGS_H
-
-// Each kind of analyzer gets a tag. When adding an analyzer here, also adapt
-// the table of analyzers in Analyzer.cc.
-//
-// Using a namespace here is kind of a hack: ideally this would be in "class
-// Analyzer {...}". But then we'd have circular dependencies across the header
-// files.
-
-#include "util.h"
-
-typedef uint32 AnalyzerID;
-
-namespace AnalyzerTag {
-	enum Tag {
-		Error = 0,	// used as error code
-
-		// Analyzer in charge of protocol detection.
-		PIA_TCP, PIA_UDP,
-
-		// Transport-layer analyzers.
-		ICMP, TCP, UDP,
-
-		// Application-layer analyzers (hand-written).
-		BitTorrent, BitTorrentTracker,
-		DCE_RPC, DNS, Finger, FTP, Gnutella, HTTP, Ident, IRC,
-		Login, NCP, NetbiosSSN, NFS, NTP, POP3, Portmapper, Rlogin,
-		RPC, Rsh, SMB, SMTP, SSH,
-		Telnet,
-
-		// Application-layer analyzers, binpac-generated.
-		DHCP_BINPAC, DNS_TCP_BINPAC, DNS_UDP_BINPAC,
-		HTTP_BINPAC, SSL, SYSLOG_BINPAC,
-		Modbus,
-
-		// Decapsulation analyzers.
-		AYIYA,
-		SOCKS,
-		Teredo,
-		GTPv1,
-
-		// Other
-		File, IRC_Data, FTP_Data, Backdoor, InterConn, SteppingStone, TCPStats,
-		ConnSize,
-
-		// Support-analyzers
-		Contents, ContentLine, NVT, Zip, Contents_DNS, Contents_NCP,
-		Contents_NetbiosSSN, Contents_Rlogin, Contents_Rsh,
-		Contents_DCE_RPC, Contents_SMB, Contents_RPC, Contents_NFS,
-		FTP_ADAT,
-		// End-marker.
-		LastAnalyzer
-	};
-};
-
-#endif

src/analyzer/Tag.cc

@@ -6,6 +6,8 @@
 
 using namespace analyzer;
 
+Tag Tag::Error;
+
 Tag::Tag(type_t arg_type, subtype_t arg_subtype)
 	{
 	assert(arg_type > 0);

src/analyzer/Tag.h

@@ -115,6 +115,8 @@ public:
 		return type != other.type ? type < other.type : (subtype < other.subtype);
 		}
 
+	static Tag Error;
+
 protected:
 	friend class analyzer::Manager;
 	friend class analyzer::Component;

src/file_analysis/File.h

@@ -6,7 +6,6 @@
 #include <string>
 #include <vector>
 
-#include "AnalyzerTags.h"
 #include "Conn.h"
 #include "Val.h"
 #include "AnalyzerSet.h"
@@ -132,7 +131,7 @@ protected:
 	 * Constructor; only file_analysis::Manager should be creating these.
 	 */
 	File(const string& unique, Connection* conn = 0,
-	     analyzer::Tag tag = AnalyzerTag::Error, bool is_orig = false);
+	     analyzer::Tag tag = analyzer::Tag::Error, bool is_orig = false);
 
 	/**
 	 * Updates the "conn_ids" and "conn_uids" fields in #val record with the

src/file_analysis/Manager.h

@@ -134,7 +134,7 @@ protected:
 	 *         fields.
 	 */
 	File* GetFile(const string& unique, Connection* conn = 0,
-	              analyzer::Tag tag = AnalyzerTag::Error,
+	              analyzer::Tag tag = analyzer::Tag::Error,
 	              bool is_orig = false, bool update_conn = true);
 
 	/**