Update of /cvsroot/freenet/freenet/src/freenet/node/states/announcing
In directory sc8-pr-cvs1:/tmp/cvs-serv14016/src/freenet/node/states/announcing
Modified Files:
CompleteAnnouncement.java SendAnnouncement.java
Announcing.java NewInitialRequest.java
Log Message:
6290: don't show the request box either when in simple mode.
Index: CompleteAnnouncement.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/announcing/CompleteAnnouncement.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- CompleteAnnouncement.java 31 Oct 2003 18:25:12 -0000 1.10
+++ CompleteAnnouncement.java 31 Oct 2003 19:21:21 -0000 1.11
@@ -105,7 +105,7 @@
int i = 0;
for (Enumeration e = keys.keys() ;
- e.hasMoreElements() && i < n.initialRequests ; i++) {
+ e.hasMoreElements() && i < Node.initialRequests ; i++) {
Key k = (Key) e.nextElement();
NewInitialRequest.schedule(n, k, ft);
}
Index: SendAnnouncement.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/announcing/SendAnnouncement.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -w -r1.18 -r1.19
--- SendAnnouncement.java 31 Oct 2003 18:25:12 -0000 1.18
+++ SendAnnouncement.java 31 Oct 2003 19:21:21 -0000 1.19
@@ -91,7 +91,7 @@
// Our random commit value
myVal = new byte[20];
- n.getRandSource().nextBytes(myVal);
+ Core.getRandSource().nextBytes(myVal);
byte[] commitVal;
@@ -107,20 +107,20 @@
// Count outbound requests.
- n.diagnostics.occurrenceBinomial("outboundAggregateRequests", 1, 1);
- if (n.outboundRequests != null) {
- n.outboundRequests.incTotal(target.getAddress().toString());
+ Core.diagnostics.occurrenceBinomial("outboundAggregateRequests", 1, 1);
+ if (Core.outboundRequests != null) {
+ Core.outboundRequests.incTotal(target.getAddress().toString());
}
// Keep track of outbound requests for rate limiting.
- if(n.outboundRequestLimit != null)
- n.outboundRequestLimit.inc();
+ if(Node.outboundRequestLimit != null)
+ Node.outboundRequestLimit.inc();
NoReply nr = new NoReply(id);
n.schedule(getTime(2), nr);
return new ExecuteAnnouncement(this, nr);
} catch (CommunicationException e) {
- n.diagnostics.occurrenceBinomial("outboundAggregateRequests", 1, 0);
+ Core.diagnostics.occurrenceBinomial("outboundAggregateRequests", 1, 0);
Core.logger.log(this, "Sending NodeAnnouncement failed: "+e,
Logger.MINOR);
//e, Logger.MINOR);
Index: Announcing.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/announcing/Announcing.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -w -r1.36 -r1.37
--- Announcing.java 30 Oct 2003 01:34:04 -0000 1.36
+++ Announcing.java 31 Oct 2003 19:21:21 -0000 1.37
@@ -50,8 +50,8 @@
+ " Use routing table: " + useRT + " Poll Interval: "
+ delay + " Threads: " + Node.announcementThreads +
" Attempts: " + Node.announcementAttempts,
- Core.logger.MINOR);
- n.schedule(0, new PlaceAnnouncing(n.getRandSource().nextLong(),
+ Logger.MINOR);
+ n.schedule(0, new PlaceAnnouncing(Core.getRandSource().nextLong(),
hopsToLive, targets, useRT, delay));
}
@@ -189,19 +189,19 @@
Diagnostics.NUMBER_OF_EVENTS);
Core.logger.log(this, "Traffic: "+traffic+", Connections: "+
- connections, Core.logger.DEBUG);
+ connections, Logger.DEBUG);
if (traffic < 1.0 || connections < 1.0 ||
(successes > 0 && successes < Node.announcementThreads) ||
( (n.loadStats.globalQueryTraffic()*
- n.defaultResetProbability >
+ Node.defaultResetProbability >
n.loadStats.localQueryTraffic()) &&
(System.currentTimeMillis() - timeLastAnnounced >
3600*1000) &&
(System.currentTimeMillis() - startTime > delay*2))) {
// FIXME: this only ensures that we have 3 successes _THE FIRST
TIME_
- if(Core.logger.shouldLog(Core.logger.DEBUG))
- Core.logger.log(this, "Announcing", Core.logger.DEBUG);
+ if(Core.logger.shouldLog(Logger.DEBUG))
+ Core.logger.log(this, "Announcing", Logger.DEBUG);
// find three peers.
timeLastAnnounced = System.currentTimeMillis();
@@ -271,7 +271,7 @@
} else {
Core.logger.log(this, traffic +
" requests in the last hour. " +
- "Won't announce.", Core.logger.MINOR);
+ "Won't announce.", Logger.MINOR);
successes = 0;
}
} finally {
Index: NewInitialRequest.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/announcing/NewInitialRequest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- NewInitialRequest.java 27 Oct 2003 14:45:17 -0000 1.5
+++ NewInitialRequest.java 31 Oct 2003 19:21:21 -0000 1.6
@@ -9,8 +9,8 @@
public class NewInitialRequest extends State {
static void schedule(Node n, Key k, AnnouncementRequestToken ft) {
- long id = n.getRandSource().nextLong();
- n.logger.log(NewInitialRequest.class,
+ long id = Core.getRandSource().nextLong();
+ Core.logger.log(NewInitialRequest.class,
"Scheduling post-announcement request on chain "
+Fields.longToHex(id)+", for key "+k,
Logger.NORMAL);
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
