[freenet-cvs] r12557 - in trunk/freenet/src/freenet: clients/http config node

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-04-09 00:28:50 +0000 (Mon, 09 Apr 2007)
New Revision: 12557

Modified:
   trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
   trunk/freenet/src/freenet/config/SubConfig.java
   trunk/freenet/src/freenet/node/FNPPacketMangler.java
Log:
Imports, dead code removal

Modified: trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java       
2007-04-08 21:03:17 UTC (rev 12556)
+++ trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java       
2007-04-09 00:28:50 UTC (rev 12557)
@@ -12,8 +12,6 @@
 import java.util.Locale;
 import java.util.Map;

-import com.sleepycat.je.JEVersion;
-
 import freenet.client.HighLevelSimpleClient;
 import freenet.config.SubConfig;
 import freenet.io.comm.IOStatisticCollector;

Modified: trunk/freenet/src/freenet/config/SubConfig.java
===================================================================
--- trunk/freenet/src/freenet/config/SubConfig.java     2007-04-08 21:03:17 UTC 
(rev 12556)
+++ trunk/freenet/src/freenet/config/SubConfig.java     2007-04-09 00:28:50 UTC 
(rev 12557)
@@ -203,7 +203,6 @@
                boolean logMINOR = Logger.shouldLog(Logger.MINOR, this);
                if(logMINOR)
                        Logger.minor(this, "Prefix="+prefix);
-               String valueString;
                while(i.hasNext()) {
                        Map.Entry entry = (Map.Entry) i.next();
                        String key = (String) entry.getKey();

Modified: trunk/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- trunk/freenet/src/freenet/node/FNPPacketMangler.java        2007-04-08 
21:03:17 UTC (rev 12556)
+++ trunk/freenet/src/freenet/node/FNPPacketMangler.java        2007-04-09 
00:28:50 UTC (rev 12557)
@@ -9,14 +9,12 @@
 import net.i2p.util.NativeBigInteger;

 import freenet.crypt.BlockCipher;
-import freenet.crypt.DSA;
 import freenet.crypt.DSASignature;
 import freenet.crypt.DiffieHellman;
 import freenet.crypt.DiffieHellmanContext;
 import freenet.crypt.EntropySource;
 import freenet.crypt.PCFBMode;
 import freenet.crypt.SHA256;
-import freenet.crypt.StationToStationContext;
 import freenet.io.comm.*;
 import freenet.io.comm.Peer.LocalAddressException;
 import freenet.support.Fields;
@@ -1622,27 +1620,7 @@
         if(context == null) return false;
         return !((PeerNode)context).isConnected();
     }
-    
-    /**
-     * Send a first-half (phase 0 or 1) StS negotiation packet to the node.
-     * @param phase The phase of the message to be sent (0 or 1).
-     * @param integer
-     * @param replyTo
-     */
-    private void sendFirstStSPacket(int phase, NativeBigInteger integer, 
PeerNode pn, Peer replyTo) {
-        if(logMINOR) Logger.minor(this, "Sending ("+phase+") 
"+integer.toHexString()+" to "+pn.getPeer());
-        byte[] data = integer.toByteArray();

-        sendAuthPacket(1, 1, phase, data, pn, replyTo);
-    }
-    
-    private void sendSecondStSPacket(int phase, StationToStationContext ctx, 
PeerNode pn, Peer replyTo, byte[] data) {
-       NativeBigInteger hisExponent = new NativeBigInteger(1, data);
-       ctx.setOtherSideExponential(hisExponent);
-       
-        sendAuthPacket(1, 1, phase, ctx.concatAndSignAndCrypt(), pn, replyTo);
-    }
-
        public void resend(ResendPacketItem item) throws 
PacketSequenceException, WouldBlockException, KeyChangedException, 
NotConnectedException {
                processOutgoingPreformatted(item.buf, 0, item.buf.length, 
item.kt, item.packetNumber, item.callbacks, 0);
        }