echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GeoIP: Prefer more recent of mmdb or Debian files if we have both

Browse Source
This commit is contained in:
zzz
2020-02-20 16:44:18 +00:00
parent 2805388a4c
commit 2524a7a69d
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
router/java/src/net/i2p/router/transport/GeoIP.java
View File

@ -186,7 +186,11 @@ public class GeoIP {
if (search.length > 0) { if (search.length > 0) {
Arrays.sort(search); Arrays.sort(search);
File f = new File(_context.getProperty(PROP_DEBIAN_GEOIP, DEBIAN_GEOIP_FILE)); File f = new File(_context.getProperty(PROP_DEBIAN_GEOIP, DEBIAN_GEOIP_FILE));
if (ENABLE_DEBIAN && f.exists()) { // if we have both, prefer the most recent.
// The Debian data can be pretty old.
// For now, we use the file date, we don't open it up to get the metadata.
if (ENABLE_DEBIAN && f.exists() &&
(geoip2 == null || f.lastModified() > geoip2.lastModified())) {
// Maxmind v1 database // Maxmind v1 database
LookupService ls = null; LookupService ls = null;
try { try {
@ -255,7 +259,8 @@ public class GeoIP {
if (search.length > 0) { if (search.length > 0) {
Arrays.sort(search); Arrays.sort(search);
File f = new File(_context.getProperty(PROP_DEBIAN_GEOIPV6, DEBIAN_GEOIPV6_FILE)); File f = new File(_context.getProperty(PROP_DEBIAN_GEOIPV6, DEBIAN_GEOIPV6_FILE));
if (ENABLE_DEBIAN && f.exists()) { if (ENABLE_DEBIAN && f.exists() &&
(geoip2 == null || f.lastModified() > geoip2.lastModified())) {
// Maxmind v1 database // Maxmind v1 database
LookupService ls = null; LookupService ls = null;
try { try {