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

Simplify MMDB code by moving more lookup functionality into MMDB class

Browse source
This commit is contained in:
Christian Kreibich 2024-01-09 22:00:29 -08:00
parent a06053ce75
commit 07499cd2e5
2 changed files with 29 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

63
src/MMDB.cc
View file

@ -56,6 +56,30 @@ MMDB::MMDB(const char* filename, struct stat info)
MMDB::~MMDB() { MMDB_close(&mmdb); }
bool MMDB::Lookup(const zeek::IPAddr& addr, MMDB_lookup_result_s& result) {
struct sockaddr_storage ss = {0};
if ( IPv4 == addr.GetFamily() ) {
struct sockaddr_in* sa = (struct sockaddr_in*)&ss;
sa->sin_family = AF_INET;
addr.CopyIPv4(&sa->sin_addr);
}
else {
struct sockaddr_in6* sa = (struct sockaddr_in6*)&ss;
sa->sin6_family = AF_INET6;
addr.CopyIPv6(&sa->sin6_addr);
}
try {
result = Lookup((struct sockaddr*)&ss);
} catch ( const std::exception& e ) {
report_msg("MaxMind DB lookup location error [%s]", e.what());
return false;
}
return result.found_entry;
}
MMDB_lookup_result_s MMDB::Lookup(const struct sockaddr* const sa) {
int mmdb_error;
MMDB_lookup_result_s result = MMDB_lookup_sockaddr(&mmdb, sa, &mmdb_error);
@ -150,41 +174,6 @@ static void mmdb_check_asn() {
}
}
static bool mmdb_lookup(const zeek::IPAddr& addr, MMDB_lookup_result_s& result, bool asn) {
struct sockaddr_storage ss = {0};
if ( IPv4 == addr.GetFamily() ) {
struct sockaddr_in* sa = (struct sockaddr_in*)&ss;
sa->sin_family = AF_INET;
addr.CopyIPv4(&sa->sin_addr);
}
else {
struct sockaddr_in6* sa = (struct sockaddr_in6*)&ss;
sa->sin6_family = AF_INET6;
addr.CopyIPv6(&sa->sin6_addr);
}
try {
result = asn ? mmdb_asn->Lookup((struct sockaddr*)&ss) : mmdb_loc->Lookup((struct sockaddr*)&ss);
}
catch ( const std::exception& e ) {
report_msg("MaxMind DB lookup location error [%s]", e.what());
return false;
}
return result.found_entry;
}
static bool mmdb_lookup_loc(const zeek::IPAddr& addr, MMDB_lookup_result_s& result) {
return mmdb_lookup(addr, result, false);
}
static bool mmdb_lookup_asn(const zeek::IPAddr& addr, MMDB_lookup_result_s& result) {
return mmdb_lookup(addr, result, true);
}
static zeek::ValPtr mmdb_getvalue(MMDB_entry_data_s* entry_data, int status, int data_type) {
switch ( status ) {
case MMDB_SUCCESS:
@ -318,7 +307,7 @@ RecordValPtr mmdb_lookup_location(AddrVal* addr) {
MMDB_lookup_result_s result;
if ( mmdb_lookup_loc(addr->AsAddr(), result) ) {
if ( mmdb_loc->Lookup(addr->AsAddr(), result) ) {
MMDB_entry_data_s entry_data;
int status;
@ -379,7 +368,7 @@ RecordValPtr mmdb_lookup_autonomous_system(AddrVal* addr) {
MMDB_lookup_result_s result;
if ( mmdb_lookup_asn(addr->AsAddr(), result) ) {
if ( mmdb_asn->Lookup(addr->AsAddr(), result) ) {
MMDB_entry_data_s entry_data;
int status;

4
src/MMDB.h
View file

@ -16,11 +16,13 @@ public:
~MMDB();
MMDB_lookup_result_s Lookup(const struct sockaddr* const sa);
bool Lookup(const zeek::IPAddr& addr, MMDB_lookup_result_s& result);
bool StaleDB();
const char* Filename();
private:
MMDB_lookup_result_s Lookup(const struct sockaddr* const sa);
MMDB_s mmdb;
struct stat file_info;
bool lookup_error;