marek/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 '412-caps' into 'master'

Browse Source 
Profiles: Increase congestion cap penalties (Gitlab #412)

Closes #412

See merge request i2p-hackers/i2p.i2p!157
This commit is contained in:
zzz
2023-11-21 21:25:18 +00:00
parent 18b8d05597 e9f3b58b7d
commit a80f01f7b3
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,9 +35,9 @@ class CapacityCalculator {
private static final double PENALTY_U_CAP = 2; private static final double PENALTY_U_CAP = 2;
private static final double PENALTY_LAST_SEND_FAIL = 4; private static final double PENALTY_LAST_SEND_FAIL = 4;
private static final String PROP_D_CAP = "router.penaltyCapD"; private static final String PROP_D_CAP = "router.penaltyCapD";
private static final double PENALTY_CAP_D = 0.5; private static final double PENALTY_CAP_D = 2.5;
private static final String PROP_E_CAP = "router.penaltyCapE"; private static final String PROP_E_CAP = "router.penaltyCapE";
private static final double PENALTY_CAP_E = 0.9; private static final double PENALTY_CAP_E = 4.75;
// private static final String PROP_G_CAP = "router.gcapPenalty"; // private static final String PROP_G_CAP = "router.gcapPenalty";
// private static final double PENALTY_G_CAP = 0; // private static final double PENALTY_G_CAP = 0;
private static final double PENALTY_RECENT_SEND_FAIL = 4; private static final double PENALTY_RECENT_SEND_FAIL = 4;
@ -133,18 +133,31 @@ class CapacityCalculator {
if (caps.indexOf(Router.CAPABILITY_CONGESTION_MODERATE) >= 0) { if (caps.indexOf(Router.CAPABILITY_CONGESTION_MODERATE) >= 0) {
String dcapPenalty = context.getProperty(PROP_D_CAP); String dcapPenalty = context.getProperty(PROP_D_CAP);
if (dcapPenalty != null) { if (dcapPenalty != null) {
double dcap = Double.parseDouble(dcapPenalty); try {
capacity -= dcap; double dcap = Double.parseDouble(dcapPenalty);
capacity -= dcap;
} catch (NumberFormatException nfe) {
capacity -= PENALTY_CAP_D;
}
} else { } else {
capacity -= PENALTY_CAP_D; capacity -= PENALTY_CAP_D;
} }
} else if (caps.indexOf(Router.CAPABILITY_CONGESTION_SEVERE) >= 0){ } else if (caps.indexOf(Router.CAPABILITY_CONGESTION_SEVERE) >= 0){
String ecapPenalty = context.getProperty(PROP_E_CAP); String ecapPenalty = context.getProperty(PROP_E_CAP);
if (ecapPenalty != null) { if (ecapPenalty != null) {
double ecap = Double.parseDouble(ecapPenalty); try {
capacity -= ecap; double ecap = Double.parseDouble(ecapPenalty);
capacity -= ecap;
} catch (NumberFormatException nfe) {
capacity -= PENALTY_CAP_E;
}
} else { } else {
capacity -= PENALTY_CAP_E; // treat older than 15 minutes as D, as recommended in proposal 162
long age = context.clock().now() - ri.getPublished();
if (age < 15*60*1000)
capacity -= PENALTY_CAP_E;
else
capacity -= PENALTY_CAP_D;
} }
} }
} else { } else {