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

Removing active mapping.

Browse source
This commit is contained in:
Robin Sommer 2011-03-14 18:31:17 -07:00
parent c92154994a
commit 57fe369c4e
8 changed files with 6 additions and 441 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/main.cc
View file

@ -23,7 +23,6 @@ extern "C" void OPENSSL_add_all_algorithms_conf(void);
#include "bsd-getopt-long.h"
#include "input.h"
#include "Active.h"
#include "ScriptAnaly.h"
#include "DNS_Mgr.h"
#include "Frame.h"
@ -136,9 +135,6 @@ void usage()
fprintf(stderr, "bro version %s\n", bro_version());
fprintf(stderr, "usage: %s [options] [file ...]\n", prog);
fprintf(stderr, " <file> | policy file, or read stdin\n");
#ifdef ACTIVE_MAPPING
fprintf(stderr, " -a|--active-mapping <mapfile> | use active mapping results\n");
#endif
fprintf(stderr, " -d|--debug-policy | activate policy file debugging\n");
fprintf(stderr, " -e|--exec <bro code> | augment loaded policies by given code\n");
fprintf(stderr, " -f|--filter <filter> | tcpdump filter\n");
@ -393,9 +389,6 @@ int main(int argc, char** argv)
{"print-id", required_argument, 0, 'I'},
{"status-file", required_argument, 0, 'U'},
#ifdef ACTIVE_MAPPING
{"active-mapping", no_argument, 0, 'a'},
#endif
#ifdef DEBUG
{"debug", required_argument, 0, 'B'},
#endif
@ -441,7 +434,7 @@ int main(int argc, char** argv)
opterr = 0;
char opts[256];
safe_strncpy(opts, "A:a:B:D:e:f:I:i:K:n:p:R:r:s:T:t:U:w:x:X:y:Y:z:CFGHLOPSWdghlv",
safe_strncpy(opts, "A:B:D:e:f:I:i:K:n:p:R:r:s:T:t:U:w:x:X:y:Y:z:CFGHLOPSWdghlv",
sizeof(opts));
#ifdef USE_PERFTOOLS
@ -451,16 +444,6 @@ int main(int argc, char** argv)
int op;
while ( (op = getopt_long(argc, argv, opts, long_opts, &long_optsind)) != EOF )
switch ( op ) {
case 'a':
#ifdef ACTIVE_MAPPING
fprintf(stderr, "Using active mapping file %s.\n", optarg);
active_file = optarg;
#else
fprintf(stderr, "Bro not compiled for active mapping.\n");
exit(1);
#endif
break;
case 'd':
fprintf(stderr, "Policy file debugging ON.\n");
g_policy_debug = true;
@ -709,13 +692,6 @@ int main(int argc, char** argv)
add_input_file(argv[optind++]);
}
if ( ! load_mapping_table(active_file.c_str()) )
{
fprintf(stderr, "Could not load active mapping file %s\n",
active_file.c_str());
exit(1);
}
dns_mgr = new DNS_Mgr(dns_type);
// It would nice if this were configurable. This is similar to the