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

Add an internal getenv wrapper function: zeekenv

Browse source 
It maps newer environment variable names starting with ZEEK to the
legacy names starting with BRO.
This commit is contained in:
Jon Siwek 2019-05-23 20:40:03 -07:00
parent 580822a32c
commit 7f0fb49612
14 changed files with 82 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/main.cc
View file

@ -147,10 +147,7 @@ const char* bro_version()
bool bro_dns_fake()
{
if ( getenv("ZEEK_DNS_FAKE") || getenv("BRO_DNS_FAKE") )
return true;
else
return false;
return zeekenv("ZEEK_DNS_FAKE");
}
void usage(int code = 1)
@ -208,8 +205,8 @@ void usage(int code = 1)
fprintf(stderr, " $ZEEK_SEED_FILE | file to load seeds from (not set)\n");
fprintf(stderr, " $ZEEK_LOG_SUFFIX | ASCII log file extension (.%s)\n", logging::writer::Ascii::LogExt().c_str());
fprintf(stderr, " $ZEEK_PROFILER_FILE | Output file for script execution statistics (not set)\n");
fprintf(stderr, " $ZEEK_DISABLE_ZEEKYGEN | Disable Zeekygen documentation support (%s)\n", getenv("ZEEK_DISABLE_ZEEKYGEN") || getenv("BRO_DISABLE_BROXYGEN") ? "set" : "not set");
fprintf(stderr, " $ZEEK_DNS_RESOLVER | IPv4/IPv6 address of DNS resolver to use (%s)\n", getenv("ZEEK_DNS_RESOLVER") ? getenv("ZEEK_DNS_RESOLVER") : "not set, will use first IPv4 address from /etc/resolv.conf");
fprintf(stderr, " $ZEEK_DISABLE_ZEEKYGEN | Disable Zeekygen documentation support (%s)\n", zeekenv("ZEEK_DISABLE_ZEEKYGEN") ? "set" : "not set");
fprintf(stderr, " $ZEEK_DNS_RESOLVER | IPv4/IPv6 address of DNS resolver to use (%s)\n", zeekenv("ZEEK_DNS_RESOLVER") ? zeekenv("ZEEK_DNS_RESOLVER") : "not set, will use first IPv4 address from /etc/resolv.conf");
fprintf(stderr, "\n");
@ -428,10 +425,7 @@ int main(int argc, char** argv)
char* id_name = 0;
char* events_file = 0;
char* seed_load_file = getenv("ZEEK_SEED_FILE");
if ( ! seed_load_file )
seed_load_file = getenv("BRO_SEED_FILE");
char* seed_load_file = zeekenv("ZEEK_SEED_FILE");
char* seed_save_file = 0;
char* user_pcap_filter = 0;
char* debug_streams = 0;
@ -500,9 +494,7 @@ int main(int argc, char** argv)
prefixes.append(strdup("")); // "" = "no prefix"
char* p = getenv("ZEEK_PREFIXES");
if ( ! p )
p = getenv("BRO_PREFIXES");
char* p = zeekenv("ZEEK_PREFIXES");
if ( p )
add_to_name_list(p, ':', prefixes);
@ -1088,7 +1080,7 @@ int main(int argc, char** argv)
// Drain the event queue here to support the protocols framework configuring DPM
mgr.Drain();
if ( reporter->Errors() > 0 && ! getenv("ZEEK_ALLOW_INIT_ERRORS") )
if ( reporter->Errors() > 0 && ! zeekenv("ZEEK_ALLOW_INIT_ERRORS") )
reporter->FatalError("errors occurred while initializing");
broker_mgr->ZeekInitDone();