diff --git a/src/DHCP-binpac.h b/src/DHCP-binpac.h index a3890b399d..df47ec7765 100644 --- a/src/DHCP-binpac.h +++ b/src/DHCP-binpac.h @@ -19,7 +19,7 @@ public: { return new DHCP_Analyzer_binpac(conn); } static bool Available() - { return dhcp_request && FLAGS_use_binpac; } + { return dhcp_request; } protected: binpac::DHCP::DHCP_Conn* interp; diff --git a/src/DNS.h b/src/DNS.h index 28e68cccad..569af906bf 100644 --- a/src/DNS.h +++ b/src/DNS.h @@ -271,8 +271,7 @@ public: static bool Available() { - return (dns_request || dns_full_request) && - ! FLAGS_use_binpac; + return (dns_request || dns_full_request); } protected: diff --git a/src/Syslog-binpac.h b/src/Syslog-binpac.h index 85caf5aaa4..88b64c5f70 100644 --- a/src/Syslog-binpac.h +++ b/src/Syslog-binpac.h @@ -46,7 +46,7 @@ protected: // { return new Syslog_TCP_Analyzer_binpac(conn); } // // static bool Available() -// { return (Syslog_request || Syslog_full_request) && FLAGS_use_binpac; } +// { return (Syslog_request || Syslog_full_request); } // //protected: // binpac::Syslog_on_TCP::Syslog_TCP_Conn* interp; diff --git a/src/binpac_bro.h b/src/binpac_bro.h index 5f46d8f458..5902c52113 100644 --- a/src/binpac_bro.h +++ b/src/binpac_bro.h @@ -35,6 +35,4 @@ inline StringVal* bytestring_to_val(const_bytestring const &str) } // namespace binpac -extern int FLAGS_use_binpac; - #endif diff --git a/src/main.cc b/src/main.cc index 7a86bde6da..cb3fbd7f6e 100644 --- a/src/main.cc +++ b/src/main.cc @@ -114,8 +114,6 @@ vector params; char* proc_status_file = 0; int snaplen = 0; // this gets set from the scripting-layer's value -int FLAGS_use_binpac = false; - extern std::list docs_generated; // Keep copy of command line @@ -204,8 +202,6 @@ void usage() fprintf(stderr, " -n|--idmef-dtd | specify path to IDMEF DTD file\n"); #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, " $BRO_PREFIXES | prefix list (%s)\n", bro_prefixes()); 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'}, - {"use-binpac", no_argument, &FLAGS_use_binpac, 1}, - {0, 0, 0, 0}, };