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

merge of '1f636df6ff10db350d6b020b2e06daf842fb23e1'

Browse Source 
and '5e5df32501efc3a7548958249e5bd99acf8edd8f'
This commit is contained in:
sponge
2010-01-13 14:38:01 +00:00
parent b15392ea85 9f28c06e9e
commit 865116b3f4
13 changed files with 49 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,9 +18,10 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 19;
public final static long BUILD = 0;
/** for example "-test" */
public final static String EXTRA = "-rc";
public final static String EXTRA = "";
public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
public static void main(String args[]) {
System.out.println("I2P Router version: " + FULL_VERSION);

2
router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java
View File

@ -27,7 +27,7 @@ class FloodfillMonitorJob extends JobImpl {
private static final long MIN_UPTIME = 2*60*60*1000;
private static final long MIN_CHANGE_DELAY = 6*60*60*1000;
private static final int MIN_FF = 4;
private static final int MAX_FF = 6;
private static final int MAX_FF = 9;
private static final String PROP_FLOODFILL_PARTICIPANT = "router.floodfillParticipant";
public FloodfillMonitorJob(RouterContext context, FloodfillNetworkDatabaseFacade facade) {

3
router/java/src/net/i2p/router/networkdb/kademlia/FloodfillStoreJob.java
View File

@ -53,6 +53,7 @@ class FloodfillStoreJob extends StoreJob {
@Override
protected void succeed() {
super.succeed();
if (_state != null) {
// Get the time stamp from the data we sent, so the Verify job can meke sure that
// it finds something stamped with that time or newer.
@ -61,6 +62,8 @@ class FloodfillStoreJob extends StoreJob {
boolean isRouterInfo = data instanceof RouterInfo;
if (isRouterInfo) {
published = ((RouterInfo) data).getPublished();
// Temporarily disable
return;
} else if (data instanceof LeaseSet) {
published = ((LeaseSet) data).getEarliestLeaseDate();
}

2
router/java/src/net/i2p/router/networkdb/kademlia/KBucketImpl.java
View File

@ -231,7 +231,7 @@ class KBucketImpl implements KBucket {
/**
* Todo: shuffling here is a hack and doesn't work since
* wwe witched back to a HashSet implementation
* we switched back to a HashSet implementation
*/
public int add(Hash peer) {
_entries.add(peer);

2
router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
View File

@ -77,7 +77,7 @@ public class CommSystemFacadeImpl extends CommSystemFacade {
public boolean haveHighOutboundCapacity() { return (_manager == null ? false : _manager.haveHighOutboundCapacity()); }
/**
* Framed average clock skew of connected peers in seconds, or the clock offset if we cannot answer.
* @return Framed average clock skew of connected peers in seconds, or the clock offset if we cannot answer.
* Average is calculated over the middle "percentToInclude" peers.
*/
@Override