Update of /cvsroot/freenet/freenet/src/freenet/node/states/FNP
In directory sc8-pr-cvs1:/tmp/cvs-serv14016/src/freenet/node/states/FNP
Modified Files:
FNPFeedbackToken.java NewRequest.java
Log Message:
6290: don't show the request box either when in simple mode.
Index: FNPFeedbackToken.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FNP/FNPFeedbackToken.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -w -r1.25 -r1.26
--- FNPFeedbackToken.java 30 Oct 2003 01:34:10 -0000 1.25
+++ FNPFeedbackToken.java 31 Oct 2003 19:21:20 -0000 1.26
@@ -22,6 +22,7 @@
import freenet.node.Node;
import freenet.node.NodeReference;
import freenet.node.states.request.FeedbackToken;
+import freenet.support.Logger;
/** Relays results from the request states back to a remote node.
* @author tavin
@@ -81,8 +82,8 @@
origPeer, Core.hopTime(origHopsToLive));
} catch (UnknownHostException e) {
// this should be impossible
- n.logger.log(this, "This should be impossible", e,
- n.logger.ERROR);
+ Core.logger.log(this, "This should be impossible", e,
+ Logger.ERROR);
throw new SendFailedException(origPeer.getAddress(),
e.getMessage());
}
@@ -101,12 +102,12 @@
// experimental way of helping to keep buggy nodes out of the network
String vers = nr.getVersion();
if (vers != null && !Version.checkGoodVersion(vers)) {
- n.logger.log(this, "Automatically resetting DataSource "+
- "due to old version: "+ vers, n.logger.DEBUG);
+ Core.logger.log(this, "Automatically resetting DataSource "+
+ "due to old version: "+ vers, Logger.DEBUG);
nr = null;
}
}
- if(n.getRandSource().nextFloat()< n.probIncHopsSinceReset)
+ if(Core.getRandSource().nextFloat()< Node.probIncHopsSinceReset)
hopsSinceReset++;
// LATER...
// Use n.loadStats.resetProbability() to determine the reset
Index: NewRequest.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FNP/NewRequest.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -w -r1.38 -r1.39
--- NewRequest.java 30 Oct 2003 01:34:10 -0000 1.38
+++ NewRequest.java 31 Oct 2003 19:21:20 -0000 1.39
@@ -42,7 +42,7 @@
// Augmented because is on the routingTime path
long startTime = System.currentTimeMillis();
- boolean shouldLog = Core.logger.shouldLog(Core.logger.DEBUG);
+ boolean shouldLog = Core.logger.shouldLog(Logger.DEBUG);
NodeReference ref = mo.getSource();
@@ -60,7 +60,7 @@
logTime(1, time1-startTime, shouldLog);
if (origRec == null) {
- n.logger.log(this,
+ Core.logger.log(this,
"No shared session and presentation with: "+mo.getSource(),
Logger.MINOR);
// FIXME: add to loadStats here? if not, document why not
@@ -72,7 +72,7 @@
String vers = mo.getSource().getVersion();
if (vers != null && !Version.checkGoodVersion(vers)) {
String reason = Version.explainBadVersion(vers);
- n.logger.log(this,
+ Core.logger.log(this,
"Rejecting query from host of type "+vers+": "+reason,
Logger.MINOR);
if(ph.timeSinceLastMessageSent() > ph.rejectOldVersion(false) &&
@@ -104,13 +104,13 @@
long time5 = System.currentTimeMillis();
logTime(4, time5-time4, shouldLog);
- if (Math.exp(HTL_FACTOR*htl*htl) < 1 - n.getRandSource().nextDouble()){
- //n.logger.log(this, "Decrementing HTL",
- // n.logger.DEBUG);
+ if (Math.exp(HTL_FACTOR*htl*htl) < 1 - Core.getRandSource().nextDouble()){
+ //Core.logger.log(this, "Decrementing HTL",
+ // Logger.DEBUG);
--htl;
} else {
- //n.logger.log(this, "Not decrementing HTL",
- // n.logger.DEBUG);
+ //Core.logger.log(this, "Not decrementing HTL",
+ // Logger.DEBUG);
}
long time6 = System.currentTimeMillis();
@@ -119,7 +119,7 @@
// Enforce request rate limiting
if (!n.acceptRequest(mo.searchKey, mo.source.peerAddress())) {
String reason = "Node overloaded";
- n.logger.log(this,
+ Core.logger.log(this,
"Rejecting query, rate limit exceeded.",
Logger.DEBUGGING);
if(!n.rejectingConnections()) {
@@ -173,7 +173,7 @@
mo.setReceivedTime(acceptTime + mo.getReceivedTime());
} catch (CommunicationException e) {
- n.logger.log(this, "Failed to send initial response to Request.",
+ Core.logger.log(this, "Failed to send initial response to Request.",
e, Logger.MINOR);
throw new RequestAbortException(null);
}
@@ -182,8 +182,8 @@
private void logTime(int num, long time, boolean shouldLog) {
if(shouldLog) {
Core.logger.log(this, "logTime: "+Fields.longToHex(id)+":"+num+". "+
- time+" ms.", time>500 ? Core.logger.MINOR :
- Core.logger.DEBUG);
+ time+" ms.", time>500 ? Logger.MINOR :
+ Logger.DEBUG);
}
}
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
