Update of /cvsroot/freenet/freenet/src/freenet/node/states/announcement
In directory sc8-pr-cvs1:/tmp/cvs-serv8807/src/freenet/node/states/announcement
Modified Files:
Tag: stable
AnnouncementDone.java AnnouncementState.java
CompletePending.java ExecuteHandler.java ExecutePending.java
LastNode.java NewAnnouncement.java ReplyPending.java
Log Message:
5030: Merge minor(ish) changes from unstable:
Open Connections infolet
Minor implementation changes on normal mode
Show total bytes transmitted/received so far
Much new information on the PeerHandler mode
Fixed tons of eclipse warnings (almost all are style issues, not functional changes -
relating to logger and imports mostly). Remove deprecated FieldSet.add(String,String).
Update TestLocalNIOInterface to current API
Make 5029 mandatory (it can't connect to us anyway, only vice versa).
If incoming HTL is 25, 50% chance of not decrementing it, so we have some plausible
deniability when we send out an HTL 25 request (the client level HTL perturb mechanism
is insufficient although useful).
Don't use seednodes with no physical address.
Use our own URLEncoder/URLDecoder's, catch the exceptions. We were using java's, which
are deprecated.
Add support for deprecated options. These will be read form config file and handled,
but will not be written to it by --config. Currently bandwidthLimit and
averageBandwidthLimit are in this category. Separate code logs an error when these are
set.
Change the way bandwidthLimit set but others not set, to prevent it from constantly
getting 100% load due to bandwidth limit (0!) exceeded.
Set priority of entropy thread to MIN.
Remove old datastore code, GOOD RIDDENS!
Add a memory usage test for the Failure Table
Increase size of failure table to 20,000 (from 2,000).
Don't show the key request form in simple mode on the default infolet.
Major refactoring of HTML reporting, writing to disk, in NGRouting estimators.
Relative times in (for example) ?date= in fproxy: ?date=-1year gives the edition of a
DBR one year ago.
NIO refactoring (ASL.ChannelAttachmentPairQueue).
Logging.
Index: AnnouncementDone.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/announcement/AnnouncementDone.java,v
retrieving revision 1.1.1.1.4.1.2.1
retrieving revision 1.1.1.1.4.1.2.2
diff -u -w -r1.1.1.1.4.1.2.1 -r1.1.1.1.4.1.2.2
--- AnnouncementDone.java 28 Oct 2003 20:20:42 -0000 1.1.1.1.4.1.2.1
+++ AnnouncementDone.java 1 Nov 2003 16:55:35 -0000 1.1.1.1.4.1.2.2
@@ -1,6 +1,7 @@
package freenet.node.states.announcement;
import freenet.*;
import freenet.node.*;
+import freenet.support.Logger;
import freenet.message.*;
/**
* To make sure we don't get Announcements we have already rejected.
@@ -29,7 +30,7 @@
try {
n.sendMessage(rf, na.getSource(), 0);
} catch (CommunicationException e) {
- n.logger.log(this, "Failed to send back " + rf, n.logger.MINOR);
+ Core.logger.log(this, "Failed to send back " + rf, Logger.MINOR);
}
return this;
}
Index: AnnouncementState.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/announcement/AnnouncementState.java,v
retrieving revision 1.1.1.1.4.1.2.3
retrieving revision 1.1.1.1.4.1.2.4
diff -u -w -r1.1.1.1.4.1.2.3 -r1.1.1.1.4.1.2.4
--- AnnouncementState.java 28 Oct 2003 20:20:42 -0000 1.1.1.1.4.1.2.3
+++ AnnouncementState.java 1 Nov 2003 16:55:35 -0000 1.1.1.1.4.1.2.4
@@ -1,16 +1,23 @@
package freenet.node.states.announcement;
-import freenet.*;
-import freenet.node.*;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import freenet.CommunicationException;
+import freenet.Core;
+import freenet.Message;
+import freenet.Peer;
+import freenet.SendFailedException;
+import freenet.TrailerWriter;
+import freenet.TrailerWriterOutputStream;
+import freenet.crypt.Digest;
+import freenet.crypt.SHA1;
+import freenet.node.BadStateException;
+import freenet.node.Node;
+import freenet.node.NodeReference;
+import freenet.node.State;
import freenet.node.rt.Routing;
-import freenet.crypt.*;
-import freenet.message.NodeAnnouncement;
-import java.math.BigInteger;
-import java.util.Enumeration;
-import freenet.support.Logger;
import freenet.support.KeyList;
-import java.io.OutputStream;
-import java.io.IOException;
/**
* A base class for the announcement states.
Index: CompletePending.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/announcement/CompletePending.java,v
retrieving revision 1.3.4.1.2.2
retrieving revision 1.3.4.1.2.3
diff -u -w -r1.3.4.1.2.2 -r1.3.4.1.2.3
--- CompletePending.java 28 Oct 2003 20:20:42 -0000 1.3.4.1.2.2
+++ CompletePending.java 1 Nov 2003 16:55:35 -0000 1.3.4.1.2.3
@@ -1,12 +1,16 @@
package freenet.node.states.announcement;
-import freenet.*;
-import freenet.node.*;
-import freenet.message.*;
+import java.io.IOException;
+
+import freenet.CommunicationException;
+import freenet.Core;
+import freenet.Key;
+import freenet.message.AnnouncementComplete;
+import freenet.node.BadStateException;
+import freenet.node.Node;
+import freenet.node.State;
import freenet.support.KeyList;
import freenet.support.Logger;
import freenet.support.io.ParseIOException;
-import java.util.Enumeration;
-import java.io.IOException;
/**
* Waiting for an AnnouncementComplete.
@@ -56,11 +60,11 @@
ac.readKeys(depth + hopsToLive);
}
catch (ParseIOException e) { // ignore and refill
- n.logger.log(this, "parse error reading key list, continuing",
+ Core.logger.log(this, "parse error reading key list, continuing",
e, Logger.MINOR);
}
catch (IOException e) { //
- n.logger.log(this, "I/O error reading key list, continuing",
+ Core.logger.log(this, "I/O error reading key list, continuing",
e, Logger.MINOR);
}
@@ -122,8 +126,8 @@
try {
sendMessage(n, origRec, ac, newKeys, getTime(hopsToLive)*3);
} catch (CommunicationException e) {
- n.logger.log(this, "Failed to send AnnouncementComplete",
- e, n.logger.MINOR);
+ Core.logger.log(this, "Failed to send AnnouncementComplete",
+ e, Logger.MINOR);
}
terminateRouting(false, false);
// since we've added the ref
Index: ExecuteHandler.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/announcement/ExecuteHandler.java,v
retrieving revision 1.2.6.2
retrieving revision 1.2.6.3
diff -u -w -r1.2.6.2 -r1.2.6.3
--- ExecuteHandler.java 1 Jul 2003 02:27:16 -0000 1.2.6.2
+++ ExecuteHandler.java 1 Nov 2003 16:55:35 -0000 1.2.6.3
@@ -44,12 +44,12 @@
ae.readValueList(depth);
}
catch (ParseIOException e) {
- n.logger.log(this, "Parse error on AnnouncementExecute value list,
rejecting",
+ Core.logger.log(this, "Parse error on AnnouncementExecute value list,
rejecting",
e, Logger.NORMAL);
return null;
}
catch (IOException e) {
- n.logger.log(this, "I/O error reading value list from
AnnouncementExecute",
+ Core.logger.log(this, "I/O error reading value list from
AnnouncementExecute",
e, Logger.NORMAL);
return null;
}
@@ -71,10 +71,10 @@
return new Key(total, 0, 0);
} else {
- n.logger.log(this, "Rejecting execute, KLSIZE: " + kl.size()
+ Core.logger.log(this, "Rejecting execute, KLSIZE: " + kl.size()
+ " DEPTH: " + depth + " COMMITVAL: " +
Fields.bytesToHex(commitVal) + " KH: " +
- Fields.bytesToHex(kh), n.logger.NORMAL);
+ Fields.bytesToHex(kh), Logger.NORMAL);
return null;
}
Index: ExecutePending.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/announcement/ExecutePending.java,v
retrieving revision 1.1.1.1.4.1.2.2
retrieving revision 1.1.1.1.4.1.2.3
diff -u -w -r1.1.1.1.4.1.2.2 -r1.1.1.1.4.1.2.3
--- ExecutePending.java 28 Oct 2003 20:20:42 -0000 1.1.1.1.4.1.2.2
+++ ExecutePending.java 1 Nov 2003 16:55:35 -0000 1.1.1.1.4.1.2.3
@@ -1,9 +1,17 @@
package freenet.node.states.announcement;
-import freenet.*;
-import freenet.node.*;
-import freenet.message.*;
+import freenet.CommunicationException;
+import freenet.Core;
+import freenet.Key;
+import freenet.Message;
+import freenet.MessageObject;
+import freenet.message.AnnouncementExecute;
+import freenet.message.AnnouncementFailed;
+import freenet.message.QueryAborted;
+import freenet.node.BadStateException;
+import freenet.node.Node;
+import freenet.node.State;
+import freenet.node.StateException;
import freenet.support.Logger;
-import java.util.Enumeration;
/**
* Waiting for a Execute on a reply
@@ -40,13 +48,13 @@
if (ne != this.ne) {
throw new BadStateException("Got the wrong NoExecute message");
}
- n.logger.log(this, "ExecutePending got NoExecute "+ne,
+ Core.logger.log(this, "ExecutePending got NoExecute "+ne,
Logger.NORMAL);
try {
n.sendMessage(new QueryAborted(id), lastAddr,
getTime((int)depth));
} catch (CommunicationException e) {
- n.logger.log(this, "Failed to send QueryAborted after no Execute",
+ Core.logger.log(this, "Failed to send QueryAborted after no Execute",
e, Logger.DEBUG);
}
@@ -56,7 +64,7 @@
origRec, getTime(origHopsToLive));
} catch (CommunicationException e) {
- n.logger.log(this,
+ Core.logger.log(this,
"Failed to send AnnouncementFailed after no Execute",
e, Logger.DEBUG);
}
@@ -67,14 +75,14 @@
public State receivedMessage(Node n, QueryAborted qr) {
- n.logger.log(this, "Announcement Aborted by previous node",
+ Core.logger.log(this, "Announcement Aborted by previous node",
Logger.DEBUG);
ne.cancel();
try {
n.sendMessage(qr, lastAddr, getTime((int)depth));
} catch (CommunicationException e) {
- n.logger.log(this, "Failed to send QueryAborted after no Execute",
+ Core.logger.log(this, "Failed to send QueryAborted after no Execute",
e, Logger.DEBUG);
}
@@ -99,9 +107,9 @@
// LONG timeout, announcements should be quite tolerant
return cp;
} catch (CommunicationException e) {
- n.logger.log(this, "Failed to send AnnouncementComplete - "
+ Core.logger.log(this, "Failed to send AnnouncementComplete - "
+ "pretending like I never got it back.",
- e, n.logger.MINOR);
+ e, Logger.MINOR);
// well, we aren't going to get a Complete, so...
return cp.received(n, nc);
}
@@ -114,14 +122,14 @@
try {
n.sendMessage(qa, lastAddr, getTime((int)depth));
} catch (CommunicationException e) {
- n.logger.log(this, "Failed to send QueryAborted after bad AE.",
- n.logger.MINOR);
+ Core.logger.log(this, "Failed to send QueryAborted after bad AE.",
+ Logger.MINOR);
}
try {
n.sendMessage(af, origRec, getTime(origHopsToLive));
} catch (CommunicationException e) {
- n.logger.log(this, "Failed to send AnnouncementFailed after "
- + "bad AE.", n.logger.MINOR);
+ Core.logger.log(this, "Failed to send AnnouncementFailed after "
+ + "bad AE.", Logger.MINOR);
}
return new AnnouncementDone(this);
Index: LastNode.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/announcement/LastNode.java,v
retrieving revision 1.3.4.1.2.3
retrieving revision 1.3.4.1.2.4
diff -u -w -r1.3.4.1.2.3 -r1.3.4.1.2.4
--- LastNode.java 28 Oct 2003 20:20:42 -0000 1.3.4.1.2.3
+++ LastNode.java 1 Nov 2003 16:55:35 -0000 1.3.4.1.2.4
@@ -1,11 +1,16 @@
package freenet.node.states.announcement;
-import freenet.*;
-import freenet.node.*;
-import freenet.message.*;
+import freenet.CommunicationException;
+import freenet.Core;
+import freenet.Key;
+import freenet.message.AnnouncementComplete;
+import freenet.message.AnnouncementExecute;
+import freenet.message.AnnouncementFailed;
+import freenet.message.QueryAborted;
+import freenet.node.BadStateException;
+import freenet.node.Node;
+import freenet.node.State;
import freenet.support.KeyList;
-import freenet.support.Fields;
-import java.util.Enumeration;
-import java.math.BigInteger;
+import freenet.support.Logger;
/**
* The state object for terminating nodes in Announcement chains,
* which only need to wait for an reply to the AnouncementExecute.
@@ -51,8 +56,8 @@
try {
n.sendMessage(af, origRec, getTime(origHopsToLive));
} catch (CommunicationException sfe) {
- n.logger.log(this, "Failed to send AnnouncementFailed",
- sfe, n.logger.MINOR);
+ Core.logger.log(this, "Failed to send AnnouncementFailed",
+ sfe, Logger.MINOR);
}
return new AnnouncementDone(this);
@@ -79,15 +84,15 @@
try {
sendMessage(n, origRec, ac, keys, getTime(origHopsToLive));
} catch (CommunicationException e) {
- n.logger.log(this, "Failed to send AnnouncementComplete",
- e, n.logger.MINOR);
+ Core.logger.log(this, "Failed to send AnnouncementComplete",
+ e, Logger.MINOR);
}
}
public State receivedMessage(Node n, NoExecute ne) {
- n.logger.log(this, "Did not receive AnnouncementExecute message, " +
- "dropping chain", n.logger.MINOR);
+ Core.logger.log(this, "Did not receive AnnouncementExecute message, " +
+ "dropping chain", Logger.MINOR);
return new AnnouncementDone(this);
@@ -99,8 +104,8 @@
this.ne.cancel();
- n.logger.log(this, "Announcement query aborted by previous node",
- n.logger.DEBUG);
+ Core.logger.log(this, "Announcement query aborted by previous node",
+ Logger.DEBUG);
return new AnnouncementDone(this);
}
Index: NewAnnouncement.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/announcement/NewAnnouncement.java,v
retrieving revision 1.1.1.1.4.4.2.2
retrieving revision 1.1.1.1.4.4.2.3
diff -u -w -r1.1.1.1.4.4.2.2 -r1.1.1.1.4.4.2.3
--- NewAnnouncement.java 28 Oct 2003 20:20:42 -0000 1.1.1.1.4.4.2.2
+++ NewAnnouncement.java 1 Nov 2003 16:55:35 -0000 1.1.1.1.4.4.2.3
@@ -1,13 +1,20 @@
package freenet.node.states.announcement;
-import freenet.*;
-import freenet.node.*;
-import freenet.message.*;
-import freenet.crypt.*;
-import freenet.support.Logger;
+import freenet.AuthenticationFailedException;
+import freenet.CommunicationException;
+import freenet.Core;
+import freenet.Key;
+import freenet.Version;
+import freenet.message.Accepted;
+import freenet.message.AnnouncementFailed;
+import freenet.message.AnnouncementReply;
+import freenet.message.NodeAnnouncement;
+import freenet.message.QueryRejected;
+import freenet.node.Node;
+import freenet.node.NodeReference;
+import freenet.node.State;
import freenet.support.Fields;
-import java.math.BigInteger;
-import java.util.Enumeration;
+import freenet.support.Logger;
/**
* Initial state for the announcements.
@@ -34,7 +41,7 @@
try {
origRec = n.getPeer(na.getSource());
if (origRec == null) {
- n.logger.log(this,
+ Core.logger.log(this,
"Failed to determine Peer for NodeReference",
Logger.NORMAL);
return null;
@@ -58,7 +65,7 @@
String vers = na.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);
@@ -70,11 +77,11 @@
}
if (!announcee.checkAddresses(n.transports)) {
- if (n.logger.shouldLog(n.logger.MINOR))
- n.logger.log(this,
+ if (Core.logger.shouldLog(Logger.MINOR))
+ Core.logger.log(this,
"Rejecting announcement because addresses "
+ "of announcee wrong: "
- + announcee.toString(), n.logger.MINOR);
+ + announcee.toString(), Logger.MINOR);
n.sendMessage(new QueryRejected(id, na.hopsToLive(),
"Broken addresses.",
null), origRec,
@@ -82,16 +89,16 @@
}
if (n.rt.references(announcee.getIdentity())) {
- if(n.logger.shouldLog(Logger.DEBUG,this))
- n.logger.log(this, "Previously knew Announcee, rejecting.",
+ if(Core.logger.shouldLog(Logger.DEBUG,this))
+ Core.logger.log(this, "Previously knew Announcee, rejecting.",
Logger.DEBUG);
n.sendMessage(new AnnouncementFailed(id,
AnnouncementFailed.KNOWN_ANNOUNCEE),
origRec, getTime(2));
return null;
} else if ((depth + hopsToLive) > Node.maxHopsToLive) {
- if(n.logger.shouldLog(Logger.DEBUG,this))
- n.logger.log(this, "Too high HTL on Announcement, rejecting.",
+ if(Core.logger.shouldLog(Logger.DEBUG,this))
+ Core.logger.log(this, "Too high HTL on Announcement, rejecting.",
Logger.DEBUG);
n.sendMessage(
new AnnouncementFailed(id, AnnouncementFailed.UNACCEPTABLE_HTL),
@@ -111,13 +118,13 @@
} catch (CommunicationException e) {
- n.logger.log(this, "Failed to return reply to Announcement",
- n.logger.MINOR);
+ Core.logger.log(this, "Failed to return reply to Announcement",
+ Logger.MINOR);
return null;
}
// Our random commit value
myVal = new byte[20];
- n.getRandSource().nextBytes(myVal);
+ Core.getRandSource().nextBytes(myVal);
// update commitVal
synchronized (ctx) {
@@ -139,7 +146,7 @@
//System.err.println("MYVAL: " + Fields.bytesToHex(myVal));
return new LastNode(this, ne);
} catch (CommunicationException e) {
- n.logger.log(this, "Failed to return reply to Announcement: "+e,
+ Core.logger.log(this, "Failed to return reply to Announcement: "+e,
Logger.MINOR);
return null;
}
@@ -157,7 +164,7 @@
if (routes == null) { // first time
// Route. No sense in taking too much entropy. (And this way
// I can test Tavin's routing table :-) ).
- long l = n.getRandSource().nextLong();
+ long l = Core.getRandSource().nextLong();
Key k = new Key(new byte[] {
(byte) l, (byte) (l >> 8), (byte) (l >> 16),
(byte) (l >> 24), (byte) (l >> 32), (byte) (l >> 40),
@@ -169,8 +176,8 @@
routed++;
while (routed < MAX_ROUTING_TIMES) { // routed does not change in loop
- if(n.logger.shouldLog(Logger.DEBUG,this))
- n.logger.log(this, "Trying to route "+Fields.longToHex(id)+
+ if(Core.logger.shouldLog(Logger.DEBUG,this))
+ Core.logger.log(this, "Trying to route "+Fields.longToHex(id)+
" - iteration "+routed+" of "+MAX_ROUTING_TIMES,
Logger.DEBUG);
@@ -182,11 +189,11 @@
// don't loop back to the sender
continue;
- if(n.logger.shouldLog(Logger.DEBUG,this))
- n.logger.log(this, "Forwarding query ("+Fields.longToHex(id)+
+ if(Core.logger.shouldLog(Logger.DEBUG,this))
+ Core.logger.log(this, "Forwarding query ("+Fields.longToHex(id)+
") to: "+nr, Logger.DEBUG);
try {
- n.sendMessage(na, nr, n.routeConnectTimeout);
+ n.sendMessage(na, nr, Node.routeConnectTimeout);
lastAddr = n.getPeer(nr);
NoReply nrm = new NoReply(id);
@@ -205,8 +212,8 @@
na.otherFields), origRec,
getTime(2));
} catch (CommunicationException e) {
- n.logger.log(this, "Failed to send back QueryRejected.",
- e, n.logger.MINOR);
+ Core.logger.log(this, "Failed to send back QueryRejected.",
+ e, Logger.MINOR);
}
return new AnnouncementDone(this);
}
Index: ReplyPending.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/announcement/ReplyPending.java,v
retrieving revision 1.1.1.1.4.2.2.2
retrieving revision 1.1.1.1.4.2.2.3
diff -u -w -r1.1.1.1.4.2.2.2 -r1.1.1.1.4.2.2.3
--- ReplyPending.java 28 Oct 2003 20:20:42 -0000 1.1.1.1.4.2.2.2
+++ ReplyPending.java 1 Nov 2003 16:55:35 -0000 1.1.1.1.4.2.2.3
@@ -1,11 +1,21 @@
package freenet.node.states.announcement;
-import freenet.*;
-import freenet.node.*;
-import freenet.message.*;
+import freenet.CommunicationException;
+import freenet.Core;
+import freenet.MessageObject;
+import freenet.message.Accepted;
+import freenet.message.AnnouncementFailed;
+import freenet.message.AnnouncementReply;
+import freenet.message.NodeAnnouncement;
+import freenet.message.QueryAborted;
+import freenet.message.QueryRejected;
+import freenet.message.QueryRestarted;
+import freenet.node.BadStateException;
+import freenet.node.Node;
+import freenet.node.State;
+import freenet.node.StateException;
import freenet.support.Fields;
import freenet.support.Logger;
-import java.util.Enumeration;
/**
* Waiting for a Reply to the message
@@ -34,7 +44,7 @@
try {
n.sendMessage(rf, na.getSource(), 0);
} catch (CommunicationException e) {
- n.logger.log(this, "Failed to send back "+rf+": "+e,
+ Core.logger.log(this, "Failed to send back "+rf+": "+e,
Logger.MINOR);
}
return this;
@@ -50,7 +60,7 @@
try {
n.sendMessage(qa, lastAddr, 0);
} catch (CommunicationException e) {
- n.logger.log(this, "Failed to forward " + qa +": "+e,
+ Core.logger.log(this, "Failed to forward " + qa +": "+e,
Logger.MINOR);
}
@@ -81,7 +91,7 @@
throw new BadStateException("Received the wrong NoReply - probably"
+ " accepted NoReply lingering");
} else {
- n.logger.log(this,
+ Core.logger.log(this,
"Restarting Announcement chain "+Fields.longToHex(id),
Logger.MINOR);
@@ -110,9 +120,9 @@
throws BadStateException {
checkReply(qr);
- if(n.logger.shouldLog(Logger.DEBUG,this))
- n.logger.log(this, "Received QueryRejected on "+Fields.longToHex(id)+
- " ("+qr.hopsToLive+","+qr.reason+")", n.logger.DEBUG);
+ if(Core.logger.shouldLog(Logger.DEBUG,this))
+ Core.logger.log(this, "Received QueryRejected on "+Fields.longToHex(id)+
+ " ("+qr.hopsToLive+","+qr.reason+")", Logger.DEBUG);
nr.cancel();
@@ -148,13 +158,13 @@
checkReply(af);
nr.cancel();
- n.logger.log(this, "Announcement failed for reason " + af.reason()
- + "at later node", n.logger.DEBUG);
+ Core.logger.log(this, "Announcement failed for reason " + af.reason()
+ + "at later node", Logger.DEBUG);
try {
n.sendMessage(af, origRec, getTime(origHopsToLive));
} catch (CommunicationException e) {
- n.logger.log(this, "Failed to send AnnouncementFailed",
- e, n.logger.MINOR);
+ Core.logger.log(this, "Failed to send AnnouncementFailed",
+ e, Logger.MINOR);
}
terminateRouting(false, false);
return new AnnouncementDone(this);
@@ -176,8 +186,8 @@
try {
n.sendMessage(ar, origRec, getTime(origHopsToLive));
} catch (CommunicationException e) {
- n.logger.log(this, "Failed to send AnnouncementReply", e,
- n.logger.MINOR);
+ Core.logger.log(this, "Failed to send AnnouncementReply", e,
+ Logger.MINOR);
}
NoExecute ne = new NoExecute(id);
@@ -190,7 +200,7 @@
try {
totalRestarts++;
if (totalRestarts > MAX_RESTARTS) {
- n.logger.log(this, "Failing announcement after too many " +
+ Core.logger.log(this, "Failing announcement after too many " +
" restarts.", Logger.MINOR);
try {
n.sendMessage(new AnnouncementFailed(id,
@@ -207,8 +217,8 @@
return true;
} catch (CommunicationException e) {
- n.logger.log(this, "Failed to restart query",
- e, n.logger.MINOR);
+ Core.logger.log(this, "Failed to restart query",
+ e, Logger.MINOR);
return false;
}
}
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
