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

Merge remote-tracking branch 'origin/master' into topic/liangzhu/analyzer-ocsp

Browse source
This commit is contained in:
Liang Zhu 2015-07-02 16:48:51 -07:00
commit da122a6a14
9 changed files with 120 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/main.cc
View file

@ -181,8 +181,8 @@ void usage()
fprintf(stderr, " -r|--readfile <readfile> | read from given tcpdump file\n");
fprintf(stderr, " -s|--rulefile <rulefile> | read rules from given file\n");
fprintf(stderr, " -t|--tracefile <tracefile> | activate execution tracing\n");
fprintf(stderr, " -w|--writefile <writefile> | write to given tcpdump file\n");
fprintf(stderr, " -v|--version | print version and exit\n");
fprintf(stderr, " -w|--writefile <writefile> | write to given tcpdump file\n");
fprintf(stderr, " -x|--print-state <file.bst> | print contents of state file\n");
fprintf(stderr, " -z|--analyze <analysis> | run the specified policy file analysis\n");
#ifdef DEBUG
@ -190,6 +190,8 @@ void usage()
#endif
fprintf(stderr, " -C|--no-checksums | ignore checksums\n");
fprintf(stderr, " -F|--force-dns | force DNS\n");
fprintf(stderr, " -G|--load-seeds <file> | load seeds from given file\n");
fprintf(stderr, " -H|--save-seeds <file> | save seeds to given file\n");
fprintf(stderr, " -I|--print-id <ID name> | print out given ID\n");
fprintf(stderr, " -J|--set-seed <seed> | set the random number seed\n");
fprintf(stderr, " -K|--md5-hashkey <hashkey> | set key for MD5-keyed hashing\n");
@ -211,8 +213,6 @@ void usage()
fprintf(stderr, " -X <file.bst> | print contents of state file as XML\n");
#endif
fprintf(stderr, " --pseudo-realtime[=<speedup>] | enable pseudo-realtime for performance evaluation (default 1)\n");
fprintf(stderr, " --load-seeds <file> | load seeds from given file\n");
fprintf(stderr, " --save-seeds <file> | save seeds to given file\n");
#ifdef USE_IDMEF
fprintf(stderr, " -n|--idmef-dtd <idmef-msg.dtd> | specify path to IDMEF DTD file\n");
@ -549,7 +549,7 @@ int main(int argc, char** argv)
opterr = 0;
char opts[256];
safe_strncpy(opts, "B:e:f:I:i:J:K:n:p:R:r:s:T:t:U:w:x:X:z:CFNPSWabdghvQ",
safe_strncpy(opts, "B:e:f:G:H:I:i:J:K:n:p:R:r:s:T:t:U:w:x:X:z:CFNPQSWabdghv",
sizeof(opts));
#ifdef USE_PERFTOOLS_DEBUG
@ -584,6 +584,10 @@ int main(int argc, char** argv)
dump_cfg = true;
break;
case 'h':
usage();
break;
case 'i':
interfaces.append(optarg);
break;
@ -605,10 +609,19 @@ int main(int argc, char** argv)
g_trace_state.TraceOn();
break;
case 'v':
fprintf(stderr, "%s version %s\n", prog, bro_version());
exit(0);
break;
case 'w':
writefile = optarg;
break;
case 'x':
bst_file = optarg;
break;
case 'z':
if ( streq(optarg, "notice") )
do_notice_analysis = 1;
@ -619,6 +632,10 @@ int main(int argc, char** argv)
}
break;
case 'B':
debug_streams = optarg;
break;
case 'C':
override_ignore_checksums = 1;
break;
@ -690,13 +707,8 @@ int main(int argc, char** argv)
do_watchdog = 1;
break;
case 'h':
usage();
break;
case 'v':
fprintf(stderr, "%s version %s\n", prog, bro_version());
exit(0);
case 'X':
broxygen_config = optarg;
break;
#ifdef USE_PERFTOOLS_DEBUG
@ -709,9 +721,6 @@ int main(int argc, char** argv)
break;
#endif
case 'x':
bst_file = optarg;
break;
#if 0 // broken
case 'X':
bst_file = optarg;
@ -719,10 +728,6 @@ int main(int argc, char** argv)
break;
#endif
case 'X':
broxygen_config = optarg;
break;
#ifdef USE_IDMEF
case 'n':
fprintf(stderr, "Using IDMEF XML DTD from %s\n", optarg);
@ -730,10 +735,6 @@ int main(int argc, char** argv)
break;
#endif
case 'B':
debug_streams = optarg;
break;
case 0:
// This happens for long options that don't have
// a short-option equivalent.