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

* Profiles: Only use same-country metric for countries with

Browse Source 
lots of I2P users
This commit is contained in:
zzz
2011-11-14 15:04:27 +00:00
parent 66f25e845a
commit 0675c4caeb
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
router/java/src/net/i2p/router/peermanager/PeerProfile.java
View File

@ -2,6 +2,9 @@ package net.i2p.router.peermanager;
import java.io.File;
import java.text.DecimalFormat;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import net.i2p.data.Hash;
import net.i2p.router.RouterContext;
@ -60,6 +63,18 @@ public class PeerProfile {
private int _consecutiveShitlists;
private final int _distance;
/**
* Countries with more than about a 2% share of the netdb.
* Only routers in these countries will use a same-country metric.
* Yes this is an arbitrary cutoff.
*/
private static final Set<String> _bigCountries = new HashSet();
static {
String[] big = new String[] {"ca", "fi", "fr", "de", "ru", "se", "ua", "gb", "us" };
_bigCountries.addAll(Arrays.asList(big));
}
public PeerProfile(RouterContext context, Hash peer) {
this(context, peer, true);
}
@ -118,7 +133,9 @@ public class PeerProfile {
/** @since 0.8.11 */
boolean isSameCountry() {
String us = _context.commSystem().getOurCountry();
return us != null && us.equals(_context.commSystem().getCountry(_peer));
return us != null &&
_bigCountries.contains(us) &&
us.equals(_context.commSystem().getCountry(_peer));
}
/**