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

[t...@freenetproject.org]

Author: toad
Date: 2007-12-24 22:25:11 +0000 (Mon, 24 Dec 2007)
New Revision: 16813

Modified:
   trunk/freenet/src/freenet/node/FNPPacketMangler.java
   trunk/freenet/src/freenet/node/Node.java
Log:
Node.acceptSeedConnections - turn this off if you don't ever want to be a 
seednode.
Don't accept seednode connections unless this is on AND opennet is enabled.

Modified: trunk/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- trunk/freenet/src/freenet/node/FNPPacketMangler.java        2007-12-24 
22:08:30 UTC (rev 16812)
+++ trunk/freenet/src/freenet/node/FNPPacketMangler.java        2007-12-24 
22:25:11 UTC (rev 16813)
@@ -296,7 +296,9 @@
                                }
                        }
                }
-               if(tryProcessAuthAnon(buf, offset, length, peer, now)) return;
+               if(node.wantAnonAuth()) {
+                       if(tryProcessAuthAnon(buf, offset, length, peer, now)) 
return;
+               }
                Logger.normal(this,"Unmatchable packet from "+peer);
        }


Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2007-12-24 22:08:30 UTC (rev 
16812)
+++ trunk/freenet/src/freenet/node/Node.java    2007-12-24 22:25:11 UTC (rev 
16813)
@@ -334,6 +334,7 @@
        private final NodeCryptoConfig opennetCryptoConfig;
        private OpennetManager opennet;
        private int maxOpennetPeers;
+       private boolean acceptSeedConnections;
        private boolean passOpennetRefsThroughDarknet;

        // General stuff
@@ -892,6 +893,20 @@
                        opennet = null;
                }

+               opennetConfig.register("acceptSeedConnections", true, 2, true, 
true, "Node.acceptSeedConnectionsShort", "Node.acceptSeedConnections", new 
BooleanCallback() {
+
+                       public boolean get() {
+                               return acceptSeedConnections;
+                       }
+
+                       public void set(boolean val) throws 
InvalidConfigValueException {
+                               acceptSeedConnections = val;
+                       }
+                       
+               });
+               
+               acceptSeedConnections = 
opennetConfig.getBoolean("acceptSeedConnections");
+               
                opennetConfig.finishedInitialization();

                nodeConfig.register("passOpennetPeersThroughDarknet", true, 
sortOrder++, true, false, "Node.passOpennetPeersThroughDarknet", 
"Node.passOpennetPeersThroughDarknetLong",
@@ -2880,4 +2895,8 @@
                        }
                }
        }
+
+       public boolean wantAnonAuth() {
+               return opennet != null && acceptSeedConnections;
+       }
 }