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

Router: Revert deprecation;

Browse Source 
addCapabilities() tweaks
This commit is contained in:
zzz
2015-03-17 21:38:59 +00:00
parent 819b07a52a
commit 0af1f67c33
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -500,7 +500,7 @@ public class Router implements RouterClock.ClockShiftListener {
public void setHigherVersionSeen(boolean seen) { _higherVersionSeen = seen; }
/**
* @deprecated unused
* Used only by routerconsole.. to be deprecated?
*/
public long getWhenStarted() { return _started; }
@@ -856,6 +856,12 @@ public class Router implements RouterClock.ClockShiftListener {
/**
* For building our RI. Not for external use.
* This does not publish the ri.
* This does not use anything in the ri (i.e. it can be freshly constructed)
*
* TODO just return a string instead of passing in the RI? See PublishLocalRouterInfoJob.
*
* @param an unpublished ri we are generating.
*/
public void addCapabilities(RouterInfo ri) {
int bwLim = Math.min(_context.bandwidthLimiter().getInboundKBytesPerSecond(),
@@ -877,12 +883,18 @@ public class Router implements RouterClock.ClockShiftListener {
ri.addCapability(CAPABILITY_BW128);
} else if (bwLim <= 256) {
ri.addCapability(CAPABILITY_BW256);
} else {
} else if (bwLim <= 2000) { // TODO adjust threshold
// 512 supported as of 0.9.18;
// Add 256 as well for compatibility
// TODO uncomment
//ri.addCapability(CAPABILITY_BW512);
ri.addCapability(CAPABILITY_BW256);
} else {
// Unlimited supported as of 0.9.18;
// Add 256 as well for compatibility
// TODO uncomment
//ri.addCapability(CAPABILITY_BW_UNLIMITED);
ri.addCapability(CAPABILITY_BW256);
}
// if prop set to true, don't tell people we are ff even if we are