Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-04 15:48:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Removing the --use-binpac switch.

Browse source
This commit is contained in:
Robin Sommer 2013-04-03 13:40:49 -07:00
parent bfda42b9e9
commit 40ca718e90
5 changed files with 3 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/DHCP-binpac.h
View file

@ -19,7 +19,7 @@ public:
{ return new DHCP_Analyzer_binpac(conn); } { return new DHCP_Analyzer_binpac(conn); }
static bool Available() static bool Available()
{ return dhcp_request && FLAGS_use_binpac; } { return dhcp_request; }
protected: protected:
binpac::DHCP::DHCP_Conn* interp; binpac::DHCP::DHCP_Conn* interp;

3
src/DNS.h
View file

@ -271,8 +271,7 @@ public:
static bool Available() static bool Available()
{ {
return (dns_request || dns_full_request) && return (dns_request || dns_full_request);
! FLAGS_use_binpac;
} }
protected: protected:

2
src/Syslog-binpac.h
View file

@ -46,7 +46,7 @@ protected:
// { return new Syslog_TCP_Analyzer_binpac(conn); } // { return new Syslog_TCP_Analyzer_binpac(conn); }
// //
// static bool Available() // static bool Available()
// { return (Syslog_request || Syslog_full_request) && FLAGS_use_binpac; } // { return (Syslog_request || Syslog_full_request); }
// //
//protected: //protected:
// binpac::Syslog_on_TCP::Syslog_TCP_Conn* interp; // binpac::Syslog_on_TCP::Syslog_TCP_Conn* interp;

2
src/binpac_bro.h
View file

@ -35,6 +35,4 @@ inline StringVal* bytestring_to_val(const_bytestring const &str)
} // namespace binpac } // namespace binpac
extern int FLAGS_use_binpac;
#endif #endif

6
src/main.cc
View file

@ -114,8 +114,6 @@ vector<string> params;
char* proc_status_file = 0; char* proc_status_file = 0;
int snaplen = 0; // this gets set from the scripting-layer's value int snaplen = 0; // this gets set from the scripting-layer's value
int FLAGS_use_binpac = false;
extern std::list<BroDoc*> docs_generated; extern std::list<BroDoc*> docs_generated;
// Keep copy of command line // Keep copy of command line
@ -204,8 +202,6 @@ void usage()
fprintf(stderr, " -n|--idmef-dtd <idmef-msg.dtd> | specify path to IDMEF DTD file\n"); fprintf(stderr, " -n|--idmef-dtd <idmef-msg.dtd> | specify path to IDMEF DTD file\n");
#endif #endif
fprintf(stderr, " --use-binpac | use new-style BinPAC parsers when available\n");
fprintf(stderr, " $BROPATH | file search path (%s)\n", bro_path()); fprintf(stderr, " $BROPATH | file search path (%s)\n", bro_path());
fprintf(stderr, " $BRO_PREFIXES | prefix list (%s)\n", bro_prefixes()); fprintf(stderr, " $BRO_PREFIXES | prefix list (%s)\n", bro_prefixes());
fprintf(stderr, " $BRO_DNS_FAKE | disable DNS lookups (%s)\n", bro_dns_fake()); fprintf(stderr, " $BRO_DNS_FAKE | disable DNS lookups (%s)\n", bro_dns_fake());
@ -497,8 +493,6 @@ int main(int argc, char** argv)
{"pseudo-realtime", optional_argument, 0, 'E'}, {"pseudo-realtime", optional_argument, 0, 'E'},
{"use-binpac", no_argument, &FLAGS_use_binpac, 1},
{0, 0, 0, 0}, {0, 0, 0, 0},
}; };