diff --git a/installer/tools/java/src/net/i2p/router/networkdb/kademlia/BundleRouterInfos.java b/installer/tools/java/src/net/i2p/router/networkdb/kademlia/BundleRouterInfos.java index f6df2055dc5dee412ae41153227939b039d1fa5e..6a544d45f3d2e470cfbc48d41e2afdae48299e8b 100644 --- a/installer/tools/java/src/net/i2p/router/networkdb/kademlia/BundleRouterInfos.java +++ b/installer/tools/java/src/net/i2p/router/networkdb/kademlia/BundleRouterInfos.java @@ -29,7 +29,7 @@ import net.i2p.data.DataFormatException; import net.i2p.data.Hash; import net.i2p.data.router.RouterAddress; import net.i2p.data.router.RouterInfo; -import net.i2p.router.transport.BadCountries; +import net.i2p.router.transport.StrictCountries; import net.i2p.router.transport.GeoIP; import net.i2p.util.FileUtil; @@ -227,7 +227,7 @@ public class BundleRouterInfos { for (Map.Entry<String, String> e : ipMap.entrySet()) { String co = geoIP.get(e.getKey()); if (co != null) { - if (BadCountries.contains(co)) { + if (StrictCountries.contains(co)) { String name = e.getValue(); File toFile = new File(toDir, name); if (toFile.delete()) { diff --git a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java index 450cb6348e8863b22878ccb1db61af942c42d979..ef35ea5740655538a4ac1ec2bf18abfdc594c8f2 100644 --- a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java +++ b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java @@ -438,7 +438,7 @@ public class CommSystemFacadeImpl extends CommSystemFacade { @Override public boolean isInBadCountry() { String us = getOurCountry(); - return (us != null && BadCountries.contains(us)) || _context.getBooleanProperty("router.forceBadCountry"); + return (us != null && StrictCountries.contains(us)) || _context.getBooleanProperty("router.forceBadCountry"); } /** @@ -449,7 +449,7 @@ public class CommSystemFacadeImpl extends CommSystemFacade { @Override public boolean isInBadCountry(Hash peer) { String c = getCountry(peer); - return c != null && BadCountries.contains(c); + return c != null && StrictCountries.contains(c); } /** @@ -463,7 +463,7 @@ public class CommSystemFacadeImpl extends CommSystemFacade { if (ip == null) return false; String c = _geoIP.get(ip); - return c != null && BadCountries.contains(c); + return c != null && StrictCountries.contains(c); } /** diff --git a/router/java/src/net/i2p/router/transport/BadCountries.java b/router/java/src/net/i2p/router/transport/StrictCountries.java similarity index 93% rename from router/java/src/net/i2p/router/transport/BadCountries.java rename to router/java/src/net/i2p/router/transport/StrictCountries.java index dc848d85986ac812c18a8269c4dc63c0522b4c14..c54f531ca2509ebac5069417077935453f1940ae 100644 --- a/router/java/src/net/i2p/router/transport/BadCountries.java +++ b/router/java/src/net/i2p/router/transport/StrictCountries.java @@ -6,10 +6,11 @@ import java.util.Locale; import java.util.Set; /** - * Maintain a list of bad places. + * Maintain a list of countries that may have + * tight restrictions on applications like ours. * @since 0.8.13 */ -public abstract class BadCountries { +public abstract class StrictCountries { private static final Set<String> _countries;