Update of /cvsroot/freenet/freenet/src/freenet/node/states/announcement
In directory sc8-pr-cvs1:/tmp/cvs-serv14016/src/freenet/node/states/announcement
Modified Files:
ReplyPending.java LastNode.java CompletePending.java
AnnouncementDone.java ExecutePending.java NewAnnouncement.java
ExecuteHandler.java
Log Message:
6290: don't show the request box either when in simple mode.
Index: ReplyPending.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/announcement/ReplyPending.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -r1.12 -r1.13
--- ReplyPending.java 31 Oct 2003 18:25:12 -0000 1.12
+++ ReplyPending.java 31 Oct 2003 19:21:16 -0000 1.13
@@ -122,7 +122,7 @@
if(n.logger.shouldLog(Logger.DEBUG,this))
Core.logger.log(this, "Received QueryRejected on "+Fields.longToHex(id)+
- " ("+qr.hopsToLive+","+qr.reason+")", n.logger.DEBUG);
+ " ("+qr.hopsToLive+","+qr.reason+")", Logger.DEBUG);
nr.cancel();
@@ -159,12 +159,12 @@
nr.cancel();
Core.logger.log(this, "Announcement failed for reason " + af.reason()
- + "at later node", n.logger.DEBUG);
+ + "at later node", Logger.DEBUG);
try {
n.sendMessage(af, origRec, getTime(origHopsToLive));
} catch (CommunicationException e) {
Core.logger.log(this, "Failed to send AnnouncementFailed",
- e, n.logger.MINOR);
+ e, Logger.MINOR);
}
terminateRouting(false, false);
return new AnnouncementDone(this);
@@ -187,7 +187,7 @@
n.sendMessage(ar, origRec, getTime(origHopsToLive));
} catch (CommunicationException e) {
Core.logger.log(this, "Failed to send AnnouncementReply", e,
- n.logger.MINOR);
+ Logger.MINOR);
}
NoExecute ne = new NoExecute(id);
@@ -218,7 +218,7 @@
return true;
} catch (CommunicationException e) {
Core.logger.log(this, "Failed to restart query",
- e, n.logger.MINOR);
+ e, Logger.MINOR);
return false;
}
}
Index: LastNode.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/announcement/LastNode.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -r1.11 -r1.12
--- LastNode.java 31 Oct 2003 18:25:12 -0000 1.11
+++ LastNode.java 31 Oct 2003 19:21:16 -0000 1.12
@@ -85,14 +85,14 @@
sendMessage(n, origRec, ac, keys, getTime(origHopsToLive));
} catch (CommunicationException e) {
Core.logger.log(this, "Failed to send AnnouncementComplete",
- e, n.logger.MINOR);
+ e, Logger.MINOR);
}
}
public State receivedMessage(Node n, NoExecute ne) {
Core.logger.log(this, "Did not receive AnnouncementExecute message, " +
- "dropping chain", n.logger.MINOR);
+ "dropping chain", Logger.MINOR);
return new AnnouncementDone(this);
@@ -105,7 +105,7 @@
this.ne.cancel();
Core.logger.log(this, "Announcement query aborted by previous node",
- n.logger.DEBUG);
+ Logger.DEBUG);
return new AnnouncementDone(this);
}
Index: CompletePending.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/announcement/CompletePending.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -r1.11 -r1.12
--- CompletePending.java 31 Oct 2003 18:25:12 -0000 1.11
+++ CompletePending.java 31 Oct 2003 19:21:16 -0000 1.12
@@ -127,7 +127,7 @@
sendMessage(n, origRec, ac, newKeys, getTime(hopsToLive)*3);
} catch (CommunicationException e) {
Core.logger.log(this, "Failed to send AnnouncementComplete",
- e, n.logger.MINOR);
+ e, Logger.MINOR);
}
terminateRouting(false, false);
// since we've added the ref
Index: AnnouncementDone.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/announcement/AnnouncementDone.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- AnnouncementDone.java 30 Aug 2003 23:16:53 -0000 1.3
+++ AnnouncementDone.java 31 Oct 2003 19:21:16 -0000 1.4
@@ -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: ExecutePending.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/announcement/ExecutePending.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- ExecutePending.java 31 Oct 2003 18:25:12 -0000 1.7
+++ ExecutePending.java 31 Oct 2003 19:21:16 -0000 1.8
@@ -109,7 +109,7 @@
} catch (CommunicationException e) {
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);
}
@@ -123,13 +123,13 @@
n.sendMessage(qa, lastAddr, getTime((int)depth));
} catch (CommunicationException e) {
Core.logger.log(this, "Failed to send QueryAborted after bad AE.",
- n.logger.MINOR);
+ Logger.MINOR);
}
try {
n.sendMessage(af, origRec, getTime(origHopsToLive));
} catch (CommunicationException e) {
Core.logger.log(this, "Failed to send AnnouncementFailed after "
- + "bad AE.", n.logger.MINOR);
+ + "bad AE.", Logger.MINOR);
}
return new AnnouncementDone(this);
Index: NewAnnouncement.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/announcement/NewAnnouncement.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -w -r1.16 -r1.17
--- NewAnnouncement.java 31 Oct 2003 18:25:12 -0000 1.16
+++ NewAnnouncement.java 31 Oct 2003 19:21:16 -0000 1.17
@@ -77,11 +77,11 @@
}
if (!announcee.checkAddresses(n.transports)) {
- if (n.logger.shouldLog(n.logger.MINOR))
+ if (n.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,
@@ -119,12 +119,12 @@
} catch (CommunicationException e) {
Core.logger.log(this, "Failed to return reply to Announcement",
- n.logger.MINOR);
+ Logger.MINOR);
return null;
}
// Our random commit value
myVal = new byte[20];
- n.getRandSource().nextBytes(myVal);
+ Core.getRandSource().nextBytes(myVal);
// update commitVal
synchronized (ctx) {
@@ -164,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),
@@ -189,11 +189,11 @@
// don't loop back to the sender
continue;
- if(n.logger.shouldLog(Logger.DEBUG,this))
+ 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);
@@ -213,7 +213,7 @@
getTime(2));
} catch (CommunicationException e) {
Core.logger.log(this, "Failed to send back QueryRejected.",
- e, n.logger.MINOR);
+ e, Logger.MINOR);
}
return new AnnouncementDone(this);
}
Index: ExecuteHandler.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/announcement/ExecuteHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- ExecuteHandler.java 30 Jun 2003 14:31:50 -0000 1.4
+++ ExecuteHandler.java 31 Oct 2003 19:21:16 -0000 1.5
@@ -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;
}
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
