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

This commit is contained in:
Shreyas Zare
2024-03-16 12:38:08 +05:30
parent 0690ee72b7
commit 19d550429c

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 GeoContinent
static MaxMind _maxMind; static MaxMind _maxMind;
readonly DatabaseReader _mmCountryReader; readonly DatabaseReader _mmCountryReader;
readonly DatabaseReader _mmIspReader;
readonly DatabaseReader _mmAsnReader;
#endregion #endregion
@@ -38,15 +40,26 @@ namespace GeoContinent
private MaxMind(IDnsServer dnsServer) private MaxMind(IDnsServer dnsServer)
{ {
string mmFile = Path.Combine(dnsServer.ApplicationFolder, "GeoIP2-Country.mmdb"); string mmCountryFile = Path.Combine(dnsServer.ApplicationFolder, "GeoIP2-Country.mmdb");
if (!File.Exists(mmFile)) if (!File.Exists(mmCountryFile))
mmFile = Path.Combine(dnsServer.ApplicationFolder, "GeoLite2-Country.mmdb"); mmCountryFile = Path.Combine(dnsServer.ApplicationFolder, "GeoLite2-Country.mmdb");
if (!File.Exists(mmFile)) if (!File.Exists(mmCountryFile))
throw new FileNotFoundException("MaxMind Country file is missing!"); throw new FileNotFoundException("MaxMind Country file is missing!");
_mmCountryReader = new DatabaseReader(mmFile); _mmCountryReader = new DatabaseReader(mmCountryFile);
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 GeoContinent
if (disposing) if (disposing)
{ {
if (_mmCountryReader is not null) _mmCountryReader?.Dispose();
_mmCountryReader.Dispose(); _mmIspReader?.Dispose();
_mmAsnReader?.Dispose();
} }
_disposed = true; _disposed = true;
@@ -91,9 +105,15 @@ namespace GeoContinent
#region properties #region properties
public DatabaseReader DatabaseReader public DatabaseReader CountryReader
{ get { return _mmCountryReader; } } { get { return _mmCountryReader; } }
public DatabaseReader IspReader
{ get { return _mmIspReader; } }
public DatabaseReader AsnReader
{ get { return _mmAsnReader; } }
#endregion #endregion
} }
} }