GeoDistance.MaxMind: Implemented support for ISP/ASN database.

This commit is contained in:
Shreyas Zare
2024-03-16 13:17:14 +05:30
parent 7c5b45e655
commit ffd2f69893

View File

@@ -1,6 +1,6 @@
/* /*
Technitium DNS Server Technitium DNS Server
Copyright (C) 2021 Shreyas Zare (shreyas@technitium.com) Copyright (C) 2024 Shreyas Zare (shreyas@technitium.com)
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@@ -31,6 +31,8 @@ namespace GeoDistance
static MaxMind _maxMind; static MaxMind _maxMind;
readonly DatabaseReader _mmCityReader; readonly DatabaseReader _mmCityReader;
readonly DatabaseReader _mmIspReader;
readonly DatabaseReader _mmAsnReader;
#endregion #endregion
@@ -38,15 +40,26 @@ namespace GeoDistance
private MaxMind(IDnsServer dnsServer) private MaxMind(IDnsServer dnsServer)
{ {
string mmFile = Path.Combine(dnsServer.ApplicationFolder, "GeoIP2-City.mmdb"); string mmCityFile = Path.Combine(dnsServer.ApplicationFolder, "GeoIP2-City.mmdb");
if (!File.Exists(mmFile)) if (!File.Exists(mmCityFile))
mmFile = Path.Combine(dnsServer.ApplicationFolder, "GeoLite2-City.mmdb"); mmCityFile = Path.Combine(dnsServer.ApplicationFolder, "GeoLite2-City.mmdb");
if (!File.Exists(mmFile)) if (!File.Exists(mmCityFile))
throw new FileNotFoundException("MaxMind City file is missing!"); throw new FileNotFoundException("MaxMind City file is missing!");
_mmCityReader = new DatabaseReader(mmFile); _mmCityReader = new DatabaseReader(mmCityFile);
string mmIspFile = Path.Combine(dnsServer.ApplicationFolder, "GeoIP2-ISP.mmdb");
if (File.Exists(mmIspFile))
{
_mmIspReader = new DatabaseReader(mmIspFile);
return;
}
string mmAsnFile = Path.Combine(dnsServer.ApplicationFolder, "GeoLite2-ASN.mmdb");
if (File.Exists(mmAsnFile))
_mmAsnReader = new DatabaseReader(mmAsnFile);
} }
#endregion #endregion
@@ -62,8 +75,9 @@ namespace GeoDistance
if (disposing) if (disposing)
{ {
if (_mmCityReader is not null) _mmCityReader?.Dispose();
_mmCityReader.Dispose(); _mmIspReader?.Dispose();
_mmAsnReader?.Dispose();
} }
_disposed = true; _disposed = true;
@@ -91,9 +105,15 @@ namespace GeoDistance
#region properties #region properties
public DatabaseReader DatabaseReader public DatabaseReader CityReader
{ get { return _mmCityReader; } } { get { return _mmCityReader; } }
public DatabaseReader IspReader
{ get { return _mmIspReader; } }
public DatabaseReader AsnReader
{ get { return _mmAsnReader; } }
#endregion #endregion
} }
} }