osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Qt: Fix build withouth MaxMindDB

This commit is contained in:
Stig Bjørlykke 2022-06-02 08:56:22 +02:00
parent dd9e4fd3fa
commit 335795ab16
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/qt/endpoint_dialog.cpp
View File

@ -122,6 +122,8 @@ void EndpointDialog::tabChanged(int idx)
bool geoIp = trafficTab()->hasGeoIPData(idx);
map_bt_->setEnabled(geoIp);
}
#else
Q_UNUSED(idx);
#endif
}

4
ui/qt/models/atap_data_model.cpp
View File

@ -66,6 +66,7 @@ QString ATapDataModel::tap() const
return proto_get_protocol_filter_name(_protoId);
}
#ifdef HAVE_MAXMINDDB
bool ATapDataModel::hasGeoIPData()
{
QString key = QString("geoip_found_%1").arg(_protoId);
@ -87,6 +88,7 @@ bool ATapDataModel::hasGeoIPData()
return _lookUp.value(key, false).toBool();
}
#endif
bool ATapDataModel::enableTap()
{
@ -380,9 +382,9 @@ QVariant EndpointDataModel::data(const QModelIndex &idx, int role) const
// Column text cooked representation.
hostlist_talker_t *item = &g_array_index(storage_, hostlist_talker_t, idx.row());
char addr[WS_INET6_ADDRSTRLEN];
const mmdb_lookup_t *mmdb_lookup = nullptr;
#ifdef HAVE_MAXMINDDB
char addr[WS_INET6_ADDRSTRLEN];
if (item->myaddress.type == AT_IPv4) {
const ws_in4_addr * ip4 = (const ws_in4_addr *) item->myaddress.data;
mmdb_lookup = maxmind_db_lookup_ipv4(ip4);