Update of /cvsroot/freenet/freenet/src/freenet/node/rt
In directory sc8-pr-cvs1:/tmp/cvs-serv3005/src/freenet/node/rt
Modified Files:
NGRoutingTable.java
Log Message:
use signed refs if possible. Reinstates fast RT fill.
Index: NGRoutingTable.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/NGRoutingTable.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- NGRoutingTable.java 22 Oct 2003 23:34:59 -0000 1.10
+++ NGRoutingTable.java 23 Oct 2003 00:09:41 -0000 1.11
@@ -118,6 +118,7 @@
public synchronized void updateReference(NodeReference nr) {
Identity i = nr.getIdentity();
RoutingMemory mem = routingStore.getNode(i);
+ Core.logger.log(this, "updateReference("+nr+")", Logger.DEBUG);
if(mem != null) {
NodeEstimator e = (NodeEstimator)(estimators.get(i));
if(nr.supersedes(mem.getNodeReference())) {
@@ -129,17 +130,25 @@
e.ref = nr;
}
} else {
+ Core.logger.log(this, "Still referencing "+nr+":
estimators.size()="+
+ estimators.size()+" of
"+maxNodes, Logger.DEBUG);
if(estimators.size() < (maxNodes/2)) {
- if(!(nr.noPhysical() ||
(!Version.checkGoodVersion(nr.getVersion(), true))
- || (!nr.isSigned()))) {
+ if((!nr.noPhysical()) &&
Version.checkGoodVersion(nr.getVersion(), true) &&
+ nr.isSigned()) {
Core.logger.log(this, "Referencing "+nr+" to
no key out of desperation",
Logger.MINOR);
reference(null, nr);
} else {
- if(Core.logger.shouldLog(Logger.DEBUG))
- Core.logger.log(this,
"updateReference("+nr+") did nothing",
-
Logger.DEBUG);
+ if(Core.logger.shouldLog(Logger.DEBUG,this))
+ Core.logger.log(this,
"updateReference("+nr+
+ ") did
nothing: noPhysical="+nr.noPhysical()+
+ ",
check version="+
+
Version.checkGoodVersion(nr.getVersion(), true)+
+ ",
isSigned="+nr.isSigned(), Logger.DEBUG);
}
+ } else {
+ Core.logger.log(this, "updateReference("+nr+")
ignoring because size="+
+ estimators.size()+" of
"+maxNodes, Logger.DEBUG);
}
}
}
@@ -147,6 +156,8 @@
public synchronized void reference(Key k, NodeReference nr) {
Identity i = nr.getIdentity();
RoutingMemory mem = routingStore.getNode(i);
+ Core.logger.log(this, "reference("+k+","+nr+")",
+ Logger.DEBUG);
if(mem == null) {
if(!Version.checkGoodVersion(nr.getVersion(), true)) {
Core.logger.log(this, "Rejecting reference "+nr+" -
too old",
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
