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

Merge branch 'peer-selection' into 'master'

Browse Source 
Tunnels: Peer selection adjustments

See merge request i2p-hackers/i2p.i2p!167
This commit is contained in:
zzz
2024-01-02 13:34:15 +00:00
parent 5a2eba7426 69da9f4034
commit 2efc759908
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
router/java/src/net/i2p/router/peermanager/CapacityCalculator.java
View File

@@ -159,6 +159,8 @@ class CapacityCalculator {
else
capacity -= PENALTY_CAP_D;
}
} else if (caps.indexOf(Router.CAPABILITY_NO_TUNNELS) >= 0) {
capacity = 0;
}
} else {
capacity -= PENALTY_NO_RI;

16
router/java/src/net/i2p/router/tunnel/pool/TunnelPeerSelector.java
View File

@@ -42,7 +42,9 @@ import net.i2p.util.VersionComparator;
*/
public abstract class TunnelPeerSelector extends ConnectChecker {
private static final String DEFAULT_EXCLUDE_CAPS = String.valueOf(Router.CAPABILITY_BW12)+String.valueOf(Router.CAPABILITY_CONGESTION_SEVERE);//+String.valueOf(Router.CAPABILITY_CONGESTION_MODERATE);
private static final String DEFAULT_EXCLUDE_CAPS = String.valueOf(Router.CAPABILITY_BW12) +
String.valueOf(Router.CAPABILITY_CONGESTION_SEVERE) +
String.valueOf(Router.CAPABILITY_NO_TUNNELS);
protected TunnelPeerSelector(RouterContext context) {
super(context);
@@ -231,8 +233,14 @@ public abstract class TunnelPeerSelector extends ConnectChecker {
if (info == null)
return true;
// reduce load on floodfills
String caps = info.getCapabilities();
if (isExploratory &&
caps.indexOf(FloodfillNetworkDatabaseFacade.CAPABILITY_FLOODFILL) >= 0 &&
ctx.random().nextInt(4) != 0)
return true;
if (filterUnreachable(isInbound, isExploratory)) {
String caps = info.getCapabilities();
if (caps.indexOf(Router.CAPABILITY_UNREACHABLE) >= 0)
return true;
}
@@ -340,8 +348,8 @@ public abstract class TunnelPeerSelector extends ConnectChecker {
return ctx.getProperty("router.excludePeerCaps", DEFAULT_EXCLUDE_CAPS);
}
/** Short ECIES tunnel build messages (1.5.0) */
private static final String MIN_VERSION = "0.9.51";
/** SSU2 fixes (2.1.0), Congestion fixes (2.2.0) */
private static final String MIN_VERSION = "0.9.58";
/**
* Should the peer be excluded based on its published caps?