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

[t...@freenetproject.org]

Author: toad
Date: 2007-06-29 18:17:24 +0000 (Fri, 29 Jun 2007)
New Revision: 13827

Modified:
   trunk/freenet/src/freenet/node/NodeCrypto.java
   trunk/freenet/src/freenet/node/OpennetManager.java
Log:
Start and stop the opennet USH and the NodeCryptoConfig.

Modified: trunk/freenet/src/freenet/node/NodeCrypto.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeCrypto.java      2007-06-29 18:07:06 UTC 
(rev 13826)
+++ trunk/freenet/src/freenet/node/NodeCrypto.java      2007-06-29 18:17:24 UTC 
(rev 13827)
@@ -64,6 +64,7 @@
        /** My ARK sequence number */
        long myARKNumber;
        static boolean logMINOR;
+       final NodeCryptoConfig config;

        // Noderef related
        /** The signature of the above fieldset */
@@ -80,6 +81,7 @@
        public NodeCrypto(int sortOrder, Node node, boolean isOpennet, 
NodeCryptoConfig config) throws NodeInitException {

                this.node = node;
+               this.config = config;
                random = node.random;
                this.isOpennet = isOpennet;
                logMINOR = Logger.shouldLog(Logger.MINOR, this);
@@ -369,5 +371,10 @@
                }
                socket.setDropProbability(val);
        }
+
+       public void stop() {
+               socket.close(true);
+               config.stopping(this);
+       }

 }

Modified: trunk/freenet/src/freenet/node/OpennetManager.java
===================================================================
--- trunk/freenet/src/freenet/node/OpennetManager.java  2007-06-29 18:07:06 UTC 
(rev 13826)
+++ trunk/freenet/src/freenet/node/OpennetManager.java  2007-06-29 18:17:24 UTC 
(rev 13827)
@@ -72,14 +72,14 @@
        }

        public void start() {
-               // FIXME do something
+               crypto.start(node.disableHangCheckers);
        }

        /**
         * Called when opennet is disabled
         */
        public void stop() {
-               // FIXME do something
+               crypto.stop();
        }

 }