I2P_Developers/i2p.android.base
3
0
Fork 2
Code Issues 39 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

propagate from branch 'i2p.i2p.zzz.test' (head ff346bd41de699648bb66488ec9c0f1f4b5300b1)

Browse Source 
to branch 'i2p.i2p' (head 2914d3356f892de25a745f061129704f8b943fc5)
This commit is contained in:
zzz
2009-06-07 17:35:02 +00:00
parent 45d9f9d07d 4975d30714
commit c1a8c8a3fd
2 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java
View File

@ -379,34 +379,30 @@ public class ProfileOrganizer {
* Return a set of Hashes for peers that are both not failing and we're actively
* talking with.
*
* We use commSystem().isEstablished(), not profile.getIsActive(), as the
* NTCP idle time is now shorter than the 5 minute getIsActive() threshold,
* and we're using this to try and limit connections.
*
* Caution, this does NOT cascade further to non-connected peers, so it should only
* be used when there is a good number of connected peers.
*
* @param exclude non-null
* No mask parameter, to be fixed
*/
/*
private void selectActiveNotFailingPeers(int howMany, Set exclude, Set matches) {
if (true) {
selectAllNotFailingPeers(howMany, exclude, matches);
return;
}
// pick out the not-failing peers that we're actively talking with
public void selectActiveNotFailingPeers(int howMany, Set exclude, Set matches) {
if (matches.size() < howMany) {
synchronized (_reorganizeLock) {
for (Iterator iter = _notFailingPeers.keySet().iterator(); iter.hasNext(); ) {
Hash peer = (Hash)iter.next();
if ( (exclude != null) && exclude.contains(peer) ) continue;
if (matches.contains(peer)) continue;
PeerProfile prof = (PeerProfile)_notFailingPeers.get(peer);
if (prof.getIsActive())
matches.add(peer);
if (matches.size() >= howMany)
return;
getReadLock();
try {
for (Iterator<Hash> iter = _notFailingPeers.keySet().iterator(); iter.hasNext(); ) {
Hash peer = iter.next();
if (!_context.commSystem().isEstablished(peer))
exclude.add(peer);
}
}
locked_selectPeers(_notFailingPeers, howMany, exclude, matches, 0);
} finally { releaseReadLock(); }
}
// ok, still not enough, pick out the not-failing peers that we aren't talking with
if (matches.size() < howMany)
selectAllNotFailingPeers(howMany, exclude, matches);
return;
}
*/
/**
* Return a set of Hashes for peers that are not failing.
*
@ -414,6 +410,10 @@ public class ProfileOrganizer {
public void selectAllNotFailingPeers(int howMany, Set exclude, Set matches, boolean onlyNotFailing) {
selectAllNotFailingPeers(howMany, exclude, matches, onlyNotFailing, 0);
}
/**
* @param mask ignored, should call locked_selectPeers, to be fixed
*
*/
private void selectAllNotFailingPeers(int howMany, Set exclude, Set matches, boolean onlyNotFailing, int mask) {
if (matches.size() < howMany) {
int orig = matches.size();

7
router/java/src/net/i2p/router/tunnel/pool/ExploratoryPeerSelector.java
View File

@ -42,10 +42,15 @@ class ExploratoryPeerSelector extends TunnelPeerSelector {
// exclude.addAll(fac.getFloodfillPeers());
HashSet matches = new HashSet(length);
boolean exploreHighCap = shouldPickHighCap(ctx);
//
// We don't honor IP Restriction here, to be fixed
//
if (exploreHighCap)
ctx.profileOrganizer().selectHighCapacityPeers(length, exclude, matches);
else
else if (ctx.commSystem().haveOutboundCapacity())
ctx.profileOrganizer().selectNotFailingPeers(length, exclude, matches, false);
else // use only connected peers so we don't make more connections
ctx.profileOrganizer().selectActiveNotFailingPeers(length, exclude, matches);
if (l.shouldLog(Log.DEBUG))
l.debug("profileOrganizer.selectNotFailing(" + length + ") found " + matches);