Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' of ssh://git.bro-ids.org/bro

Browse source
This commit is contained in:
Seth Hall 2011-07-15 01:11:55 -04:00
commit 2317bf61f3
4 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Reporter.cc
View file

@ -139,7 +139,7 @@ void Reporter::WeirdHelper(EventHandlerPtr event, Val* conn_val, const char* nam
delete vl; delete vl;
} }
void Reporter::WeirdFlowHelper(addr_type orig, addr_type resp, const char* name, ...) void Reporter::WeirdFlowHelper(const uint32* orig, const uint32* resp, const char* name, ...)
{ {
val_list* vl = new val_list(2); val_list* vl = new val_list(2);
vl->append(new AddrVal(orig)); vl->append(new AddrVal(orig));
@ -168,7 +168,7 @@ void Reporter::Weird(Val* conn_val, const char* name, const char* addl)
WeirdHelper(conn_weird, conn_val, name, addl); WeirdHelper(conn_weird, conn_val, name, addl);
} }
void Reporter::Weird(addr_type orig, addr_type resp, const char* name) void Reporter::Weird(const uint32* orig, const uint32* resp, const char* name)
{ {
WeirdFlowHelper(orig, resp, name); WeirdFlowHelper(orig, resp, name);
} }

4
src/Reporter.h
View file

@ -47,7 +47,7 @@ public:
void Weird(const char* name); // Raises net_weird(). void Weird(const char* name); // Raises net_weird().
void Weird(Connection* conn, const char* name, const char* addl = ""); // Raises conn_weird(). void Weird(Connection* conn, const char* name, const char* addl = ""); // Raises conn_weird().
void Weird(Val* conn_val, const char* name, const char* addl = ""); // Raises conn_weird(). void Weird(Val* conn_val, const char* name, const char* addl = ""); // Raises conn_weird().
void Weird(addr_type orig, addr_type resp, const char* name); // Raises flow_weird(). void Weird(const uint32* orig, const uint32* resp, const char* name); // Raises flow_weird().
// Syslog a message. This methods does nothing if we're running // Syslog a message. This methods does nothing if we're running
// offline from a trace. // offline from a trace.
@ -90,7 +90,7 @@ private:
void DoLog(const char* prefix, EventHandlerPtr event, FILE* out, Connection* conn, val_list* addl, bool location, bool time, const char* fmt, va_list ap); void DoLog(const char* prefix, EventHandlerPtr event, FILE* out, Connection* conn, val_list* addl, bool location, bool time, const char* fmt, va_list ap);
void WeirdHelper(EventHandlerPtr event, Val* conn_val, const char* name, const char* addl, ...); void WeirdHelper(EventHandlerPtr event, Val* conn_val, const char* name, const char* addl, ...);
void WeirdFlowHelper(addr_type orig, addr_type resp, const char* name, ...); void WeirdFlowHelper(const uint32* orig, const uint32* resp, const char* name, ...);
int errors; int errors;
bool via_events; bool via_events;

2
src/Sessions.cc
View file

@ -1276,7 +1276,7 @@ void NetSessions::Weird(const char* name,
void NetSessions::Weird(const char* name, const IP_Hdr* ip) void NetSessions::Weird(const char* name, const IP_Hdr* ip)
{ {
reporter->Weird(ip->SrcAddr4(), ip->DstAddr4(), name); reporter->Weird(ip->SrcAddr(), ip->DstAddr(), name);
} }
unsigned int NetSessions::ConnectionMemoryUsage() unsigned int NetSessions::ConnectionMemoryUsage()

1
testing/external/.gitignore vendored
View file

@ -1,2 +1,3 @@
*.git *.git
diag.log diag.log
bro-testing