[freenet-cvs] r8645 - in trunk/freenet/src/freenet: io/comm node pluginmanager

[nextg...@freenetproject.org]

Author: nextgens
Date: 2006-05-07 23:24:54 +0000 (Sun, 07 May 2006)
New Revision: 8645

Modified:
   trunk/freenet/src/freenet/io/comm/IOStatisticCollector.java
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/pluginmanager/PluginRespirator.java
Log:
We get rid of SNMP related stuffs :=> will be a plugin

Modified: trunk/freenet/src/freenet/io/comm/IOStatisticCollector.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/IOStatisticCollector.java 2006-05-07 
16:09:40 UTC (rev 8644)
+++ trunk/freenet/src/freenet/io/comm/IOStatisticCollector.java 2006-05-07 
23:24:54 UTC (rev 8645)
@@ -4,9 +4,6 @@
 import java.util.HashMap;
 import java.util.Iterator;

-import freenet.snmplib.SNMPStarter;
-
-
 public class IOStatisticCollector {
        public static final int STATISTICS_ENTRIES = 10;
        public static final int STATISTICS_DURATION_S = 30;
@@ -25,7 +22,7 @@
                // TODO: only for testing!!!!
                // This should only happen once
                //SNMPAgent.create();
-               SNMPStarter.initialize();
+               //SNMPStarter.initialize();
        }

        private static IOStatisticCollector getSC() {

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2006-05-07 16:09:40 UTC (rev 
8644)
+++ trunk/freenet/src/freenet/node/Node.java    2006-05-07 23:24:54 UTC (rev 
8645)
@@ -26,6 +26,8 @@
 import java.util.Iterator;
 import java.util.zip.DeflaterOutputStream;

+import plugins.snmplib.SNMPStarter;
+
 import freenet.client.ArchiveManager;
 import freenet.client.HighLevelSimpleClient;
 import freenet.client.HighLevelSimpleClientImpl;
@@ -74,7 +76,6 @@
 import freenet.keys.SSKVerifyException;
 import freenet.node.fcp.FCPServer;
 import freenet.pluginmanager.PluginManager;
-import freenet.snmplib.SNMPStarter;
 import freenet.store.BerkeleyDBFreenetStore;
 import freenet.store.FreenetStore;
 import freenet.support.Base64;
@@ -531,9 +532,6 @@
         System.out.println("Starting fproxy on port "+(port+2000));
         new FCPServer(port+3000, n);
         System.out.println("Starting FCP server on port "+(port+3000));
-        SNMPAgent.setSNMPPort(port+4000);
-        System.out.println("Starting SNMP server on port "+(port+4000));
-        SNMPStarter.initialize();
         //server.register(fproxy, "/SSK@", false);
         //server.register(fproxy, "/KSK@", false);
         */
@@ -1073,9 +1071,6 @@
         server.register(pproxy, "/plugins/", true);
                 * */

-        // SNMP
-        SNMPStarter.maybeCreate(this, config);
-        
         // After everything has been created, write the config file back to 
disk.
         config.finishedInit();
         config.store();

Modified: trunk/freenet/src/freenet/pluginmanager/PluginRespirator.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginRespirator.java       
2006-05-07 16:09:40 UTC (rev 8644)
+++ trunk/freenet/src/freenet/pluginmanager/PluginRespirator.java       
2006-05-07 23:24:54 UTC (rev 8645)
@@ -22,4 +22,8 @@
        public HighLevelSimpleClient getHLSimpleClient() {
                return hlsc;
        }
+       
+       public Node getNode(){
+               return node;
+       }
 }