X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_geo_maxmind.cpp;h=2850e050162af7c84e389e0a9446fe129fd4648f;hb=3151d60c1ecc9462e4c335282ee6c31672f45111;hp=b03933344731b022cbbb2f392c2142ca28e8d8b1;hpb=aa692dc1039b63deef7886e914ec499abe7facaf;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/extra/m_geo_maxmind.cpp b/src/modules/extra/m_geo_maxmind.cpp index b03933344..2850e0501 100644 --- a/src/modules/extra/m_geo_maxmind.cpp +++ b/src/modules/extra/m_geo_maxmind.cpp @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2019 Sadie Powell + * Copyright (C) 2019-2020 Sadie Powell * Copyright (C) 2019 Matt Schatz * * This file is part of InspIRCd. InspIRCd is free software: you can @@ -17,7 +17,9 @@ * along with this program. If not, see . */ +/// $CompilerFlags: require_version("libmaxminddb" "0" "1.2.1") warning("The version of libmaxminddb you are using may cause a segmentation fault if given a corrupt database file!") /// $CompilerFlags: find_compiler_flags("libmaxminddb" "") + /// $LinkerFlags: find_linker_flags("libmaxminddb" "-lmaxminddb") /// $PackageInfo: require_system("arch") libmaxminddb pkgconf @@ -154,13 +156,13 @@ class ModuleGeoMaxMind : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("Provides Geolocation lookups using the libMaxMindDB library", VF_VENDOR); + return Version("Allows the server to perform geolocation lookups on both IP addresses and users.", VF_VENDOR); } void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { ConfigTag* tag = ServerInstance->Config->ConfValue("maxmind"); - const std::string file = ServerInstance->Config->Paths.PrependConfig(tag->getString("file", "GeoLite2-Country.mmdb")); + const std::string file = ServerInstance->Config->Paths.PrependConfig(tag->getString("file", "GeoLite2-Country.mmdb", 1)); // Try to read the new database. MMDB_s mmdb; @@ -179,7 +181,7 @@ class ModuleGeoMaxMind : public Module void OnGarbageCollect() CXX11_OVERRIDE { for (LocationMap::iterator iter = geoapi.locations.begin(); iter != geoapi.locations.end(); ) - { + { Geolocation::Location* location = iter->second; if (location->GetUseCount()) {