start implementing congestion caps handling by adding...

start implementing congestion caps handling by adding CAPABILITY_CONGESTION_SEVER to TunnelPeerSelector.DEFAULT_EXCLUDE_CAPS and adding basic penalties to peers reporting congestion. Probably needs tweaking in it's present form.

router/java/src/net/i2p/router/peermanager/CapacityCalculator.java

@@ -34,9 +34,11 @@ class CapacityCalculator {
     private static final double PENALTY_NO_R_CAP = 1;
     private static final double PENALTY_U_CAP = 2;
     private static final double PENALTY_LAST_SEND_FAIL = 4;
-    private static final double PENALTY_D_CAP = 1;
-    private static final double PENALTY_E_CAP = 2;
-    //private static final double PENALTY_G_CAP = 4;
+    // congestion cap penalty not yet applied
+    //private static final double PENALTY_D_CAP = 0;
+    // congestion cap penalty not yet applied
+    //private static final double PENALTY_E_CAP = 0;
+    //private static final double PENALTY_G_CAP = 0;
     private static final double PENALTY_RECENT_SEND_FAIL = 4;
     private static final double BONUS_LAST_SEND_SUCCESS = 1;
     private static final double BONUS_RECENT_SEND_SUCCESS = 1;
@@ -128,10 +130,10 @@ class CapacityCalculator {
                 if (caps.indexOf(Router.CAPABILITY_BW32) >= 0)
                     capacity -= PENALTY_L_CAP;
 /* TODO */
-                if (caps.indexOf(Router.CAPABILITY_CONGESTION_MODERATE) >= 0)
+                /*if (caps.indexOf(Router.CAPABILITY_CONGESTION_MODERATE) >= 0)
                     capacity -= PENALTY_D_CAP;
                 else if (caps.indexOf(Router.CAPABILITY_CONGESTION_SEVERE) >= 0)
-                    capacity -= PENALTY_E_CAP;
+                    capacity -= PENALTY_E_CAP;*/
 /* TODO: G caps can be excluded in TunnelPeerSelector by adding it to DEFAULT_EXCLUDE_CAPS
                 decide what other handling if any is needed here.
                 else if (caps.indexOf(Router.CAPABILITY_NO_TUNNELS) >= 0)