* Update versions, package release

so floodfill routers don't get backed up

apps/addressbook/java/src/addressbook/AddressBook.java

@@ -21,11 +21,11 @@
 
 package addressbook;
 
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Iterator;
 import java.io.File;
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
 
 import net.i2p.I2PAppContext;
 import net.i2p.util.EepGet;
@@ -167,9 +167,19 @@ public class AddressBook {
 		host.length() <= 67 &&          // 63 + ".i2p"
                 (! host.startsWith(".")) &&
                 (! host.startsWith("-")) &&
-                (! host.endsWith("-.i2p")) &&
+                host.indexOf(".-") < 0 &&
+                host.indexOf("-.") < 0 &&
 		host.indexOf("..") < 0 &&
+                // IDN - basic check, not complete validation
+                (host.indexOf("--") < 0 || host.startsWith("xn--") || host.indexOf(".xn--") > 0) &&
                 host.replaceAll("[a-z0-9.-]", "").length() == 0 &&
+                // some reserved names that may be used for local configuration someday
+                (! host.equals("proxy.i2p")) &&
+                (! host.equals("router.i2p")) &&
+                (! host.equals("console.i2p")) &&
+                (! host.endsWith(".proxy.i2p")) &&
+                (! host.endsWith(".router.i2p")) &&
+                (! host.endsWith(".console.i2p")) &&
 
 		dest.length() == 516 &&
                 dest.endsWith("AAAA") &&

apps/addressbook/java/src/addressbook/ConfigParser.java

@@ -21,12 +21,19 @@
 
 package addressbook;
 
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.StringReader;
 import java.util.HashMap;
-import java.util.Map;
-import java.util.List;
-import java.util.LinkedList;
 import java.util.Iterator;
-import java.io.*;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Utility class providing methods to parse and write files in config file

apps/addressbook/java/src/addressbook/Daemon.java

@@ -21,12 +21,12 @@
 
 package addressbook;
 
-import java.util.Iterator;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.List;
-import java.util.LinkedList;
 import java.io.File;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Main class of addressbook.  Performs updates, and runs the main loop.
@@ -98,7 +98,8 @@ public class Daemon {
         AddressBook router = new AddressBook(routerFile);
         
         List defaultSubs = new LinkedList();
-        defaultSubs.add("http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/i2p/hosts.txt");
+        // defaultSubs.add("http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/i2p/hosts.txt");
+        defaultSubs.add("http://www.i2p2.i2p/hosts.txt");
         
         SubscriptionList subscriptions = new SubscriptionList(subscriptionFile,
                 etagsFile, lastModifiedFile, defaultSubs, (String) settings

apps/addressbook/java/src/addressbook/Servlet.java

@@ -22,10 +22,10 @@
 package addressbook;
 
 import javax.servlet.GenericServlet;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
 
 /**
  * A wrapper for addressbook to allow it to be started as a web application.

apps/addressbook/java/src/addressbook/SubscriptionList.java

@@ -21,13 +21,13 @@
 
 package addressbook;
 
-import java.util.List;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Iterator;
 import java.io.File;
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * A list of Subscriptions loaded from a file.

apps/bogobot/Bogobot.java

@@ -10,16 +10,14 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-
+import java.util.Properties;
 import java.util.Timer;
 import java.util.TimerTask;
-import java.util.Properties;
 
 import org.apache.log4j.DailyRollingFileAppender;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PatternLayout;
-
 import org.jibble.pircbot.IrcException;
 import org.jibble.pircbot.NickAlreadyInUseException;
 import org.jibble.pircbot.PircBot;

apps/i2psnark/java/build.xml

@@ -14,7 +14,7 @@
             srcdir="./src" 
             debug="true" deprecation="on" source="1.3" target="1.3" 
             destdir="./build/obj" 
-            classpath="../../../core/java/build/i2p.jar:../../jetty/jettylib/org.mortbay.jetty.jar:../../jetty/jettylib/javax.servlet.jar:../../ministreaming/java/build/mstreaming.jar" />
+            classpath="../../../core/java/build/i2p.jar:../../../router/java/build/router.jar:../../jetty/jettylib/org.mortbay.jetty.jar:../../jetty/jettylib/javax.servlet.jar:../../ministreaming/java/build/mstreaming.jar" />
     </target>
     <target name="jar" depends="builddep, compile">
         <jar destfile="./build/i2psnark.jar" basedir="./build/obj" includes="**/*.class" excludes="**/*Servlet.class">

apps/i2psnark/java/src/org/klomp/snark/BitField.java

@@ -20,9 +20,6 @@
 
 package org.klomp.snark;
 
-import java.util.Iterator;
-import java.util.Set;
-import java.util.HashSet;
 
 /**
  * Container of a byte array representing set and unset bits.

apps/i2psnark/java/src/org/klomp/snark/ConnectionAcceptor.java

@@ -20,8 +20,10 @@
 
 package org.klomp.snark;
 
-import java.io.*;
-import java.net.*;
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 
 import net.i2p.I2PException;
 import net.i2p.client.streaming.I2PServerSocket;

apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java

@@ -1,20 +1,28 @@
 package org.klomp.snark;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
 import net.i2p.I2PAppContext;
 import net.i2p.I2PException;
-import net.i2p.util.EepGet;
 import net.i2p.client.I2PSession;
-import net.i2p.data.*;
 import net.i2p.client.streaming.I2PServerSocket;
 import net.i2p.client.streaming.I2PSocket;
 import net.i2p.client.streaming.I2PSocketManager;
 import net.i2p.client.streaming.I2PSocketManagerFactory;
+import net.i2p.data.DataFormatException;
+import net.i2p.data.Destination;
+import net.i2p.data.Hash;
+import net.i2p.util.EepGet;
 import net.i2p.util.Log;
 import net.i2p.util.SimpleTimer;
 
-import java.io.*;
-import java.util.*;
-
 /**
  * I2P specific helpers for I2PSnark
  */
@@ -34,6 +42,7 @@ public class I2PSnarkUtil {
     private boolean _configured;
     private Set _shitlist;
     private int _maxUploaders;
+    private int _maxUpBW;
     
     private I2PSnarkUtil() {
         _context = I2PAppContext.getGlobalContext();
@@ -79,6 +88,11 @@ public class I2PSnarkUtil {
         _configured = true;
     }
     
+    public void setMaxUpBW(int limit) {
+        _maxUpBW = limit;
+        _configured = true;
+    }
+    
     public String getI2CPHost() { return _i2cpHost; }
     public int getI2CPPort() { return _i2cpPort; }
     public Map getI2CPOptions() { return _opts; }
@@ -86,11 +100,12 @@ public class I2PSnarkUtil {
     public int getEepProxyPort() { return _proxyPort; }
     public boolean getEepProxySet() { return _shouldProxy; }
     public int getMaxUploaders() { return _maxUploaders; }
+    public int getMaxUpBW() { return _maxUpBW; }
     
     /**
      * Connect to the router, if we aren't already
      */
-    public boolean connect() {
+    synchronized public boolean connect() {
         if (_manager == null) {
             Properties opts = new Properties();
             if (_opts != null) {
@@ -160,8 +175,10 @@ public class I2PSnarkUtil {
     /**
      * fetch the given URL, returning the file it is stored in, or null on error
      */
-    public File get(String url) { return get(url, true); }
-    public File get(String url, boolean rewrite) {
+    public File get(String url) { return get(url, true, 0); }
+    public File get(String url, boolean rewrite) { return get(url, rewrite, 0); }
+    public File get(String url, int retries) { return get(url, true, retries); }
+    public File get(String url, boolean rewrite, int retries) {
         _log.debug("Fetching [" + url + "] proxy=" + _proxyHost + ":" + _proxyPort + ": " + _shouldProxy);
         File out = null;
         try {
@@ -175,7 +192,7 @@ public class I2PSnarkUtil {
         if (rewrite)
             fetchURL = rewriteAnnounce(url);
         //_log.debug("Rewritten url [" + fetchURL + "]");
-        EepGet get = new EepGet(_context, _shouldProxy, _proxyHost, _proxyPort, 1, out.getAbsolutePath(), fetchURL);
+        EepGet get = new EepGet(_context, _shouldProxy, _proxyHost, _proxyPort, retries, out.getAbsolutePath(), fetchURL);
         if (get.fetch()) {
             _log.debug("Fetch successful [" + url + "]: size=" + out.length());
             return out;
@@ -195,6 +212,8 @@ public class I2PSnarkUtil {
     }
     
     String getOurIPString() {
+        if (_manager == null)
+            return "unknown";
         I2PSession sess = _manager.getSession();
         if (sess != null) {
             Destination dest = sess.getMyDestination();
@@ -206,15 +225,15 @@ public class I2PSnarkUtil {
     Destination getDestination(String ip) {
         if (ip == null) return null;
         if (ip.endsWith(".i2p")) {
-            Destination dest = _context.namingService().lookup(ip);
-            if (dest != null) {
-                return dest;
-            } else {
-                try {
-                    return new Destination(ip.substring(0, ip.length()-4)); // sans .i2p
-                } catch (DataFormatException dfe) {
-                    return null;
-                }
+            if (ip.length() < 520) {   // key + ".i2p"
+                Destination dest = _context.namingService().lookup(ip);
+                if (dest != null)
+                    return dest;
+            }
+            try {
+                return new Destination(ip.substring(0, ip.length()-4)); // sans .i2p
+            } catch (DataFormatException dfe) {
+                return null;
             }
         } else {
             try {
@@ -225,12 +244,22 @@ public class I2PSnarkUtil {
         }
     }
 
+    public String lookup(String name) {
+        Destination dest = getDestination(name);
+	if (dest == null)
+            return null;
+        return dest.toBase64();
+    }
+
     /**
-     * Given http://blah.i2p/foo/announce turn it into http://i2p/blah/foo/announce
+     * Given http://KEY.i2p/foo/announce turn it into http://i2p/KEY/foo/announce
+     * Given http://tracker.blah.i2p/foo/announce leave it alone
      */
     String rewriteAnnounce(String origAnnounce) {
         int destStart = "http://".length();
         int destEnd = origAnnounce.indexOf(".i2p");
+        if (destEnd < destStart + 516)
+            return origAnnounce;
         int pathStart = origAnnounce.indexOf('/', destEnd);
         String rv = "http://i2p/" + origAnnounce.substring(destStart, destEnd) + origAnnounce.substring(pathStart);
         //_log.debug("Rewriting [" + origAnnounce + "] as [" + rv + "]");

apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java

@@ -22,20 +22,22 @@ package org.klomp.snark;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.File;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
-import java.util.ArrayList;
 import java.util.Map;
-import java.util.HashMap;
 
-import org.klomp.snark.bencode.*;
+import net.i2p.crypto.SHA1;
 import net.i2p.data.Base64;
 import net.i2p.util.Log;
-import net.i2p.crypto.SHA1;
+
+import org.klomp.snark.bencode.BDecoder;
+import org.klomp.snark.bencode.BEValue;
+import org.klomp.snark.bencode.BEncoder;
+import org.klomp.snark.bencode.InvalidBEncodingException;
 
 /**
  * Note: this class is buggy, as it doesn't propogate custom meta fields into the bencoded

apps/i2psnark/java/src/org/klomp/snark/Peer.java

@@ -20,15 +20,15 @@
 
 package org.klomp.snark;
 
-import java.io.*;
-import java.net.*;
+import java.io.BufferedInputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.Arrays;
-import java.util.Map;
-
-import org.klomp.snark.bencode.*;
 
 import net.i2p.client.streaming.I2PSocket;
-import net.i2p.data.DataHelper;
 import net.i2p.util.Log;
 
 public class Peer implements Comparable
@@ -114,6 +114,14 @@ public class Peer implements Comparable
       return "[unknown id] " + _id;
   }
 
+  /**
+   * Returns socket (for debug printing)
+   */
+  public String getSocket()
+  {
+    return sock.toString();
+  }
+
   /**
    * The hash code of a Peer is the hash code of the peerID.
    */
@@ -324,9 +332,9 @@ public class Peer implements Comparable
       {
         // try to save partial piece
         if (this.deregister) {
-          PeerListener p = state.listener;
+          PeerListener p = s.listener;
           if (p != null) {
-            p.savePeerPartial(state);
+            p.savePeerPartial(s);
             p.markUnrequested(this);
           }
         }

apps/i2psnark/java/src/org/klomp/snark/PeerAcceptor.java

@@ -20,8 +20,12 @@
 
 package org.klomp.snark;
 
-import java.io.*;
-import java.net.*;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.SequenceInputStream;
 import java.util.Iterator;
 
 import net.i2p.client.streaming.I2PSocket;

apps/i2psnark/java/src/org/klomp/snark/PeerCheckerTask.java

@@ -20,7 +20,11 @@
 
 package org.klomp.snark;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import java.util.TimerTask;
 
 /**
  * TimerTask that checks for good/bad up/downloader. Works together
@@ -37,6 +41,8 @@ class PeerCheckerTask extends TimerTask
     this.coordinator = coordinator;
   }
 
+  private Random random = new Random();
+
   public void run()
   {
     synchronized(coordinator.peers)
@@ -68,6 +74,7 @@ class PeerCheckerTask extends TimerTask
         // we will add them back to the end of the list.
         List removed = new ArrayList();
         int uploadLimit = coordinator.allowedUploaders();
+        boolean overBWLimit = coordinator.overUpBWLimit();
         while (it.hasNext())
           {
             Peer peer = (Peer)it.next();
@@ -104,12 +111,19 @@ class PeerCheckerTask extends TimerTask
                         + " C: " + peer.isChoked(),
                         Snark.DEBUG);
 
+            // Choke half of them rather than all so it isn't so drastic...
+            // unless this torrent is over the limit all by itself.
+            boolean overBWLimitChoke = upload > 0 &&
+                                       ((overBWLimit && random.nextBoolean()) ||
+                                        (coordinator.overUpBWLimit(uploaded)));
+
             // If we are at our max uploaders and we have lots of other
             // interested peers try to make some room.
             // (Note use of coordinator.uploaders)
             if (((coordinator.uploaders == uploadLimit
                 && coordinator.interestedAndChoking > 0)
-                || coordinator.uploaders > uploadLimit)
+                || coordinator.uploaders > uploadLimit
+                || overBWLimitChoke)
                 && !peer.isChoking())
               {
                 // Check if it still wants pieces from us.
@@ -125,6 +139,19 @@ class PeerCheckerTask extends TimerTask
                     it.remove();
                     removed.add(peer);
                   }
+                else if (overBWLimitChoke)
+                  {
+                    Snark.debug("BW limit (" + upload + "/" + uploaded + "), choke peer: " + peer,
+                                Snark.INFO);
+                    peer.setChoking(true);
+                    uploaders--;
+                    coordinator.uploaders--;
+                    removedCount++;
+
+                    // Put it at the back of the list for fairness, even though we won't be unchoking this time
+                    it.remove();
+                    removed.add(peer);
+                  }
                 else if (peer.isInteresting() && peer.isChoked())
                   {
                     // If they are choking us make someone else a downloader
@@ -209,7 +236,8 @@ class PeerCheckerTask extends TimerTask
           }
         
         // Optimistically unchoke a peer
-        coordinator.unchokePeer();
+        if ((!overBWLimit) && !coordinator.overUpBWLimit(uploaded))
+            coordinator.unchokePeer();
 
         // Put peers back at the end of the list that we removed earlier.
         coordinator.peers.addAll(removed);

apps/i2psnark/java/src/org/klomp/snark/PeerConnectionIn.java

@@ -20,9 +20,8 @@
 
 package org.klomp.snark;
 
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.DataInputStream;
+import java.io.IOException;
 
 import net.i2p.util.Log;
 
@@ -78,9 +77,12 @@ class PeerConnectionIn implements Runnable
         
             // Wait till we hear something...
             // The length of a complete message in bytes.
+            // The biggest is the piece message, for which the length is the
+            // request size (32K) plus 9. (we could also check if Storage.MAX_PIECES / 8
+            // in the bitfield message is bigger but it's currently 5000/8 = 625 so don't bother)
             int i = din.readInt();
             lastRcvd = System.currentTimeMillis();
-            if (i < 0)
+            if (i < 0 || i > PeerState.PARTSIZE + 9)
               throw new IOException("Unexpected length prefix: " + i);
 
             if (i == 0)

apps/i2psnark/java/src/org/klomp/snark/PeerConnectionOut.java

@@ -20,9 +20,11 @@
 
 package org.klomp.snark;
 
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
@@ -392,6 +394,23 @@ class PeerConnectionOut implements Runnable
     req.sendTime = System.currentTimeMillis();
   }
 
+  // Used by PeerState to limit pipelined requests
+  int queuedBytes()
+  {
+    int total = 0;
+    synchronized(sendQueue)
+      {
+        Iterator it = sendQueue.iterator();
+        while (it.hasNext())
+          {
+            Message m = (Message)it.next();
+            if (m.type == Message.PIECE)
+                total += m.length;
+          }
+      }
+    return total;
+  }
+
   void sendPiece(int piece, int begin, int length, byte[] bytes)
   {
     Message m = new Message();

apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java

@@ -20,8 +20,14 @@
 
 package org.klomp.snark;
 
-import java.util.*;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Random;
+import java.util.Timer;
 
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
@@ -38,8 +44,8 @@ public class PeerCoordinator implements PeerListener
 
   // package local for access by CheckDownLoadersTask
   final static long CHECK_PERIOD = 40*1000; // 40 seconds
-  final static int MAX_CONNECTIONS = 24;
-  final static int MAX_UPLOADERS = 4;
+  final static int MAX_CONNECTIONS = 16;
+  final static int MAX_UPLOADERS = 6;
 
   // Approximation of the number of current uploaders.
   // Resynced by PeerChecker once in a while.
@@ -52,8 +58,8 @@ public class PeerCoordinator implements PeerListener
   private long uploaded;
   private long downloaded;
   final static int RATE_DEPTH = 6; // make following arrays RATE_DEPTH long
-  private long uploaded_old[] = {0,0,0,0,0,0};
-  private long downloaded_old[] = {0,0,0,0,0,0};
+  private long uploaded_old[] = {-1,-1,-1,-1,-1,-1};
+  private long downloaded_old[] = {-1,-1,-1,-1,-1,-1};
 
   // synchronize on this when changing peers or downloaders
   final List peers = new ArrayList();
@@ -87,7 +93,10 @@ public class PeerCoordinator implements PeerListener
     setWantedPieces();
 
     // Install a timer to check the uploaders.
-    timer.schedule(new PeerCheckerTask(this), CHECK_PERIOD, CHECK_PERIOD);
+    // Randomize the first start time so multiple tasks are spread out,
+    // this will help the behavior with global limits
+    Random r = new Random();
+    timer.schedule(new PeerCheckerTask(this), (CHECK_PERIOD / 2) + r.nextInt((int) CHECK_PERIOD), CHECK_PERIOD);
   }
   
   // only called externally from Storage after the double-check fails
@@ -192,14 +201,29 @@ public class PeerCoordinator implements PeerListener
     return getRate(uploaded_old);
   }
 
+  public long getCurrentUploadRate()
+  {
+    // no need to synchronize, only one value
+    long r = uploaded_old[0];
+    if (r <= 0)
+        return 0;
+    return (r * 1000) / CHECK_PERIOD;
+  }
+
   private long getRate(long array[])
   {
     long rate = 0;
+    int i = 0;
     synchronized(array) {
-      for (int i = 0; i < RATE_DEPTH; i++)
+      for ( ; i < RATE_DEPTH; i++) {
+        if (array[i] < 0)
+            break;
         rate += array[i];
+      }
     }
-    return rate / (RATE_DEPTH * CHECK_PERIOD / 1000);
+    if (i == 0)
+        return 0;
+    return rate / (i * CHECK_PERIOD / 1000);
   }
 
   public MetaInfo getMetaInfo()
@@ -268,6 +292,14 @@ public class PeerCoordinator implements PeerListener
             // toDisconnect = peer to get out of synchronized(peers)
             peer.disconnect(false); // Don't deregister this connection/peer.
           }
+        // This is already checked in addPeer() but we could have gone over the limit since then
+        else if (peers.size() >= MAX_CONNECTIONS)
+          {
+            if (_log.shouldLog(Log.WARN))
+              _log.warn("Already at MAX_CONNECTIONS in connected() with peer: " + peer);
+            // toDisconnect = peer to get out of synchronized(peers)
+            peer.disconnect(false);
+          }
         else
           {
             if (_log.shouldLog(Log.INFO))
@@ -289,6 +321,7 @@ public class PeerCoordinator implements PeerListener
     }
   }
 
+  // caller must synchronize on peers
   private static Peer peerIDInList(PeerID pid, List peers)
   {
     Iterator it = peers.iterator();
@@ -310,9 +343,13 @@ public class PeerCoordinator implements PeerListener
       }
 
     boolean need_more;
+    int peersize = 0;
     synchronized(peers)
       {
-        need_more = !peer.isConnected() && peers.size() < MAX_CONNECTIONS;
+        peersize = peers.size();
+        // This isn't a strict limit, as we may have several pending connections;
+        // thus there is an additional check in connected()
+        need_more = (!peer.isConnected()) && peersize < MAX_CONNECTIONS;
         // Check if we already have this peer before we build the connection
         Peer old = peerIDInList(peer.getPeerID(), peers);
         need_more = need_more && ((old == null) || (old.getInactiveTime() > 8*60*1000));
@@ -336,15 +373,14 @@ public class PeerCoordinator implements PeerListener
         new I2PThread(r, threadName).start();
         return true;
       }
-    else
-      if (_log.shouldLog(Log.DEBUG)) {
-        if (peer.isConnected())
-          _log.info("Add peer already connected: " + peer);
-        else
-          _log.info("MAX_CONNECTIONS = " + MAX_CONNECTIONS
-                    + " not accepting extra peer: " + peer);
-      }
-      return false;
+    if (_log.shouldLog(Log.DEBUG)) {
+      if (peer.isConnected())
+        _log.info("Add peer already connected: " + peer);
+      else
+        _log.info("Connections: " + peersize + "/" + MAX_CONNECTIONS
+                  + " not accepting extra peer: " + peer);
+    }
+    return false;
   }
 
 
@@ -819,5 +855,15 @@ public class PeerCoordinator implements PeerListener
     else
         return MAX_UPLOADERS;
   }
+
+  public boolean overUpBWLimit()
+  {
+    return Snark.overUpBWLimit();
+  }
+
+  public boolean overUpBWLimit(long total)
+  {
+    return Snark.overUpBWLimit(total * 1000 / CHECK_PERIOD);
+  }
 }
 

apps/i2psnark/java/src/org/klomp/snark/PeerCoordinatorSet.java

@@ -1,6 +1,9 @@
 package org.klomp.snark;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
 
 /**
  * Hmm, any guesses as to what this is?  Used by the multitorrent functionality

apps/i2psnark/java/src/org/klomp/snark/PeerID.java

@@ -21,15 +21,15 @@
 package org.klomp.snark;
 
 import java.io.IOException;
-import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Map;
 
-import org.klomp.snark.bencode.*;
-
 import net.i2p.data.Base64;
 import net.i2p.data.Destination;
-import net.i2p.data.DataFormatException;
+
+import org.klomp.snark.bencode.BDecoder;
+import org.klomp.snark.bencode.BEValue;
+import org.klomp.snark.bencode.InvalidBEncodingException;
 
 public class PeerID implements Comparable
 {
@@ -167,7 +167,9 @@ public class PeerID implements Comparable
   }
 
   /**
-   * Returns the String "id@address" where id is the base64 encoded id.
+   * Returns the String "id@address" where id is the base64 encoded id
+   * and address is the base64 dest (was the base64 hash of the dest) which
+   * should match what the bytemonsoon tracker reports on its web pages.
    */
   public String toString()
   {
@@ -178,7 +180,7 @@ public class PeerID implements Comparable
             break;
         }
     }
-    return Base64.encode(id, nonZero, id.length-nonZero).substring(0,4) + "@" + address.calculateHash().toBase64().substring(0,6);
+    return Base64.encode(id, nonZero, id.length-nonZero).substring(0,4) + "@" + address.toBase64().substring(0,6);
   }
 
   /**

apps/i2psnark/java/src/org/klomp/snark/PeerMonitorTask.java

@@ -20,7 +20,8 @@
 
 package org.klomp.snark;
 
-import java.util.*;
+import java.util.Iterator;
+import java.util.TimerTask;
 
 /**
  * TimerTask that monitors the peers and total up/download speeds.

apps/i2psnark/java/src/org/klomp/snark/PeerState.java

@@ -23,8 +23,6 @@ package org.klomp.snark;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Set;
-import java.util.HashSet;
 
 import net.i2p.util.Log;
 
@@ -62,8 +60,9 @@ class PeerState
   // If we have te resend outstanding requests (true after we got choked).
   private boolean resend = false;
 
-  private final static int MAX_PIPELINE = 2;
-  private final static int PARTSIZE = 32*1024; // Snark was 16K, i2p-bt uses 64KB
+  private final static int MAX_PIPELINE = 2;               // this is for outbound requests
+  private final static int MAX_PIPELINE_BYTES = 128*1024;  // this is for inbound requests
+  public final static int PARTSIZE = 32*1024; // Snark was 16K, i2p-bt uses 64KB
   private final static int MAX_PARTSIZE = 64*1024; // Don't let anybody request more than this
 
   PeerState(Peer peer, PeerListener listener, MetaInfo metainfo,
@@ -185,6 +184,15 @@ class PeerState
         return;
       }
 
+    // Limit total pipelined requests to MAX_PIPELINE bytes
+    // to conserve memory and prevent DOS
+    if (out.queuedBytes() + length > MAX_PIPELINE_BYTES)
+      {
+        if (_log.shouldLog(Log.WARN))
+          _log.warn("Discarding request over pipeline limit from " + peer);
+        return;
+      }
+
     byte[] pieceBytes = listener.gotRequest(peer, piece, begin, length);
     if (pieceBytes == null)
       {

apps/i2psnark/java/src/org/klomp/snark/Piece.java

@@ -1,8 +1,8 @@
 package org.klomp.snark;
 
-import java.util.Set;
-import java.util.HashSet;
 import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
 
 public class Piece implements Comparable {
 

apps/i2psnark/java/src/org/klomp/snark/Snark.java

@@ -20,17 +20,26 @@
 
 package org.klomp.snark;
 
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+import java.util.Random;
+import java.util.StringTokenizer;
+import java.util.Timer;
+import java.util.TimerTask;
 
-import org.klomp.snark.bencode.*;
-
-import net.i2p.data.Destination;
-import net.i2p.client.streaming.I2PSocket;
 import net.i2p.client.streaming.I2PServerSocket;
+import net.i2p.data.Destination;
 import net.i2p.util.I2PThread;
 
+import org.klomp.snark.bencode.BDecoder;
+
 /**
  * Main Snark program startup class.
  *
@@ -312,7 +321,7 @@ public class Snark
         else
           {
             activity = "Getting torrent";
-            File torrentFile = I2PSnarkUtil.instance().get(torrent);
+            File torrentFile = I2PSnarkUtil.instance().get(torrent, 3);
             if (torrentFile == null) {
                 fatal("Unable to fetch " + torrent);
                 if (false) return; // never reached - fatal(..) throws
@@ -776,4 +785,24 @@ public class Snark
     // Snark.debug("Total uploaders: " + totalUploaders + " Limit: " + limit, Snark.DEBUG);
     return totalUploaders > limit;
   }
+
+  public static boolean overUpBWLimit() {
+    PeerCoordinatorSet coordinators = PeerCoordinatorSet.instance();
+    if (coordinators == null)
+      return false;
+    long total = 0;
+    for (Iterator iter = coordinators.iterator(); iter.hasNext(); ) {
+      PeerCoordinator c = (PeerCoordinator)iter.next();
+      if (!c.halted())
+        total += c.getCurrentUploadRate();
+    }
+    long limit = 1024l * I2PSnarkUtil.instance().getMaxUpBW();
+    Snark.debug("Total up bw: " + total + " Limit: " + limit, Snark.WARNING);
+    return total > limit;
+  }
+
+  public static boolean overUpBWLimit(long total) {
+    long limit = 1024l * I2PSnarkUtil.instance().getMaxUpBW();
+    return total > limit;
+  }
 }

apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java

@@ -1,10 +1,24 @@
 package org.klomp.snark;
 
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.StringTokenizer;
+import java.util.TreeMap;
+
 import net.i2p.I2PAppContext;
 import net.i2p.data.Base64;
 import net.i2p.data.DataHelper;
+import net.i2p.router.RouterContext;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
 
@@ -30,13 +44,21 @@ public class SnarkManager implements Snark.CompleteListener {
     public static final String PROP_EEP_HOST = "i2psnark.eepHost";
     public static final String PROP_EEP_PORT = "i2psnark.eepPort";
     public static final String PROP_UPLOADERS_TOTAL = "i2psnark.uploaders.total";
+    public static final String PROP_UPBW_MAX = "i2psnark.upbw.max";
     public static final String PROP_DIR = "i2psnark.dir";
     public static final String PROP_META_PREFIX = "i2psnark.zmeta.";
     public static final String PROP_META_BITFIELD_SUFFIX = ".bitfield";
 
-    public static final String PROP_AUTO_START = "i2snark.autoStart";
+    public static final String PROP_AUTO_START = "i2snark.autoStart";   // oops
     public static final String DEFAULT_AUTO_START = "false";
+    public static final String PROP_USE_OPENTRACKERS = "i2psnark.useOpentrackers";
+    public static final String DEFAULT_USE_OPENTRACKERS = "true";
+    public static final String PROP_OPENTRACKERS = "i2psnark.opentrackers";
+    public static final String DEFAULT_OPENTRACKERS = "http://tracker.welterde.i2p/a";
     
+    public static final int MIN_UP_BW = 2;
+    public static final int DEFAULT_MAX_UP_BW = 10;
+
     private SnarkManager() {
         _snarks = new HashMap();
         _addSnarkLock = new Object();
@@ -49,6 +71,8 @@ public class SnarkManager implements Snark.CompleteListener {
         I2PThread monitor = new I2PThread(new DirMonitor(), "Snark DirMonitor");
         monitor.setDaemon(true);
         monitor.start();
+        if (_context instanceof RouterContext)
+            ((RouterContext)_context).router().addShutdownTask(new SnarkManagerShutdown());
     }
     
     private static final int MAX_MESSAGES = 5;
@@ -72,7 +96,10 @@ public class SnarkManager implements Snark.CompleteListener {
     public boolean shouldAutoStart() {
         return Boolean.valueOf(_config.getProperty(PROP_AUTO_START, DEFAULT_AUTO_START+"")).booleanValue();
     }
-    private int getStartupDelayMinutes() { return 1; }
+    public boolean shouldUseOpenTrackers() {
+        return Boolean.valueOf(_config.getProperty(PROP_USE_OPENTRACKERS, DEFAULT_USE_OPENTRACKERS)).booleanValue();
+    }
+    private int getStartupDelayMinutes() { return 3; }
     public File getDataDir() { 
         String dir = _config.getProperty(PROP_DIR);
         if ( (dir == null) || (dir.trim().length() <= 0) )
@@ -105,6 +132,16 @@ public class SnarkManager implements Snark.CompleteListener {
             _config.setProperty(PROP_EEP_PORT, "4444");
         if (!_config.containsKey(PROP_UPLOADERS_TOTAL))
             _config.setProperty(PROP_UPLOADERS_TOTAL, "" + Snark.MAX_TOTAL_UPLOADERS);
+        if (!_config.containsKey(PROP_UPBW_MAX)) {
+            try {
+                if (_context instanceof RouterContext)
+                    _config.setProperty(PROP_UPBW_MAX, "" + (((RouterContext)_context).bandwidthLimiter().getOutboundKBytesPerSecond() / 2));
+                else
+                    _config.setProperty(PROP_UPBW_MAX, "" + DEFAULT_MAX_UP_BW);
+            } catch (NoClassDefFoundError ncdfe) {
+                _config.setProperty(PROP_UPBW_MAX, "" + DEFAULT_MAX_UP_BW);
+            }
+        }
         if (!_config.containsKey(PROP_DIR))
             _config.setProperty(PROP_DIR, "i2psnark");
         if (!_config.containsKey(PROP_AUTO_START))
@@ -136,6 +173,7 @@ public class SnarkManager implements Snark.CompleteListener {
         if (eepHost != null)
             I2PSnarkUtil.instance().setProxy(eepHost, eepPort);
         I2PSnarkUtil.instance().setMaxUploaders(getInt(PROP_UPLOADERS_TOTAL, Snark.MAX_TOTAL_UPLOADERS));
+        I2PSnarkUtil.instance().setMaxUpBW(getInt(PROP_UPBW_MAX, DEFAULT_MAX_UP_BW));
         getDataDir().mkdirs();
     }
     
@@ -152,7 +190,7 @@ public class SnarkManager implements Snark.CompleteListener {
     
     public void updateConfig(String dataDir, boolean autoStart, String seedPct, String eepHost, 
                              String eepPort, String i2cpHost, String i2cpPort, String i2cpOpts,
-                             String upLimit) {
+                             String upLimit, String upBW, boolean useOpenTrackers, String openTrackers) {
         boolean changed = false;
         if (eepHost != null) {
             int port = I2PSnarkUtil.instance().getEepProxyPort();
@@ -170,7 +208,7 @@ public class SnarkManager implements Snark.CompleteListener {
         if (upLimit != null) {
             int limit = I2PSnarkUtil.instance().getMaxUploaders();
             try { limit = Integer.parseInt(upLimit); } catch (NumberFormatException nfe) {}
-            if ( limit != I2PSnarkUtil.instance().getEepProxyPort()) {
+            if ( limit != I2PSnarkUtil.instance().getMaxUploaders()) {
                 if ( limit >= Snark.MIN_TOTAL_UPLOADERS ) {
                     I2PSnarkUtil.instance().setMaxUploaders(limit);
                     changed = true;
@@ -181,6 +219,20 @@ public class SnarkManager implements Snark.CompleteListener {
                 }
             }
         }
+        if (upBW != null) {
+            int limit = I2PSnarkUtil.instance().getMaxUpBW();
+            try { limit = Integer.parseInt(upBW); } catch (NumberFormatException nfe) {}
+            if ( limit != I2PSnarkUtil.instance().getMaxUpBW()) {
+                if ( limit >= MIN_UP_BW ) {
+                    I2PSnarkUtil.instance().setMaxUpBW(limit);
+                    changed = true;
+                    _config.setProperty(PROP_UPBW_MAX, "" + limit);
+                    addMessage("Up BW limit changed to " + limit + "KBps");
+                } else {
+                    addMessage("Minimum Up BW limit is " + MIN_UP_BW + "KBps");
+                }
+            }
+        }
         if (i2cpHost != null) {
             int oldI2CPPort = I2PSnarkUtil.instance().getI2CPPort();
             String oldI2CPHost = I2PSnarkUtil.instance().getI2CPHost();
@@ -265,6 +317,18 @@ public class SnarkManager implements Snark.CompleteListener {
             addMessage("Adjusted autostart to " + autoStart);
             changed = true;
         }
+        if (shouldUseOpenTrackers() != useOpenTrackers) {
+            _config.setProperty(PROP_USE_OPENTRACKERS, useOpenTrackers + "");
+            addMessage((useOpenTrackers ? "En" : "Dis") + "abled open trackers - torrent restart required to take effect");
+            changed = true;
+        }
+        if (openTrackers != null) {
+            if (openTrackers.trim().length() > 0 && !openTrackers.trim().equals(getOpenTrackerString())) {
+                _config.setProperty(PROP_OPENTRACKERS, openTrackers.trim());
+                addMessage("Open Tracker list changed - torrent restart required to take effect");
+                changed = true;
+            }
+        }
         if (changed) {
             saveConfig();
         } else {
@@ -463,7 +527,7 @@ public class SnarkManager implements Snark.CompleteListener {
         } else if (info.getPieces() <= 0) {
             return "No pieces in " + info.getName() + "?  deleting it";
         } else if (info.getPieceLength(0) > 1*1024*1024) {
-            return "Pieces are too large in " + info.getName() + " (" + info.getPieceLength(0)/1024 + "KB, deleting it";
+            return "Pieces are too large in " + info.getName() + " (" + info.getPieceLength(0)/1024 + "KB), deleting it";
         } else if (info.getTotalLength() > 10*1024*1024*1024l) {
             System.out.println("torrent info: " + info.toString());
             List lengths = info.getLengths();
@@ -594,12 +658,15 @@ public class SnarkManager implements Snark.CompleteListener {
 
     private static final String DEFAULT_TRACKERS[] = { 
        "Postman", "http://YRgrgTLGnbTq2aZOZDJQ~o6Uk5k6TK-OZtx0St9pb0G-5EGYURZioxqYG8AQt~LgyyI~NCj6aYWpPO-150RcEvsfgXLR~CxkkZcVpgt6pns8SRc3Bi-QSAkXpJtloapRGcQfzTtwllokbdC-aMGpeDOjYLd8b5V9Im8wdCHYy7LRFxhEtGb~RL55DA8aYOgEXcTpr6RPPywbV~Qf3q5UK55el6Kex-6VCxreUnPEe4hmTAbqZNR7Fm0hpCiHKGoToRcygafpFqDw5frLXToYiqs9d4liyVB-BcOb0ihORbo0nS3CLmAwZGvdAP8BZ7cIYE3Z9IU9D1G8JCMxWarfKX1pix~6pIA-sp1gKlL1HhYhPMxwyxvuSqx34o3BqU7vdTYwWiLpGM~zU1~j9rHL7x60pVuYaXcFQDR4-QVy26b6Pt6BlAZoFmHhPcAuWfu-SFhjyZYsqzmEmHeYdAwa~HojSbofg0TMUgESRXMw6YThK1KXWeeJVeztGTz25sL8AAAA.i2p/announce.php=http://tracker.postman.i2p/"
-       , "eBook", "http://E71FRom6PZNEqTN2Lr8P-sr23b7HJVC32KoGnVQjaX6zJiXwhJy2HsXob36Qmj81TYFZdewFZa9mSJ533UZgGyQkXo2ahctg82JKYZfDe5uDxAn1E9YPjxZCWJaFJh0S~UwSs~9AZ7UcauSJIoNtpxrtbmRNVFLqnkEDdLZi26TeucfOmiFmIWnVblLniWv3tG1boE9Abd-6j3FmYVrRucYuepAILYt6katmVNOk6sXmno1Eynrp~~MBuFq0Ko6~jsc2E2CRVYXDhGHEMdt-j6JUz5D7S2RIVzDRqQyAZLKJ7OdQDmI31przzmne1vOqqqLC~1xUumZVIvF~yOeJUGNjJ1Vx0J8i2BQIusn1pQJ6UCB~ZtZZLQtEb8EPVCfpeRi2ri1M5CyOuxN0V5ekmPHrYIBNevuTCRC26NP7ZS5VDgx1~NaC3A-CzJAE6f1QXi0wMI9aywNG5KGzOPifcsih8eyGyytvgLtrZtV7ykzYpPCS-rDfITncpn5hliPUAAAA.i2p/pub/bt/announce.php=http://de-ebook-archiv.i2p/pub/bt/"
-       , "Gaytorrents", "http://uxPWHbK1OIj9HxquaXuhMiIvi21iK0~ZiG9d8G0840ZXIg0r6CbiV71xlsqmdnU6wm0T2LySriM0doW2gUigo-5BNkUquHwOjLROiETnB3ZR0Ml4IGa6QBPn1aAq2d9~g1r1nVjLE~pcFnXB~cNNS7kIhX1d6nLgYVZf0C2cZopEow2iWVUggGGnAA9mHjE86zLEnTvAyhbAMTqDQJhEuLa0ZYSORqzJDMkQt90MV4YMjX1ICY6RfUSFmxEqu0yWTrkHsTtRw48l~dz9wpIgc0a0T9C~eeWvmBFTqlJPtQZwntpNeH~jF7nlYzB58olgV2HHFYpVYD87DYNzTnmNWxCJ5AfDorm6AIUCV2qaE7tZtI1h6fbmGpGlPyW~Kw5GXrRfJwNvr6ajwAVi~bPVnrBwDZezHkfW4slOO8FACPR28EQvaTu9nwhAbqESxV2hCTq6vQSGjuxHeOuzBOEvRWkLKOHWTC09t2DbJ94FSqETmZopTB1ukEmaxRWbKSIaAAAA.i2p/announce.php=http://gaytorrents.i2p/"
+//       , "eBook", "http://E71FRom6PZNEqTN2Lr8P-sr23b7HJVC32KoGnVQjaX6zJiXwhJy2HsXob36Qmj81TYFZdewFZa9mSJ533UZgGyQkXo2ahctg82JKYZfDe5uDxAn1E9YPjxZCWJaFJh0S~UwSs~9AZ7UcauSJIoNtpxrtbmRNVFLqnkEDdLZi26TeucfOmiFmIWnVblLniWv3tG1boE9Abd-6j3FmYVrRucYuepAILYt6katmVNOk6sXmno1Eynrp~~MBuFq0Ko6~jsc2E2CRVYXDhGHEMdt-j6JUz5D7S2RIVzDRqQyAZLKJ7OdQDmI31przzmne1vOqqqLC~1xUumZVIvF~yOeJUGNjJ1Vx0J8i2BQIusn1pQJ6UCB~ZtZZLQtEb8EPVCfpeRi2ri1M5CyOuxN0V5ekmPHrYIBNevuTCRC26NP7ZS5VDgx1~NaC3A-CzJAE6f1QXi0wMI9aywNG5KGzOPifcsih8eyGyytvgLtrZtV7ykzYpPCS-rDfITncpn5hliPUAAAA.i2p/pub/bt/announce.php=http://de-ebook-archiv.i2p/pub/bt/"
+//       , "Gaytorrents", "http://uxPWHbK1OIj9HxquaXuhMiIvi21iK0~ZiG9d8G0840ZXIg0r6CbiV71xlsqmdnU6wm0T2LySriM0doW2gUigo-5BNkUquHwOjLROiETnB3ZR0Ml4IGa6QBPn1aAq2d9~g1r1nVjLE~pcFnXB~cNNS7kIhX1d6nLgYVZf0C2cZopEow2iWVUggGGnAA9mHjE86zLEnTvAyhbAMTqDQJhEuLa0ZYSORqzJDMkQt90MV4YMjX1ICY6RfUSFmxEqu0yWTrkHsTtRw48l~dz9wpIgc0a0T9C~eeWvmBFTqlJPtQZwntpNeH~jF7nlYzB58olgV2HHFYpVYD87DYNzTnmNWxCJ5AfDorm6AIUCV2qaE7tZtI1h6fbmGpGlPyW~Kw5GXrRfJwNvr6ajwAVi~bPVnrBwDZezHkfW4slOO8FACPR28EQvaTu9nwhAbqESxV2hCTq6vQSGjuxHeOuzBOEvRWkLKOHWTC09t2DbJ94FSqETmZopTB1ukEmaxRWbKSIaAAAA.i2p/announce.php=http://gaytorrents.i2p/"
        , "NickyB", "http://9On6d3cZ27JjwYCtyJJbowe054d5tFnfMjv4PHsYs-EQn4Y4mk2zRixatvuAyXz2MmRfXG-NAUfhKr0KCxRNZbvHmlckYfT-WBzwwpiMAl0wDFY~Pl8cqXuhfikSG5WrqdPfDNNIBuuznS0dqaczf~OyVaoEOpvuP3qV6wKqbSSLpjOwwAaQPHjlRtNIW8-EtUZp-I0LT45HSoowp~6b7zYmpIyoATvIP~sT0g0MTrczWhbVTUZnEkZeLhOR0Duw1-IRXI2KHPbA24wLO9LdpKKUXed05RTz0QklW5ROgR6TYv7aXFufX8kC0-DaKvQ5JKG~h8lcoHvm1RCzNqVE-2aiZnO2xH08H-iCWoLNJE-Td2kT-Tsc~3QdQcnEUcL5BF-VT~QYRld2--9r0gfGl-yDrJZrlrihHGr5J7ImahelNn9PpkVp6eIyABRmJHf2iicrk3CtjeG1j9OgTSwaNmEpUpn4aN7Kx0zNLdH7z6uTgCGD9Kmh1MFYrsoNlTp4AAAA.i2p/bittorrent/announce.php=http://nickyb.i2p/bittorrent/"
-       , "Orion", "http://gKik1lMlRmuroXVGTZ~7v4Vez3L3ZSpddrGZBrxVriosCQf7iHu6CIk8t15BKsj~P0JJpxrofeuxtm7SCUAJEr0AIYSYw8XOmp35UfcRPQWyb1LsxUkMT4WqxAT3s1ClIICWlBu5An~q-Mm0VFlrYLIPBWlUFnfPR7jZ9uP5ZMSzTKSMYUWao3ejiykr~mtEmyls6g-ZbgKZawa9II4zjOy-hdxHgP-eXMDseFsrym4Gpxvy~3Fv9TuiSqhpgm~UeTo5YBfxn6~TahKtE~~sdCiSydqmKBhxAQ7uT9lda7xt96SS09OYMsIWxLeQUWhns-C~FjJPp1D~IuTrUpAFcVEGVL-BRMmdWbfOJEcWPZ~CBCQSO~VkuN1ebvIOr9JBerFMZSxZtFl8JwcrjCIBxeKPBmfh~xYh16BJm1BBBmN1fp2DKmZ2jBNkAmnUbjQOqWvUcehrykWk5lZbE7bjJMDFH48v3SXwRuDBiHZmSbsTY6zhGY~GkMQHNGxPMMSIAAAA.i2p/bt/announce.php=http://orion.i2p/bt/"
+//       , "Orion", "http://gKik1lMlRmuroXVGTZ~7v4Vez3L3ZSpddrGZBrxVriosCQf7iHu6CIk8t15BKsj~P0JJpxrofeuxtm7SCUAJEr0AIYSYw8XOmp35UfcRPQWyb1LsxUkMT4WqxAT3s1ClIICWlBu5An~q-Mm0VFlrYLIPBWlUFnfPR7jZ9uP5ZMSzTKSMYUWao3ejiykr~mtEmyls6g-ZbgKZawa9II4zjOy-hdxHgP-eXMDseFsrym4Gpxvy~3Fv9TuiSqhpgm~UeTo5YBfxn6~TahKtE~~sdCiSydqmKBhxAQ7uT9lda7xt96SS09OYMsIWxLeQUWhns-C~FjJPp1D~IuTrUpAFcVEGVL-BRMmdWbfOJEcWPZ~CBCQSO~VkuN1ebvIOr9JBerFMZSxZtFl8JwcrjCIBxeKPBmfh~xYh16BJm1BBBmN1fp2DKmZ2jBNkAmnUbjQOqWvUcehrykWk5lZbE7bjJMDFH48v3SXwRuDBiHZmSbsTY6zhGY~GkMQHNGxPMMSIAAAA.i2p/bt/announce.php=http://orion.i2p/bt/"
 //       , "anonymity", "http://8EoJZIKrWgGuDrxA3nRJs1jsPfiGwmFWL91hBrf0HA7oKhEvAna4Ocx47VLUR9retVEYBAyWFK-eZTPcvhnz9XffBEiJQQ~kFSCqb1fV6IfPiV3HySqi9U5Caf6~hC46fRd~vYnxmaBLICT3N160cxBETqH3v2rdxdJpvYt8q4nMk9LUeVXq7zqCTFLLG5ig1uKgNzBGe58iNcsvTEYlnbYcE930ABmrzj8G1qQSgSwJ6wx3tUQNl1z~4wSOUMan~raZQD60lRK70GISjoX0-D0Po9WmPveN3ES3g72TIET3zc3WPdK2~lgmKGIs8GgNLES1cXTolvbPhdZK1gxddRMbJl6Y6IPFyQ9o4-6Rt3Lp-RMRWZ2TG7j2OMcNSiOmATUhKEFBDfv-~SODDyopGBmfeLw16F4NnYednvn4qP10dyMHcUASU6Zag4mfc2-WivrOqeWhD16fVAh8MoDpIIT~0r9XmwdaVFyLcjbXObabJczxCAW3fodQUnvuSkwzAAAA.i2p/anonymityTracker/announce.php=http://anonymityweb.i2p/anonymityTracker/"
 //       , "The freak's tracker", "http://mHKva9x24E5Ygfey2llR1KyQHv5f8hhMpDMwJDg1U-hABpJ2NrQJd6azirdfaR0OKt4jDlmP2o4Qx0H598~AteyD~RJU~xcWYdcOE0dmJ2e9Y8-HY51ie0B1yD9FtIV72ZI-V3TzFDcs6nkdX9b81DwrAwwFzx0EfNvK1GLVWl59Ow85muoRTBA1q8SsZImxdyZ-TApTVlMYIQbdI4iQRwU9OmmtefrCe~ZOf4UBS9-KvNIqUL0XeBSqm0OU1jq-D10Ykg6KfqvuPnBYT1BYHFDQJXW5DdPKwcaQE4MtAdSGmj1epDoaEBUa9btQlFsM2l9Cyn1hzxqNWXELmx8dRlomQLlV4b586dRzW~fLlOPIGC13ntPXogvYvHVyEyptXkv890jC7DZNHyxZd5cyrKC36r9huKvhQAmNABT2Y~pOGwVrb~RpPwT0tBuPZ3lHYhBFYmD8y~AOhhNHKMLzea1rfwTvovBMByDdFps54gMN1mX4MbCGT4w70vIopS9yAAAA.i2p/bytemonsoon/announce.php"
+       , "welterde", "http://BGKmlDOoH3RzFbPRfRpZV2FjpVj8~3moFftw5-dZfDf2070TOe8Tf2~DAVeaM6ZRLdmFEt~9wyFL8YMLMoLoiwGEH6IGW6rc45tstN68KsBDWZqkTohV1q9XFgK9JnCwE~Oi89xLBHsLMTHOabowWM6dkC8nI6QqJC2JODqLPIRfOVrDdkjLwtCrsckzLybNdFmgfoqF05UITDyczPsFVaHtpF1sRggOVmdvCM66otyonlzNcJbn59PA-R808vUrCPMGU~O9Wys0i-NoqtIbtWfOKnjCRFMNw5ex4n9m5Sxm9e20UkpKG6qzEuvKZWi8vTLe1NW~CBrj~vG7I3Ok4wybUFflBFOaBabxYJLlx4xTE1zJIVxlsekmAjckB4v-cQwulFeikR4LxPQ6mCQknW2HZ4JQIq6hL9AMabxjOlYnzh7kjOfRGkck8YgeozcyTvcDUcUsOuSTk06L4kdrv8h2Cozjbloi5zl6KTbj5ZTciKCxi73Pn9grICn-HQqEAAAA.i2p/a=http://tracker.welterde.i2p/stats?mode=top5"
+       , "mastertracker", "http://VzXD~stRKbL3MOmeTn1iaCQ0CFyTmuFHiKYyo0Rd~dFPZFCYH-22rT8JD7i-C2xzYFa4jT5U2aqHzHI-Jre4HL3Ri5hFtZrLk2ax3ji7Qfb6qPnuYkuiF2E2UDmKUOppI8d9Ye7tjdhQVCy0izn55tBaB-U7UWdcvSK2i85sauyw3G0Gfads1Rvy5-CAe2paqyYATcDmGjpUNLoxbfv9KH1KmwRTNH6k1v4PyWYYnhbT39WfKMbBjSxVQRdi19cyJrULSWhjxaQfJHeWx5Z8Ev4bSPByBeQBFl2~4vqy0S5RypINsRSa3MZdbiAAyn5tr5slWR6QdoqY3qBQgBJFZppy-3iWkFqqKgSxCPundF8gdDLC5ddizl~KYcYKl42y9SGFHIukH-TZs8~em0~iahzsqWVRks3zRG~tlBcX2U3M2~OJs~C33-NKhyfZT7-XFBREvb8Szmd~p66jDxrwOnKaku-G6DyoQipJqIz4VHmY9-y5T8RrUcJcM-5lVoMpAAAA.i2p/announce.php=http://tracker.mastertracker.i2p/"
+       , "Galen", "http://5jpwQMI5FT303YwKa5Rd38PYSX04pbIKgTaKQsWbqoWjIfoancFdWCShXHLI5G5ofOb0Xu11vl2VEMyPsg1jUFYSVnu4-VfMe3y4TKTR6DTpetWrnmEK6m2UXh91J5DZJAKlgmO7UdsFlBkQfR2rY853-DfbJtQIFl91tbsmjcA5CGQi4VxMFyIkBzv-pCsuLQiZqOwWasTlnzey8GcDAPG1LDcvfflGV~6F5no9mnuisZPteZKlrv~~TDoXTj74QjByWc4EOYlwqK8sbU9aOvz~s31XzErbPTfwiawiaZ0RUI-IDrKgyvmj0neuFTWgjRGVTH8bz7cBZIc3viy6ioD-eMQOrXaQL0TCWZUelRwHRvgdPiQrxdYQs7ixkajeHzxi-Pq0EMm5Vbh3j3Q9kfUFW3JjFDA-MLB4g6XnjCbM5J1rC0oOBDCIEfhQkszru5cyLjHiZ5yeA0VThgu~c7xKHybv~OMXION7V8pBKOgET7ZgAkw1xgYe3Kkyq5syAAAA.i2p/tr/announce.php=http://galen.i2p/tr/"
     };
     
     /** comma delimited list of name=announceURL=baseURL for the trackers to be displayed */
@@ -634,6 +701,26 @@ public class SnarkManager implements Snark.CompleteListener {
         return trackerMap;
     }
     
+    public String getOpenTrackerString() { 
+        return _config.getProperty(PROP_OPENTRACKERS, DEFAULT_OPENTRACKERS);
+    }
+
+    /** comma delimited list open trackers to use as backups */
+    /** sorted map of name to announceURL=baseURL */
+    public List getOpenTrackers() { 
+        if (!shouldUseOpenTrackers())
+            return null;
+        List rv = new ArrayList(1);
+        String trackers = getOpenTrackerString();
+        StringTokenizer tok = new StringTokenizer(trackers, ", ");
+        while (tok.hasMoreTokens())
+            rv.add(tok.nextToken());
+        
+        if (rv.size() <= 0)
+            return null;
+        return rv;
+    }
+    
     private static class TorrentFilenameFilter implements FilenameFilter {
         private static final TorrentFilenameFilter _filter = new TorrentFilenameFilter();
         public static TorrentFilenameFilter instance() { return _filter; }
@@ -641,4 +728,15 @@ public class SnarkManager implements Snark.CompleteListener {
             return (name != null) && (name.endsWith(".torrent"));
         }
     }
+
+    public class SnarkManagerShutdown extends I2PThread {
+        public void run() {
+            Set names = listTorrentFiles();
+            for (Iterator iter = names.iterator(); iter.hasNext(); ) {
+                Snark snark = getTorrent((String)iter.next());
+                if ( (snark != null) && (!snark.stopped) )
+                    snark.stopTorrent();
+            }
+        }
+    }
 }

apps/i2psnark/java/src/org/klomp/snark/StaticSnark.java

@@ -20,10 +20,6 @@
 
 package org.klomp.snark;
 
-import java.security.Provider;
-import java.security.Security;
-
-import org.klomp.snark.bencode.*;
 
 /**
  * Main snark startup class for staticly linking with gcj.

apps/i2psnark/java/src/org/klomp/snark/Storage.java

@@ -20,10 +20,13 @@
 
 package org.klomp.snark;
 
-import java.io.*;
-import java.util.*;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
+import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.StringTokenizer;
 
 import net.i2p.crypto.SHA1;
 
@@ -309,7 +312,7 @@ public class Storage
             if (lm <= 0 || lm > savedTime)
                 useSavedBitField = false;
         }
-        if (base.exists() && !base.canWrite())  // hope we can get away with this, if we are only seeding...
+        if (base.exists() && ((useSavedBitField && savedBitField.complete()) || !base.canWrite()))
             rafs[0] = new RandomAccessFile(base, "r");
         else
             rafs[0] = new RandomAccessFile(base, "rw");
@@ -338,7 +341,7 @@ public class Storage
                 if (lm <= 0 || lm > savedTime)
                     useSavedBitField = false;
             }
-            if (f.exists() && !f.canWrite()) // see above re: only seeding
+            if (f.exists() && ((useSavedBitField && savedBitField.complete()) || !f.canWrite()))
                 rafs[i] = new RandomAccessFile(f, "r");
             else
                 rafs[i] = new RandomAccessFile(f, "rw");
@@ -468,9 +471,10 @@ public class Storage
           }
         else if (length == 0)
           allocateFile(i);
-        else
-          throw new IOException("File '" + names[i]
-                                + "' exists, but has wrong length");
+        else {
+          Snark.debug("File '" + names[i] + "' exists, but has wrong length - repairing corruption", Snark.ERROR);
+          rafs[i].setLength(lengths[i]);
+        }
       }
 
     // Check which pieces match and which don't

apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java

@@ -20,11 +20,17 @@
 
 package org.klomp.snark;
 
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import java.util.Set;
 
-import org.klomp.snark.bencode.*;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
 
@@ -46,6 +52,10 @@ public class TrackerClient extends I2PThread
   private final static int SLEEP = 5; // 5 minutes.
   private final static int DELAY_MIN = 2000; // 2 secs.
   private final static int DELAY_MUL = 1500; // 1.5 secs.
+  private final static int MAX_REGISTER_FAILS = 10; // * INITIAL_SLEEP = 15m to register
+  private final static int INITIAL_SLEEP = 90*1000;
+  private final static int MAX_CONSEC_FAILS = 5;    // slow down after this
+  private final static int LONG_SLEEP = 30*60*1000; // sleep a while after lots of fails
 
   private final MetaInfo meta;
   private final PeerCoordinator coordinator;
@@ -54,8 +64,7 @@ public class TrackerClient extends I2PThread
   private boolean stop;
   private boolean started;
 
-  private long interval;
-  private long lastRequestTime;
+  private List trackers;
 
   public TrackerClient(MetaInfo meta, PeerCoordinator coordinator)
   {
@@ -100,14 +109,47 @@ public class TrackerClient extends I2PThread
   
   public void run()
   {
-    // XXX - Support other IPs
-    String announce = meta.getAnnounce(); //I2PSnarkUtil.instance().rewriteAnnounce(meta.getAnnounce());
     String infoHash = urlencode(meta.getInfoHash());
     String peerID = urlencode(coordinator.getID());
 
-    _log.debug("Announce: [" + meta.getAnnounce() + "] infoHash: " + infoHash 
-               + " xmitAnnounce: [" + announce + "]");
+    _log.debug("Announce: [" + meta.getAnnounce() + "] infoHash: " + infoHash);
     
+    // Construct the list of trackers for this torrent,
+    // starting with the primary one listed in the metainfo,
+    // followed by the secondary open trackers
+    // It's painful, but try to make sure if an open tracker is also
+    // the primary tracker, that we don't add it twice.
+    trackers = new ArrayList(2);
+    trackers.add(new Tracker(meta.getAnnounce(), true));
+    List tlist = SnarkManager.instance().getOpenTrackers();
+    if (tlist != null) {
+        for (int i = 0; i < tlist.size(); i++) {
+             String url = (String)tlist.get(i);
+             if (!url.startsWith("http://")) {
+                _log.error("Bad announce URL: [" + url + "]");
+                continue;
+             }
+             int slash = url.indexOf('/', 7);
+             if (slash <= 7) {
+                _log.error("Bad announce URL: [" + url + "]");
+                continue;
+             }
+             if (meta.getAnnounce().startsWith(url.substring(0, slash)))
+                continue;
+             String dest = I2PSnarkUtil.instance().lookup(url.substring(7, slash));
+             if (dest == null) {
+                _log.error("Announce host unknown: [" + url + "]");
+                continue;
+             }
+             if (meta.getAnnounce().startsWith("http://" + dest))
+                continue;
+             if (meta.getAnnounce().startsWith("http://i2p/" + dest))
+                continue;
+             trackers.add(new Tracker(url, false));
+             _log.debug("Additional announce: [" + url + "] for infoHash: " + infoHash);
+        }
+    }
+
     long uploaded = coordinator.getUploaded();
     long downloaded = coordinator.getDownloaded();
     long left = coordinator.getLeft();
@@ -119,78 +161,29 @@ public class TrackerClient extends I2PThread
       {
         if (!verifyConnected()) return;
         boolean started = false;
-        while (!started)
-          {
-            sleptTime = 0;
-            try
-              {
-                // Send start.
-                TrackerInfo info = doRequest(announce, infoHash, peerID,
-                                             uploaded, downloaded, left,
-                                             STARTED_EVENT);
-                Set peers = info.getPeers();
-                coordinator.trackerSeenPeers = peers.size();
-                coordinator.trackerProblems = null;
-                if (!completed) {
-                    Iterator it = peers.iterator();
-                    while (it.hasNext()) {
-                      Peer cur = (Peer)it.next();
-                      coordinator.addPeer(cur);
-                      int delay = DELAY_MUL;
-                      delay *= ((int)cur.getPeerID().getAddress().calculateHash().toBase64().charAt(0)) % 10;
-                      delay += DELAY_MIN;
-                      sleptTime += delay;
-                      try { Thread.sleep(delay); } catch (InterruptedException ie) {}
-                    }
-                }
-                started = true;
-              }
-            catch (IOException ioe)
-              {
-                // Probably not fatal (if it doesn't last to long...)
-                Snark.debug
-                  ("WARNING: Could not contact tracker at '"
-                   + announce + "': " + ioe, Snark.WARNING);
-                coordinator.trackerProblems = ioe.getMessage();
-                if (coordinator.trackerProblems.toLowerCase().startsWith(NOT_REGISTERED)) {
-                  stop = true;
-                  coordinator.snark.stopTorrent();
-                }
-              }
-
-            if (stop)
-              break;
-       
-            if (!started)
-              {
-                Snark.debug("         Retrying in one minute...", Snark.DEBUG);
-                try
-                  {
-                    // Sleep one minutes...
-                    Thread.sleep(60*1000);
-                  }
-                catch(InterruptedException interrupt)
-                  {
-                    // ignore
-                  }
-              }
-          }
-
+        boolean firstTime = true;
+        int consecutiveFails = 0;
         Random r = new Random();
         while(!stop)
           {
             try
               {
                 // Sleep some minutes...
+                // Sleep the minimum interval for all the trackers, but 60s minimum
+                // except for the first time...
                 int delay;
-                if(coordinator.trackerProblems != null && !completed) {
-                  delay = 60*1000;
-                } else if(completed) {
-                  delay = 3*SLEEP*60*1000 + r.nextInt(120*1000);
-                } else {
-                  delay = SLEEP*60*1000 + r.nextInt(120*1000);
-                  delay -= sleptTime;
-                }
+                int random = r.nextInt(120*1000);
+                if (firstTime) {
+                  delay = r.nextInt(30*1000);
+                  firstTime = false;
+                } else if (completed && started)
+                  delay = 3*SLEEP*60*1000 + random;
+                else if (coordinator.trackerProblems != null && ++consecutiveFails < MAX_CONSEC_FAILS)
+                  delay = INITIAL_SLEEP;
+                else
+                  // sleep a while, when we wake up we will contact only the trackers whose intervals have passed
+                  delay = SLEEP*60*1000 + random;
+
                 if (delay > 0)
                   Thread.sleep(delay);
               }
@@ -218,21 +211,37 @@ public class TrackerClient extends I2PThread
             else
               event = NO_EVENT;
             
+            // *** loop once for each tracker
             // Only do a request when necessary.
             sleptTime = 0;
-            if (event == COMPLETED_EVENT
-                || coordinator.needPeers()
-                || System.currentTimeMillis() > lastRequestTime + interval)
+            int maxSeenPeers = 0;
+            for (Iterator iter = trackers.iterator(); iter.hasNext(); ) {
+              Tracker tr = (Tracker)iter.next();
+              if ((!stop) && (!tr.stop) &&
+                  (completed || coordinator.needPeers()) &&
+                  (event == COMPLETED_EVENT || System.currentTimeMillis() > tr.lastRequestTime + tr.interval))
               {
                 try
                   {
-                    TrackerInfo info = doRequest(announce, infoHash, peerID,
+                    if (!tr.started)
+                      event = STARTED_EVENT;
+                    TrackerInfo info = doRequest(tr, infoHash, peerID,
                                                  uploaded, downloaded, left,
                                                  event);
 
                     coordinator.trackerProblems = null;
+                    tr.trackerProblems = null;
+                    tr.registerFails = 0;
+                    tr.consecutiveFails = 0;
+                    if (tr.isPrimary)
+                        consecutiveFails = 0;
+                    started = true;
+                    tr.started = true;
+
                     Set peers = info.getPeers();
-                    coordinator.trackerSeenPeers = peers.size();
+                    tr.seenPeers = peers.size();
+                    if (coordinator.trackerSeenPeers < tr.seenPeers) // update rising number quickly
+                        coordinator.trackerSeenPeers = tr.seenPeers;
                     if ( (left > 0) && (!completed) ) {
                         // we only want to talk to new people if we need things
                         // from them (duh)
@@ -257,16 +266,38 @@ public class TrackerClient extends I2PThread
                     // Probably not fatal (if it doesn't last to long...)
                     Snark.debug
                       ("WARNING: Could not contact tracker at '"
-                       + announce + "': " + ioe, Snark.WARNING);
-                    coordinator.trackerProblems = ioe.getMessage();
-                    if (coordinator.trackerProblems.toLowerCase().startsWith(NOT_REGISTERED)) {
-                      stop = true;
-                      coordinator.snark.stopTorrent();
+                       + tr.announce + "': " + ioe, Snark.WARNING);
+                    tr.trackerProblems = ioe.getMessage();
+                    // don't show secondary tracker problems to the user
+                    if (tr.isPrimary)
+                      coordinator.trackerProblems = tr.trackerProblems;
+                    if (tr.trackerProblems.toLowerCase().startsWith(NOT_REGISTERED)) {
+                      // Give a guy some time to register it if using opentrackers too
+                      if (trackers.size() == 1) {
+                        stop = true;
+                        coordinator.snark.stopTorrent();
+                      } else { // hopefully each on the opentrackers list is really open
+                        if (tr.registerFails++ > MAX_REGISTER_FAILS)
+                          tr.stop = true;
+                      }
+                    }
+                    if (++tr.consecutiveFails == MAX_CONSEC_FAILS) {
+                        tr.seenPeers = 0;
+                        if (tr.interval < LONG_SLEEP)
+                            tr.interval = LONG_SLEEP;  // slow down
                     }
                   }
               }
-          }
-      }
+              if ((!tr.stop) && maxSeenPeers < tr.seenPeers)
+                  maxSeenPeers = tr.seenPeers;
+            }  // *** end of trackers loop here
+
+            // we could try and total the unique peers but that's too hard for now
+            coordinator.trackerSeenPeers = maxSeenPeers;
+            if (!started)
+                Snark.debug("         Retrying in one minute...", Snark.DEBUG);
+          } // *** end of while loop
+      } // try
     catch (Throwable t)
       {
         I2PSnarkUtil.instance().debug("TrackerClient: " + t, Snark.ERROR, t);
@@ -277,21 +308,27 @@ public class TrackerClient extends I2PThread
       {
         try
           {
-            if (!verifyConnected()) return;
-            TrackerInfo info = doRequest(announce, infoHash, peerID, uploaded,
+            // try to contact everybody we can
+            // We don't need I2CP connection for eepget
+            // if (!verifyConnected()) return;
+            for (Iterator iter = trackers.iterator(); iter.hasNext(); ) {
+              Tracker tr = (Tracker)iter.next();
+              if (tr.started && (!tr.stop) && tr.trackerProblems == null)
+                  doRequest(tr, infoHash, peerID, uploaded,
                                          downloaded, left, STOPPED_EVENT);
+            }
           }
         catch(IOException ioe) { /* ignored */ }
       }
     
   }
   
-  private TrackerInfo doRequest(String announce, String infoHash,
+  private TrackerInfo doRequest(Tracker tr, String infoHash,
                                 String peerID, long uploaded,
                                 long downloaded, long left, String event)
     throws IOException
   {
-    String s = announce
+    String s = tr.announce
       + "?info_hash=" + infoHash
       + "&peer_id=" + peerID
       + "&port=" + port
@@ -302,6 +339,7 @@ public class TrackerClient extends I2PThread
       + ((event != NO_EVENT) ? ("&event=" + event) : "");
     Snark.debug("Sending TrackerClient request: " + s, Snark.INFO);
       
+    tr.lastRequestTime = System.currentTimeMillis();
     File fetched = I2PSnarkUtil.instance().get(s);
     if (fetched == null) {
         throw new IOException("Error fetching " + s);
@@ -315,13 +353,12 @@ public class TrackerClient extends I2PThread
         TrackerInfo info = new TrackerInfo(in, coordinator.getID(),
                                            coordinator.getMetaInfo());
         Snark.debug("TrackerClient response: " + info, Snark.INFO);
-        lastRequestTime = System.currentTimeMillis();
 
         String failure = info.getFailureReason();
         if (failure != null)
           throw new IOException(failure);
 
-        interval = info.getInterval() * 1000;
+        tr.interval = info.getInterval() * 1000;
         return info;
     } finally {
         if (in != null) try { in.close(); } catch (IOException ioe) {}
@@ -347,4 +384,32 @@ public class TrackerClient extends I2PThread
          
     return sb.toString();
   }
+
+  private class Tracker
+  {
+      String announce;
+      boolean isPrimary;
+      long interval;
+      long lastRequestTime;
+      String trackerProblems;
+      boolean stop;
+      boolean started;
+      int registerFails;
+      int consecutiveFails;
+      int seenPeers;
+
+      public Tracker(String a, boolean p)
+      {
+          announce = a;
+          isPrimary = p;
+          interval = INITIAL_SLEEP;
+          lastRequestTime = 0;
+          trackerProblems = null;
+          stop = false;
+          started = false;
+          registerFails = 0;
+          consecutiveFails = 0;
+          seenPeers = 0;
+      }
+  }
 }

apps/i2psnark/java/src/org/klomp/snark/TrackerInfo.java

@@ -22,14 +22,15 @@ package org.klomp.snark;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.math.BigInteger;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.HashSet;
 
-import org.klomp.snark.bencode.*;
+import org.klomp.snark.bencode.BDecoder;
+import org.klomp.snark.bencode.BEValue;
+import org.klomp.snark.bencode.InvalidBEncodingException;
 
 public class TrackerInfo
 {
@@ -95,7 +96,14 @@ public class TrackerInfo
     Iterator it = l.iterator();
     while (it.hasNext())
       {
-        PeerID peerID = new PeerID(((BEValue)it.next()).getMap());
+        PeerID peerID;
+        try {
+            peerID = new PeerID(((BEValue)it.next()).getMap());
+        } catch (InvalidBEncodingException ibe) {
+            // don't let one bad entry spoil the whole list
+            Snark.debug("Discarding peer from list: " + ibe, Snark.ERROR);
+            continue;
+        }
         peers.add(new Peer(peerID, my_id, metainfo));
       }
 

apps/i2psnark/java/src/org/klomp/snark/bencode/BDecoder.java

@@ -20,20 +20,16 @@
 
 package org.klomp.snark.bencode;
 
+import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.EOFException;
-import java.io.UnsupportedEncodingException;
-
 import java.math.BigInteger;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.HashMap;
-import java.util.Map;
-
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Decodes a bencoded stream to <code>BEValue</code>s.

apps/i2psnark/java/src/org/klomp/snark/bencode/BEValue.java

@@ -21,7 +21,6 @@
 package org.klomp.snark.bencode;
 
 import java.io.UnsupportedEncodingException;
-
 import java.util.List;
 import java.util.Map;
 

apps/i2psnark/java/src/org/klomp/snark/bencode/BEncoder.java

@@ -20,11 +20,9 @@
 
 package org.klomp.snark.bencode;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.UnsupportedEncodingException;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;

apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java

@@ -1,12 +1,23 @@
 package org.klomp.snark.web;
 
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
+
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServlet;
 
 import net.i2p.I2PAppContext;
 import net.i2p.data.Base64;
@@ -14,7 +25,14 @@ import net.i2p.data.DataHelper;
 import net.i2p.util.FileUtil;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
-import org.klomp.snark.*;
+
+import org.klomp.snark.I2PSnarkUtil;
+import org.klomp.snark.MetaInfo;
+import org.klomp.snark.Peer;
+import org.klomp.snark.Snark;
+import org.klomp.snark.SnarkManager;
+import org.klomp.snark.Storage;
+import org.klomp.snark.TrackerClient;
 
 /**
  *
@@ -107,13 +125,17 @@ public class I2PSnarkServlet extends HttpServlet {
         if (I2PSnarkUtil.instance().connected())
             out.write("<a href=\"" + uri + "?action=StopAll&nonce=" + _nonce +
                       "\" title=\"Stop all torrents and the i2p tunnel\">Stop All</a>");
+        else if (snarks.size() > 0)
+            out.write("<a href=\"" + uri + "?action=StartAll&nonce=" + _nonce +
+                      "\" title=\"Start all torrents and the i2p tunnel\">Start All</a>");
         else
             out.write("&nbsp;");
         out.write("</th></tr></thead>\n");
         for (int i = 0; i < snarks.size(); i++) {
             Snark snark = (Snark)snarks.get(i);
-            boolean showPeers = "1".equals(peerParam) || Base64.encode(snark.meta.getInfoHash()).equals(peerParam);
-            displaySnark(out, snark, uri, i, stats, showPeers);
+            boolean showDebug = "2".equals(peerParam);
+            boolean showPeers = showDebug || "1".equals(peerParam) || Base64.encode(snark.meta.getInfoHash()).equals(peerParam);
+            displaySnark(out, snark, uri, i, stats, showPeers, showDebug);
         }
         if (snarks.size() <= 0) {
             out.write(TABLE_EMPTY);
@@ -289,7 +311,10 @@ public class I2PSnarkServlet extends HttpServlet {
             String i2cpPort = req.getParameter("i2cpPort");
             String i2cpOpts = req.getParameter("i2cpOpts");
             String upLimit = req.getParameter("upLimit");
-            _manager.updateConfig(dataDir, autoStart, seedPct, eepHost, eepPort, i2cpHost, i2cpPort, i2cpOpts, upLimit);
+            String upBW = req.getParameter("upBW");
+            boolean useOpenTrackers = req.getParameter("useOpenTrackers") != null;
+            String openTrackers = req.getParameter("openTrackers");
+            _manager.updateConfig(dataDir, autoStart, seedPct, eepHost, eepPort, i2cpHost, i2cpPort, i2cpOpts, upLimit, upBW, useOpenTrackers, openTrackers);
         } else if ("Create torrent".equals(action)) {
             String baseData = req.getParameter("baseFile");
             if (baseData != null) {
@@ -338,6 +363,14 @@ public class I2PSnarkServlet extends HttpServlet {
                 I2PSnarkUtil.instance().disconnect();
                 _manager.addMessage("I2P tunnel closed");
             }
+        } else if ("StartAll".equals(action)) {
+            _manager.addMessage("Opening the I2P tunnel and starting all torrents");
+            List snarks = getSortedSnarks(req);
+            for (int i = 0; i < snarks.size(); i++) {
+                Snark snark = (Snark)snarks.get(i);
+                if (snark.stopped)
+                    snark.startTorrent();
+            }
         }
     }
     
@@ -356,7 +389,7 @@ public class I2PSnarkServlet extends HttpServlet {
 
     private static final int MAX_DISPLAYED_FILENAME_LENGTH = 60;
     private static final int MAX_DISPLAYED_ERROR_LENGTH = 40;
-    private void displaySnark(PrintWriter out, Snark snark, String uri, int row, long stats[], boolean showPeers) throws IOException {
+    private void displaySnark(PrintWriter out, Snark snark, String uri, int row, long stats[], boolean showPeers, boolean showDebug) throws IOException {
         String filename = snark.torrent;
         File f = new File(filename);
         filename = f.getName(); // the torrent may be the canonical name, so lets just grab the local name
@@ -540,6 +573,8 @@ public class I2PSnarkServlet extends HttpServlet {
                 else
                     client = "Unknown";
                 out.write("<font size=-1>" + client + "</font>&nbsp;&nbsp;<tt>" + peer.toString().substring(5, 9) + "</tt>");
+                if (showDebug)
+                    out.write(" inactive " + (peer.getInactiveTime() / 1000) + "s");
                 out.write("</td>\n\t");
                 out.write("<td class=\"snarkTorrentStatus " + rowClass + "\">");
                 out.write("</td>\n\t");
@@ -588,6 +623,8 @@ public class I2PSnarkServlet extends HttpServlet {
                 out.write("</td>\n\t");
                 out.write("<td class=\"snarkTorrentStatus " + rowClass + "\">");
                 out.write("</td></tr>\n\t");
+                if (showDebug)
+                    out.write("<tr><td colspan=\"8\" align=\"right\" class=\"snarkTorrentStatus " + rowClass + "\">" + peer.getSocket() + "</td></tr>");
             }
         }
     }
@@ -649,6 +686,8 @@ public class I2PSnarkServlet extends HttpServlet {
         String uri = req.getRequestURI();
         String dataDir = _manager.getDataDir().getAbsolutePath();
         boolean autoStart = _manager.shouldAutoStart();
+        boolean useOpenTrackers = _manager.shouldUseOpenTrackers();
+        String openTrackers = _manager.getOpenTrackerString();
         //int seedPct = 0;
        
         out.write("<form action=\"" + uri + "\" method=\"POST\">\n");
@@ -656,7 +695,7 @@ public class I2PSnarkServlet extends HttpServlet {
         out.write("<input type=\"hidden\" name=\"nonce\" value=\"" + _nonce + "\" />\n");
         out.write("<span class=\"snarkConfigTitle\">Configuration:</span><br />\n");
         out.write("Data directory: <input type=\"text\" size=\"40\" name=\"dataDir\" value=\"" + dataDir + "\" ");
-        out.write("title=\"Directory to store torrents and data\" disabled=\"true\" /><br />\n");
+        out.write("title=\"Directory to store torrents and data\" disabled=\"true\" /> <i>(Edit i2psnark.config and restart to change)</i><br />\n");
         out.write("Auto start: <input type=\"checkbox\" name=\"autoStart\" value=\"true\" " 
                   + (autoStart ? "checked " : "") 
                   + "title=\"If true, automatically start torrents that are added\" />");
@@ -680,17 +719,25 @@ public class I2PSnarkServlet extends HttpServlet {
         out.write("</select><br />\n");
 */
         out.write("Total uploader limit: <input type=\"text\" name=\"upLimit\" value=\""
-                  + I2PSnarkUtil.instance().getMaxUploaders() + "\" size=\"3\" /> peers<br />\n");
+                  + I2PSnarkUtil.instance().getMaxUploaders() + "\" size=\"3\" maxlength=\"3\" /> peers<br />\n");
+        out.write("Up bandwidth limit: <input type=\"text\" name=\"upBW\" value=\""
+                  + I2PSnarkUtil.instance().getMaxUpBW() + "\" size=\"3\" maxlength=\"3\" /> KBps <i>(Router Up BW / 2 recommended)</i><br />\n");
         
+        out.write("Use open trackers also: <input type=\"checkbox\" name=\"useOpenTrackers\" value=\"true\" " 
+                  + (useOpenTrackers ? "checked " : "") 
+                  + "title=\"If true, uses open trackers in addition\" /> ");
+        out.write("Announce URLs: <input type=\"text\" name=\"openTrackers\" value=\""
+                  + openTrackers + "\" size=\"50\" /><br />\n");
+
         //out.write("<hr />\n");
         out.write("EepProxy host: <input type=\"text\" name=\"eepHost\" value=\""
                   + I2PSnarkUtil.instance().getEepProxyHost() + "\" size=\"15\" /> ");
         out.write("port: <input type=\"text\" name=\"eepPort\" value=\""
-                  + I2PSnarkUtil.instance().getEepProxyPort() + "\" size=\"5\" /><br />\n");
+                  + I2PSnarkUtil.instance().getEepProxyPort() + "\" size=\"5\" maxlength=\"5\" /><br />\n");
         out.write("I2CP host: <input type=\"text\" name=\"i2cpHost\" value=\"" 
                   + I2PSnarkUtil.instance().getI2CPHost() + "\" size=\"15\" /> ");
         out.write("port: <input type=\"text\" name=\"i2cpPort\" value=\"" +
-                  + I2PSnarkUtil.instance().getI2CPPort() + "\" size=\"5\" /> <br />\n");
+                  + I2PSnarkUtil.instance().getI2CPPort() + "\" size=\"5\" maxlength=\"5\" /> <br />\n");
         StringBuffer opts = new StringBuffer(64);
         Map options = new TreeMap(I2PSnarkUtil.instance().getI2CPOptions());
         for (Iterator iter = options.keySet().iterator(); iter.hasNext(); ) {
@@ -824,7 +871,8 @@ class FetchAndAdd implements Runnable {
     }
     public void run() {
         _url = _url.trim();
-        File file = I2PSnarkUtil.instance().get(_url, false);
+        // 3 retries
+        File file = I2PSnarkUtil.instance().get(_url, false, 3);
         try {
             if ( (file != null) && (file.exists()) && (file.length() > 0) ) {
                 _manager.addMessage("Torrent fetched from " + _url);

apps/i2psnark/java/src/org/klomp/snark/web/RunStandalone.java

@@ -3,6 +3,7 @@ package org.klomp.snark.web;
 import java.io.File;
 
 import net.i2p.util.FileUtil;
+
 import org.mortbay.jetty.Server;
 
 public class RunStandalone {

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java

@@ -8,11 +8,15 @@ package net.i2p.i2ptunnel;
  *
  */
 
-import java.io.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
+import java.io.ByteArrayOutputStream;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
 import java.util.zip.GZIPInputStream;
+
 import net.i2p.I2PAppContext;
 import net.i2p.data.ByteArray;
 import net.i2p.util.ByteCache;

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java

@@ -16,8 +16,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
 
-import net.i2p.I2PException;
 import net.i2p.I2PAppContext;
+import net.i2p.I2PException;
 import net.i2p.client.I2PSession;
 import net.i2p.client.streaming.I2PSocket;
 import net.i2p.client.streaming.I2PSocketManager;
@@ -26,8 +26,8 @@ import net.i2p.client.streaming.I2PSocketOptions;
 import net.i2p.data.Destination;
 import net.i2p.util.EventDispatcher;
 import net.i2p.util.I2PThread;
-import net.i2p.util.SimpleTimer;
 import net.i2p.util.Log;
+import net.i2p.util.SimpleTimer;
 
 public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runnable {
 

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java

@@ -11,10 +11,10 @@ import java.net.Socket;
 import java.net.SocketException;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
-import java.util.StringTokenizer;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Properties;
+import java.util.StringTokenizer;
 
 import net.i2p.I2PAppContext;
 import net.i2p.I2PException;
@@ -647,9 +647,10 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
     
     private static String jumpServers[] = {
                                            "http://i2host.i2p/cgi-bin/i2hostjump?",
-                                           "http://orion.i2p/jump/",
+                                           // "http://orion.i2p/jump/",
                                            "http://stats.i2p/cgi-bin/jump.cgi?a=",
-                                           "http://trevorreznik.i2p/cgi-bin/jump.php?hostname="
+                                           // "http://trevorreznik.i2p/cgi-bin/jump.php?hostname=",
+                                           "http://i2jump.i2p/"
                                           };
     private static void writeErrorMessage(byte[] errMessage, OutputStream out, String targetRequest,
                                           boolean usingWWWProxy, String wwwProxy, boolean showAddrHelper) throws IOException {
@@ -671,6 +672,16 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
                 if (showAddrHelper) {
                     out.write("<br><br>Click a link below to look for an address helper by using a \"jump\" service:<br>".getBytes());
                     for (int i = 0; i < jumpServers.length; i++) {
+                        // Skip jump servers we don't know
+                        String jumphost = jumpServers[i].substring(7);  // "http://"
+                        jumphost = jumphost.substring(0, jumphost.indexOf('/'));
+                        try {
+                            Destination dest = I2PTunnel.destFromName(jumphost);
+                            if (dest == null) continue;
+                        } catch (DataFormatException dfe) {
+                            continue;
+                        }
+
                         out.write("<br><a href=\"".getBytes());
                         out.write(jumpServers[i].getBytes());
                         out.write(uri.getBytes());

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientRunner.java

@@ -3,17 +3,14 @@
  */
 package net.i2p.i2ptunnel;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.Socket;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Properties;
 
 import net.i2p.I2PAppContext;
 import net.i2p.client.streaming.I2PSocket;
-import net.i2p.data.ByteArray;
-import net.i2p.data.DataHelper;
-import net.i2p.util.ByteCache;
 import net.i2p.util.Log;
 
 /**

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java

@@ -3,18 +3,17 @@
  */
 package net.i2p.i2ptunnel;
 
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.InetAddress;
 import java.net.Socket;
 import java.net.SocketException;
 import java.util.Iterator;
 import java.util.Properties;
 import java.util.zip.GZIPOutputStream;
-import java.util.zip.Deflater;
 
-import net.i2p.I2PAppContext;
-import net.i2p.I2PException;
-import net.i2p.client.streaming.I2PServerSocket;
 import net.i2p.client.streaming.I2PSocket;
 import net.i2p.data.DataHelper;
 import net.i2p.util.EventDispatcher;

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCClient.java

@@ -1,16 +1,17 @@
 package net.i2p.i2ptunnel;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
 import java.net.Socket;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.StringTokenizer;
-import java.lang.IndexOutOfBoundsException;
 
 import net.i2p.I2PAppContext;
 import net.i2p.client.streaming.I2PSocket;
 import net.i2p.data.DataFormatException;
-import net.i2p.data.DataHelper;
 import net.i2p.data.Destination;
 import net.i2p.util.EventDispatcher;
 import net.i2p.util.I2PThread;
@@ -164,7 +165,7 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
                                 if (_log.shouldLog(Log.INFO))
                                     _log.info("inbound: "+outmsg);
                             }
-                            outmsg=outmsg+"\n";
+                            outmsg=outmsg+"\r\n";   // rfc1459 sec. 2.3
                             output.write(outmsg.getBytes("ISO-8859-1"));
                         } else {
                             if (_log.shouldLog(Log.WARN))
@@ -238,7 +239,7 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
                                     if (_log.shouldLog(Log.INFO))
                                         _log.info("outbound: "+outmsg);
                                 }
-                                outmsg=outmsg+"\n";
+                                outmsg=outmsg+"\r\n";   // rfc1459 sec. 2.3
                                 output.write(outmsg.getBytes("ISO-8859-1"));
                             } else {
                                 if (_log.shouldLog(Log.WARN))
@@ -435,6 +436,16 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
                 return s;
         }
         
+        // mIRC sends "NOTICE user :DCC Send file (IP)"
+        // in addition to the CTCP version
+        if("NOTICE".equalsIgnoreCase(command))
+        {
+            String msg = field[2];
+            if(msg.startsWith(":DCC "))
+                return null;
+            // fall through
+        }
+        
         // Allow PRIVMSG, but block CTCP (except ACTION).
         if("PRIVMSG".equalsIgnoreCase(command) || "NOTICE".equalsIgnoreCase(command))
         {

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java

@@ -8,10 +8,10 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.ConnectException;
 import java.net.InetAddress;
 import java.net.Socket;
 import java.net.SocketException;
-import java.net.ConnectException;
 import java.util.Iterator;
 import java.util.Properties;
 

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java

@@ -1,9 +1,8 @@
 package net.i2p.i2ptunnel;
 
-import java.io.IOException;
 import java.io.File;
 import java.io.FileOutputStream;
-
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java

@@ -13,10 +13,8 @@ import java.util.List;
 import java.util.Properties;
 import java.util.StringTokenizer;
 
-import net.i2p.I2PAppContext;
 import net.i2p.i2ptunnel.TunnelController;
 import net.i2p.i2ptunnel.TunnelControllerGroup;
-import net.i2p.util.Log;
 
 /**
  * Ugly little accessor for the edit page

apps/i2ptunnel/jsp/editClient.jsp

@@ -186,8 +186,9 @@
                   %><option value="0"<%=(tunnelDepth == 0 ? " selected=\"selected\"" : "") %>>0 hop tunnel (low anonymity, low latency)</option>
                     <option value="1"<%=(tunnelDepth == 1 ? " selected=\"selected\"" : "") %>>1 hop tunnel (medium anonymity, medium latency)</option>
                     <option value="2"<%=(tunnelDepth == 2 ? " selected=\"selected\"" : "") %>>2 hop tunnel (high anonymity, high latency)</option>
-                <% if (tunnelDepth > 2) { 
-                %>    <option value="<%=tunnelDepth%>" selected="selected"><%=tunnelDepth%> hop tunnel</option>
+                    <option value="3"<%=(tunnelDepth == 3 ? " selected=\"selected\"" : "") %>>3 hop tunnel (very high anonymity, poor performance)</option>
+                <% if (tunnelDepth > 3) { 
+                %>    <option value="<%=tunnelDepth%>" selected="selected"><%=tunnelDepth%> hop tunnel (very poor performance)</option>
                 <% }
               %></select>
             </div>
@@ -213,11 +214,11 @@
                 </label>
                 <select id="tunnelQuantity" name="tunnelQuantity" title="Number of Tunnels in Group" class="selectbox">
                     <% int tunnelQuantity = editBean.getTunnelQuantity(curTunnel, 2);
-                  %><option value="1"<%=(tunnelQuantity == 1 ? " selected=\"selected\"" : "") %>>1 inbound tunnel (low bandwidth usage, less reliability)</option>
-                    <option value="2"<%=(tunnelQuantity == 2 ? " selected=\"selected\"" : "") %>>2 inbound tunnels (standard bandwidth usage, standard reliability)</option>
-                    <option value="3"<%=(tunnelQuantity == 3 ? " selected=\"selected\"" : "") %>>3 inbound tunnels (higher bandwidth usage, higher reliability)</option>
+                  %><option value="1"<%=(tunnelQuantity == 1 ? " selected=\"selected\"" : "") %>>1 inbound, 1 outbound tunnel  (low bandwidth usage, less reliability)</option>
+                    <option value="2"<%=(tunnelQuantity == 2 ? " selected=\"selected\"" : "") %>>2 inbound, 2 outbound tunnels (standard bandwidth usage, standard reliability)</option>
+                    <option value="3"<%=(tunnelQuantity == 3 ? " selected=\"selected\"" : "") %>>3 inbound, 3 outbound tunnels (higher bandwidth usage, higher reliability)</option>
                 <% if (tunnelQuantity > 3) {
-                %>    <option value="<%=tunnelQuantity%>" selected="selected"><%=tunnelQuantity%> inbound tunnels</option>
+                %>    <option value="<%=tunnelQuantity%>" selected="selected"><%=tunnelQuantity%> tunnels</option>
                 <% }
               %></select>                
             </div>
@@ -228,9 +229,9 @@
                 <select id="tunnelBackupQuantity" name="tunnelBackupQuantity" title="Number of Reserve Tunnels" class="selectbox">
                     <% int tunnelBackupQuantity = editBean.getTunnelBackupQuantity(curTunnel, 0);
                   %><option value="0"<%=(tunnelBackupQuantity == 0 ? " selected=\"selected\"" : "") %>>0 backup tunnels (0 redundancy, no added resource usage)</option>
-                    <option value="1"<%=(tunnelBackupQuantity == 1 ? " selected=\"selected\"" : "") %>>1 backup tunnel (low redundancy, low resource usage)</option>
-                    <option value="2"<%=(tunnelBackupQuantity == 2 ? " selected=\"selected\"" : "") %>>2 backup tunnels (medium redundancy, medium resource usage)</option>
-                    <option value="3"<%=(tunnelBackupQuantity == 3 ? " selected=\"selected\"" : "") %>>3 backup tunnels (high redundancy, high resource usage)</option>
+                    <option value="1"<%=(tunnelBackupQuantity == 1 ? " selected=\"selected\"" : "") %>>1 backup tunnel each direction (low redundancy, low resource usage)</option>
+                    <option value="2"<%=(tunnelBackupQuantity == 2 ? " selected=\"selected\"" : "") %>>2 backup tunnels each direction (medium redundancy, medium resource usage)</option>
+                    <option value="3"<%=(tunnelBackupQuantity == 3 ? " selected=\"selected\"" : "") %>>3 backup tunnels each direction (high redundancy, high resource usage)</option>
                 <% if (tunnelBackupQuantity > 3) {
                 %>    <option value="<%=tunnelBackupQuantity%>" selected="selected"><%=tunnelBackupQuantity%> backup tunnels</option>
                 <% }
@@ -284,4 +285,4 @@
     <div id="pageFooter">
         </div>
     </body>
-</html>
+</html>

apps/i2ptunnel/jsp/editServer.jsp

@@ -158,8 +158,9 @@
                   %><option value="0"<%=(tunnelDepth == 0 ? " selected=\"selected\"" : "") %>>0 hop tunnel (low anonymity, low latency)</option>
                     <option value="1"<%=(tunnelDepth == 1 ? " selected=\"selected\"" : "") %>>1 hop tunnel (medium anonymity, medium latency)</option>
                     <option value="2"<%=(tunnelDepth == 2 ? " selected=\"selected\"" : "") %>>2 hop tunnel (high anonymity, high latency)</option>
-                <% if (tunnelDepth > 2) { 
-                %>    <option value="<%=tunnelDepth%>" selected="selected"><%=tunnelDepth%> hop tunnel</option>
+                    <option value="3"<%=(tunnelDepth == 3 ? " selected=\"selected\"" : "") %>>3 hop tunnel (very high anonymity, poor performance)</option>
+                <% if (tunnelDepth > 3) { 
+                %>    <option value="<%=tunnelDepth%>" selected="selected"><%=tunnelDepth%> hop tunnel (very poor performance)</option>
                 <% }
               %></select>
             </div>
@@ -185,11 +186,11 @@
                 </label>
                 <select id="tunnelQuantity" name="tunnelQuantity" title="Number of Tunnels in Group" class="selectbox">
                     <% int tunnelQuantity = editBean.getTunnelQuantity(curTunnel, 2);
-                  %><option value="1"<%=(tunnelQuantity == 1 ? " selected=\"selected\"" : "") %>>1 inbound tunnel  (low bandwidth usage, less reliability)</option>
-                    <option value="2"<%=(tunnelQuantity == 2 ? " selected=\"selected\"" : "") %>>2 inbound tunnels (standard bandwidth usage, standard reliability)</option>
-                    <option value="3"<%=(tunnelQuantity == 3 ? " selected=\"selected\"" : "") %>>3 inbound tunnels (higher bandwidth usage, higher reliability)</option>
+                  %><option value="1"<%=(tunnelQuantity == 1 ? " selected=\"selected\"" : "") %>>1 inbound, 1 outbound tunnel  (low bandwidth usage, less reliability)</option>
+                    <option value="2"<%=(tunnelQuantity == 2 ? " selected=\"selected\"" : "") %>>2 inbound, 2 outbound tunnels (standard bandwidth usage, standard reliability)</option>
+                    <option value="3"<%=(tunnelQuantity == 3 ? " selected=\"selected\"" : "") %>>3 inbound, 3 outbound tunnels (higher bandwidth usage, higher reliability)</option>
                 <% if (tunnelQuantity > 3) {
-                %>    <option value="<%=tunnelQuantity%>" selected="selected"><%=tunnelQuantity%> inbound tunnels</option>
+                %>    <option value="<%=tunnelQuantity%>" selected="selected"><%=tunnelQuantity%> tunnels</option>
                 <% }
               %></select>                
             </div>
@@ -200,9 +201,9 @@
                 <select id="tunnelBackupQuantity" name="tunnelBackupQuantity" title="Number of Reserve Tunnels" class="selectbox">
                     <% int tunnelBackupQuantity = editBean.getTunnelBackupQuantity(curTunnel, 0);
                   %><option value="0"<%=(tunnelBackupQuantity == 0 ? " selected=\"selected\"" : "") %>>0 backup tunnels      (0 redundancy, no added resource usage)</option>
-                    <option value="1"<%=(tunnelBackupQuantity == 1 ? " selected=\"selected\"" : "") %>>1 backup tunnel       (low redundancy, low resource usage)</option>
-                    <option value="2"<%=(tunnelBackupQuantity == 2 ? " selected=\"selected\"" : "") %>>2 backup tunnels      (medium redundancy, medium resource usage)</option>
-                    <option value="3"<%=(tunnelBackupQuantity == 3 ? " selected=\"selected\"" : "") %>>3 backup tunnels      (high redundancy, high resource usage)</option>
+                    <option value="1"<%=(tunnelBackupQuantity == 1 ? " selected=\"selected\"" : "") %>>1 backup tunnel each direction (low redundancy, low resource usage)</option>
+                    <option value="2"<%=(tunnelBackupQuantity == 2 ? " selected=\"selected\"" : "") %>>2 backup tunnels each direction (medium redundancy, medium resource usage)</option>
+                    <option value="3"<%=(tunnelBackupQuantity == 3 ? " selected=\"selected\"" : "") %>>3 backup tunnels each direction (high redundancy, high resource usage)</option>
                 <% if (tunnelBackupQuantity > 3) {
                 %>    <option value="<%=tunnelBackupQuantity%>" selected="selected"><%=tunnelBackupQuantity%> backup tunnels</option>
                 <% }
@@ -256,4 +257,4 @@
     <div id="pageFooter">
     </div>
 </body>
-</html>
+</html>

apps/jetty/build.xml

@@ -1,25 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project basedir="." default="all" name="jetty">
-        
+
+    <property name="jetty.sha1" value="021164f84da7304bd1ff07c268b45aa3e0b13322" />
+    <property name="jetty.md5" value="a61adc832be6baf2678935506743cfc3" />
+    <property name="jetty.url" value="http://dist.codehaus.org/jetty/jetty-5.1.x/jetty-5.1.12.zip" />
+    <property name="jetty.filename" value="jetty-5.1.12.zip" />
+
     <target name="all" depends="build" />
-    <target name="fetchJettylib" >
-        <available property="jetty.zip.available" file="jetty-5.1.12.zip" type="file" />
+
+    <target name="ensureJettylib" >
+        <available property="jetty.zip.available" file="${jetty.filename}" type="file" />
         <available property="jetty.zip.extracted" file="jettylib" type="dir" />
-        <ant target="doFetchJettylib" />
-        <ant target="doExtractJettylib" />
+        <ant target="fetchJettylib" />
+        <ant target="verifyJettylib" />
+        <ant target="extractJettylib" />
     </target>
-    <target name="doFetchJettylib" unless="jetty.zip.available" >
-        <echo message="The libraries contained within the fetched file are from Jetty's 5.1.12" />
-        <echo message="distribution (http://jetty.mortbay.org/).  These are not " />
-        <echo message="necessary for using I2P, but are used by some applications on top of I2P," />
-        <echo message="such as the routerconsole." />
-        <get src="http://mesh.dl.sourceforge.net/sourceforge/jetty/jetty-5.1.12.zip" verbose="true" dest="jetty-5.1.12.zip" />
+
+    <target name="fetchJettylib" unless="jetty.zip.available" >
+        <echo message="It seems that you don't have '${jetty.filename}' deployed." />
+        <echo message="The build script can download this file for you automatically," />
+        <echo message="or alternatively you can obtain it manually from:" />
+        <echo message="${jetty.url}" />
+        <echo message="" />
+        <echo message="The libraries contained in the fetched file provide the Jetty web server" />
+        <echo message="(http://jetty.mortbay.org/). They are not absolutely necessary" />
+        <echo message="but strongly recommended, since they are used by some applications" />
+        <echo message="on top of I2P, like the router console." />
+        <echo message="" />
+        <echo message="Even if you deploy the Jetty archive manually, the build script will" />
+        <echo message="still attempt to verify its checksums, which must be:" />
+        <echo message="SHA1 ${jetty.sha1}" />
+        <echo message="MD5 ${jetty.md5}" />
+        <echo message="" />
+        <input message="Download Jetty archive automatically?" validargs="y,n" addproperty="jetty.download" />
+        <fail message="Aborting as requested. Please deploy the Jetty archive manually." >
+            <condition>
+                <equals arg1="${jetty.download}" arg2="n"/>
+            </condition>
+        </fail>
+        <get src="${jetty.url}" verbose="true" dest="${jetty.filename}" />
     </target>
-    <target name="doExtractJettylib" unless="jetty.zip.extracted" >
-        <ant target="doExtract" />
+
+    <target name="verifyJettylib" >
+        <condition property="jetty.zip.verified" >
+            <and>
+                <checksum file="${jetty.filename}" algorithm="SHA" property="${jetty.sha1}" />
+                <checksum file="${jetty.filename}" algorithm="MD5" property="${jetty.md5}" />
+            </and>
+        </condition>
+        <fail message="Jetty archive does not match its checksums!" >
+            <condition>
+                <not>
+                    <istrue value="${jetty.zip.verified}" />
+                </not>
+            </condition>
+        </fail>
     </target>
-    <target name="doExtract">
-        <unzip src="jetty-5.1.12.zip" dest="." />
+
+    <target name="extractJettylib" unless="jetty.zip.extracted" >
+        <unzip src="${jetty.filename}" dest="." />
         <mkdir dir="jettylib" />
         <copy todir="jettylib">
             <fileset dir="jetty-5.1.12/lib">
@@ -30,7 +69,7 @@
             <fileset dir="jetty-5.1.12/ext">
                 <include name="ant.jar" />
                 <include name="commons-el.jar" />
-	        <include name="commons-logging.jar" />
+                <include name="commons-logging.jar" />
                 <include name="jasper-compiler.jar" />
                 <include name="jasper-runtime.jar" />
                 <include name="javax.servlet.jar" />
@@ -40,7 +79,8 @@
         </copy>
         <delete dir="jetty-5.1.12" />
     </target>
-    <target name="build" depends="fetchJettylib" />
+
+    <target name="build" depends="ensureJettylib" />
     <target name="builddep" />
     <target name="compile" />
     <target name="jar" />

apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkClient.java

@@ -4,17 +4,15 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.io.OutputStream;
-
 import java.net.ConnectException;
 import java.net.NoRouteToHostException;
-
 import java.util.Properties;
 import java.util.Random;
 
 import net.i2p.I2PAppContext;
 import net.i2p.I2PException;
-import net.i2p.data.Destination;
 import net.i2p.data.DataFormatException;
+import net.i2p.data.Destination;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
 

apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkSend.java

@@ -4,14 +4,13 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.io.OutputStream;
-
 import java.net.ConnectException;
 import java.net.NoRouteToHostException;
 
 import net.i2p.I2PAppContext;
 import net.i2p.I2PException;
-import net.i2p.data.Destination;
 import net.i2p.data.DataFormatException;
+import net.i2p.data.Destination;
 import net.i2p.util.Log;
 
 /**

apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkServer.java

@@ -4,10 +4,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-
 import java.net.ConnectException;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Properties;
 
 import net.i2p.I2PAppContext;

apps/ministreaming/java/src/net/i2p/client/streaming/TestSwarm.java

@@ -1,15 +1,16 @@
 package net.i2p.client.streaming;
 
-import java.io.InputStream;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
 import java.io.OutputStream;
+
 import net.i2p.I2PAppContext;
 import net.i2p.client.I2PClientFactory;
 import net.i2p.data.Destination;
-import net.i2p.util.Log;
 import net.i2p.util.I2PThread;
+import net.i2p.util.Log;
 
 /**
  * Sit around on a destination, receiving lots of data and sending lots of

apps/pants/pants/java/src/net/i2p/pants/MergeTypedPropertiesTask.java

@@ -127,8 +127,8 @@ public class MergeTypedPropertiesTask extends Task {
 			while (strtokString.hasMoreTokens())
 				_propertiesOut.setProperty(strtokString.nextToken().trim(), "");
 
-			for (Enumeration enum = _propertiesIn.elements(); enum.hasMoreElements(); ) {
-				property = (String) enum.nextElement();
+			for (Enumeration enumm = _propertiesIn.elements(); enumm.hasMoreElements(); ) {
+				property = (String) enumm.nextElement();
 
 				if (_onlyExpected && !_propertiesOut.containsKey(property))
 					continue;

apps/q/java/src/HTML/Template.java

@@ -34,13 +34,28 @@
 */
 
 package HTML;
-import java.util.*;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.Reader;
+import java.util.EmptyStackException;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.NoSuchElementException;
+import java.util.Properties;
+import java.util.Stack;
+import java.util.StringTokenizer;
+import java.util.Vector;
 
-import HTML.Tmpl.Element.*;
-import HTML.Tmpl.Parsers.*;
-import HTML.Tmpl.Util;
 import HTML.Tmpl.Filter;
+import HTML.Tmpl.Util;
+import HTML.Tmpl.Element.Conditional;
+import HTML.Tmpl.Element.Element;
+import HTML.Tmpl.Element.If;
+import HTML.Tmpl.Element.Var;
+import HTML.Tmpl.Parsers.Parser;
 
 /**
  * Use HTML Templates with java.

apps/q/java/src/HTML/Tmpl/Element/Conditional.java

@@ -35,12 +35,12 @@
 
 package HTML.Tmpl.Element;
 
-import java.util.Vector;
-import java.util.Hashtable;
 import java.util.Enumeration;
+import java.util.Hashtable;
 import java.util.NoSuchElementException;
+import java.util.Vector;
 
-import HTML.*;
+import HTML.Template;
 
 public class Conditional extends Element
 {

apps/q/java/src/HTML/Tmpl/Element/Loop.java

@@ -29,10 +29,10 @@
 */
 
 package HTML.Tmpl.Element;
-import java.util.Vector;
-import java.util.Hashtable;
 import java.util.Enumeration;
+import java.util.Hashtable;
 import java.util.NoSuchElementException;
+import java.util.Vector;
 
 public class Loop extends Element
 {

apps/q/java/src/HTML/Tmpl/Element/Var.java

@@ -35,8 +35,9 @@
 package HTML.Tmpl.Element;
 import java.util.Hashtable;
 import java.util.NoSuchElementException;
-import HTML.Tmpl.Util;
+
 import HTML.Template;
+import HTML.Tmpl.Util;
 
 public class Var extends Element
 {

apps/q/java/src/HTML/Tmpl/Parsers/Parser.java

@@ -30,9 +30,16 @@
 
 
 package HTML.Tmpl.Parsers;
-import java.util.*;
-import HTML.Tmpl.Element.*;
+import java.util.NoSuchElementException;
+import java.util.Properties;
+import java.util.StringTokenizer;
+import java.util.Vector;
+
 import HTML.Tmpl.Util;
+import HTML.Tmpl.Element.Element;
+import HTML.Tmpl.Element.If;
+import HTML.Tmpl.Element.Loop;
+import HTML.Tmpl.Element.Unless;
 
 public class Parser
 {

apps/q/java/src/net/i2p/aum/DupHashtable.java

@@ -6,8 +6,8 @@
 
 package net.i2p.aum;
 
-import java.*;
-import java.util.*;
+import java.util.Hashtable;
+import java.util.Vector;
 
 /**
  * similar in some ways to Properties, except that duplicate keys

apps/q/java/src/net/i2p/aum/EchoClient.java

@@ -4,16 +4,22 @@
 
 package net.i2p.aum;
 
-import java.lang.*;
-import java.io.*;
-import java.util.*;
-import java.net.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InterruptedIOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.net.ConnectException;
+import java.net.NoRouteToHostException;
 
-import net.i2p.*;
-import net.i2p.client.*;
-import net.i2p.client.streaming.*;
-import net.i2p.data.*;
-import net.i2p.util.*;
+import net.i2p.I2PException;
+import net.i2p.client.streaming.I2PSocket;
+import net.i2p.client.streaming.I2PSocketManager;
+import net.i2p.client.streaming.I2PSocketManagerFactory;
+import net.i2p.data.DataFormatException;
+import net.i2p.data.DataHelper;
+import net.i2p.data.Destination;
+import net.i2p.util.Log;
 
 /**
  * a simple program which illustrates the use of I2P stream

apps/q/java/src/net/i2p/aum/EchoServer.java

@@ -1,17 +1,21 @@
 
 package net.i2p.aum;
 
-import java.lang.*;
-import java.io.*;
-import java.util.*;
-import java.net.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStreamWriter;
+import java.net.ConnectException;
+import java.util.Properties;
 
-import net.i2p.*;
-import net.i2p.client.*;
-import net.i2p.client.streaming.*;
-import net.i2p.data.*;
-
-import net.i2p.util.*;
+import net.i2p.I2PException;
+import net.i2p.client.streaming.I2PServerSocket;
+import net.i2p.client.streaming.I2PSocket;
+import net.i2p.client.streaming.I2PSocketManager;
+import net.i2p.client.streaming.I2PSocketManagerFactory;
+import net.i2p.data.DataFormatException;
+import net.i2p.data.DataHelper;
+import net.i2p.data.Destination;
+import net.i2p.util.Log;
 
 /**
  * a simple program which illustrates the use of I2P stream

apps/q/java/src/net/i2p/aum/EchoTest.java

@@ -2,15 +2,10 @@
 
 package net.i2p.aum;
 
-import java.lang.*;
-import java.io.*;
-import java.util.*;
-import java.net.*;
+import java.io.IOException;
 
-import net.i2p.*;
-import net.i2p.client.*;
-import net.i2p.client.streaming.*;
-import net.i2p.data.*;
+import net.i2p.I2PException;
+import net.i2p.data.Destination;
 
 /**
  * A simple program which runs the EchoServer and EchoClient

apps/q/java/src/net/i2p/aum/EmbargoedQueue.java

@@ -6,9 +6,9 @@
 
 package net.i2p.aum;
 
-import java.*;
-import java.lang.*;
-import java.util.*;
+import java.util.Date;
+import java.util.Random;
+import java.util.Vector;
 
 /**
  * <p>Implements a queue of objects, where each object is 'embargoed'

apps/q/java/src/net/i2p/aum/I2PCat.java

@@ -3,18 +3,26 @@
 
 package net.i2p.aum;
 
-import java.lang.*;
-import java.io.*;
-import java.util.*;
-import java.net.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InterruptedIOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.net.ConnectException;
+import java.net.NoRouteToHostException;
+import java.util.Properties;
 
-import net.i2p.*;
-import net.i2p.client.*;
-import net.i2p.client.naming.*;
-import net.i2p.client.streaming.*;
-import net.i2p.data.*;
-
-import net.i2p.util.*;
+import net.i2p.I2PAppContext;
+import net.i2p.I2PException;
+import net.i2p.client.naming.HostsTxtNamingService;
+import net.i2p.client.streaming.I2PServerSocket;
+import net.i2p.client.streaming.I2PSocket;
+import net.i2p.client.streaming.I2PSocketManager;
+import net.i2p.client.streaming.I2PSocketManagerFactory;
+import net.i2p.data.DataFormatException;
+import net.i2p.data.DataHelper;
+import net.i2p.data.Destination;
+import net.i2p.util.Log;
 
 /**
  * A I2P equivalent of the much-beloved 'netcat' utility.

apps/q/java/src/net/i2p/aum/I2PSocketHelper.java

@@ -1,16 +1,6 @@
 
 package net.i2p.aum;
 
-import java.lang.*;
-import java.io.*;
-import java.util.*;
-import java.net.*;
-
-import net.i2p.*;
-import net.i2p.client.*;
-import net.i2p.client.streaming.*;
-import net.i2p.util.*;
-import net.i2p.data.*;
 
 /**
  * Class which wraps an I2PSocket object with convenient methods.

apps/q/java/src/net/i2p/aum/I2PTunnelXMLObject.java

@@ -1,15 +1,7 @@
 package net.i2p.aum;
 
-import org.apache.xmlrpc.*;
-import java.lang.*;
-import java.io.*;
-import java.util.*;
+import java.util.Hashtable;
 
-import net.i2p.*;
-import net.i2p.client.*;
-import net.i2p.client.streaming.*;
-import net.i2p.util.*;
-import net.i2p.data.*;
 import net.i2p.i2ptunnel.I2PTunnelXMLWrapper;
 
 /**

apps/q/java/src/net/i2p/aum/I2PTunnelXMLServer.java

@@ -1,15 +1,7 @@
 
 package net.i2p.aum;
 
-import org.apache.xmlrpc.*;
-import java.lang.*;
-import java.io.*;
-
-import net.i2p.*;
-import net.i2p.client.*;
-import net.i2p.client.streaming.*;
-import net.i2p.util.*;
-import net.i2p.data.*;
+import org.apache.xmlrpc.WebServer;
 
 /**
  * Provides a means for programs in any language to dynamically manage

apps/q/java/src/net/i2p/aum/I2PXmlRpcClient.java

@@ -1,19 +1,13 @@
 
 package net.i2p.aum;
 
-import java.lang.*;
-import java.io.*;
-import java.util.*;
-import java.net.*;
+import java.net.MalformedURLException;
+import java.net.URL;
 
-import org.apache.xmlrpc.*;
+import net.i2p.data.Destination;
+import net.i2p.util.Log;
 
-import net.i2p.*;
-import net.i2p.client.*;
-import net.i2p.client.streaming.*;
-import net.i2p.data.Base64;
-import net.i2p.util.*;
-import net.i2p.data.*;
+import org.apache.xmlrpc.XmlRpcClient;
 
 
 /**

apps/q/java/src/net/i2p/aum/I2PXmlRpcClientFactory.java

@@ -1,19 +1,16 @@
 
 package net.i2p.aum;
 
-import java.lang.*;
-import java.io.*;
-import java.util.*;
-import java.net.*;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Properties;
+import java.util.Vector;
 
-import org.apache.xmlrpc.*;
+import net.i2p.data.DataFormatException;
+import net.i2p.data.Destination;
+import net.i2p.util.Log;
 
-import net.i2p.*;
-import net.i2p.client.*;
-import net.i2p.client.streaming.*;
-import net.i2p.data.Base64;
-import net.i2p.util.*;
-import net.i2p.data.*;
+import org.apache.xmlrpc.XmlRpcClient;
 
 
 /**

apps/q/java/src/net/i2p/aum/I2PXmlRpcDemoClass.java

@@ -1,19 +1,6 @@
 
 package net.i2p.aum;
 
-import java.lang.*;
-import java.io.*;
-import java.util.*;
-import java.net.*;
-
-import org.apache.xmlrpc.*;
-
-import net.i2p.*;
-import net.i2p.client.*;
-import net.i2p.client.streaming.*;
-import net.i2p.data.Base64;
-import net.i2p.util.*;
-import net.i2p.data.*;
 
 /**
  * A simple class providing callable xmlrpc server methods, gets linked in to

apps/q/java/src/net/i2p/aum/I2PXmlRpcServer.java

@@ -1,18 +1,23 @@
 package net.i2p.aum;
 
-import java.lang.*;
-import java.io.*;
-import java.util.*;
-import java.net.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStreamWriter;
+import java.util.Date;
+import java.util.Properties;
 
-import org.apache.xmlrpc.*;
+import net.i2p.I2PAppContext;
+import net.i2p.I2PException;
+import net.i2p.client.streaming.I2PServerSocket;
+import net.i2p.client.streaming.I2PSocket;
+import net.i2p.client.streaming.I2PSocketManager;
+import net.i2p.client.streaming.I2PSocketManagerFactory;
+import net.i2p.data.DataFormatException;
+import net.i2p.data.Destination;
 
-import net.i2p.*;
-import net.i2p.client.*;
-import net.i2p.client.streaming.*;
-import net.i2p.data.Base64;
-import net.i2p.util.*;
-import net.i2p.data.*;
+import org.apache.xmlrpc.XmlRpcServer;
 
 
 /**

apps/q/java/src/net/i2p/aum/I2PXmlRpcServerFactory.java

@@ -1,18 +1,13 @@
 package net.i2p.aum;
 
-import java.lang.*;
-import java.io.*;
-import java.util.*;
-import java.net.*;
+import java.io.IOException;
+import java.util.Properties;
 
-import org.apache.xmlrpc.*;
-
-import net.i2p.*;
-import net.i2p.client.*;
-import net.i2p.client.streaming.*;
-import net.i2p.data.Base64;
-import net.i2p.util.*;
-import net.i2p.data.*;
+import net.i2p.I2PAppContext;
+import net.i2p.I2PException;
+import net.i2p.client.streaming.I2PSocketManager;
+import net.i2p.data.DataFormatException;
+import net.i2p.util.Log;
 
 
 /**

apps/q/java/src/net/i2p/aum/PrivDestination.java

@@ -1,19 +1,23 @@
 
 package net.i2p.aum;
 
-import java.lang.*;
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
 
-import net.i2p.*;
-import net.i2p.client.*;
-import net.i2p.data.*;
-
-import net.i2p.*;
-import net.i2p.client.*;
-import net.i2p.client.streaming.*;
+import net.i2p.I2PException;
+import net.i2p.client.I2PClient;
+import net.i2p.client.I2PClientFactory;
 import net.i2p.data.Base64;
-import net.i2p.util.*;
-import net.i2p.data.*;
+import net.i2p.data.DataFormatException;
+import net.i2p.data.DataStructureImpl;
+import net.i2p.data.Destination;
+import net.i2p.data.PrivateKey;
+import net.i2p.data.PublicKey;
+import net.i2p.data.SigningPrivateKey;
+import net.i2p.data.SigningPublicKey;
+import net.i2p.util.Log;
 
 /**
  * A convenience class for encapsulating and manipulating I2P private keys

apps/q/java/src/net/i2p/aum/PropertiesFile.java

@@ -6,9 +6,17 @@
 
 package net.i2p.aum;
 
-import java.lang.*;
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.NoSuchElementException;
+import java.util.Properties;
 
 /**
  * builds on Properties with methods to load/save directly to/from file

apps/q/java/src/net/i2p/aum/SimpleFile.java

@@ -1,11 +1,9 @@
 package net.i2p.aum;
 
-import java.lang.*;
-import java.io.*;
-import java.util.*;
-import java.net.*;
-
-import net.i2p.data.*;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.RandomAccessFile;
 
 /**
  * SimpleFile - subclass of File which adds some python-like

apps/q/java/src/net/i2p/aum/SimpleFile_old.java

@@ -1,11 +1,9 @@
 package net.i2p.aum;
 
-import java.lang.*;
-import java.io.*;
-import java.util.*;
-import java.net.*;
-
-import net.i2p.data.*;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
 
 /**
  * SimpleFile - subclass of File which adds some python-like

apps/q/java/src/net/i2p/aum/SimpleQueue.java

@@ -6,9 +6,7 @@
 
 package net.i2p.aum;
 
-import java.*;
-import java.lang.*;
-import java.util.*;
+import java.util.Vector;
 
 /**
  * Implements simething similar to python's 'Queue' class

apps/q/java/src/net/i2p/aum/http/HtmlPage.java

@@ -6,9 +6,9 @@
 
 package net.i2p.aum.http;
 
-import java.util.*;
+import java.util.Enumeration;
 
-import net.i2p.aum.*;
+import net.i2p.aum.DupHashtable;
 
 /**
  * Framework for building up a page of HTML by method calls alone, breaking

apps/q/java/src/net/i2p/aum/http/I2PHttpRequestHandler.java

@@ -6,15 +6,12 @@
 
 package net.i2p.aum.http;
 
-import java.lang.*;
-import java.lang.reflect.*;
-import java.util.*;
-import java.io.*;
-import java.net.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.Socket;
 
-import net.i2p.data.*;
-import net.i2p.client.*;
-import net.i2p.client.streaming.*;
+import net.i2p.client.streaming.I2PSocket;
 
 /**
  *

apps/q/java/src/net/i2p/aum/http/I2PHttpServer.java

@@ -6,15 +6,16 @@
 
 package net.i2p.aum.http;
 
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.util.Properties;
 
-import net.i2p.*;
-import net.i2p.data.*;
-import net.i2p.client.*;
-import net.i2p.client.streaming.*;
-
-import net.i2p.aum.*;
+import net.i2p.I2PException;
+import net.i2p.aum.PrivDestination;
+import net.i2p.client.streaming.I2PServerSocket;
+import net.i2p.client.streaming.I2PSocket;
+import net.i2p.client.streaming.I2PSocketManager;
+import net.i2p.client.streaming.I2PSocketManagerFactory;
+import net.i2p.data.DataFormatException;
 
 /**
  *

apps/q/java/src/net/i2p/aum/http/MiniHttpRequestHandler.java

@@ -7,12 +7,19 @@
 
 package net.i2p.aum.http;
 
-import java.net.*;
-import java.io.*;
-import java.util.*;
-import java.lang.*;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.net.URLDecoder;
+import java.util.Enumeration;
+import java.util.Vector;
 
-import net.i2p.aum.*;
+import net.i2p.aum.DupHashtable;
+import net.i2p.aum.Mimetypes;
 
 public abstract class MiniHttpRequestHandler implements Runnable {
     final static String CRLF = "\r\n";

apps/q/java/src/net/i2p/aum/http/MiniHttpServer.java

@@ -13,13 +13,13 @@ package net.i2p.aum.http;
   // server implements HTTP GET method
   //***************************************
 
-import java.net.*;
-import java.io.*;
-import java.util.*;
-import java.lang.*;
-import java.lang.reflect.*;
+import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.net.ServerSocket;
+import java.net.Socket;
 
-import org.apache.xmlrpc.*;
+import org.apache.xmlrpc.XmlRpcServer;
 
 public class MiniHttpServer extends Thread
 {

apps/q/java/src/net/i2p/aum/http/Tag.java

@@ -6,9 +6,11 @@
 
 package net.i2p.aum.http;
 
-import java.lang.*;
-import java.util.*;
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Enumeration;
+import java.util.Vector;
 
 /**
  * Base class for building up quick-n-dirty HTML by code alone;

apps/q/java/src/net/i2p/aum/q/QClientAPI.java

@@ -6,13 +6,13 @@
 
 package net.i2p.aum.q;
 
-import java.*;
-import java.io.*;
-import java.util.*;
-import java.lang.*;
-import java.net.*;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.util.Hashtable;
+import java.util.Vector;
 
-import org.apache.xmlrpc.*;
+import org.apache.xmlrpc.XmlRpcClient;
+import org.apache.xmlrpc.XmlRpcException;
 
 /**
  * <p>The official Java API for client applications wishing to access the Q

apps/q/java/src/net/i2p/aum/q/QClientNode.java

@@ -6,20 +6,18 @@
 
 package net.i2p.aum.q;
 
-import java.*;
-import java.io.*;
-import java.util.*;
-import java.lang.*;
+import java.io.File;
+import java.io.IOException;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.Vector;
 
-import org.apache.xmlrpc.*;
-
-import net.i2p.*;
-import net.i2p.data.*;
-
-import net.i2p.aum.*;
-import net.i2p.aum.http.*;
-
-import HTML.Template;
+import net.i2p.I2PException;
+import net.i2p.aum.Mimetypes;
+import net.i2p.aum.http.I2PHttpServer;
+import net.i2p.aum.http.MiniHttpServer;
+import net.i2p.data.DataFormatException;
 
 /**
  * Implements Q client nodes.

apps/q/java/src/net/i2p/aum/q/QClientWebInterface.java

@@ -6,16 +6,20 @@
 
 package net.i2p.aum.q;
 
-import java.lang.*;
-import java.lang.reflect.*;
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.Socket;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Vector;
 
+import net.i2p.aum.http.HtmlPage;
+import net.i2p.aum.http.I2PHttpRequestHandler;
+import net.i2p.aum.http.MiniHttpServer;
 import HTML.Template;
 
-import net.i2p.aum.http.*;
-
 
 /**
  * Request handler for Q Client nodes that listens within I2P

apps/q/java/src/net/i2p/aum/q/QConsole.java

@@ -6,16 +6,23 @@
 
 package net.i2p.aum.q;
 
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.URLDecoder;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Properties;
+import java.util.Vector;
 
-import javax.servlet.*;
-import javax.servlet.http.*;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
-import org.apache.xmlrpc.*;
-
-import HTML.*; 
+import org.apache.xmlrpc.XmlRpcClient;
 
 /**
  *

apps/q/java/src/net/i2p/aum/q/QDataItem.java

@@ -6,20 +6,17 @@
 
 package net.i2p.aum.q;
 
-import java.*;
-import java.lang.*;
-import java.util.*;
-import java.io.*;
-import java.net.*;
+import java.io.Serializable;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.TreeSet;
 
-import net.i2p.*;
-import net.i2p.*;
-import net.i2p.client.*;
-import net.i2p.client.streaming.*;
-import net.i2p.data.*;
-import net.i2p.crypto.*;
-
-import net.i2p.aum.*;
+import net.i2p.aum.Mimetypes;
+import net.i2p.crypto.DSAEngine;
+import net.i2p.data.DataFormatException;
+import net.i2p.data.Signature;
+import net.i2p.data.SigningPrivateKey;
+import net.i2p.data.SigningPublicKey;
 
 
 /**

apps/q/java/src/net/i2p/aum/q/QIndexFile.java

@@ -6,10 +6,13 @@
 
 package net.i2p.aum.q;
 
-import java.*;
-import java.lang.*;
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.util.Date;
+import java.util.Iterator;
 
 /**
  * <p>Implements a binary-searchable file for storing (time, hash) records.

apps/q/java/src/net/i2p/aum/q/QIndexFileIterator.java

@@ -6,8 +6,8 @@
 
 package net.i2p.aum.q;
 
-import java.*;
-import java.util.*;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
 
 /**
  * Implements an Iterator for index files

apps/q/java/src/net/i2p/aum/q/QKademliaComparator.java

@@ -6,8 +6,8 @@
 
 package net.i2p.aum.q;
 
-import java.util.*;
-import java.math.*;
+import java.math.BigInteger;
+import java.util.Comparator;
 
 /**
  * implements a Comparator class which compares two QPeerRec objects

apps/q/java/src/net/i2p/aum/q/QMgr.java

@@ -6,16 +6,22 @@
 
 package net.i2p.aum.q;
 
-import java.*;
-import java.lang.*;
-import java.io.*;
-import java.util.*;
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Properties;
+import java.util.Vector;
 
-import org.apache.xmlrpc.*;
+import net.i2p.aum.I2PXmlRpcClientFactory;
+import net.i2p.aum.PropertiesFile;
+import net.i2p.aum.SimpleFile;
+import net.i2p.data.Destination;
 
-import net.i2p.data.*;
-
-import net.i2p.aum.*;
+import org.apache.xmlrpc.XmlRpcClient;
 
 /**
  * <p>Command Line Interface (CLI) for starting/stopping Q nodes,

apps/q/java/src/net/i2p/aum/q/QNode.java

@@ -6,21 +6,46 @@
 
 package net.i2p.aum.q;
 
-import java.lang.*;
-import java.io.*;
-import java.util.*;
-import java.util.jar.*;
-import java.net.*;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.RandomAccessFile;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Properties;
+import java.util.Vector;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
 
-import org.apache.xmlrpc.*;
+import net.i2p.I2PAppContext;
+import net.i2p.I2PException;
+import net.i2p.aum.EmbargoedQueue;
+import net.i2p.aum.I2PXmlRpcClient;
+import net.i2p.aum.I2PXmlRpcClientFactory;
+import net.i2p.aum.I2PXmlRpcServer;
+import net.i2p.aum.PrivDestination;
+import net.i2p.aum.PropertiesFile;
+import net.i2p.aum.SimpleFile;
+import net.i2p.aum.SimpleSemaphore;
+import net.i2p.client.I2PClient;
+import net.i2p.client.I2PClientFactory;
+import net.i2p.data.DataFormatException;
+import net.i2p.data.Destination;
 
-import net.i2p.*;
-import net.i2p.client.*;
-import net.i2p.client.streaming.*;
-import net.i2p.data.*;
-import net.i2p.crypto.*;
-
-import net.i2p.aum.*;
+import org.apache.xmlrpc.XmlRpcException;
 
 //import gnu.crypto.hash.*;
 

apps/q/java/src/net/i2p/aum/q/QPeer.java

@@ -6,12 +6,12 @@
 
 package net.i2p.aum.q;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.Serializable;
 
-import net.i2p.*;
-import net.i2p.data.*;
-import net.i2p.util.*;
-import net.i2p.aum.*;
+import net.i2p.aum.PropertiesFile;
+import net.i2p.data.DataFormatException;
+import net.i2p.data.Destination;
 
 /**
  * Wrapper for a peer record file.

apps/q/java/src/net/i2p/aum/q/QServerMethods.java

@@ -6,9 +6,9 @@
 
 package net.i2p.aum.q;
 
-import java.lang.*;
-import java.util.*;
-import java.io.*;
+import java.io.IOException;
+import java.util.Hashtable;
+import java.util.Vector;
 
 
 /**

apps/q/java/src/net/i2p/aum/q/QServerNode.java

@@ -6,17 +6,14 @@
 
 package net.i2p.aum.q;
 
-import java.*;
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.util.Properties;
 
-import org.apache.xmlrpc.*;
-
-import net.i2p.*;
-import net.i2p.data.*;
-
-import net.i2p.aum.*;
-import net.i2p.aum.http.*;
+import net.i2p.I2PException;
+import net.i2p.aum.I2PXmlRpcServerFactory;
+import net.i2p.aum.http.I2PHttpServer;
+import net.i2p.aum.http.MiniHttpServer;
+import net.i2p.data.DataFormatException;
 
 /**
  *

apps/q/java/src/net/i2p/aum/q/QTest.java

@@ -6,15 +6,11 @@
 
 package net.i2p.aum.q;
 
-import java.*;
-import java.lang.*;
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.util.Hashtable;
 
-import net.i2p.*;
-import net.i2p.data.*;
-
-import net.i2p.aum.*;
+import net.i2p.I2PException;
+import net.i2p.data.DataFormatException;
 
 
 /**

apps/q/java/src/net/i2p/aum/q/QUtil.java

@@ -6,10 +6,11 @@
 
 package net.i2p.aum.q;
 
-import java.*;
-
-import net.i2p.*;
-import net.i2p.data.*;
+import net.i2p.I2PAppContext;
+import net.i2p.data.Base64;
+import net.i2p.data.DataFormatException;
+import net.i2p.data.SigningPrivateKey;
+import net.i2p.data.SigningPublicKey;
 
 /**
  * A general collection of static utility methods

apps/q/java/src/net/i2p/aum/q/QWorkerThread.java

@@ -6,10 +6,12 @@
 
 package net.i2p.aum.q;
 
-import java.util.*;
-import java.io.*;
+import java.io.File;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Vector;
 
-import net.i2p.aum.*;
+import net.i2p.aum.SimpleFile;
 
 /**
  * Thread which performs a single background job for a nod

apps/q/java/src/net/i2p/aum/test/HttpServerTest.java

@@ -4,8 +4,8 @@
  */
 package net.i2p.aum.test;
 
-import java.util.*;
-import net.i2p.aum.http.*;
+import net.i2p.aum.http.MiniHttpRequestPage;
+import net.i2p.aum.http.MiniHttpServer;
 
 public class HttpServerTest extends MiniHttpRequestPage {
     

apps/q/java/src/net/i2p/aum/util/Ico2Java.java

@@ -1,9 +1,9 @@
 package net.i2p.aum.util;
 
-import java.*;
-import java.io.*;
-import java.util.*;
-import java.lang.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileWriter;
+import java.io.InputStream;
 
 /**
  * development utility - converts Favicon.ico to

apps/q/java/src/net/i2p/i2ptunnel/I2PTunnelXMLWrapper.java

@@ -1,20 +1,12 @@
 package net.i2p.i2ptunnel;
 
-import org.apache.xmlrpc.*;
-import java.lang.*;
-import java.util.*;
-import java.io.*;
-import java.lang.reflect.*;
-
-
-import net.i2p.*;
-import net.i2p.client.*;
-import net.i2p.client.streaming.*;
-import net.i2p.data.Base64;
-import net.i2p.util.*;
-import net.i2p.util.*;
-import net.i2p.data.*;
-import net.i2p.i2ptunnel.*;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.lang.reflect.Array;
+import java.util.Hashtable;
+import java.util.Vector;
 
 
 /**

apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHandler.java

@@ -1,7 +1,7 @@
 package net.i2p.router.web;
 
-import java.io.ByteArrayInputStream;
 import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.HashSet;