From 5983d44d950d2b93d91c36846668b35fb24d437a Mon Sep 17 00:00:00 2001
From: Bernhard Amann <bernhard@icsi.berkeley.edu>
Date: Tue, 8 Nov 2011 15:33:32 -0800
Subject: [PATCH] read header line in bro logfile format

---
 src/InputReaderAscii.cc | 19 +++++++++++++++++--
 src/InputReaderAscii.h  |  3 ++-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/InputReaderAscii.cc b/src/InputReaderAscii.cc
index 39635de407..e4770421c6 100644
--- a/src/InputReaderAscii.cc
+++ b/src/InputReaderAscii.cc
@@ -62,7 +62,7 @@ bool InputReaderAscii::DoInit(string path, int num_fields, int idx_fields, const
 bool InputReaderAscii::ReadHeader() {	 
 	// try to read the header line...
 	string line;
-	if ( !getline(*file, line) ) {
+	if ( !GetLine(line) ) {
 		Error("could not read first line");
 		return false;
 	}
@@ -111,6 +111,21 @@ bool InputReaderAscii::ReadHeader() {
 	return true;
 }
 
+bool InputReaderAscii::GetLine(string& str) {
+	while ( getline(*file, str) ) {
+		if ( str[0] != '#' ) {
+			return true;
+		}
+
+		if ( str.compare(0,8, "#fields\t") == 0 ) {
+			str = str.substr(8);
+			return true;
+		}
+	}
+
+	return false;
+}
+
 // read the entire file and send appropriate thingies back to InputMgr
 bool InputReaderAscii::DoUpdate() {
 
@@ -143,7 +158,7 @@ bool InputReaderAscii::DoUpdate() {
 	//map<string, string> *newKeyMap = new map<string, string>();
 
 	string line;
-	while ( getline(*file, line ) ) {
+	while ( GetLine(line ) ) {
 		// split on tabs
 		
 		istringstream splitstream(line);
diff --git a/src/InputReaderAscii.h b/src/InputReaderAscii.h
index 673a2cdae2..f86cfd0062 100644
--- a/src/InputReaderAscii.h
+++ b/src/InputReaderAscii.h
@@ -37,8 +37,9 @@ protected:
 	virtual bool DoUpdate();
     
 private:
-
 	bool ReadHeader();
+
+	bool GetLine(string& str);
 	
 	ifstream* file;
 	string fname;