Update of /cvsroot/freenet/Freenet0.7Rewrite/src/freenet/node
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv689/src/freenet/node
Modified Files:
Version.java NodeDispatcher.java PeerManager.java
RequestSender.java InsertSender.java
Log Message:
Build 131:
Major bug on inserts.
Index: Version.java
===================================================================
RCS file: /cvsroot/freenet/Freenet0.7Rewrite/src/freenet/node/Version.java,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -w -r1.125 -r1.126
--- Version.java 7 Sep 2005 14:56:45 -0000 1.125
+++ Version.java 7 Sep 2005 15:22:16 -0000 1.126
@@ -20,10 +20,10 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- public static final int buildNumber = 130;
+ public static final int buildNumber = 131;
/** Oldest build of Fred we will talk to */
- public static final int lastGoodBuild = 127;
+ public static final int lastGoodBuild = 131;
/** The highest reported build of fred */
public static int highestSeenBuild = buildNumber;
Index: NodeDispatcher.java
===================================================================
RCS file:
/cvsroot/freenet/Freenet0.7Rewrite/src/freenet/node/NodeDispatcher.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -w -r1.21 -r1.22
--- NodeDispatcher.java 25 Aug 2005 17:28:19 -0000 1.21
+++ NodeDispatcher.java 7 Sep 2005 15:22:16 -0000 1.22
@@ -256,7 +256,7 @@
// Forward
m = preForward(m, htl);
while(true) {
- PeerNode next = node.peers.closerPeer(pn, ctx.routedTo, target, pn
== null);
+ PeerNode next = node.peers.closerPeer(pn, ctx.routedTo, target,
true);
Logger.minor(this, "Next: "+next+" message: "+m);
if(next != null) {
Logger.minor(this, "Forwarding "+m.getSpec()+" to
"+next.getPeer().getPort());
Index: PeerManager.java
===================================================================
RCS file: /cvsroot/freenet/Freenet0.7Rewrite/src/freenet/node/PeerManager.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -w -r1.26 -r1.27
--- PeerManager.java 7 Sep 2005 14:34:47 -0000 1.26
+++ PeerManager.java 7 Sep 2005 15:22:16 -0000 1.27
@@ -282,9 +282,9 @@
public PeerNode closerPeer(PeerNode pn, HashSet routedTo, double loc,
boolean ignoreSelf) {
PeerNode[] peers = connectedPeers;
double bestDiff = 1.0;
- double minDiff = 0.0;
+ double maxDiff = 0.0;
if(!ignoreSelf)
- minDiff = distance(node.lm.getLocation().getValue(), loc);
+ maxDiff = distance(node.lm.getLocation().getValue(), loc);
PeerNode best = null;
PeerNode any = null;
int count = 0;
@@ -296,7 +296,7 @@
count++;
any = p;
double diff = distance(p.getLocation().getValue(), loc);
- if((!ignoreSelf) && diff > minDiff) continue;
+ if((!ignoreSelf) && diff > maxDiff) continue;
if(diff < bestDiff) {
best = p;
bestDiff = diff;
Index: RequestSender.java
===================================================================
RCS file:
/cvsroot/freenet/Freenet0.7Rewrite/src/freenet/node/RequestSender.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -r1.11 -r1.12
--- RequestSender.java 7 Sep 2005 14:34:48 -0000 1.11
+++ RequestSender.java 7 Sep 2005 15:22:16 -0000 1.12
@@ -98,7 +98,7 @@
PeerNode next;
double nextValue;
synchronized(node.peers) {
- next = node.peers.closerPeer(source, nodesRoutedTo, target,
source == null);
+ next = node.peers.closerPeer(source, nodesRoutedTo, target,
true);
if(next != null)
nextValue = next.getLocation().getValue();
else
Index: InsertSender.java
===================================================================
RCS file:
/cvsroot/freenet/Freenet0.7Rewrite/src/freenet/node/InsertSender.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -r1.13 -r1.14
--- InsertSender.java 7 Sep 2005 14:34:48 -0000 1.13
+++ InsertSender.java 7 Sep 2005 15:22:16 -0000 1.14
@@ -78,7 +78,7 @@
// Can backtrack, so only route to nodes closer than we are to
target.
double nextValue;
synchronized(node.peers) {
- next = node.peers.closerPeer(source, nodesRoutedTo, target,
source == null);
+ next = node.peers.closerPeer(source, nodesRoutedTo, target,
true);
if(next != null)
nextValue = next.getLocation().getValue();
else
@@ -98,7 +98,7 @@
htl = node.decrementHTL(source, htl);
}
- Message req = DMT.createFNPInsertRequest(uid, htl, myKey);
+ Message req = DMT.createFNPInsertRequest(uid, htl, myKey,
closestLocation);
// Wait for ack or reject... will come before even a locally
generated DataReply
