[freenet-cvs] r13896 - trunk/freenet/src/freenet/node

[t...@freenetproject.org]

Author: toad
Date: 2007-07-03 14:21:13 +0000 (Tue, 03 Jul 2007)
New Revision: 13896

Modified:
   trunk/freenet/src/freenet/node/DarknetPeerNode.java
   trunk/freenet/src/freenet/node/OpennetPeerNode.java
   trunk/freenet/src/freenet/node/PeerNode.java
Log:
Actually check the opennet field

Modified: trunk/freenet/src/freenet/node/DarknetPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/DarknetPeerNode.java 2007-07-03 14:17:07 UTC 
(rev 13895)
+++ trunk/freenet/src/freenet/node/DarknetPeerNode.java 2007-07-03 14:21:13 UTC 
(rev 13896)
@@ -95,7 +95,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, mangler);
+       super(fs, node2, crypto, peers, fromLocal, mangler, false);

        logMINOR = Logger.shouldLog(Logger.MINOR, this);


Modified: trunk/freenet/src/freenet/node/OpennetPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/OpennetPeerNode.java 2007-07-03 14:17:07 UTC 
(rev 13895)
+++ trunk/freenet/src/freenet/node/OpennetPeerNode.java 2007-07-03 14:21:13 UTC 
(rev 13896)
@@ -7,7 +7,7 @@
 public class OpennetPeerNode extends PeerNode {

        public OpennetPeerNode(SimpleFieldSet fs, Node node2, NodeCrypto 
crypto, PeerManager peers, boolean fromLocal, OutgoingPacketMangler mangler) 
throws FSParseException, PeerParseException, 
ReferenceSignatureVerificationException {
-               super(fs, node2, crypto, peers, fromLocal, mangler);
+               super(fs, node2, crypto, peers, fromLocal, mangler, true);
        }

        public PeerNodeStatus getStatus() {

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2007-07-03 14:17:07 UTC 
(rev 13895)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2007-07-03 14:21:13 UTC 
(rev 13896)
@@ -314,7 +314,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, OutgoingPacketMangler mangler) throws 
FSParseException, PeerParseException, ReferenceSignatureVerificationException {
+    public PeerNode(SimpleFieldSet fs, Node node2, NodeCrypto crypto, 
PeerManager peers, boolean fromLocal, OutgoingPacketMangler mangler, boolean 
isOpennet) throws FSParseException, PeerParseException, 
ReferenceSignatureVerificationException {
        logMINOR = Logger.shouldLog(Logger.MINOR, PeerNode.class);
        myRef = new WeakReference(this);
        this.outgoingMangler = mangler;
@@ -385,6 +385,9 @@
         if(negTypes == null || negTypes.length == 0)
                negTypes = new int[] { 0 };

+        if((!fromLocal) && fs.getBoolean("opennet", false) != isOpennet)
+               throw new FSParseException("Trying to parse a darknet peer as 
opennet or an opennet peer as darknet");
+        
         /* Read the DSA key material for the peer */
         try {
                SimpleFieldSet sfs = fs.subset("dsaGroup");