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

Merge remote-tracking branch 'origin/master' into dev/2.7

Browse source
This commit is contained in:
Jon Siwek 2018-09-25 16:47:01 -05:00
commit 43aab5be7b
14 changed files with 65 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/OSFinger.cc
View file

@ -469,6 +469,7 @@ reparse_ptr:
{
case 'E':
Error("OS fingerprinting: Quirk 'E' is obsolete. Remove it, append E to the options. Line",(uint32)ln);
break;
case 'K':
if ( mode != RST_FINGERPRINT_MODE )

25
src/bro.bif
View file

@ -3626,7 +3626,7 @@ private:
};
MMDB::MMDB(const char* filename, struct stat info)
: file_info{info}, lookup_error{false},
: file_info(info), lookup_error{false},
last_check{std::chrono::steady_clock::now()}
{
int status = MMDB_open(filename, MMDB_MODE_MMAP, &mmdb);
@ -3695,6 +3695,8 @@ const char* MMDB::Filename()
std::unique_ptr<MMDB> mmdb_loc;
std::unique_ptr<MMDB> mmdb_asn;
static bool did_mmdb_loc_db_error = false;
static bool did_mmdb_asn_db_error = false;
static bool mmdb_open(const char* filename, bool asn)
{
@ -3719,6 +3721,11 @@ static bool mmdb_open(const char* filename, bool asn)
catch ( const std::exception& e )
{
if ( asn )
did_mmdb_asn_db_error = false;
else
did_mmdb_loc_db_error = false;
reporter->Info("Failed to open MaxMind DB: %s [%s]", filename,
e.what());
return false;
@ -3742,6 +3749,7 @@ static void mmdb_check_loc()
if ( mmdb_loc && mmdb_loc->StaleDB() )
{
reporter->Info("Closing stale MaxMind DB [%s]", mmdb_loc->Filename());
did_mmdb_loc_db_error = false;
mmdb_loc.release();
}
}
@ -3751,6 +3759,7 @@ static void mmdb_check_asn()
if ( mmdb_asn && mmdb_asn->StaleDB() )
{
reporter->Info("Closing stale MaxMind DB [%s]", mmdb_asn->Filename());
did_mmdb_asn_db_error = false;
mmdb_asn.release();
}
}
@ -3943,7 +3952,12 @@ function lookup_location%(a: addr%) : geo_location
{
if ( ! mmdb_try_open_loc() )
{
builtin_error("Failed to open GeoIP location database");
if ( ! did_mmdb_loc_db_error )
{
did_mmdb_loc_db_error = true;
builtin_error("Failed to open GeoIP location database");
}
return location;
}
}
@ -4021,7 +4035,12 @@ function lookup_asn%(a: addr%) : count
{
if ( ! mmdb_try_open_asn() )
{
builtin_error("No open GeoIP ASN database");
if ( ! did_mmdb_asn_db_error )
{
did_mmdb_asn_db_error = true;
builtin_error("Failed to open GeoIP ASN database");
}
return new Val(0, TYPE_COUNT);
}
}

8
src/threading/BasicThread.cc
View file

@ -11,6 +11,10 @@
#include <sys/prctl.h>
#endif
#ifdef __FreeBSD__
#include <pthread_np.h>
#endif
using namespace threading;
static const int STD_FMT_BUF_LEN = 2048;
@ -60,8 +64,8 @@ void BasicThread::SetOSName(const char* arg_name)
pthread_setname_np(arg_name);
#endif
#ifdef FREEBSD
pthread_set_name_np(thread.native_handle(), arg_name, arg_name);
#ifdef __FreeBSD__
pthread_set_name_np(thread.native_handle(), arg_name);
#endif
}

2
src/util.cc
View file

@ -1272,7 +1272,7 @@ FILE* rotate_file(const char* name, RecordVal* rotate_info)
// Build file names.
const int buflen = strlen(name) + 128;
char tmpname[buflen], newname[buflen+4];
char newname[buflen], tmpname[buflen+4];
safe_snprintf(newname, buflen, "%s.%d.%.06f.tmp",
name, getpid(), network_time);