Renaming the Logger to Reporter.

Also changing output to not include timestamps when we haven't started
processing packets yet.
This commit is contained in:
Robin Sommer 2011-07-01 09:22:33 -07:00
parent 93894eed9b
commit 66e2c3b623
123 changed files with 722 additions and 713 deletions

View file

@ -3,7 +3,7 @@
#include <stdio.h>
#include "RuleMatcher.h"
#include "Logger.h"
#include "Reporter.h"
extern void begin_PS();
extern void end_PS();
@ -170,7 +170,7 @@ rule_attr:
| TOK_PATTERN_TYPE '[' rangeopt ']' pattern
{
if ( $3.offset > 0 )
bro_logger->Warning("Offsets are currently ignored for patterns");
reporter->Warning("Offsets are currently ignored for patterns");
current_rule->AddPattern($5, $1, 0, $3.len);
}
@ -317,14 +317,14 @@ pattern:
void rules_error(const char* msg)
{
bro_logger->Error("Error in signature (%s:%d): %s\n",
reporter->Error("Error in signature (%s:%d): %s\n",
current_rule_file, rules_line_number+1, msg);
rule_matcher->SetParseError();
}
void rules_error(const char* msg, const char* addl)
{
bro_logger->Error("Error in signature (%s:%d): %s (%s)\n",
reporter->Error("Error in signature (%s:%d): %s (%s)\n",
current_rule_file, rules_line_number+1, msg, addl);
rule_matcher->SetParseError();
}
@ -332,7 +332,7 @@ void rules_error(const char* msg, const char* addl)
void rules_error(Rule* r, const char* msg)
{
const Location& l = r->GetLocation();
bro_logger->Error("Error in signature %s (%s:%d): %s\n",
reporter->Error("Error in signature %s (%s:%d): %s\n",
r->ID(), l.filename, l.first_line, msg);
rule_matcher->SetParseError();
}