I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

2007-08-04 Complication

Browse Source 
* Lower the threshold between the K and L bandwidth class,
      so that K is now < 12 KB/s, instead of <= 16 KB/s.
      Hopefully this lets people with 128 kbit/s (16 KB/s) upload lines
      participate in routing, if they keep the default share percentage.
This commit is contained in:
complication
2007-08-05 03:25:30 +00:00
committed by zzz
parent da10fe0df7
commit 99b5bf9609
5 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
history.txt
View File

@ -1,4 +1,10 @@
$Id: history.txt,v 1.578 2007-07-16 15:47:57 zzz Exp $
$Id: history.txt,v 1.579 2007-07-16 16:15:51 zzz Exp $
2007-08-04 Complication
* Lower the threshold between the K and L bandwidth class,
so that K is now < 12 KB/s, instead of <= 16 KB/s.
Hopefully this lets people with 128 kbit/s (16 KB/s) upload lines
participate in routing, if they keep the default share percentage.
2007-07-16 zzz
* i2psnark: Add tooltip info for choked/uninterested

6
router/java/src/net/i2p/router/Router.java
View File

@ -363,7 +363,7 @@ public class Router {
// publicize our ballpark capacity - this does not affect anything at
// the moment
public static final char CAPABILITY_BW16 = 'K';
public static final char CAPABILITY_BW12 = 'K';
public static final char CAPABILITY_BW32 = 'L';
public static final char CAPABILITY_BW64 = 'M';
public static final char CAPABILITY_BW128 = 'N';
@ -382,8 +382,8 @@ public class Router {
if (_log.shouldLog(Log.WARN))
_log.warn("Adding capabilities w/ bw limit @ " + bwLim, new Exception("caps"));
if (bwLim <= 16) {
ri.addCapability(CAPABILITY_BW16);
if (bwLim < 12) {
ri.addCapability(CAPABILITY_BW12);
} else if (bwLim <= 32) {
ri.addCapability(CAPABILITY_BW32);
} else if (bwLim <= 64) {

4
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
*
*/
public class RouterVersion {
public final static String ID = "$Revision: 1.513 $ $Date: 2007-07-16 15:47:59 $";
public final static String ID = "$Revision: 1.514 $ $Date: 2007-07-16 16:15:53 $";
public final static String VERSION = "0.6.1.28";
public final static long BUILD = 16;
public final static long BUILD = 17;
public static void main(String args[]) {
System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
System.out.println("Router ID: " + RouterVersion.ID);

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

@ -277,7 +277,7 @@ public abstract class TunnelPeerSelector {
private static char[] getExcludeCaps(RouterContext ctx) {
String excludeCaps = ctx.getProperty("router.excludePeerCaps",
String.valueOf(Router.CAPABILITY_BW16));
String.valueOf(Router.CAPABILITY_BW12));
Set peers = new HashSet();
if (excludeCaps != null) {
char excl[] = excludeCaps.toCharArray();

10
router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java
View File

@ -535,14 +535,14 @@ public class TunnelPoolManager implements TunnelManagerFacade {
RouterInfo info = _context.netDb().lookupRouterInfoLocally(peer);
if (info != null) {
String caps = info.getCapabilities();
if (caps.indexOf(Router.CAPABILITY_BW16) >= 0) {
return "[&lt;16&nbsp;]";
if (caps.indexOf(Router.CAPABILITY_BW12) >= 0) {
return "[&lt;12&nbsp;]";
} else if (caps.indexOf(Router.CAPABILITY_BW32) >= 0) {
return "[&lt;32&nbsp;]";
return "[&lt;=32&nbsp;]";
} else if (caps.indexOf(Router.CAPABILITY_BW64) >= 0) {
return "[&lt;64&nbsp;]";
return "[&lt;=64&nbsp;]";
} else if (caps.indexOf(Router.CAPABILITY_BW128) >= 0) {
return "<b>[&lt;128]</b>";
return "<b>[&lt;=128]</b>";
} else if (caps.indexOf(Router.CAPABILITY_BW256) >= 0) {
return "<b>[&gt;128]</b>";
} else {