Author: j16sdiz
Date: 2008-09-07 11:58:26 +0000 (Sun, 07 Sep 2008)
New Revision: 22519
Modified:
trunk/freenet/src/freenet/node/AnnounceSender.java
trunk/freenet/src/freenet/node/CHKInsertSender.java
trunk/freenet/src/freenet/node/NetworkIDManager.java
trunk/freenet/src/freenet/node/NodeDispatcher.java
trunk/freenet/src/freenet/node/PeerManager.java
trunk/freenet/src/freenet/node/RequestSender.java
trunk/freenet/src/freenet/node/ResettingHTLProbeRequestSender.java
trunk/freenet/src/freenet/node/SSKInsertSender.java
Log:
unused parameter: nodesNotIgnored
Modified: trunk/freenet/src/freenet/node/AnnounceSender.java
===================================================================
--- trunk/freenet/src/freenet/node/AnnounceSender.java 2008-09-07 11:35:25 UTC
(rev 22518)
+++ trunk/freenet/src/freenet/node/AnnounceSender.java 2008-09-07 11:58:26 UTC
(rev 22519)
@@ -93,7 +93,6 @@
// Now route it.
HashSet nodesRoutedTo = new HashSet();
- HashSet nodesNotIgnored = new HashSet();
PeerNode next = null;
while(true) {
if(logMINOR) Logger.minor(this, "htl="+htl);
@@ -121,7 +120,8 @@
if(onlyNode == null) {
// Route it
- next = node.peers.closerPeer(source, nodesRoutedTo,
nodesNotIgnored, target, true, node.isAdvancedModeEnabled(), -1, null, null);
+ next = node.peers.closerPeer(source, nodesRoutedTo, target,
true, node.isAdvancedModeEnabled(), -1,
+ null, null);
} else {
next = onlyNode;
if(nodesRoutedTo.contains(onlyNode)) {
Modified: trunk/freenet/src/freenet/node/CHKInsertSender.java
===================================================================
--- trunk/freenet/src/freenet/node/CHKInsertSender.java 2008-09-07 11:35:25 UTC
(rev 22518)
+++ trunk/freenet/src/freenet/node/CHKInsertSender.java 2008-09-07 11:58:26 UTC
(rev 22519)
@@ -269,7 +269,6 @@
private void realRun() {
HashSet nodesRoutedTo = new HashSet();
- HashSet nodesNotIgnored = new HashSet();
PeerNode next = null;
while(true) {
@@ -296,7 +295,8 @@
}
// Route it
// Can backtrack, so only route to nodes closer than we are to
target.
- next = node.peers.closerPeer(source, nodesRoutedTo,
nodesNotIgnored, target, true, node.isAdvancedModeEnabled(), -1, null, null);
+ next = node.peers.closerPeer(source, nodesRoutedTo, target, true,
node.isAdvancedModeEnabled(), -1, null,
+ null);
if(next == null) {
// Backtrack
Modified: trunk/freenet/src/freenet/node/NetworkIDManager.java
===================================================================
--- trunk/freenet/src/freenet/node/NetworkIDManager.java 2008-09-07
11:35:25 UTC (rev 22518)
+++ trunk/freenet/src/freenet/node/NetworkIDManager.java 2008-09-07
11:58:26 UTC (rev 22519)
@@ -17,7 +17,6 @@
import freenet.io.comm.Message;
import freenet.io.comm.MessageFilter;
import freenet.io.comm.NotConnectedException;
-
import freenet.support.Logger;
import freenet.support.ShortBuffer;
import freenet.support.math.BootstrappingDecayingRunningAverage;
@@ -157,14 +156,14 @@
//Not a local match... forward
double target=m.getDouble(DMT.TARGET_LOCATION);
HashSet routedTo=new HashSet();
- HashSet notIgnored=new HashSet();
while (true) {
PeerNode next;
if (htl > dawnHtl &&
routedTo.isEmpty()) {
next=node.peers.getRandomPeer(source);
} else {
-
next=node.peers.closerPeer(source, routedTo, notIgnored, target, true,
node.isAdvancedModeEnabled(), -1, null, null);
+ next =
node.peers.closerPeer(source, routedTo, target, true,
node.isAdvancedModeEnabled(), -1,
+ null, null);
}
if (next==null) {
@@ -440,14 +439,14 @@
PeerNode target=processing;
double randomTarget=node.random.nextDouble();
HashSet nodesRoutedTo = new HashSet();
- PeerNode next = node.peers.closerPeer(target,
nodesRoutedTo, null, randomTarget, true, false, -1, null, null);
+ PeerNode next = node.peers.closerPeer(target,
nodesRoutedTo, randomTarget, true, false, -1, null, null);
while (next!=null && target.isRoutable() &&
!processingRace) {
nodesRoutedTo.add(next);
//the order is not that important, but for all
connected peers try to ping 'target'
blockingUpdatePingRecord(target, next);
//Since we are causing traffic to 'target'
betweenPingSleep(target);
- next = node.peers.closerPeer(target,
nodesRoutedTo, null, randomTarget, true, false, -1, null, null);
+ next = node.peers.closerPeer(target,
nodesRoutedTo, randomTarget, true, false, -1, null, null);
}
}
boolean didAnything;
@@ -576,10 +575,10 @@
private HashSet getAllConnectedPeers() {
double randomTarget=node.random.nextDouble();
HashSet connectedPeers = new HashSet();
- PeerNode next = node.peers.closerPeer(null, connectedPeers,
null, randomTarget, true, false, -1, null, null);
+ PeerNode next = node.peers.closerPeer(null, connectedPeers,
randomTarget, true, false, -1, null, null);
while (next!=null) {
connectedPeers.add(next);
- next = node.peers.closerPeer(null, connectedPeers,
null, randomTarget, true, false, -1, null, null);
+ next = node.peers.closerPeer(null, connectedPeers,
randomTarget, true, false, -1, null, null);
}
return connectedPeers;
}
Modified: trunk/freenet/src/freenet/node/NodeDispatcher.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeDispatcher.java 2008-09-07 11:35:25 UTC
(rev 22518)
+++ trunk/freenet/src/freenet/node/NodeDispatcher.java 2008-09-07 11:58:26 UTC
(rev 22519)
@@ -539,7 +539,6 @@
long accessTime;
PeerNode source;
final HashSet<PeerNode> routedTo;
- final HashSet<PeerNode> notIgnored;
Message msg;
short lastHtl;
final byte[] identity;
@@ -548,7 +547,6 @@
createdTime = accessTime = System.currentTimeMillis();
this.source = source;
routedTo = new HashSet<PeerNode>();
- notIgnored = new HashSet<PeerNode>();
this.msg = msg;
lastHtl = msg.getShort(DMT.HTL);
this.identity = identity;
@@ -690,7 +688,8 @@
next = null;
}
if(next == null)
- next = node.peers.closerPeer(pn, ctx.routedTo,
ctx.notIgnored, target, true, node.isAdvancedModeEnabled(), -1, null, null);
+ next = node.peers.closerPeer(pn, ctx.routedTo, target,
true, node.isAdvancedModeEnabled(), -1, null,
+ null);
if(logMINOR) Logger.minor(this, "Next: "+next+"
message: "+m);
if(next != null) {
// next is connected, or at least has been =>
next.getPeer() CANNOT be null.
Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java 2008-09-07 11:35:25 UTC
(rev 22518)
+++ trunk/freenet/src/freenet/node/PeerManager.java 2008-09-07 11:58:26 UTC
(rev 22519)
@@ -13,12 +13,12 @@
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Set;
import java.util.Vector;
-import java.util.ArrayList;
import freenet.io.comm.AsyncMessageCallback;
import freenet.io.comm.ByteCounter;
@@ -34,10 +34,8 @@
import freenet.support.Logger;
import freenet.support.ShortBuffer;
import freenet.support.SimpleFieldSet;
+import freenet.support.io.Closer;
import freenet.support.io.FileUtil;
-import freenet.support.io.Closer;
-import java.util.SortedSet;
-import java.util.TreeSet;
/**
* @author amphibian
@@ -815,15 +813,16 @@
return closestDist < nodeDist;
}
- public PeerNode closerPeer(PeerNode pn, Set routedTo, Set notIgnored,
double loc, boolean ignoreSelf, boolean calculateMisrouting, int minVersion,
Vector addUnpickedLocsTo, Key key) {
- return closerPeer(pn, routedTo, notIgnored, loc, ignoreSelf,
calculateMisrouting, minVersion, addUnpickedLocsTo, 2.0, key);
+ public PeerNode closerPeer(PeerNode pn, Set routedTo, double loc,
boolean ignoreSelf, boolean calculateMisrouting,
+ int minVersion, Vector addUnpickedLocsTo, Key key) {
+ return closerPeer(pn, routedTo, loc, ignoreSelf,
calculateMisrouting, minVersion, addUnpickedLocsTo, 2.0, key);
}
/**
* Find the peer, if any, which is closer to the target location than
we are, and is not included in the provided set.
* If ignoreSelf==false, and we are closer to the target than any
peers, this function returns null.
* This function returns two values, the closest such peer which is
backed off, and the same which is not backed off.
- * It is possible for either to be null independant of the other,
'closest' is the closer of the two in either case, and
+ * It is possible for either to be null independent of the other,
'closest' is the closer of the two in either case, and
* will not be null if any of the other two return values is not null.
* @param addUnpickedLocsTo Add all locations we didn't choose which we
could have routed to to
* this array. Remove the location of the peer we pick from it.
@@ -831,7 +830,8 @@
* @param key The original key, if we have it, and if we want to
consult with the FailureTable
* to avoid routing to nodes which have recently failed for the same
key.
*/
- public PeerNode closerPeer(PeerNode pn, Set routedTo, Set notIgnored,
double target, boolean ignoreSelf, boolean calculateMisrouting, int minVersion,
Vector addUnpickedLocsTo, double maxDistance, Key key) {
+ public PeerNode closerPeer(PeerNode pn, Set routedTo, double target,
boolean ignoreSelf,
+ boolean calculateMisrouting, int minVersion, Vector
addUnpickedLocsTo, double maxDistance, Key key) {
PeerNode[] peers;
synchronized(this) {
peers = connectedPeers;
Modified: trunk/freenet/src/freenet/node/RequestSender.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestSender.java 2008-09-07 11:35:25 UTC
(rev 22518)
+++ trunk/freenet/src/freenet/node/RequestSender.java 2008-09-07 11:58:26 UTC
(rev 22519)
@@ -447,7 +447,6 @@
int routeAttempts=0;
int rejectOverloads=0;
HashSet nodesRoutedTo = new HashSet();
- HashSet nodesNotIgnored = new HashSet();
PeerNode next = null;
while(true) {
/*
@@ -473,7 +472,8 @@
routeAttempts++;
// Route it
- next = node.peers.closerPeer(source, nodesRoutedTo,
nodesNotIgnored, target, true, node.isAdvancedModeEnabled(), -1, null, key);
+ next = node.peers.closerPeer(source, nodesRoutedTo, target, true,
node.isAdvancedModeEnabled(), -1, null,
+ key);
if(next == null) {
if (logMINOR && rejectOverloads>0)
Modified: trunk/freenet/src/freenet/node/ResettingHTLProbeRequestSender.java
===================================================================
--- trunk/freenet/src/freenet/node/ResettingHTLProbeRequestSender.java
2008-09-07 11:35:25 UTC (rev 22518)
+++ trunk/freenet/src/freenet/node/ResettingHTLProbeRequestSender.java
2008-09-07 11:58:26 UTC (rev 22519)
@@ -101,7 +101,6 @@
int routeAttempts=0;
int rejectOverloads=0;
HashSet nodesRoutedTo = new HashSet();
- HashSet nodesNotIgnored = new HashSet();
while(true) {
if(logMINOR) Logger.minor(this, "htl="+htl);
if(htl == 0) {
@@ -113,7 +112,8 @@
// Route it
PeerNode next;
- next = node.peers.closerPeer(source, nodesRoutedTo,
nodesNotIgnored, target, true, node.isAdvancedModeEnabled(), -1, null, null);
+ next = node.peers.closerPeer(source, nodesRoutedTo, target, true,
node.isAdvancedModeEnabled(), -1, null,
+ null);
if(next == null) {
if (logMINOR && rejectOverloads>0)
Modified: trunk/freenet/src/freenet/node/SSKInsertSender.java
===================================================================
--- trunk/freenet/src/freenet/node/SSKInsertSender.java 2008-09-07 11:35:25 UTC
(rev 22518)
+++ trunk/freenet/src/freenet/node/SSKInsertSender.java 2008-09-07 11:58:26 UTC
(rev 22519)
@@ -121,7 +121,6 @@
private void realRun() {
HashSet nodesRoutedTo = new HashSet();
- HashSet nodesNotIgnored = new HashSet();
PeerNode next = null;
while(true) {
@@ -142,7 +141,8 @@
}
// Route it
- next = node.peers.closerPeer(source, nodesRoutedTo,
nodesNotIgnored, target, true, node.isAdvancedModeEnabled(), -1, null, null);
+ next = node.peers.closerPeer(source, nodesRoutedTo, target, true,
node.isAdvancedModeEnabled(), -1, null,
+ null);
if(next == null) {
// Backtrack
