Update of /cvsroot/freenet/freenet/src/freenet/node/states/announcing
In directory sc8-pr-cvs1:/tmp/cvs-serv21851/src/freenet/node/states/announcing
Modified Files:
Announcing.java SendAnnouncement.java ExecuteAnnouncement.java
CompleteAnnouncement.java AnnouncingState.java
Log Message:
6314:
Fix announcements to nodes not already known.
Fix descriptions for diff diagnostics vars.
Report diffTransferRate etc in bytes per second.
Logging
Index: Announcing.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/announcing/Announcing.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -w -r1.38 -r1.39
--- Announcing.java 31 Oct 2003 19:36:15 -0000 1.38
+++ Announcing.java 5 Nov 2003 22:36:39 -0000 1.39
@@ -265,7 +265,7 @@
" announcement targets for this node.",
Logger.NORMAL);
for (int i = 0 ; i < m ; i++) {
- SendAnnouncement.makeTry(n, id, n.getPeer(now[i]),
+ SendAnnouncement.makeTry(n, id, now[i],
hopsToLive);
}
} else {
Index: SendAnnouncement.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/announcing/SendAnnouncement.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -w -r1.19 -r1.20
--- SendAnnouncement.java 31 Oct 2003 19:21:21 -0000 1.19
+++ SendAnnouncement.java 5 Nov 2003 22:36:39 -0000 1.20
@@ -8,6 +8,7 @@
import freenet.node.BadStateException;
import freenet.node.Node;
import freenet.node.NodeMessageObject;
+import freenet.node.NodeReference;
import freenet.node.State;
import freenet.node.states.announcement.NoReply;
import freenet.support.Logger;
@@ -28,7 +29,7 @@
* make sure it is not more than what is tolerated by the
* network.
*/
- static State makeTry(Node n, long id, Peer target, int htl) {
+ static State makeTry(Node n, long id, NodeReference target, int htl) {
if (htl > Node.maxHopsToLive) {
Core.logger.log(SendAnnouncement.class,
@@ -66,7 +67,7 @@
- private SendAnnouncement(long id, int htl, Peer target) {
+ private SendAnnouncement(long id, int htl, NodeReference target) {
super(id, htl, target);
}
@@ -109,7 +110,7 @@
// Count outbound requests.
Core.diagnostics.occurrenceBinomial("outboundAggregateRequests", 1, 1);
if (Core.outboundRequests != null) {
- Core.outboundRequests.incTotal(target.getAddress().toString());
+ Core.outboundRequests.incTotal(target.firstPhysicalToString());
}
// Keep track of outbound requests for rate limiting.
Index: ExecuteAnnouncement.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/announcing/ExecuteAnnouncement.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -r1.11 -r1.12
--- ExecuteAnnouncement.java 31 Oct 2003 18:25:12 -0000 1.11
+++ ExecuteAnnouncement.java 5 Nov 2003 22:36:39 -0000 1.12
@@ -48,7 +48,7 @@
if (mo instanceof NoReply)
return nr == mo;
else if (mo instanceof Message)
- return target.equalsIdent(((Message) mo).peerIdentity());
+ return target.getIdentity().equals(((Message) mo).peerIdentity());
else
return false;
}
Index: CompleteAnnouncement.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/announcing/CompleteAnnouncement.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -r1.12 -r1.13
--- CompleteAnnouncement.java 31 Oct 2003 19:36:14 -0000 1.12
+++ CompleteAnnouncement.java 5 Nov 2003 22:36:39 -0000 1.13
@@ -40,7 +40,7 @@
if (mo instanceof NoComplete)
return nc == mo;
else if (mo instanceof Message)
- return target.equalsIdent(((Message) mo).peerIdentity());
+ return target.getIdentity().equals(((Message) mo).peerIdentity());
else
return false;
}
Index: AnnouncingState.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/announcing/AnnouncingState.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- AnnouncingState.java 30 Jun 2003 21:00:55 -0000 1.4
+++ AnnouncingState.java 5 Nov 2003 22:36:39 -0000 1.5
@@ -10,12 +10,12 @@
static final Digest ctx = SHA1.getInstance();
final int hopsToLive;
- final Peer target;
+ final NodeReference target;
byte[] myVal;
- AnnouncingState(long id, int hopsToLive, Peer target) {
+ AnnouncingState(long id, int hopsToLive, NodeReference target) {
super(id);
this.hopsToLive = hopsToLive;
this.target = target;
@@ -48,7 +48,7 @@
public State received(Node n, MessageObject mo) throws StateException {
// customary source check
if (mo instanceof Message &&
- !target.equalsIdent(((Message) mo).peerIdentity())) {
+ !target.getIdentity().equals(((Message) mo).peerIdentity())) {
throw new BadStateException("Reply from wrong node: "+mo);
}
return super.received(n, mo);
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
