Author: toad
Date: 2008-01-15 00:12:42 +0000 (Tue, 15 Jan 2008)
New Revision: 17051
Modified:
trunk/freenet/src/freenet/node/AnnounceSender.java
trunk/freenet/src/freenet/node/AnnouncementCallback.java
trunk/freenet/src/freenet/node/Announcer.java
trunk/freenet/src/freenet/node/TextModeClientInterface.java
Log:
Get rid of bogusNoderef("not added - maybe not needed").
Modified: trunk/freenet/src/freenet/node/AnnounceSender.java
===================================================================
--- trunk/freenet/src/freenet/node/AnnounceSender.java 2008-01-15 00:01:15 UTC
(rev 17050)
+++ trunk/freenet/src/freenet/node/AnnounceSender.java 2008-01-15 00:12:42 UTC
(rev 17051)
@@ -372,7 +372,7 @@
if(pn != null)
cb.addedNode(pn);
else
- cb.bogusNoderef("not added - maybe not
needed?");
+ cb.nodeNotAdded();
} catch (FSParseException e) {
Logger.normal(this, "Failed to parse reply:
"+e, e);
if(cb != null) cb.bogusNoderef("parse failed:
"+e);
Modified: trunk/freenet/src/freenet/node/AnnouncementCallback.java
===================================================================
--- trunk/freenet/src/freenet/node/AnnouncementCallback.java 2008-01-15
00:01:15 UTC (rev 17050)
+++ trunk/freenet/src/freenet/node/AnnouncementCallback.java 2008-01-15
00:12:42 UTC (rev 17051)
@@ -12,5 +12,7 @@
public void noMoreNodes();
public void addedNode(PeerNode pn);
public void nodeNotWanted();
+ /** Node valid but locally not added e.g. because we already have it */
+ public void nodeNotAdded();
}
Modified: trunk/freenet/src/freenet/node/Announcer.java
===================================================================
--- trunk/freenet/src/freenet/node/Announcer.java 2008-01-15 00:01:15 UTC
(rev 17050)
+++ trunk/freenet/src/freenet/node/Announcer.java 2008-01-15 00:12:42 UTC
(rev 17051)
@@ -446,6 +446,9 @@
}
Logger.error(this, "Announcement to
"+seed.userToString()+" returned node not wanted for a total of
"+announcementNotWantedNodes+" ("+totalNotWanted+" from this announcement)");
}
+ public void nodeNotAdded() {
+ Logger.error(this, "Announcement to
"+seed.userToString()+" : node not wanted (maybe already have it, opennet just
turned off, etc)");
+ }
}, seed);
node.executor.execute(sender, "Announcer to "+seed);
}
Modified: trunk/freenet/src/freenet/node/TextModeClientInterface.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterface.java 2008-01-15
00:01:15 UTC (rev 17050)
+++ trunk/freenet/src/freenet/node/TextModeClientInterface.java 2008-01-15
00:12:42 UTC (rev 17051)
@@ -941,6 +941,9 @@
public void nodeNotWanted() {
write("Hop doesn't want me.");
}
+ public void nodeNotAdded() {
+ write("Node not added as we don't want
it for some reason.");
+ }
});
} else {
