Author: toad
Date: 2007-12-19 15:00:40 +0000 (Wed, 19 Dec 2007)
New Revision: 16711
Modified:
trunk/freenet/src/freenet/node/DarknetPeerNode.java
trunk/freenet/src/freenet/node/OpennetPeerNode.java
trunk/freenet/src/freenet/node/PeerNode.java
trunk/freenet/src/freenet/node/SeedClientPeerNode.java
trunk/freenet/src/freenet/node/SeedServerPeerNode.java
Log:
ignoreLastGoodVersion -> ignoreLastGoodVersion()
Modified: trunk/freenet/src/freenet/node/DarknetPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/DarknetPeerNode.java 2007-12-19 14:58:46 UTC
(rev 16710)
+++ trunk/freenet/src/freenet/node/DarknetPeerNode.java 2007-12-19 15:00:40 UTC
(rev 16711)
@@ -87,7 +87,7 @@
* @param node2 The running Node we are part of.
*/
public DarknetPeerNode(SimpleFieldSet fs, Node node2, NodeCrypto crypto,
PeerManager peers, boolean fromLocal, OutgoingPacketMangler mangler) throws
FSParseException, PeerParseException, ReferenceSignatureVerificationException {
- super(fs, node2, crypto, peers, fromLocal, false, mangler, false,
false);
+ super(fs, node2, crypto, peers, fromLocal, false, mangler, false);
logMINOR = Logger.shouldLog(Logger.MINOR, this);
Modified: trunk/freenet/src/freenet/node/OpennetPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/OpennetPeerNode.java 2007-12-19 14:58:46 UTC
(rev 16710)
+++ trunk/freenet/src/freenet/node/OpennetPeerNode.java 2007-12-19 15:00:40 UTC
(rev 16711)
@@ -10,7 +10,7 @@
private long timeLastSuccess;
public OpennetPeerNode(SimpleFieldSet fs, Node node2, NodeCrypto
crypto, OpennetManager opennet, PeerManager peers, boolean fromLocal,
OutgoingPacketMangler mangler) throws FSParseException, PeerParseException,
ReferenceSignatureVerificationException {
- super(fs, node2, crypto, peers, fromLocal, false, mangler,
true, false);
+ super(fs, node2, crypto, peers, fromLocal, false, mangler,
true);
this.opennet = opennet;
}
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2007-12-19 14:58:46 UTC
(rev 16710)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2007-12-19 15:00:40 UTC
(rev 16711)
@@ -308,6 +308,10 @@
*/
protected abstract boolean generateIdentityFromPubkey();
+ protected boolean ignoreLastGoodVersion() {
+ return false;
+ }
+
/**
* Create a PeerNode from a SimpleFieldSet containing a
* node reference for one. This must contain the following
@@ -321,7 +325,7 @@
* @param fs The SimpleFieldSet to parse
* @param node2 The running Node we are part of.
*/
- public PeerNode(SimpleFieldSet fs, Node node2, NodeCrypto crypto,
PeerManager peers, boolean fromLocal, boolean fromAnonymousInitiator,
OutgoingPacketMangler mangler, boolean isOpennet, boolean
ignoreLastGoodVersion) throws FSParseException, PeerParseException,
ReferenceSignatureVerificationException {
+ public PeerNode(SimpleFieldSet fs, Node node2, NodeCrypto crypto,
PeerManager peers, boolean fromLocal, boolean fromAnonymousInitiator,
OutgoingPacketMangler mangler, boolean isOpennet) throws FSParseException,
PeerParseException, ReferenceSignatureVerificationException {
boolean noSig = false;
if(fromLocal || fromAnonymousInitiator) noSig = true;
logMINOR = Logger.shouldLog(Logger.MINOR, PeerNode.class);
@@ -343,7 +347,7 @@
disableRouting = disableRoutingHasBeenSetLocally = false;
disableRoutingHasBeenSetRemotely = false; // Assume so
- if(ignoreLastGoodVersion)
+ if(ignoreLastGoodVersion())
lastGoodVersion = version;
else
lastGoodVersion = fs.get("lastGoodVersion");
Modified: trunk/freenet/src/freenet/node/SeedClientPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/SeedClientPeerNode.java 2007-12-19
14:58:46 UTC (rev 16710)
+++ trunk/freenet/src/freenet/node/SeedClientPeerNode.java 2007-12-19
15:00:40 UTC (rev 16711)
@@ -14,7 +14,7 @@
public class SeedClientPeerNode extends PeerNode {
public SeedClientPeerNode(SimpleFieldSet fs, Node node2, NodeCrypto
crypto, PeerManager peers, boolean fromLocal, boolean noSig,
OutgoingPacketMangler mangler) throws FSParseException, PeerParseException,
ReferenceSignatureVerificationException {
- super(fs, node2, crypto, peers, fromLocal, noSig, mangler,
true, noSig);
+ super(fs, node2, crypto, peers, fromLocal, noSig, mangler,
true);
}
public PeerNodeStatus getStatus() {
@@ -75,4 +75,8 @@
protected boolean generateIdentityFromPubkey() {
return true;
}
+
+ protected boolean ignoreLastGoodVersion() {
+ return true;
+ }
}
Modified: trunk/freenet/src/freenet/node/SeedServerPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/SeedServerPeerNode.java 2007-12-19
14:58:46 UTC (rev 16710)
+++ trunk/freenet/src/freenet/node/SeedServerPeerNode.java 2007-12-19
15:00:40 UTC (rev 16711)
@@ -19,7 +19,7 @@
public class SeedServerPeerNode extends PeerNode {
public SeedServerPeerNode(SimpleFieldSet fs, Node node2, NodeCrypto
crypto, PeerManager peers, boolean fromLocal, OutgoingPacketMangler mangler)
throws FSParseException, PeerParseException,
ReferenceSignatureVerificationException {
- super(fs, node2, crypto, peers, fromLocal, false, mangler,
true, false);
+ super(fs, node2, crypto, peers, fromLocal, false, mangler,
true);
}
public PeerNodeStatus getStatus() {
