0.6.1.29 released

* readme.html - Add inproxy.tino.i2p, replace search.i2p with eepsites.i2p,
      tweak the eepsite and troubleshooting sections

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

@@ -32,6 +32,7 @@ public class BitField
 
   private final byte[] bitfield;
   private final int size;
+  private int count;
 
   /**
    * Creates a new BitField that represents <code>size</code> unset bits.
@@ -41,6 +42,7 @@ public class BitField
     this.size = size;
     int arraysize = ((size-1)/8)+1;
     bitfield = new byte[arraysize];
+    this.count = 0;
   }
 
   /**
@@ -60,6 +62,11 @@ public class BitField
     // XXX - More correct would be to check that unused bits are
     // cleared or clear them explicitly ourselves.
     System.arraycopy(bitfield, 0, this.bitfield, 0, arraysize);
+
+    this.count = 0;
+    for (int i = 0; i < size; i++)
+      if (get(i))
+        this.count++;
   }
 
   /**
@@ -95,7 +102,10 @@ public class BitField
       throw new IndexOutOfBoundsException(Integer.toString(bit));
     int index = bit/8;
     int mask = 128 >> (bit % 8);
-    bitfield[index] |= mask;
+    if ((bitfield[index] & mask) == 0) {
+      count++;
+      bitfield[index] |= mask;
+    }
   }
 
   /**
@@ -114,6 +124,22 @@ public class BitField
     return (bitfield[index] & mask) != 0;
   }
 
+  /**
+   * Return the number of set bits.
+   */
+  public int count()
+  {
+    return count;
+  }
+
+  /**
+   * Return true if all bits are set.
+   */
+  public boolean complete()
+  {
+    return count >= size;
+  }
+
   public String toString()
   {
     // Not very efficient
@@ -129,4 +155,5 @@ public class BitField
 
     return sb.toString();
   }
+
 }

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

@@ -33,6 +33,7 @@ public class I2PSnarkUtil {
     private I2PSocketManager _manager;
     private boolean _configured;
     private Set _shitlist;
+    private int _maxUploaders;
     
     private I2PSnarkUtil() {
         _context = I2PAppContext.getGlobalContext();
@@ -42,6 +43,7 @@ public class I2PSnarkUtil {
         setI2CPConfig("127.0.0.1", 7654, null);
         _shitlist = new HashSet(64);
         _configured = false;
+        _maxUploaders = Snark.MAX_TOTAL_UPLOADERS;
     }
     
     /**
@@ -72,12 +74,18 @@ public class I2PSnarkUtil {
         _configured = true;
     }
     
+    public void setMaxUploaders(int limit) {
+        _maxUploaders = limit;
+        _configured = true;
+    }
+    
     public String getI2CPHost() { return _i2cpHost; }
     public int getI2CPPort() { return _i2cpPort; }
     public Map getI2CPOptions() { return _opts; }
     public String getEepProxyHost() { return _proxyHost; }
     public int getEepProxyPort() { return _proxyPort; }
     public boolean getEepProxySet() { return _shouldProxy; }
+    public int getMaxUploaders() { return _maxUploaders; }
     
     /**
      * Connect to the router, if we aren't already
@@ -93,10 +101,16 @@ public class I2PSnarkUtil {
             }
             if (opts.getProperty("inbound.nickname") == null)
                 opts.setProperty("inbound.nickname", "I2PSnark");
+            if (opts.getProperty("outbound.nickname") == null)
+                opts.setProperty("outbound.nickname", "I2PSnark");
             if (opts.getProperty("i2p.streaming.inactivityTimeout") == null)
                 opts.setProperty("i2p.streaming.inactivityTimeout", "90000");
             if (opts.getProperty("i2p.streaming.inactivityAction") == null)
                 opts.setProperty("i2p.streaming.inactivityAction", "2"); // 1 == disconnect, 2 == ping
+            if (opts.getProperty("i2p.streaming.initialWindowSize") == null)
+                opts.setProperty("i2p.streaming.initialWindowSize", "1");
+            if (opts.getProperty("i2p.streaming.slowStartGrowthRateFactor") == null)
+                opts.setProperty("i2p.streaming.slowStartGrowthRateFactor", "1");
             //if (opts.getProperty("i2p.streaming.writeTimeout") == null)
             //    opts.setProperty("i2p.streaming.writeTimeout", "90000");
             //if (opts.getProperty("i2p.streaming.readTimeout") == null)

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

@@ -54,6 +54,10 @@ public class Peer implements Comparable
   private boolean deregister = true;
   private static long __id;
   private long _id;
+  final static long CHECK_PERIOD = PeerCoordinator.CHECK_PERIOD; // 40 seconds
+  final static int RATE_DEPTH = PeerCoordinator.RATE_DEPTH; // make following arrays RATE_DEPTH long
+  private long uploaded_old[] = {-1,-1,-1,-1,-1,-1};
+  private long downloaded_old[] = {-1,-1,-1,-1,-1,-1};
 
   /**
    * Creates a disconnected peer given a PeerID, your own id and the
@@ -318,6 +322,14 @@ public class Peer implements Comparable
     PeerState s = state;
     if (s != null)
       {
+        // try to save partial piece
+        if (this.deregister) {
+          PeerListener p = state.listener;
+          if (p != null) {
+            p.savePeerPartial(state);
+            p.markUnrequested(this);
+          }
+        }
         state = null;
 
         PeerConnectionIn in = s.in;
@@ -458,4 +470,94 @@ public class Peer implements Comparable
           return -1; //"no state";
       }
   }
+
+  /**
+   * Send keepalive
+   */
+  public void keepAlive()
+  {
+    PeerState s = state;
+    if (s != null)
+      s.keepAlive();
+  }
+
+  /**
+   * Retransmit outstanding requests if necessary
+   */
+  public void retransmitRequests()
+  {
+    PeerState s = state;
+    if (s != null)
+      s.retransmitRequests();
+  }
+
+  /**
+   * Return how much the peer has
+   */
+  public int completed()
+  {
+    PeerState s = state;
+    if (s == null || s.bitfield == null)
+        return 0;
+    return s.bitfield.count();
+  }
+
+  /**
+   * Return if a peer is a seeder
+   */
+  public boolean isCompleted()
+  {
+    PeerState s = state;
+    if (s == null || s.bitfield == null)
+        return false;
+    return s.bitfield.complete();
+  }
+
+  /**
+   * Push the total uploaded/downloaded onto a RATE_DEPTH deep stack
+   */
+  public void setRateHistory(long up, long down)
+  {
+    setRate(up, uploaded_old);
+    setRate(down, downloaded_old);
+  }
+
+  private void setRate(long val, long array[])
+  {
+    synchronized(array) {
+      for (int i = RATE_DEPTH-1; i > 0; i--)
+        array[i] = array[i-1];
+      array[0] = val;
+    }
+  }
+
+  /**
+   * Returns the 4-minute-average rate in Bps
+   */
+  public long getUploadRate()
+  {
+    return getRate(uploaded_old);
+  }
+
+  public long getDownloadRate()
+  {
+    return getRate(downloaded_old);
+  }
+
+  private long getRate(long array[])
+  {
+    long rate = 0;
+    int i = 0;
+    synchronized(array) {
+      for ( ; i < RATE_DEPTH; i++){
+        if (array[i] < 0)
+            break;
+        rate += array[i];
+      }
+    }
+    if (i == 0)
+        return 0;
+    return rate / (i * CHECK_PERIOD / 1000);
+  }
+
 }

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

@@ -41,6 +41,17 @@ class PeerCheckerTask extends TimerTask
   {
     synchronized(coordinator.peers)
       {
+        Iterator it = coordinator.peers.iterator();
+        if ((!it.hasNext()) || coordinator.halted()) {
+          coordinator.peerCount = 0;
+          coordinator.interestedAndChoking = 0;
+          coordinator.setRateHistory(0, 0);
+          coordinator.uploaders = 0;
+          if (coordinator.halted())
+            cancel();
+          return;
+        }
+
         // Calculate total uploading and worst downloader.
         long worstdownload = Long.MAX_VALUE;
         Peer worstDownloader = null;
@@ -48,10 +59,7 @@ class PeerCheckerTask extends TimerTask
         int peers = 0;
         int uploaders = 0;
         int downloaders = 0;
-        int interested = 0;
-        int interesting = 0;
-        int choking = 0;
-        int choked = 0;
+        int removedCount = 0;
 
         long uploaded = 0;
         long downloaded = 0;
@@ -59,8 +67,7 @@ class PeerCheckerTask extends TimerTask
         // Keep track of peers we remove now,
         // we will add them back to the end of the list.
         List removed = new ArrayList();
-
-        Iterator it = coordinator.peers.iterator();
+        int uploadLimit = coordinator.allowedUploaders();
         while (it.hasNext())
           {
             Peer peer = (Peer)it.next();
@@ -80,21 +87,12 @@ class PeerCheckerTask extends TimerTask
               uploaders++;
             if (!peer.isChoked() && peer.isInteresting())
               downloaders++;
-            if (peer.isInterested())
-              interested++;
-            if (peer.isInteresting())
-              interesting++;
-            if (peer.isChoking())
-              choking++;
-            if (peer.isChoked())
-              choked++;
 
-            // XXX - We should calculate the up/download rate a bit
-            // more intelligently
             long upload = peer.getUploaded();
             uploaded += upload;
             long download = peer.getDownloaded();
             downloaded += download;
+	    peer.setRateHistory(upload, download);
             peer.resetCounters();
 
             if (Snark.debug >= Snark.DEBUG)
@@ -112,8 +110,9 @@ class PeerCheckerTask extends TimerTask
             // 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 >= PeerCoordinator.MAX_UPLOADERS
-                && interested > PeerCoordinator.MAX_UPLOADERS
+            if (((coordinator.uploaders == uploadLimit
+                && coordinator.interestedAndChoking > 0)
+                || coordinator.uploaders > uploadLimit)
                 && !peer.isChoking())
               {
                 // Check if it still wants pieces from us.
@@ -130,7 +129,7 @@ class PeerCheckerTask extends TimerTask
                     it.remove();
                     removed.add(peer);
                   }
-                else if (peer.isChoked())
+                else if (peer.isInteresting() && peer.isChoked())
                   {
                     // If they are choking us make someone else a downloader
                     if (Snark.debug >= Snark.DEBUG)
@@ -138,6 +137,21 @@ class PeerCheckerTask extends TimerTask
                     peer.setChoking(true);
                     uploaders--;
                     coordinator.uploaders--;
+                    removedCount++;
+                    
+                    // Put it at the back of the list
+                    it.remove();
+                    removed.add(peer);
+                  }
+                else if (!peer.isInteresting() && !coordinator.completed())
+                  {
+                    // If they aren't interesting make someone else a downloader
+                    if (Snark.debug >= Snark.DEBUG)
+                      Snark.debug("Choke uninteresting peer: " + peer, Snark.DEBUG);
+                    peer.setChoking(true);
+                    uploaders--;
+                    coordinator.uploaders--;
+                    removedCount++;
                     
                     // Put it at the back of the list
                     it.remove();
@@ -154,27 +168,38 @@ class PeerCheckerTask extends TimerTask
                     peer.setChoking(true);
                     uploaders--;
                     coordinator.uploaders--;
+                    removedCount++;
                     
                     // Put it at the back of the list
                     it.remove();
                     removed.add(peer);
                   }
-                else if (!peer.isChoking() && download < worstdownload)
+                else if (peer.isInteresting() && !peer.isChoked() &&
+                         download < worstdownload)
                   {
                     // Make sure download is good if we are uploading
                     worstdownload = download;
                     worstDownloader = peer;
                   }
+                else if (upload < worstdownload && coordinator.completed())
+                  {
+                    // Make sure upload is good if we are seeding
+                    worstdownload = upload;
+                    worstDownloader = peer;
+                  }
               }
+            peer.retransmitRequests();
+            peer.keepAlive();
           }
 
         // Resync actual uploaders value
         // (can shift a bit by disconnecting peers)
         coordinator.uploaders = uploaders;
 
-        // Remove the worst downloader if needed.
-        if (uploaders >= PeerCoordinator.MAX_UPLOADERS
-            && interested > PeerCoordinator.MAX_UPLOADERS
+        // Remove the worst downloader if needed. (uploader if seeding)
+        if (((uploaders == uploadLimit
+            && coordinator.interestedAndChoking > 0)
+            || uploaders > uploadLimit)
             && worstDownloader != null)
           {
             if (Snark.debug >= Snark.DEBUG)
@@ -183,6 +208,7 @@ class PeerCheckerTask extends TimerTask
 
             worstDownloader.setChoking(true);
             coordinator.uploaders--;
+            removedCount++;
 
             // Put it at the back of the list
             coordinator.peers.remove(worstDownloader);
@@ -196,9 +222,11 @@ class PeerCheckerTask extends TimerTask
         // Put peers back at the end of the list that we removed earlier.
         coordinator.peers.addAll(removed);
         coordinator.peerCount = coordinator.peers.size();
+        coordinator.interestedAndChoking += removedCount;
+
+	// store the rates
+	coordinator.setRateHistory(uploaded, downloaded);
+
       }
-    if (coordinator.halted()) {
-        cancel();
-    }
   }
 }

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

@@ -33,7 +33,7 @@ class PeerConnectionIn implements Runnable
   private final DataInputStream din;
 
   private Thread thread;
-  private boolean quit;
+  private volatile boolean quit;
 
   public PeerConnectionIn(Peer peer, DataInputStream din)
   {
@@ -51,6 +51,13 @@ class PeerConnectionIn implements Runnable
     Thread t = thread;
     if (t != null)
       t.interrupt();
+    if (din != null) {
+        try {
+            din.close();
+        } catch (IOException ioe) {
+            _log.warn("Error closing the stream from " + peer, ioe);
+        }
+    }
   }
 
   public void run()

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

@@ -72,6 +72,16 @@ class PeerConnectionOut implements Runnable
           {
             Message m = null;
             PeerState state = null;
+            boolean shouldFlush;
+            synchronized(sendQueue)
+              {
+                shouldFlush = !quit && peer.isConnected() && sendQueue.isEmpty();
+              }
+            if (shouldFlush)
+                // Make sure everything will reach the other side.
+                // flush while not holding lock, could take a long time
+                dout.flush();
+
             synchronized(sendQueue)
               {
                 while (!quit && peer.isConnected() && sendQueue.isEmpty())
@@ -79,7 +89,8 @@ class PeerConnectionOut implements Runnable
                     try
                       {
                         // Make sure everything will reach the other side.
-                        dout.flush();
+                        // don't flush while holding lock, could take a long time
+                        // dout.flush();
                         
                         // Wait till more data arrives.
                         sendQueue.wait(60*1000);
@@ -197,10 +208,12 @@ class PeerConnectionOut implements Runnable
   /**
    * Adds a message to the sendQueue and notifies the method waiting
    * on the sendQueue to change.
+   * If a PIECE message only, add a timeout.
    */
   private void addMessage(Message m)
   {
-    SimpleTimer.getInstance().addEvent(new RemoveTooSlow(m), SEND_TIMEOUT);
+    if (m.type == Message.PIECE)
+      SimpleTimer.getInstance().addEvent(new RemoveTooSlow(m), SEND_TIMEOUT);
     synchronized(sendQueue)
       {
         sendQueue.add(m);
@@ -259,7 +272,13 @@ class PeerConnectionOut implements Runnable
   {
     Message m = new Message();
     m.type = Message.KEEP_ALIVE;
-    addMessage(m);
+//  addMessage(m);
+    synchronized(sendQueue)
+      {
+        if(sendQueue.isEmpty())
+          sendQueue.add(m);
+        sendQueue.notifyAll();
+      }
   }
 
   void sendChoke(boolean choke)
@@ -318,6 +337,23 @@ class PeerConnectionOut implements Runnable
     addMessage(m);
   }
 
+  /** reransmit requests not received in 7m */
+  private static final int REQ_TIMEOUT = (2 * SEND_TIMEOUT) + (60 * 1000);
+  void retransmitRequests(List requests)
+  {
+    long now = System.currentTimeMillis();
+    Iterator it = requests.iterator();
+    while (it.hasNext())
+      {
+        Request req = (Request)it.next();
+        if(now > req.sendTime + REQ_TIMEOUT) {
+          if (_log.shouldLog(Log.DEBUG))
+              _log.debug("Retransmit request " + req + " to peer " + peer);
+          sendRequest(req);
+        }
+      }
+  }
+
   void sendRequests(List requests)
   {
     Iterator it = requests.iterator();
@@ -330,12 +366,30 @@ class PeerConnectionOut implements Runnable
 
   void sendRequest(Request req)
   {
+    // Check for duplicate requests to deal with fibrillating i2p-bt
+    // (multiple choke/unchokes received cause duplicate requests in the queue)
+    synchronized(sendQueue)
+      {
+        Iterator it = sendQueue.iterator();
+        while (it.hasNext())
+          {
+            Message m = (Message)it.next();
+            if (m.type == Message.REQUEST && m.piece == req.piece &&
+                m.begin == req.off && m.length == req.len)
+              {
+                if (_log.shouldLog(Log.DEBUG))
+                  _log.debug("Discarding duplicate request " + req + " to peer " + peer);
+                return;
+              }
+          }
+      }
     Message m = new Message();
     m.type = Message.REQUEST;
     m.piece = req.piece;
     m.begin = req.off;
     m.length = req.len;
     addMessage(m);
+    req.sendTime = System.currentTimeMillis();
   }
 
   void sendPiece(int piece, int begin, int length, byte[] bytes)
@@ -346,7 +400,7 @@ class PeerConnectionOut implements Runnable
     m.begin = begin;
     m.length = length;
     m.data = bytes;
-    m.off = begin;
+    m.off = 0;
     m.len = length;
     addMessage(m);
   }

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

@@ -37,19 +37,23 @@ public class PeerCoordinator implements PeerListener
   final Snark snark;
 
   // package local for access by CheckDownLoadersTask
-  final static long CHECK_PERIOD = 20*1000; // 20 seconds
+  final static long CHECK_PERIOD = 40*1000; // 40 seconds
   final static int MAX_CONNECTIONS = 24;
-  final static int MAX_UPLOADERS = 12; // i2p: might as well balance it out
+  final static int MAX_UPLOADERS = 4;
 
   // Approximation of the number of current uploaders.
   // Resynced by PeerChecker once in a while.
   int uploaders = 0;
+  int interestedAndChoking = 0;
 
   // final static int MAX_DOWNLOADERS = MAX_CONNECTIONS;
   // int downloaders = 0;
 
   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};
 
   // synchronize on this when changing peers or downloaders
   final List peers = new ArrayList();
@@ -62,7 +66,7 @@ public class PeerCoordinator implements PeerListener
   private final byte[] id;
 
   // Some random wanted pieces
-  private final List wantedPieces;
+  private List wantedPieces;
 
   private boolean halted = false;
 
@@ -80,6 +84,15 @@ public class PeerCoordinator implements PeerListener
     this.listener = listener;
     this.snark = torrent;
 
+    setWantedPieces();
+
+    // Install a timer to check the uploaders.
+    timer.schedule(new PeerCheckerTask(this), CHECK_PERIOD, CHECK_PERIOD);
+  }
+  
+  // only called externally from Storage after the double-check fails
+  public void setWantedPieces()
+  {
     // Make a list of pieces
     wantedPieces = new ArrayList();
     BitField bitfield = storage.getBitField();
@@ -87,14 +100,20 @@ public class PeerCoordinator implements PeerListener
       if (!bitfield.get(i))
         wantedPieces.add(new Piece(i));
     Collections.shuffle(wantedPieces);
-
-    // Install a timer to check the uploaders.
-    timer.schedule(new PeerCheckerTask(this), CHECK_PERIOD, CHECK_PERIOD);
   }
-  
+
   public Storage getStorage() { return storage; }
   public CoordinatorListener getListener() { return listener; }
 
+  // for web page detailed stats
+  public List peerList()
+  {
+    synchronized(peers)
+      {
+        return new ArrayList(peers);
+      }
+  }
+
   public byte[] getID()
   {
     return id;
@@ -123,7 +142,7 @@ public class PeerCoordinator implements PeerListener
   public long getLeft()
   {
     // XXX - Only an approximation.
-    return storage.needed() * metainfo.getPieceLength(0);
+    return ((long) storage.needed()) * metainfo.getPieceLength(0);
   }
 
   /**
@@ -142,6 +161,47 @@ public class PeerCoordinator implements PeerListener
     return downloaded;
   }
 
+  /**
+   * Push the total uploaded/downloaded onto a RATE_DEPTH deep stack
+   */
+  public void setRateHistory(long up, long down)
+  {
+    setRate(up, uploaded_old);
+    setRate(down, downloaded_old);
+  }
+
+  private static void setRate(long val, long array[])
+  {
+    synchronized(array) {
+      for (int i = RATE_DEPTH-1; i > 0; i--)
+        array[i] = array[i-1];
+      array[0] = val;
+    }
+  }
+
+  /**
+   * Returns the 4-minute-average rate in Bps
+   */
+  public long getDownloadRate()
+  {
+    return getRate(downloaded_old);
+  }
+
+  public long getUploadRate()
+  {
+    return getRate(uploaded_old);
+  }
+
+  private long getRate(long array[])
+  {
+    long rate = 0;
+    synchronized(array) {
+      for (int i = 0; i < RATE_DEPTH; i++)
+        rate += array[i];
+    }
+    return rate / (RATE_DEPTH * CHECK_PERIOD / 1000);
+  }
+
   public MetaInfo getMetaInfo()
   {
     return metainfo;
@@ -177,6 +237,8 @@ public class PeerCoordinator implements PeerListener
         peer.disconnect();
         removePeerFromPieces(peer);
     }
+    // delete any saved orphan partial piece
+    savedRequest = null;
   }
 
   public void connected(Peer peer)
@@ -191,8 +253,10 @@ public class PeerCoordinator implements PeerListener
     synchronized(peers)
       {
         Peer old = peerIDInList(peer.getPeerID(), peers);
-        if ( (old != null) && (old.getInactiveTime() > 2*60*1000) ) {
-            // idle for 2 minutes, kill the old con
+        if ( (old != null) && (old.getInactiveTime() > 4*60*1000) ) {
+            // idle for 4 minutes, kill the old con (64KB/4min = 273B/sec minimum for one block)
+            if (_log.shouldLog(Log.WARN))
+              _log.warn("Remomving old peer: " + peer + ": " + old + ", inactive for " + old.getInactiveTime());
             peers.remove(old);
             toDisconnect = old;
             old = null;
@@ -201,6 +265,7 @@ public class PeerCoordinator implements PeerListener
           {
             if (_log.shouldLog(Log.WARN))
               _log.warn("Already connected to: " + peer + ": " + old + ", inactive for " + old.getInactiveTime());
+            // toDisconnect = peer to get out of synchronized(peers)
             peer.disconnect(false); // Don't deregister this connection/peer.
           }
         else
@@ -235,12 +300,13 @@ public class PeerCoordinator implements PeerListener
     return null;
   }
 
-  public void addPeer(final Peer peer)
+// returns true if actual attempt to add peer occurs
+  public boolean addPeer(final Peer peer)
   {
     if (halted)
       {
         peer.disconnect(false);
-        return;
+        return false;
       }
 
     boolean need_more;
@@ -265,6 +331,7 @@ public class PeerCoordinator implements PeerListener
           };
         String threadName = peer.toString();
         new I2PThread(r, threadName).start();
+        return true;
       }
     else
       if (_log.shouldLog(Log.DEBUG)) {
@@ -274,6 +341,7 @@ public class PeerCoordinator implements PeerListener
           _log.info("MAX_CONNECTIONS = " + MAX_CONNECTIONS
                     + " not accepting extra peer: " + peer);
       }
+      return false;
   }
 
 
@@ -285,34 +353,40 @@ public class PeerCoordinator implements PeerListener
     // other peer that are interested, but are choking us.
     List interested = new LinkedList();
     synchronized (peers) {
+        int count = 0;
+        int unchokedCount = 0;
+        int maxUploaders = allowedUploaders();
         Iterator it = peers.iterator();
         while (it.hasNext())
           {
             Peer peer = (Peer)it.next();
-            boolean remove = false;
-            if (uploaders < MAX_UPLOADERS
-                && peer.isChoking()
-                && peer.isInterested())
+            if (peer.isChoking() && peer.isInterested())
               {
-                if (!peer.isChoked())
-                  interested.add(0, peer);
-                else
-                  interested.add(peer);
+                count++;
+                if (uploaders < maxUploaders)
+                  {
+                    if (!peer.isChoked())
+                      interested.add(unchokedCount++, peer);
+                    else
+                      interested.add(peer);
+                  }
               }
           }
 
-        while (uploaders < MAX_UPLOADERS && interested.size() > 0)
+        while (uploaders < maxUploaders && interested.size() > 0)
           {
             Peer peer = (Peer)interested.remove(0);
             if (_log.shouldLog(Log.DEBUG))
               _log.debug("Unchoke: " + peer);
             peer.setChoking(false);
             uploaders++;
+            count--;
             // Put peer back at the end of the list.
             peers.remove(peer);
             peers.add(peer);
             peerCount = peers.size();
           }
+        interestedAndChoking = count;
     }
   }
 
@@ -351,9 +425,10 @@ public class PeerCoordinator implements PeerListener
           {
             Piece p = (Piece)it.next();
             int i = p.getId();
-            if (bitfield.get(i))
+            if (bitfield.get(i)) {
               p.addPeer(peer);
               return true;
+            }
           }
       }
     return false;
@@ -392,6 +467,8 @@ public class PeerCoordinator implements PeerListener
         
         //Only request a piece we've requested before if there's no other choice.
         if (piece == null) {
+            // let's not all get on the same piece
+            Collections.shuffle(requested);
             Iterator it2 = requested.iterator();
             while (piece == null && it2.hasNext())
               {
@@ -403,9 +480,17 @@ public class PeerCoordinator implements PeerListener
               }
             if (piece == null) {
                 if (_log.shouldLog(Log.WARN))
-                    _log.warn("nothing to even rerequest from " + peer + ": requested = " + requested 
-                              + " wanted = " + wantedPieces + " peerHas = " + havePieces);
+                    _log.warn("nothing to even rerequest from " + peer + ": requested = " + requested);
+                //  _log.warn("nothing to even rerequest from " + peer + ": requested = " + requested 
+                //            + " wanted = " + wantedPieces + " peerHas = " + havePieces);
                 return -1; //If we still can't find a piece we want, so be it.
+            } else {
+                // Should be a lot smarter here - limit # of parallel attempts and
+                // share blocks rather than starting from 0 with each peer.
+                // This is where the flaws of the snark data model are really exposed.
+                // Could also randomize within the duplicate set rather than strict rarest-first
+                if (_log.shouldLog(Log.DEBUG))
+                    _log.debug("parallel request (end game?) for " + peer + ": piece = " + piece);
             }
         }
         piece.setRequested(true);
@@ -417,14 +502,14 @@ public class PeerCoordinator implements PeerListener
    * Returns a byte array containing the requested piece or null of
    * the piece is unknown.
    */
-  public byte[] gotRequest(Peer peer, int piece)
+  public byte[] gotRequest(Peer peer, int piece, int off, int len)
   {
     if (halted)
       return null;
 
     try
       {
-        return storage.getPiece(piece);
+        return storage.getPiece(piece, off, len);
       }
     catch (IOException ioe)
       {
@@ -504,14 +589,27 @@ public class PeerCoordinator implements PeerListener
       }
 
     // Announce to the world we have it!
+    // Disconnect from other seeders when we get the last piece
     synchronized(peers)
       {
+        List toDisconnect = new ArrayList(); 
         Iterator it = peers.iterator();
         while (it.hasNext())
           {
             Peer p = (Peer)it.next();
             if (p.isConnected())
-              p.have(piece);
+              {
+                  if (completed() && p.isCompleted())
+                      toDisconnect.add(p);
+                  else
+                      p.have(piece);
+              }
+          }
+        it = toDisconnect.iterator();
+        while (it.hasNext())
+          {
+            Peer p = (Peer)it.next();
+            p.disconnect(true);
           }
       }
     
@@ -533,7 +631,7 @@ public class PeerCoordinator implements PeerListener
       {
         synchronized(peers)
           {
-            if (uploaders < MAX_UPLOADERS)
+            if (uploaders < allowedUploaders())
               {
                 if(peer.isChoking())
                   {
@@ -582,4 +680,141 @@ public class PeerCoordinator implements PeerListener
           }
       } 
   }
+
+
+  /** Simple method to save a partial piece on peer disconnection
+   *  and hopefully restart it later.
+   *  Only one partial piece is saved at a time.
+   *  Replace it if a new one is bigger or the old one is too old.
+   *  Storage method is private so we can expand to save multiple partials
+   *  if we wish.
+   */
+  private Request savedRequest = null;
+  private long savedRequestTime = 0;
+  public void savePeerPartial(PeerState state)
+  {
+    if (halted)
+      return;
+    Request req = state.getPartialRequest();
+    if (req == null)
+      return;
+    if (savedRequest == null ||
+        req.off > savedRequest.off ||
+        System.currentTimeMillis() > savedRequestTime + (15 * 60 * 1000)) {
+      if (savedRequest == null || (req.piece != savedRequest.piece && req.off != savedRequest.off)) {
+        if (_log.shouldLog(Log.DEBUG)) {
+          _log.debug(" Saving orphaned partial piece " + req);
+          if (savedRequest != null)
+            _log.debug(" (Discarding previously saved orphan) " + savedRequest);
+        }
+      }
+      savedRequest = req;
+      savedRequestTime = System.currentTimeMillis();
+    } else {
+      if (req.piece != savedRequest.piece)
+        if (_log.shouldLog(Log.DEBUG))
+          _log.debug(" Discarding orphaned partial piece " + req);
+    }
+  }
+
+  /** Return partial piece if it's still wanted and peer has it.
+   */
+  public Request getPeerPartial(BitField havePieces) {
+    if (savedRequest == null)
+      return null;
+    if (! havePieces.get(savedRequest.piece)) {
+      if (_log.shouldLog(Log.DEBUG))
+        _log.debug("Peer doesn't have orphaned piece " + savedRequest);
+      return null;
+    }
+    synchronized(wantedPieces)
+      {
+        for(Iterator iter = wantedPieces.iterator(); iter.hasNext(); ) {
+          Piece piece = (Piece)iter.next();
+          if (piece.getId() == savedRequest.piece) {
+            Request req = savedRequest;
+            piece.setRequested(true);
+            if (_log.shouldLog(Log.DEBUG))
+              _log.debug("Restoring orphaned partial piece " + req);
+            savedRequest = null;
+            return req;
+          }
+        }
+      }
+    if (_log.shouldLog(Log.DEBUG))
+      _log.debug("We no longer want orphaned piece " + savedRequest);
+    savedRequest = null;
+    return null;
+  }
+
+  /** Clear the requested flag for a piece if the peer
+   ** is the only one requesting it
+   */
+  private void markUnrequestedIfOnlyOne(Peer peer, int piece)
+  {
+    // see if anybody else is requesting
+    synchronized (peers)
+      {
+        Iterator it = peers.iterator();
+        while (it.hasNext()) {
+          Peer p = (Peer)it.next();
+          if (p.equals(peer))
+            continue;
+          if (p.state == null)
+            continue;
+          int[] arr = p.state.getRequestedPieces();
+          for (int i = 0; arr[i] >= 0; i++)
+            if(arr[i] == piece) {
+              if (_log.shouldLog(Log.DEBUG))
+                _log.debug("Another peer is requesting piece " + piece);
+              return;
+            }
+        }
+      }
+
+    // nobody is, so mark unrequested
+    synchronized(wantedPieces)
+      {
+        Iterator it = wantedPieces.iterator();
+        while (it.hasNext()) {
+          Piece p = (Piece)it.next();
+          if (p.getId() == piece) {
+            p.setRequested(false);
+            if (_log.shouldLog(Log.DEBUG))
+              _log.debug("Removing from request list piece " + piece);
+            return;
+          }
+        }
+      }
+  }
+
+  /** Mark a peer's requested pieces unrequested when it is disconnected
+   ** Once for each piece
+   ** This is enough trouble, maybe would be easier just to regenerate
+   ** the requested list from scratch instead.
+   */
+  public void markUnrequested(Peer peer)
+  {
+    if (halted || peer.state == null)
+      return;
+    int[] arr = peer.state.getRequestedPieces();
+    for (int i = 0; arr[i] >= 0; i++)
+      markUnrequestedIfOnlyOne(peer, arr[i]);
+  }
+
+  /** Return number of allowed uploaders for this torrent.
+   ** Check with Snark to see if we are over the total upload limit.
+   */
+  public int allowedUploaders()
+  {
+    if (Snark.overUploadLimit(uploaders)) {
+        if (_log.shouldLog(Log.DEBUG))
+          _log.debug("Over limit, uploaders was: " + uploaders);
+        return uploaders - 1;
+    } else if (uploaders < MAX_UPLOADERS)
+        return uploaders + 1;
+    else
+        return MAX_UPLOADERS;
+  }
 }
+

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

@@ -107,11 +107,13 @@ public interface PeerListener
    *
    * @param peer the Peer that wants the piece.
    * @param piece the piece number requested.
+   * @param off byte offset into the piece.
+   * @param len length of the chunk requested.
    *
    * @return a byte array containing the piece or null when the piece
    * is not available (which is a protocol error).
    */
-  byte[] gotRequest(Peer peer, int piece);
+  byte[] gotRequest(Peer peer, int piece, int off, int len);
 
   /**
    * Called when a (partial) piece has been downloaded from the peer.
@@ -142,4 +144,29 @@ public interface PeerListener
    * we are no longer interested in the peer.
    */
   int wantPiece(Peer peer, BitField bitfield);
+
+  /**
+   * Called when the peer has disconnected and the peer task may have a partially
+   * downloaded piece that the PeerCoordinator can save
+   *
+   * @param state the PeerState for the peer
+   */
+  void savePeerPartial(PeerState state);
+
+  /**
+   * Called when a peer has connected and there may be a partially
+   * downloaded piece that the coordinatorator can give the peer task
+   *
+   * @param havePieces the have-pieces bitmask for the peer
+   *
+   * @return request (contains the partial data and valid length)
+   */
+  Request getPeerPartial(BitField havePieces);
+
+  /** Mark a peer's requested pieces unrequested when it is disconnected
+   *  This prevents premature end game
+   *
+   * @param peer the peer that is disconnecting
+   */
+  void markUnrequested(Peer peer);
 }

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

@@ -62,8 +62,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 = 1;
-  private final static int PARTSIZE = 64*1024; // default was 16K, i2p-bt uses 64KB
+  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_PARTSIZE = 64*1024; // Don't let anybody request more than this
 
   PeerState(Peer peer, PeerListener listener, MetaInfo metainfo,
             PeerConnectionIn in, PeerConnectionOut out)
@@ -173,7 +174,7 @@ class PeerState
         || begin < 0
         || begin > metainfo.getPieceLength(piece)
         || length <= 0
-        || length > 4*PARTSIZE)
+        || length > MAX_PARTSIZE)
       {
         // XXX - Protocol error -> disconnect?
         if (_log.shouldLog(Log.WARN))
@@ -184,7 +185,7 @@ class PeerState
         return;
       }
 
-    byte[] pieceBytes = listener.gotRequest(peer, piece);
+    byte[] pieceBytes = listener.gotRequest(peer, piece, begin, length);
     if (pieceBytes == null)
       {
         // XXX - Protocol error-> diconnect?
@@ -194,7 +195,7 @@ class PeerState
       }
 
     // More sanity checks
-    if (begin >= pieceBytes.length || begin + length > pieceBytes.length)
+    if (length != pieceBytes.length)
       {
         // XXX - Protocol error-> disconnect?
         if (_log.shouldLog(Log.WARN))
@@ -221,6 +222,10 @@ class PeerState
     listener.uploaded(peer, size);
   }
 
+  // This is used to flag that we have to back up from the firstOutstandingRequest
+  // when calculating how far we've gotten
+  Request pendingRequest = null;
+
   /**
    * Called when a partial piece request has been handled by
    * PeerConnectionIn.
@@ -231,6 +236,8 @@ class PeerState
     downloaded += size;
     listener.downloaded(peer, size);
 
+    pendingRequest = null;
+
     // Last chunk needed for this piece?
     if (getFirstOutstandingRequest(req.piece) == -1)
       {
@@ -318,14 +325,8 @@ class PeerState
               {
                 Request dropReq = (Request)outstandingRequests.remove(0);
                 outstandingRequests.add(dropReq);
-                // We used to rerequest the missing chunks but that mostly
-                // just confuses the other side. So now we just keep
-                // waiting for them. They will be rerequested when we get
-                // choked/unchoked again.
-                /*
-                  if (!choked)
+                if (!choked)
                   out.sendRequest(dropReq);
-                */
                 if (_log.shouldLog(Log.WARN))
                   _log.warn("dropped " + dropReq + " with peer " + peer);
               }
@@ -336,10 +337,58 @@ class PeerState
     // Request more if necessary to keep the pipeline filled.
     addRequest();
 
+    pendingRequest = req;
     return req;
 
   }
 
+  // get longest partial piece
+  Request getPartialRequest()
+  {
+    Request req = null;
+    for (int i = 0; i < outstandingRequests.size(); i++) {
+      Request r1 = (Request)outstandingRequests.get(i);
+      int j = getFirstOutstandingRequest(r1.piece);
+      if (j == -1)
+        continue;
+      Request r2 = (Request)outstandingRequests.get(j);
+      if (r2.off > 0 && ((req == null) || (r2.off > req.off)))
+        req = r2;
+    }
+    if (pendingRequest != null && req != null && pendingRequest.off < req.off) {
+      if (pendingRequest.off != 0)
+        req = pendingRequest;
+      else
+        req = null;
+    }
+    return req;
+  }
+
+  // return array of pieces terminated by -1
+  // remove most duplicates
+  // but still could be some duplicates, not guaranteed
+  int[] getRequestedPieces()
+  {
+    int size = outstandingRequests.size();
+    int[] arr = new int[size+2];
+    int pc = -1;
+    int pos = 0;
+    if (pendingRequest != null) {
+      pc = pendingRequest.piece;
+      arr[pos++] = pc;
+    }
+    Request req = null;
+    for (int i = 0; i < size; i++) {
+      Request r1 = (Request)outstandingRequests.get(i);
+      if (pc != r1.piece) {
+        pc = r1.piece;
+        arr[pos++] = pc;
+      }
+    }
+    arr[pos] = -1;
+    return(arr);
+  }
+
   void cancelMessage(int piece, int begin, int length)
   {
     if (_log.shouldLog(Log.DEBUG))
@@ -414,16 +463,12 @@ class PeerState
   /**
    * Adds a new request to the outstanding requests list.
    */
-  private void addRequest()
+  synchronized private void addRequest()
   {
     boolean more_pieces = true;
     while (more_pieces)
       {
-        synchronized(this)
-          {
-            more_pieces = outstandingRequests.size() < MAX_PIPELINE;
-          }
-        
+        more_pieces = outstandingRequests.size() < MAX_PIPELINE;
         // We want something and we don't have outstanding requests?
         if (more_pieces && lastRequest == null)
           more_pieces = requestNextPiece();
@@ -431,19 +476,14 @@ class PeerState
           {
             int pieceLength;
             boolean isLastChunk;
-            synchronized(this)
-              {
-                pieceLength = metainfo.getPieceLength(lastRequest.piece);
-                isLastChunk = lastRequest.off + lastRequest.len == pieceLength;
-              }
+            pieceLength = metainfo.getPieceLength(lastRequest.piece);
+            isLastChunk = lastRequest.off + lastRequest.len == pieceLength;
 
             // Last part of a piece?
             if (isLastChunk)
               more_pieces = requestNextPiece();
             else
               {
-                synchronized(this)
-                  {
                     int nextPiece = lastRequest.piece;
                     int nextBegin = lastRequest.off + PARTSIZE;
                     byte[] bs = lastRequest.bs;
@@ -456,7 +496,6 @@ class PeerState
                     if (!choked)
                       out.sendRequest(req);
                     lastRequest = req;
-                  }
               }
           }
       }
@@ -472,16 +511,41 @@ class PeerState
     // Check that we already know what the other side has.
     if (bitfield != null)
       {
+        // Check for adopting an orphaned partial piece
+        Request r = listener.getPeerPartial(bitfield);
+        if (r != null) {
+              // Check that r not already in outstandingRequests
+              int[] arr = getRequestedPieces();
+              boolean found = false;
+              for (int i = 0; arr[i] >= 0; i++) {
+                if (arr[i] == r.piece) {
+                  found = true;
+                  break;
+                }
+              }
+              if (!found) {
+                outstandingRequests.add(r);
+                if (!choked)
+                  out.sendRequest(r);
+                lastRequest = r;
+                return true;
+              }
+        }
         int nextPiece = listener.wantPiece(peer, bitfield);
         if (_log.shouldLog(Log.DEBUG))
           _log.debug(peer + " want piece " + nextPiece);
-        synchronized(this)
-          {
             if (nextPiece != -1
                 && (lastRequest == null || lastRequest.piece != nextPiece))
               {
                 int piece_length = metainfo.getPieceLength(nextPiece);
-                byte[] bs = new byte[piece_length];
+                //Catch a common place for OOMs esp. on 1MB pieces
+                byte[] bs;
+                try {
+                  bs = new byte[piece_length];
+                } catch (OutOfMemoryError oom) {
+                  _log.warn("Out of memory, can't request piece " + nextPiece, oom);
+                  return false;
+                }
                 
                 int length = Math.min(piece_length, PARTSIZE);
                 Request req = new Request(nextPiece, bs, 0, length);
@@ -491,7 +555,6 @@ class PeerState
                 lastRequest = req;
                 return true;
               }
-          }
       }
 
     return false;
@@ -523,4 +586,15 @@ class PeerState
         out.sendChoke(choke);
       }
   }
+
+  void keepAlive()
+  {
+        out.sendAlive();
+  }
+
+  synchronized void retransmitRequests()
+  {
+      if (interesting && !choked)
+        out.retransmitRequests(outstandingRequests);
+  }
 }

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

@@ -29,6 +29,7 @@ class Request
   final byte[] bs;
   final int off;
   final int len;
+  long sendTime;
 
   /**
    * Creates a new Request.

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

@@ -234,6 +234,7 @@ public class Snark
   public String rootDataDir = ".";
   public CompleteListener completeListener;
   public boolean stopped;
+  byte[] id;
 
   Snark(String torrent, String ip, int user_port,
         StorageListener slistener, CoordinatorListener clistener) { 
@@ -268,7 +269,7 @@ public class Snark
     // zeros bytes, then three bytes filled with snark and then
     // sixteen random bytes.
     byte snark = (((3 + 7 + 10) * (1000 - 8)) / 992) - 17;
-    byte[] id = new byte[20];
+    id = new byte[20];
     Random random = new Random();
     int i;
     for (i = 0; i < 9; i++)
@@ -283,6 +284,11 @@ public class Snark
 
     int port;
     IOException lastException = null;
+/*
+ * Don't start a tunnel if the torrent isn't going to be started.
+ * If we are starting,
+ * startTorrent() will force a connect.
+ *
     boolean ok = I2PSnarkUtil.instance().connect();
     if (!ok) fatal("Unable to connect to I2P");
     I2PServerSocket serversocket = I2PSnarkUtil.instance().getServerSocket();
@@ -292,6 +298,7 @@ public class Snark
         Destination d = serversocket.getManager().getSession().getMyDestination();
         debug("Listening on I2P destination " + d.toBase64() + " / " + d.calculateHash().toBase64(), NOTICE);
     }
+*/
 
     // Figure out what the torrent argument represents.
     meta = null;
@@ -361,6 +368,9 @@ public class Snark
             activity = "Checking storage";
             storage = new Storage(meta, slistener);
             storage.check(rootDataDir);
+            // have to figure out when to reopen
+            // if (!start)
+            //    storage.close();
           }
         catch (IOException ioe)
           {
@@ -371,14 +381,19 @@ public class Snark
           }
       }
 
+
+/*
+ * see comment above
+ *
     activity = "Collecting pieces";
     coordinator = new PeerCoordinator(id, meta, storage, clistener, this);
     PeerCoordinatorSet set = PeerCoordinatorSet.instance();
     set.add(coordinator);
     ConnectionAcceptor acceptor = ConnectionAcceptor.instance();
     acceptor.startAccepting(set, serversocket);
-    
     trackerclient = new TrackerClient(meta, coordinator);
+*/
+    
     if (start)
         startTorrent();
   }
@@ -386,6 +401,26 @@ public class Snark
    * Start up contacting peers and querying the tracker
    */
   public void startTorrent() {
+    boolean ok = I2PSnarkUtil.instance().connect();
+    if (!ok) fatal("Unable to connect to I2P");
+    if (coordinator == null) {
+        I2PServerSocket serversocket = I2PSnarkUtil.instance().getServerSocket();
+        if (serversocket == null)
+            fatal("Unable to listen for I2P connections");
+        else {
+            Destination d = serversocket.getManager().getSession().getMyDestination();
+            debug("Listening on I2P destination " + d.toBase64() + " / " + d.calculateHash().toBase64(), NOTICE);
+        }
+        debug("Starting PeerCoordinator, ConnectionAcceptor, and TrackerClient", NOTICE);
+        activity = "Collecting pieces";
+        coordinator = new PeerCoordinator(id, meta, storage, this, this);
+        PeerCoordinatorSet set = PeerCoordinatorSet.instance();
+        set.add(coordinator);
+        ConnectionAcceptor acceptor = ConnectionAcceptor.instance();
+        acceptor.startAccepting(set, serversocket);
+        trackerclient = new TrackerClient(meta, coordinator);
+    }
+
     stopped = false;
     boolean coordinatorChanged = false;
     if (coordinator.halted()) {
@@ -402,6 +437,17 @@ public class Snark
     if (!trackerclient.started() && !coordinatorChanged) {
         trackerclient.start();
     } else if (trackerclient.halted() || coordinatorChanged) {
+        try
+          {
+            storage.reopen(rootDataDir);
+          }
+        catch (IOException ioe)
+          {
+            try { storage.close(); } catch (IOException ioee) {
+                ioee.printStackTrace();
+            }
+            fatal("Could not reopen storage", ioe);
+          }
         TrackerClient newClient = new TrackerClient(coordinator.getMetaInfo(), coordinator);
         if (!trackerclient.halted())
             trackerclient.halt();
@@ -422,6 +468,8 @@ public class Snark
         pc.halt();
     Storage st = storage;
     if (st != null) {
+        if (storage.changed)
+            SnarkManager.instance().saveTorrentStatus(storage.getMetaInfo(), storage.getBitField());
         try { 
             storage.close(); 
         } catch (IOException ioe) {
@@ -693,6 +741,11 @@ public class Snark
         completeListener.torrentComplete(this);
   }
 
+  public void setWantedPieces(Storage storage)
+  {
+    coordinator.setWantedPieces();
+  }
+
   public void shutdown()
   {
     // Should not be necessary since all non-deamon threads should
@@ -703,4 +756,23 @@ public class Snark
   public interface CompleteListener {
     public void torrentComplete(Snark snark);
   }
+
+  /** Maintain a configurable total uploader cap
+   */
+  final static int MIN_TOTAL_UPLOADERS = 4;
+  final static int MAX_TOTAL_UPLOADERS = 10;
+  public static boolean overUploadLimit(int uploaders) {
+    PeerCoordinatorSet coordinators = PeerCoordinatorSet.instance();
+    if (coordinators == null || uploaders <= 0)
+      return false;
+    int totalUploaders = 0;
+    for (Iterator iter = coordinators.iterator(); iter.hasNext(); ) {
+      PeerCoordinator c = (PeerCoordinator)iter.next();
+      if (!c.halted())
+        totalUploaders += c.uploaders;
+    }
+    int limit = I2PSnarkUtil.instance().getMaxUploaders();
+    Snark.debug("Total uploaders: " + totalUploaders + " Limit: " + limit, Snark.DEBUG);
+    return totalUploaders > limit;
+  }
 }

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

@@ -3,6 +3,7 @@ package org.klomp.snark;
 import java.io.*;
 import java.util.*;
 import net.i2p.I2PAppContext;
+import net.i2p.data.Base64;
 import net.i2p.data.DataHelper;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
@@ -16,6 +17,7 @@ public class SnarkManager implements Snark.CompleteListener {
     
     /** map of (canonical) filename to Snark instance (unsynchronized) */
     private Map _snarks;
+    private Object _addSnarkLock;
     private String _configFile;
     private Properties _config;
     private I2PAppContext _context;
@@ -27,19 +29,23 @@ public class SnarkManager implements Snark.CompleteListener {
     public static final String PROP_I2CP_OPTS = "i2psnark.i2cpOptions";
     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_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 DEFAULT_AUTO_START = "false";
     
     private SnarkManager() {
         _snarks = new HashMap();
+        _addSnarkLock = new Object();
         _context = I2PAppContext.getGlobalContext();
         _log = _context.logManager().getLog(SnarkManager.class);
         _messages = new ArrayList(16);
         loadConfig("i2psnark.config");
         int minutes = getStartupDelayMinutes();
-        _messages.add("Starting up torrents in " + minutes + (minutes == 1 ? " minute" : " minutes"));
+        _messages.add("Adding torrents in " + minutes + (minutes == 1 ? " minute" : " minutes"));
         I2PThread monitor = new I2PThread(new DirMonitor(), "Snark DirMonitor");
         monitor.setDaemon(true);
         monitor.start();
@@ -91,10 +97,14 @@ public class SnarkManager implements Snark.CompleteListener {
             _config.setProperty(PROP_I2CP_HOST, "localhost");
         if (!_config.containsKey(PROP_I2CP_PORT))
             _config.setProperty(PROP_I2CP_PORT, "7654");
+        if (!_config.containsKey(PROP_I2CP_OPTS))
+            _config.setProperty(PROP_I2CP_OPTS, "inbound.length=1 inbound.lengthVariance=1 outbound.length=1 outbound.lengthVariance=1");
         if (!_config.containsKey(PROP_EEP_HOST))
             _config.setProperty(PROP_EEP_HOST, "localhost");
         if (!_config.containsKey(PROP_EEP_PORT))
             _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_DIR))
             _config.setProperty(PROP_DIR, "i2psnark");
         if (!_config.containsKey(PROP_AUTO_START))
@@ -125,6 +135,7 @@ public class SnarkManager implements Snark.CompleteListener {
         int eepPort = getInt(PROP_EEP_PORT, 4444);
         if (eepHost != null)
             I2PSnarkUtil.instance().setProxy(eepHost, eepPort);
+        I2PSnarkUtil.instance().setMaxUploaders(getInt(PROP_UPLOADERS_TOTAL, Snark.MAX_TOTAL_UPLOADERS));
         getDataDir().mkdirs();
     }
     
@@ -140,7 +151,8 @@ 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 eepPort, String i2cpHost, String i2cpPort, String i2cpOpts,
+                             String upLimit) {
         boolean changed = false;
         if (eepHost != null) {
             int port = I2PSnarkUtil.instance().getEepProxyPort();
@@ -155,6 +167,20 @@ public class SnarkManager implements Snark.CompleteListener {
                 addMessage("EepProxy location changed to " + eepHost + ":" + port);
             }
         }
+        if (upLimit != null) {
+            int limit = I2PSnarkUtil.instance().getMaxUploaders();
+            try { limit = Integer.parseInt(upLimit); } catch (NumberFormatException nfe) {}
+            if ( limit != I2PSnarkUtil.instance().getEepProxyPort()) {
+                if ( limit >= Snark.MIN_TOTAL_UPLOADERS ) {
+                    I2PSnarkUtil.instance().setMaxUploaders(limit);
+                    changed = true;
+                    _config.setProperty(PROP_UPLOADERS_TOTAL, "" + limit);
+                    addMessage("Total uploaders limit changed to " + limit);
+                } else {
+                    addMessage("Minimum total uploaders limit is " + Snark.MIN_TOTAL_UPLOADERS);
+                }
+            }
+        }
         if (i2cpHost != null) {
             int oldI2CPPort = I2PSnarkUtil.instance().getI2CPPort();
             String oldI2CPHost = I2PSnarkUtil.instance().getI2CPHost();
@@ -248,7 +274,9 @@ public class SnarkManager implements Snark.CompleteListener {
     
     public void saveConfig() {
         try {
-            DataHelper.storeProps(_config, new File(_configFile));
+            synchronized (_configFile) {
+                DataHelper.storeProps(_config, new File(_configFile));
+            }
         } catch (IOException ioe) {
             addMessage("Unable to save the config to '" + _configFile + "'");
         }
@@ -267,7 +295,7 @@ public class SnarkManager implements Snark.CompleteListener {
     public Snark getTorrent(String filename) { synchronized (_snarks) { return (Snark)_snarks.get(filename); } }
     public void addTorrent(String filename) { addTorrent(filename, false); }
     public void addTorrent(String filename, boolean dontAutoStart) {
-        if (!I2PSnarkUtil.instance().connected()) {
+        if ((!dontAutoStart) && !I2PSnarkUtil.instance().connected()) {
             addMessage("Connecting to I2P");
             boolean ok = I2PSnarkUtil.instance().connect();
             if (!ok) {
@@ -287,7 +315,16 @@ public class SnarkManager implements Snark.CompleteListener {
         Snark torrent = null;
         synchronized (_snarks) {
             torrent = (Snark)_snarks.get(filename);
-            if (torrent == null) {
+        }
+        // don't hold the _snarks lock while verifying the torrent
+        if (torrent == null) {
+            synchronized (_addSnarkLock) {
+                // double-check
+                synchronized (_snarks) {
+                    if(_snarks.get(filename) != null)
+                        return;
+                }
+
                 FileInputStream fis = null;
                 try {
                     fis = new FileInputStream(sfile);
@@ -303,7 +340,9 @@ public class SnarkManager implements Snark.CompleteListener {
                     } else {
                         torrent = new Snark(filename, null, -1, null, null, false, dataDir.getPath());
                         torrent.completeListener = this;
-                        _snarks.put(filename, torrent);
+                        synchronized (_snarks) {
+                            _snarks.put(filename, torrent);
+                        }
                     }
                 } catch (IOException ioe) {
                     addMessage("Torrent in " + sfile.getName() + " is invalid: " + ioe.getMessage());
@@ -313,9 +352,9 @@ public class SnarkManager implements Snark.CompleteListener {
                 } finally {
                     if (fis != null) try { fis.close(); } catch (IOException ioe) {}
                 }
-            } else {
-                return;
             }
+        } else {
+            return;
         }
         // ok, snark created, now lets start it up or configure it further
         File f = new File(filename);
@@ -327,13 +366,103 @@ public class SnarkManager implements Snark.CompleteListener {
         }
     }
     
+    /**
+     * Get the timestamp for a torrent from the config file
+     */
+    public long getSavedTorrentTime(MetaInfo metainfo) {
+        byte[] ih = metainfo.getInfoHash();
+        String infohash = Base64.encode(ih);
+        infohash = infohash.replace('=', '$');
+        String time = _config.getProperty(PROP_META_PREFIX + infohash + PROP_META_BITFIELD_SUFFIX);
+        if (time == null)
+            return 0;
+        int comma = time.indexOf(',');
+        if (comma <= 0)
+            return 0;
+        time = time.substring(0, comma);
+        try { return Long.parseLong(time); } catch (NumberFormatException nfe) {}
+        return 0;
+    }
+    
+    /**
+     * Get the saved bitfield for a torrent from the config file.
+     * Convert "." to a full bitfield.
+     */
+    public BitField getSavedTorrentBitField(MetaInfo metainfo) {
+        byte[] ih = metainfo.getInfoHash();
+        String infohash = Base64.encode(ih);
+        infohash = infohash.replace('=', '$');
+        String bf = _config.getProperty(PROP_META_PREFIX + infohash + PROP_META_BITFIELD_SUFFIX);
+        if (bf == null)
+            return null;
+        int comma = bf.indexOf(',');
+        if (comma <= 0)
+            return null;
+        bf = bf.substring(comma + 1).trim();
+        int len = metainfo.getPieces();
+        if (bf.equals(".")) {
+            BitField bitfield = new BitField(len);
+            for (int i = 0; i < len; i++)
+                 bitfield.set(i);
+            return bitfield;
+        }
+        byte[] bitfield = Base64.decode(bf);
+        if (bitfield == null)
+            return null;
+        if (bitfield.length * 8 < len)
+            return null;
+        return new BitField(bitfield, len);
+    }
+    
+    /**
+     * Save the completion status of a torrent and the current time in the config file
+     * in the form "i2psnark.zmeta.$base64infohash=$time,$base64bitfield".
+     * The config file property key is appended with the Base64 of the infohash,
+     * with the '=' changed to '$' since a key can't contain '='.
+     * The time is a standard long converted to string.
+     * The status is either a bitfield converted to Base64 or "." for a completed
+     * torrent to save space in the config file and in memory.
+     */
+    public void saveTorrentStatus(MetaInfo metainfo, BitField bitfield) {
+        byte[] ih = metainfo.getInfoHash();
+        String infohash = Base64.encode(ih);
+        infohash = infohash.replace('=', '$');
+        String now = "" + System.currentTimeMillis();
+        String bfs;
+        if (bitfield.complete()) {
+          bfs = ".";
+        } else {
+          byte[] bf = bitfield.getFieldBytes();
+          bfs = Base64.encode(bf);
+        }
+        _config.setProperty(PROP_META_PREFIX + infohash + PROP_META_BITFIELD_SUFFIX, now + "," + bfs);
+        saveConfig();
+    }
+    
+    /**
+     * Remove the status of a torrent from the config file.
+     * This may help the config file from growing too big.
+     */
+    public void removeTorrentStatus(MetaInfo metainfo) {
+        byte[] ih = metainfo.getInfoHash();
+        String infohash = Base64.encode(ih);
+        infohash = infohash.replace('=', '$');
+        _config.remove(PROP_META_PREFIX + infohash + PROP_META_BITFIELD_SUFFIX);
+        saveConfig();
+    }
+    
     private String locked_validateTorrent(MetaInfo info) throws IOException {
+        String announce = info.getAnnounce();
+        // basic validation of url
+        if ((!announce.startsWith("http://")) ||
+            (announce.indexOf(".i2p/") < 0))
+            return "Non-i2p tracker in " + info.getName() + ", deleting it";
         List files = info.getFiles();
         if ( (files != null) && (files.size() > MAX_FILES_PER_TORRENT) ) {
             return "Too many files in " + info.getName() + " (" + files.size() + "), deleting it";
         } else if (info.getPieces() <= 0) {
             return "No pieces in " + info.getName() + "?  deleting it";
-        } else if (info.getPieceLength(0) > 10*1024*1024) {
+        } else if (info.getPieceLength(0) > 1*1024*1024) {
             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());
@@ -392,6 +521,8 @@ public class SnarkManager implements Snark.CompleteListener {
         if (torrent != null) {
             File torrentFile = new File(filename);
             torrentFile.delete();
+            if (torrent.storage != null)
+                removeTorrentStatus(torrent.storage.getMetaInfo());
             addMessage("Torrent removed: '" + torrentFile.getName() + "'");
         }
     }
@@ -444,10 +575,9 @@ public class SnarkManager implements Snark.CompleteListener {
             if (existingNames.contains(foundNames.get(i))) {
                 // already known.  noop
             } else {
-                if (I2PSnarkUtil.instance().connect())
-                    addTorrent((String)foundNames.get(i));
-                else
+                if (shouldAutoStart() && !I2PSnarkUtil.instance().connect())
                     addMessage("Unable to connect to I2P");
+                addTorrent((String)foundNames.get(i), !shouldAutoStart());
             }
         }
         // now lets see which ones have been removed...
@@ -463,22 +593,29 @@ public class SnarkManager implements Snark.CompleteListener {
     }
 
     private static final String DEFAULT_TRACKERS[] = { 
-       "Postman's tracker", "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"
-       , "Orion's tracker", "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"
+       "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/"
+       , "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/"
+       , "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"
     };
     
-    /** comma delimited list of name=announceURL for the trackers to be displayed */
+    /** comma delimited list of name=announceURL=baseURL for the trackers to be displayed */
     public static final String PROP_TRACKERS = "i2psnark.trackers";
-    /** unordered map of announceURL to name */
+    private static Map trackerMap = null;
+    /** sorted map of name to announceURL=baseURL */
     public Map getTrackers() { 
-        HashMap rv = new HashMap();
+        if (trackerMap != null) // only do this once, can't be updated while running
+            return trackerMap;
+        Map rv = new TreeMap();
         String trackers = _config.getProperty(PROP_TRACKERS);
         if ( (trackers == null) || (trackers.trim().length() <= 0) )
             trackers = _context.getProperty(PROP_TRACKERS);
         if ( (trackers == null) || (trackers.trim().length() <= 0) ) {
             for (int i = 0; i < DEFAULT_TRACKERS.length; i += 2)
-                rv.put(DEFAULT_TRACKERS[i+1], DEFAULT_TRACKERS[i]);
+                rv.put(DEFAULT_TRACKERS[i], DEFAULT_TRACKERS[i+1]);
         } else {
             StringTokenizer tok = new StringTokenizer(trackers, ",");
             while (tok.hasMoreTokens()) {
@@ -489,11 +626,12 @@ public class SnarkManager implements Snark.CompleteListener {
                 String name = pair.substring(0, split).trim();
                 String url = pair.substring(split+1).trim();
                 if ( (name.length() > 0) && (url.length() > 0) )
-                    rv.put(url, name);
+                    rv.put(name, url);
             }
         }
         
-        return rv;
+        trackerMap = rv;
+        return trackerMap;
     }
     
     private static class TorrentFilenameFilter implements FilenameFilter {

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

@@ -39,15 +39,17 @@ public class Storage
 
   private final StorageListener listener;
 
-  private final BitField bitfield; // BitField to represent the pieces
+  private BitField bitfield; // BitField to represent the pieces
   private int needed; // Number of pieces needed
 
   // XXX - Not always set correctly
   int piece_size;
   int pieces;
+  boolean changed;
 
   /** The default piece size. */
   private static int MIN_PIECE_SIZE = 256*1024;
+  private static int MAX_PIECE_SIZE = 1024*1024;
   /** The maximum number of pieces in a torrent. */
   private static long MAX_PIECES = 100*1024/20;
 
@@ -75,7 +77,6 @@ public class Storage
     throws IOException
   {
     this.listener = listener;
-
     // Create names, rafs and lengths arrays.
     getFiles(baseFile);
     
@@ -90,7 +91,7 @@ public class Storage
 
     piece_size = MIN_PIECE_SIZE;
     pieces = (int) ((total - 1)/piece_size) + 1;
-    while (pieces > MAX_PIECES)
+    while (pieces > MAX_PIECES && piece_size < MAX_PIECE_SIZE)
       {
         piece_size = piece_size*2;
         pieces = (int) ((total - 1)/piece_size) +1;
@@ -131,13 +132,14 @@ public class Storage
   // Creates piece hases for a new storage.
   public void create() throws IOException
   {
-    if (true) {
+//    if (true) {
         fast_digestCreate();
-    } else {
-        orig_digestCreate();
-    }
+//    } else {
+//        orig_digestCreate();
+//    }
   }
   
+/*
   private void orig_digestCreate() throws IOException {
     // Calculate piece_hashes
     MessageDigest digest = null;
@@ -155,7 +157,7 @@ public class Storage
     byte[] piece = new byte[piece_size];
     for (int i = 0; i < pieces; i++)
       {
-        int length = getUncheckedPiece(i, piece, 0);
+        int length = getUncheckedPiece(i, piece);
         digest.update(piece, 0, length);
         byte[] hash = digest.digest();
         for (int j = 0; j < 20; j++)
@@ -173,6 +175,7 @@ public class Storage
     // Reannounce to force recalculating the info_hash.
     metainfo = metainfo.reannounce(metainfo.getAnnounce());
   }
+*/
 
   private void fast_digestCreate() throws IOException {
     // Calculate piece_hashes
@@ -183,7 +186,7 @@ public class Storage
     byte[] piece = new byte[piece_size];
     for (int i = 0; i < pieces; i++)
       {
-        int length = getUncheckedPiece(i, piece, 0);
+        int length = getUncheckedPiece(i, piece);
         digest.update(piece, 0, length);
         byte[] hash = digest.digest();
         for (int j = 0; j < 20; j++)
@@ -218,6 +221,8 @@ public class Storage
       {
         File f = (File)it.next();
         names[i] = f.getPath();
+	if (base.isDirectory() && names[i].startsWith(base.getPath()))
+          names[i] = names[i].substring(base.getPath().length() + 1);
         lengths[i] = f.length();
         rafs[i] = new RandomAccessFile(f, "r");
         i++;
@@ -281,6 +286,10 @@ public class Storage
   public void check(String rootDir) throws IOException
   {
     File base = new File(rootDir, filterName(metainfo.getName()));
+    // look for saved bitfield and timestamp in the config file
+    long savedTime = SnarkManager.instance().getSavedTorrentTime(metainfo);
+    BitField savedBitField = SnarkManager.instance().getSavedTorrentBitField(metainfo);
+    boolean useSavedBitField = savedTime > 0 && savedBitField != null;
 
     List files = metainfo.getFiles();
     if (files == null)
@@ -294,6 +303,11 @@ public class Storage
         rafs = new RandomAccessFile[1];
         names = new String[1];
         lengths[0] = metainfo.getTotalLength();
+        if (useSavedBitField) {
+            long lm = base.lastModified();
+            if (lm <= 0 || lm > savedTime)
+                useSavedBitField = false;
+        }
         if (base.exists() && !base.canWrite())  // hope we can get away with this, if we are only seeding...
             rafs[0] = new RandomAccessFile(base, "r");
         else
@@ -318,6 +332,11 @@ public class Storage
             File f = createFileFromNames(base, (List)files.get(i));
             lengths[i] = ((Long)ls.get(i)).longValue();
             total += lengths[i];
+            if (useSavedBitField) {
+                long lm = base.lastModified();
+                if (lm <= 0 || lm > savedTime)
+                    useSavedBitField = false;
+            }
             if (f.exists() && !f.canWrite()) // see above re: only seeding
                 rafs[i] = new RandomAccessFile(f, "r");
             else
@@ -331,7 +350,57 @@ public class Storage
           throw new IOException("File lengths do not add up "
                                 + total + " != " + metalength);
       }
-    checkCreateFiles();
+    if (useSavedBitField) {
+      bitfield = savedBitField;
+      needed = metainfo.getPieces() - bitfield.count();
+      Snark.debug("Found saved state and files unchanged, skipping check", Snark.NOTICE);
+    } else {
+      checkCreateFiles();
+      SnarkManager.instance().saveTorrentStatus(metainfo, bitfield);
+    }
+  }
+
+  /**
+   * Reopen the file descriptors for a restart
+   * Do existence check but no length check or data reverification
+   */
+  public void reopen(String rootDir) throws IOException
+  {
+    File base = new File(rootDir, filterName(metainfo.getName()));
+
+    List files = metainfo.getFiles();
+    if (files == null)
+      {
+        // Reopen base as file.
+        Snark.debug("Reopening file: " + base, Snark.NOTICE);
+        if (!base.exists())
+          throw new IOException("Could not reopen file " + base);
+
+        if (complete() || !base.canWrite())  // hope we can get away with this, if we are only seeding...
+            rafs[0] = new RandomAccessFile(base, "r");
+        else
+            rafs[0] = new RandomAccessFile(base, "rw");
+      }
+    else
+      {
+        // Reopen base as dir.
+        Snark.debug("Reopening directory: " + base, Snark.NOTICE);
+        if (!base.isDirectory())
+          throw new IOException("Could not reopen directory " + base);
+
+        int size = files.size();
+        for (int i = 0; i < size; i++)
+          {
+            File f = getFileFromNames(base, (List)files.get(i));
+            if (!f.exists())
+                throw new IOException("Could not reopen file " + f);
+            if (complete() || !f.canWrite()) // see above re: only seeding
+                rafs[i] = new RandomAccessFile(f, "r");
+            else
+                rafs[i] = new RandomAccessFile(f, "rw");
+          }
+
+      }
   }
 
   /**
@@ -369,6 +438,17 @@ public class Storage
     return f;
   }
 
+  private File getFileFromNames(File base, List names) throws IOException
+  {
+    Iterator it = names.iterator();
+    while (it.hasNext())
+      {
+        String name = filterName((String)it.next());
+        base = new File(base, name);
+      }
+    return base;
+  }
+
   private void checkCreateFiles() throws IOException
   {
     // Whether we are resuming or not,
@@ -399,7 +479,7 @@ public class Storage
         byte[] piece = new byte[metainfo.getPieceLength(0)];
         for (int i = 0; i < pieces; i++)
           {
-            int length = getUncheckedPiece(i, piece, 0);
+            int length = getUncheckedPiece(i, piece);
             boolean correctHash = metainfo.checkPiece(i, piece, 0, length);
             if (correctHash)
               {
@@ -459,19 +539,27 @@ public class Storage
             // gobble gobble
         }
       }
+    changed = false;
   }
 
   /**
-   * Returns a byte array containing the requested piece or null if
+   * Returns a byte array containing a portion of the requested piece or null if
    * the storage doesn't contain the piece yet.
    */
-  public byte[] getPiece(int piece) throws IOException
+  public byte[] getPiece(int piece, int off, int len) throws IOException
   {
     if (!bitfield.get(piece))
       return null;
 
-    byte[] bs = new byte[metainfo.getPieceLength(piece)];
-    getUncheckedPiece(piece, bs, 0);
+    //Catch a common place for OOMs esp. on 1MB pieces
+    byte[] bs;
+    try {
+      bs = new byte[len];
+    } catch (OutOfMemoryError oom) {
+      I2PSnarkUtil.instance().debug("Out of memory, can't honor request for piece " + piece, Snark.WARNING, oom);
+      return null;
+    }
+    getUncheckedPiece(piece, bs, off, len);
     return bs;
   }
 
@@ -482,10 +570,11 @@ public class Storage
    * matches), otherwise false.
    * @exception IOException when some storage related error occurs.
    */
-  public boolean putPiece(int piece, byte[] bs) throws IOException
+  public boolean putPiece(int piece, byte[] ba) throws IOException
   {
     // First check if the piece is correct.
-    // If we were paranoia we could copy the array first.
+    // Copy the array first to be paranoid.
+    byte[] bs = (byte[]) ba.clone();
     int length = bs.length;
     boolean correctHash = metainfo.checkPiece(piece, bs, 0, length);
     if (listener != null)
@@ -504,6 +593,7 @@ public class Storage
             needed--;
             complete = needed == 0;
           }
+
       }
 
     // Early typecast, avoid possibly overflowing a temp integer
@@ -537,24 +627,48 @@ public class Storage
           }
       }
 
+    changed = true;
     if (complete) {
-      listener.storageCompleted(this);
+//    listener.storageCompleted(this);
       // do we also need to close all of the files and reopen
       // them readonly?
+
+      // Do a complete check to be sure.
+      // Temporarily resets the 'needed' variable and 'bitfield', then call
+      // checkCreateFiles() which will set 'needed' and 'bitfield'
+      // and also call listener.storageCompleted() if the double-check
+      // was successful.
+      // Todo: set a listener variable so the web shows "checking" and don't
+      // have the user panic when completed amount goes to zero temporarily?
+      needed = metainfo.getPieces();
+      bitfield = new BitField(needed);
+      checkCreateFiles();
+      if (needed > 0) {
+        listener.setWantedPieces(this);
+        Snark.debug("WARNING: Not really done, missing " + needed
+                    + " pieces", Snark.WARNING);
+      } else {
+        SnarkManager.instance().saveTorrentStatus(metainfo, bitfield);
+      }
     }
 
     return true;
   }
 
-  private int getUncheckedPiece(int piece, byte[] bs, int off)
+  private int getUncheckedPiece(int piece, byte[] bs)
+    throws IOException
+  {
+      return getUncheckedPiece(piece, bs, 0, metainfo.getPieceLength(piece));
+  }
+
+  private int getUncheckedPiece(int piece, byte[] bs, int off, int length)
     throws IOException
   {
     // XXX - copy/paste code from putPiece().
 
     // Early typecast, avoid possibly overflowing a temp integer
-    long start = (long) piece * (long) metainfo.getPieceLength(0);
+    long start = ((long) piece * (long) metainfo.getPieceLength(0)) + off;
 
-    int length = metainfo.getPieceLength(piece);
     int i = 0;
     long raflen = lengths[i];
     while (start > raflen)
@@ -572,7 +686,7 @@ public class Storage
         synchronized(rafs[i])
           {
             rafs[i].seek(start);
-            rafs[i].readFully(bs, off + read, len);
+            rafs[i].readFully(bs, read, len);
           }
         read += len;
         if (need - len > 0)

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

@@ -55,4 +55,11 @@ public interface StorageListener
    *
    */
   void storageCompleted(Storage storage);
+
+  /** Reset the peer's wanted pieces table
+   *  Call after the storage double-check fails
+   *
+   * @param peer the peer
+   */
+  void setWantedPieces(Storage storage);
 }

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

@@ -41,8 +41,11 @@ public class TrackerClient extends I2PThread
   private static final String STARTED_EVENT = "started";
   private static final String COMPLETED_EVENT = "completed";
   private static final String STOPPED_EVENT = "stopped";
+  private static final String NOT_REGISTERED  = "torrent not registered"; //bytemonsoon
 
   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 MetaInfo meta;
   private final PeerCoordinator coordinator;
@@ -110,6 +113,7 @@ public class TrackerClient extends I2PThread
     long left = coordinator.getLeft();
 
     boolean completed = (left == 0);
+    int sleptTime = 0;
 
     try
       {
@@ -117,6 +121,7 @@ public class TrackerClient extends I2PThread
         boolean started = false;
         while (!started)
           {
+            sleptTime = 0;
             try
               {
                 // Send start.
@@ -125,18 +130,20 @@ public class TrackerClient extends I2PThread
                                              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 = 3000;
-                      int c = ((int)cur.getPeerID().getAddress().calculateHash().toBase64().charAt(0)) % 10;
-                      try { Thread.sleep(delay * c); } catch (InterruptedException ie) {}
+                      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;
-                coordinator.trackerProblems = null;
               }
             catch (IOException ioe)
               {
@@ -145,9 +152,16 @@ public class TrackerClient extends I2PThread
                   ("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 (!started && !stop)
+            if (stop)
+              break;
+       
+            if (!started)
               {
                 Snark.debug("         Retrying in one minute...", Snark.DEBUG);
                 try
@@ -168,8 +182,17 @@ public class TrackerClient extends I2PThread
             try
               {
                 // Sleep some minutes...
-                int delay = SLEEP*60*1000 + r.nextInt(120*1000);
-                Thread.sleep(delay);
+                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;
+                }
+                if (delay > 0)
+                  Thread.sleep(delay);
               }
             catch(InterruptedException interrupt)
               {
@@ -196,6 +219,7 @@ public class TrackerClient extends I2PThread
               event = NO_EVENT;
             
             // Only do a request when necessary.
+            sleptTime = 0;
             if (event == COMPLETED_EVENT
                 || coordinator.needPeers()
                 || System.currentTimeMillis() > lastRequestTime + interval)
@@ -206,6 +230,7 @@ public class TrackerClient extends I2PThread
                                                  uploaded, downloaded, left,
                                                  event);
 
+                    coordinator.trackerProblems = null;
                     Set peers = info.getPeers();
                     coordinator.trackerSeenPeers = peers.size();
                     if ( (left > 0) && (!completed) ) {
@@ -216,10 +241,14 @@ public class TrackerClient extends I2PThread
                         Iterator it = ordered.iterator();
                         while (it.hasNext()) {
                           Peer cur = (Peer)it.next();
-                          coordinator.addPeer(cur);
-                          int delay = 3000;
-                          int c = ((int)cur.getPeerID().getAddress().calculateHash().toBase64().charAt(0)) % 10;
-                          try { Thread.sleep(delay * c); } catch (InterruptedException ie) {}
+                          // only delay if we actually make an attempt to add peer
+                          if(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) {}
+                          }
                         }
                     }
                   }
@@ -229,6 +258,11 @@ public class TrackerClient extends I2PThread
                     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();
+                    }
                   }
               }
           }
@@ -273,6 +307,7 @@ public class TrackerClient extends I2PThread
     if (fetched == null) {
         throw new IOException("Error fetching " + s);
     }
+    fetched.deleteOnExit();
     
     InputStream in = null;
     try {
@@ -300,7 +335,7 @@ public class TrackerClient extends I2PThread
    * Very lazy byte[] to URL encoder.  Just encodes everything, even
    * "normal" chars.
    */
-  static String urlencode(byte[] bs)
+  public static String urlencode(byte[] bs)
   {
     StringBuffer sb = new StringBuffer(bs.length*3);
     for (int i = 0; i < bs.length; i++)

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

@@ -43,22 +43,49 @@ public class I2PSnarkServlet extends HttpServlet {
         req.setCharacterEncoding("UTF-8");
         resp.setCharacterEncoding("UTF-8");
         resp.setContentType("text/html; charset=UTF-8");
+        long stats[] = {0,0,0,0};
         
         String nonce = req.getParameter("nonce");
         if ( (nonce != null) && (nonce.equals(String.valueOf(_nonce))) )
             processRequest(req);
         
+        String peerParam = req.getParameter("p");
+        String peerString;
+        if (peerParam == null) {
+            peerString = "";
+        } else {
+            peerString = "?p=" + peerParam;
+        }
+
         PrintWriter out = resp.getWriter();
         out.write(HEADER_BEGIN);
         // we want it to go to the base URI so we don't refresh with some funky action= value
-        out.write("<meta http-equiv=\"refresh\" content=\"60;" + req.getRequestURI() + "\">\n");
+        out.write("<meta http-equiv=\"refresh\" content=\"60;" + req.getRequestURI() + peerString + "\">\n");
         out.write(HEADER);
         
         out.write("<table border=\"0\" width=\"100%\">\n");
-        out.write("<tr><td width=\"5%\" class=\"snarkTitle\" valign=\"top\" align=\"left\">");
+        out.write("<tr><td width=\"20%\" class=\"snarkTitle\" valign=\"top\" align=\"left\">");
         out.write("I2PSnark<br />\n");
-        out.write("<a href=\"" + req.getRequestURI() + "\" class=\"snarkRefresh\">Refresh</a>\n");
-        out.write("</td><td width=\"95%\" class=\"snarkMessages\" valign=\"top\" align=\"left\"><pre>");
+        out.write("<table border=\"0\" width=\"100%\">\n");
+        out.write("<tr><td><a href=\"" + req.getRequestURI() + peerString + "\" class=\"snarkRefresh\">Refresh</a>\n");
+        out.write("<td><a href=\"http://forum.i2p/viewforum.php?f=21\" class=\"snarkRefresh\">Forum</a>\n");
+        int count = 0;
+        Map trackers = _manager.getTrackers();
+        for (Iterator iter = trackers.keySet().iterator(); iter.hasNext(); ) {
+            String name = (String)iter.next();
+            String baseURL = (String)trackers.get(name);
+            int e = baseURL.indexOf('=');
+            if (e < 0)
+                continue;
+            baseURL = baseURL.substring(e + 1);
+            if (count++ % 2 == 0)
+                out.write("<tr>");
+            out.write("<td><a href=\"" + baseURL + "\" class=\"snarkRefresh\">" + name + "</a>\n");
+        }
+        if (count % 2 == 1)
+            out.write("<td>&nbsp;\n");
+        out.write("</table>\n");
+        out.write("</td><td width=\"80%\" class=\"snarkMessages\" valign=\"top\" align=\"left\"><pre>");
         List msgs = _manager.getMessages();
         for (int i = msgs.size()-1; i >= 0; i--) {
             String msg = (String)msgs.get(i);
@@ -66,19 +93,42 @@ public class I2PSnarkServlet extends HttpServlet {
         }
         out.write("</pre></td></tr></table>\n");
 
-        out.write(TABLE_HEADER);
-
         List snarks = getSortedSnarks(req);
         String uri = req.getRequestURI();
+        out.write(TABLE_HEADER);
+        if (I2PSnarkUtil.instance().connected() && snarks.size() > 0) {
+            if (peerParam != null)
+                out.write("(<a href=\"" + req.getRequestURI() + "\">Hide Peers</a>)<br />\n");
+            else
+                out.write("(<a href=\"" + req.getRequestURI() + "?p=1" + "\">Show Peers</a>)<br />\n");
+        }
+        out.write(TABLE_HEADER2);
+        out.write("<th align=\"left\" valign=\"top\">");
+        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
+            out.write("&nbsp;");
+        out.write("</th></tr></thead>\n");
         for (int i = 0; i < snarks.size(); i++) {
             Snark snark = (Snark)snarks.get(i);
-            displaySnark(out, snark, uri, i);
+            boolean showPeers = "1".equals(peerParam) || Base64.encode(snark.meta.getInfoHash()).equals(peerParam);
+            displaySnark(out, snark, uri, i, stats, showPeers);
         }
         if (snarks.size() <= 0) {
             out.write(TABLE_EMPTY);
+        } else if (snarks.size() > 1) {
+            out.write(TABLE_TOTAL);
+            out.write("    <th align=\"right\" valign=\"top\">" + formatSize(stats[0]) + "</th>\n" +
+                      "    <th align=\"right\" valign=\"top\">" + formatSize(stats[1]) + "</th>\n" +
+                      "    <th align=\"right\" valign=\"top\">" + formatSize(stats[2]) + "ps</th>\n" +
+                      "    <th align=\"right\" valign=\"top\">" + formatSize(stats[3]) + "ps</th>\n" +
+                      "    <th>&nbsp;</th></tr>\n" +
+                      "</tfoot>\n");
         }
         
         out.write(TABLE_FOOTER);
+
         writeAddForm(out, req);
         if (true) // seeding needs to register the torrent first, so we can't start it automatically (boo, hiss)
             writeSeedForm(out, req);
@@ -230,7 +280,8 @@ public class I2PSnarkServlet extends HttpServlet {
             String i2cpHost = req.getParameter("i2cpHost");
             String i2cpPort = req.getParameter("i2cpPort");
             String i2cpOpts = req.getParameter("i2cpOpts");
-            _manager.updateConfig(dataDir, autoStart, seedPct, eepHost, eepPort, i2cpHost, i2cpPort, i2cpOpts);
+            String upLimit = req.getParameter("upLimit");
+            _manager.updateConfig(dataDir, autoStart, seedPct, eepHost, eepPort, i2cpHost, i2cpPort, i2cpOpts, upLimit);
         } else if ("Create torrent".equals(action)) {
             String baseData = req.getParameter("baseFile");
             if (baseData != null) {
@@ -240,7 +291,9 @@ public class I2PSnarkServlet extends HttpServlet {
                 if ( (announceURLOther != null) && (announceURLOther.trim().length() > "http://.i2p/announce".length()) )
                     announceURL = announceURLOther;
 
-                if (baseFile.exists() && baseFile.isFile()) {
+                if (announceURL == null || announceURL.length() <= 0)
+                    _manager.addMessage("Error creating torrent - you must select a tracker");
+                else if (baseFile.exists()) {
                     try {
                         Storage s = new Storage(baseFile, announceURL, null);
                         s.create();
@@ -258,12 +311,22 @@ public class I2PSnarkServlet extends HttpServlet {
                     } catch (IOException ioe) {
                         _manager.addMessage("Error creating a torrent for " + baseFile.getAbsolutePath() + ": " + ioe.getMessage());
                     }
-                } else if (baseFile.exists()) {
-                    _manager.addMessage("I2PSnark doesn't yet support creating multifile torrents");
                 } else {
-                    _manager.addMessage("Cannot create a torrent for the nonexistant data: " + baseFile.getAbsolutePath());
+                    _manager.addMessage("Cannot create a torrent for the nonexistent data: " + baseFile.getAbsolutePath());
                 }
             }
+        } else if ("StopAll".equals(action)) {
+            _manager.addMessage("Stopping all torrents and closing the I2P tunnel");
+            List snarks = getSortedSnarks(req);
+            for (int i = 0; i < snarks.size(); i++) {
+                Snark snark = (Snark)snarks.get(i);
+                if (!snark.stopped)
+                    _manager.stopTorrent(snark.torrent, false);
+            }
+            if (I2PSnarkUtil.instance().connected()) {
+                I2PSnarkUtil.instance().disconnect();
+                _manager.addMessage("I2P tunnel closed");
+            }
         }
     }
     
@@ -279,12 +342,16 @@ public class I2PSnarkServlet extends HttpServlet {
         }
         return rv;
     }
-    
+
     private static final int MAX_DISPLAYED_FILENAME_LENGTH = 60;
-    private void displaySnark(PrintWriter out, Snark snark, String uri, int row) throws IOException {
+    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 {
         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
+        int i = filename.lastIndexOf(".torrent");
+        if (i > 0)
+            filename = filename.substring(0, i);
         if (filename.length() > MAX_DISPLAYED_FILENAME_LENGTH)
             filename = filename.substring(0, MAX_DISPLAYED_FILENAME_LENGTH) + "...";
         long total = snark.meta.getTotalLength();
@@ -292,32 +359,78 @@ public class I2PSnarkServlet extends HttpServlet {
         long remaining = (long) snark.storage.needed() * (long) snark.meta.getPieceLength(0); 
         if (remaining > total)
             remaining = total;
-        int totalBps = 4096; // should probably grab this from the snark...
-        long remainingSeconds = remaining / totalBps;
-        long uploaded = snark.coordinator.getUploaded();
-        
+        long downBps = 0;
+        long upBps = 0;
+        if (snark.coordinator != null) {
+            downBps = snark.coordinator.getDownloadRate();
+            upBps = snark.coordinator.getUploadRate();
+        }
+        long remainingSeconds;
+        if (downBps > 0)
+            remainingSeconds = remaining / downBps;
+        else
+            remainingSeconds = -1;
         boolean isRunning = !snark.stopped;
+        long uploaded = 0;
+        if (snark.coordinator != null) {
+            uploaded = snark.coordinator.getUploaded();
+            stats[0] += snark.coordinator.getDownloaded();
+        }
+        stats[1] += uploaded;
+        if (isRunning) {
+            stats[2] += downBps;
+            stats[3] += upBps;
+        }
+        
         boolean isValid = snark.meta != null;
         boolean singleFile = snark.meta.getFiles() == null;
         
-        String err = snark.coordinator.trackerProblems;
-        int curPeers = snark.coordinator.getPeerCount();
-        int knownPeers = snark.coordinator.trackerSeenPeers;
+        String err = null;
+        int curPeers = 0;
+        int knownPeers = 0;
+        if (snark.coordinator != null) {
+            err = snark.coordinator.trackerProblems;
+            curPeers = snark.coordinator.getPeerCount();
+            knownPeers = snark.coordinator.trackerSeenPeers;
+        }
         
         String statusString = "Unknown";
         if (err != null) {
-            if (isRunning)
-                statusString = "TrackerErr (" + curPeers + "/" + knownPeers + " peers)";
-            else
-                statusString = "TrackerErr (" + err + ")";
+            if (isRunning && curPeers > 0 && !showPeers)
+                statusString = "<a title=\"" + err + "\">TrackerErr</a> (" +
+                               curPeers + "/" + knownPeers +
+                               " <a href=\"" + uri + "?p=" + Base64.encode(snark.meta.getInfoHash()) + "\">peers</a>)";
+            else if (isRunning)
+                statusString = "<a title=\"" + err + "\">TrackerErr (" + curPeers + "/" + knownPeers + " peers)";
+            else {
+                if (err.length() > MAX_DISPLAYED_ERROR_LENGTH)
+                    err = err.substring(0, MAX_DISPLAYED_ERROR_LENGTH) + "...";
+                statusString = "TrackerErr<br />(" + err + ")";
+            }
         } else if (remaining <= 0) {
-            if (isRunning)
+            if (isRunning && curPeers > 0 && !showPeers)
+                statusString = "Seeding (" +
+                               curPeers + "/" + knownPeers +
+                               " <a href=\"" + uri + "?p=" + Base64.encode(snark.meta.getInfoHash()) + "\">peers</a>)";
+            else if (isRunning)
                 statusString = "Seeding (" + curPeers + "/" + knownPeers + " peers)";
             else
                 statusString = "Complete";
         } else {
-            if (isRunning)
+            if (isRunning && curPeers > 0 && downBps > 0 && !showPeers)
+                statusString = "OK (" +
+                               curPeers + "/" + knownPeers +
+                               " <a href=\"" + uri + "?p=" + Base64.encode(snark.meta.getInfoHash()) + "\">peers</a>)";
+            else if (isRunning && curPeers > 0 && downBps > 0)
                 statusString = "OK (" + curPeers + "/" + knownPeers + " peers)";
+            else if (isRunning && curPeers > 0 && !showPeers)
+                statusString = "Stalled (" +
+                               curPeers + "/" + knownPeers +
+                               " <a href=\"" + uri + "?p=" + Base64.encode(snark.meta.getInfoHash()) + "\">peers</a>)";
+            else if (isRunning && curPeers > 0)
+                statusString = "Stalled (" + curPeers + "/" + knownPeers + " peers)";
+            else if (isRunning)
+                statusString = "No Peers (0/" + knownPeers + ")";
             else
                 statusString = "Stopped";
         }
@@ -334,40 +447,138 @@ public class I2PSnarkServlet extends HttpServlet {
         out.write(filename);
         if (remaining == 0)
             out.write("</a>");
-        out.write("</td>\n\t");
-        
-        out.write("<td valign=\"top\" align=\"left\" class=\"snarkTorrentDownloaded " + rowClass + "\">");
-        if (remaining > 0) {
-            out.write(formatSize(total-remaining) + "/" + formatSize(total)); // 18MB/3GB
-            // lets hold off on the ETA until we have rates sorted...
-            //out.write(" (eta " + DataHelper.formatDuration(remainingSeconds*1000) + ")"); // (eta 6h)
-        } else {
-            out.write(formatSize(total)); // 3GB
+        // temporarily hardcoded for postman and anonymity, requires bytemonsoon patch for lookup by info_hash
+        String announce = snark.meta.getAnnounce();
+        if (announce.startsWith("http://YRgrgTLG") || announce.startsWith("http://8EoJZIKr")) {
+            Map trackers = _manager.getTrackers();
+            for (Iterator iter = trackers.keySet().iterator(); iter.hasNext(); ) {
+                String name = (String)iter.next();
+                String baseURL = (String)trackers.get(name);
+                if (!baseURL.startsWith(announce))
+                    continue;
+                int e = baseURL.indexOf('=');
+                if (e < 0)
+                    continue;
+                baseURL = baseURL.substring(e + 1);
+                out.write("&nbsp;&nbsp;&nbsp;(<a href=\"" + baseURL + "details.php?dllist=1&filelist=1&info_hash=");
+                out.write(TrackerClient.urlencode(snark.meta.getInfoHash()));
+                out.write("\" title=\"" + name + " Tracker\">Details</a>)");
+                break;
+            }
         }
         out.write("</td>\n\t");
-        out.write("<td valign=\"top\" align=\"left\" class=\"snarkTorrentUploaded " + rowClass 
+        
+        out.write("<td valign=\"top\" align=\"right\" class=\"snarkTorrentETA " + rowClass + "\">");
+        if(isRunning && remainingSeconds > 0)
+            out.write(DataHelper.formatDuration(remainingSeconds*1000)); // (eta 6h)
+        out.write("</td>\n\t");
+        out.write("<td valign=\"top\" align=\"right\" class=\"snarkTorrentDownloaded " + rowClass + "\">");
+        if (remaining > 0)
+            out.write(formatSize(total-remaining) + "/" + formatSize(total)); // 18MB/3GB
+        else
+            out.write(formatSize(total)); // 3GB
+        out.write("</td>\n\t");
+        out.write("<td valign=\"top\" align=\"right\" class=\"snarkTorrentUploaded " + rowClass 
                   + "\">" + formatSize(uploaded) + "</td>\n\t");
-        //out.write("<td valign=\"top\" align=\"left\" class=\"snarkTorrentRate\">");
-        //out.write("n/a"); //2KBps/12KBps/4KBps
-        //out.write("</td>\n\t");
+        out.write("<td valign=\"top\" align=\"right\" class=\"snarkTorrentRate\">");
+        if(isRunning && remaining > 0)
+            out.write(formatSize(downBps) + "ps");
+        out.write("</td>\n\t");
+        out.write("<td valign=\"top\" align=\"right\" class=\"snarkTorrentRate\">");
+        if(isRunning)
+            out.write(formatSize(upBps) + "ps");
+        out.write("</td>\n\t");
         out.write("<td valign=\"top\" align=\"left\" class=\"snarkTorrentAction " + rowClass + "\">");
+        String parameters = "&nonce=" + _nonce + "&torrent=" + Base64.encode(snark.meta.getInfoHash());
+        if (showPeers)
+            parameters = parameters + "&p=1";
         if (isRunning) {
-            out.write("<a href=\"" + uri + "?action=Stop&nonce=" + _nonce 
-                      + "&torrent=" + Base64.encode(snark.meta.getInfoHash())
+            out.write("<a href=\"" + uri + "?action=Stop" + parameters
                       + "\" title=\"Stop the torrent\">Stop</a>");
         } else {
             if (isValid)
-                out.write("<a href=\"" + uri + "?action=Start&nonce=" + _nonce 
-                          + "&torrent=" + Base64.encode(snark.meta.getInfoHash())
+                out.write("<a href=\"" + uri + "?action=Start" + parameters
                           + "\" title=\"Start the torrent\">Start</a> ");
-            out.write("<a href=\"" + uri + "?action=Remove&nonce=" + _nonce 
-                      + "&torrent=" + Base64.encode(snark.meta.getInfoHash())
+            out.write("<a href=\"" + uri + "?action=Remove" + parameters
                       + "\" title=\"Remove the torrent from the active list, deleting the .torrent file\">Remove</a><br />");
-            out.write("<a href=\"" + uri + "?action=Delete&nonce=" + _nonce 
-                      + "&torrent=" + Base64.encode(snark.meta.getInfoHash())
+            out.write("<a href=\"" + uri + "?action=Delete" + parameters
                       + "\" title=\"Delete the .torrent file and the associated data file(s)\">Delete</a> ");
         }
         out.write("</td>\n</tr>\n");
+        if(showPeers && isRunning && curPeers > 0) {
+            List peers = snark.coordinator.peerList();
+            Iterator it = peers.iterator();
+            while (it.hasNext()) {
+                Peer peer = (Peer)it.next();
+                if (!peer.isConnected())
+                    continue;
+                out.write("<tr class=\"" + rowClass + "\">");
+                out.write("<td class=\"snarkTorrentStatus " + rowClass + "\">");
+                out.write("</td>\n\t");
+                out.write("<td valign=\"top\" align=\"right\" class=\"snarkTorrentStatus " + rowClass + "\">");
+                String ch = peer.toString().substring(0, 4);
+                String client;
+                if ("AwMD".equals(ch))
+                    client = "I2PSnark";
+                else if ("BFJT".equals(ch))
+                    client = "I2PRufus";
+                else if ("TTMt".equals(ch))
+                    client = "I2P-BT";
+                else if ("LUFa".equals(ch))
+                    client = "Azureus";
+                else
+                    client = "Unknown";
+                out.write("<font size=-1>" + client + "</font>&nbsp;&nbsp;<tt>" + peer.toString().substring(5, 9) + "</tt>");
+                out.write("</td>\n\t");
+                out.write("<td class=\"snarkTorrentStatus " + rowClass + "\">");
+                out.write("</td>\n\t");
+                out.write("<td valign=\"top\" align=\"right\" class=\"snarkTorrentStatus " + rowClass + "\">");
+                float pct = (float) (100.0 * (float) peer.completed() / snark.meta.getPieces());
+                if (pct == 100.0)
+                    out.write("<font size=-1>Seed</font>");
+                else {
+                    String ps = String.valueOf(pct);
+                    if (ps.length() > 5)
+                        ps = ps.substring(0, 5);
+                    out.write("<font size=-1>" + ps + "%</font>");
+                }
+                out.write("</td>\n\t");
+                out.write("<td class=\"snarkTorrentStatus " + rowClass + "\">");
+                out.write("</td>\n\t");
+                out.write("<td valign=\"top\" align=\"right\" class=\"snarkTorrentStatus " + rowClass + "\">");
+                if (remaining > 0) {
+                    if (peer.isInteresting() && !peer.isChoked()) {
+                        out.write("<font color=#008000>");
+                        out.write("<font size=-1>" + formatSize(peer.getDownloadRate()) + "ps</font></font>");
+                    } else {
+                        out.write("<font color=#a00000><font size=-1><a title=\"");
+                        if (!peer.isInteresting())
+                            out.write("Uninteresting\">");
+                        else
+                            out.write("Choked\">");
+                        out.write(formatSize(peer.getDownloadRate()) + "ps</a></font></font>");
+                    }
+                }
+                out.write("</td>\n\t");
+                out.write("<td valign=\"top\" align=\"right\" class=\"snarkTorrentStatus " + rowClass + "\">");
+                if (pct != 100.0) {
+                    if (peer.isInterested() && !peer.isChoking()) {
+                        out.write("<font color=#008000>");
+                        out.write("<font size=-1>" + formatSize(peer.getUploadRate()) + "ps</font></font>");
+                    } else {
+                        out.write("<font color=#a00000><font size=-1><a title=\"");
+                        if (!peer.isInterested())
+                            out.write("Uninterested\">");
+                        else
+                            out.write("Choking\">");
+                        out.write(formatSize(peer.getUploadRate()) + "ps</a></font></font>");
+                    }
+                }
+                out.write("</td>\n\t");
+                out.write("<td class=\"snarkTorrentStatus " + rowClass + "\">");
+                out.write("</td></tr>\n\t");
+            }
+        }
     }
     
     private void writeAddForm(PrintWriter out, HttpServletRequest req) throws IOException {
@@ -381,7 +592,8 @@ public class I2PSnarkServlet extends HttpServlet {
         // *not* enctype="multipart/form-data", so that the input type=file sends the filename, not the file
         out.write("<form action=\"" + uri + "\" method=\"POST\">\n");
         out.write("<input type=\"hidden\" name=\"nonce\" value=\"" + _nonce + "\" />\n");
-        out.write("From URL&nbsp;: <input type=\"text\" name=\"newURL\" size=\"50\" value=\"" + newURL + "\" /> \n");
+        out.write("<span class=\"snarkConfigTitle\">Add Torrent:</span><br />\n");
+        out.write("From URL&nbsp;: <input type=\"text\" name=\"newURL\" size=\"80\" value=\"" + newURL + "\" /> \n");
         // not supporting from file at the moment, since the file name passed isn't always absolute (so it may not resolve)
         //out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\" value=\"" + newFile + "\" /><br />\n");
         out.write("<input type=\"submit\" value=\"Add torrent\" name=\"action\" /><br />\n");
@@ -396,21 +608,24 @@ public class I2PSnarkServlet extends HttpServlet {
         if (baseFile == null)
             baseFile = "";
         
-        out.write("<span class=\"snarkNewTorrent\">\n");
+        out.write("<span class=\"snarkNewTorrent\"><hr />\n");
         // *not* enctype="multipart/form-data", so that the input type=file sends the filename, not the file
         out.write("<form action=\"" + uri + "\" method=\"POST\">\n");
         out.write("<input type=\"hidden\" name=\"nonce\" value=\"" + _nonce + "\" />\n");
+        out.write("<span class=\"snarkConfigTitle\">Create Torrent:</span><br />\n");
         //out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\" value=\"" + newFile + "\" /><br />\n");
         out.write("Data to seed: " + _manager.getDataDir().getAbsolutePath() + File.separatorChar 
                   + "<input type=\"text\" name=\"baseFile\" size=\"20\" value=\"" + baseFile 
                   + "\" title=\"File to seed (must be within the specified path)\" /><br />\n");
         out.write("Tracker: <select name=\"announceURL\"><option value=\"\">Select a tracker</option>\n");
-        Map trackers = sort(_manager.getTrackers());
+        Map trackers = _manager.getTrackers();
         for (Iterator iter = trackers.keySet().iterator(); iter.hasNext(); ) {
             String name = (String)iter.next();
             String announceURL = (String)trackers.get(name);
-            // we inject whitespace in sort(...) to guarantee uniqueness, but we can strip it off here
-            out.write("\t<option value=\"" + announceURL + "\">" + name.trim() + "</option>\n");
+            int e = announceURL.indexOf('=');
+            if (e > 0)
+                announceURL = announceURL.substring(0, e);
+            out.write("\t<option value=\"" + announceURL + "\">" + name + "</option>\n");
         }
         out.write("</select>\n");
         out.write("or <input type=\"text\" name=\"announceURLOther\" size=\"50\" value=\"http://\" " +
@@ -419,23 +634,11 @@ public class I2PSnarkServlet extends HttpServlet {
         out.write("</form>\n</span>\n");        
     }
     
-    private Map sort(Map trackers) {
-        TreeMap rv = new TreeMap();
-        for (Iterator iter = trackers.keySet().iterator(); iter.hasNext(); ) {
-            String url = (String)iter.next();
-            String name = (String)trackers.get(url);
-            while (rv.containsKey(name))
-                name = name + " ";
-            rv.put(name, url);
-        }
-        return rv;
-    }
-    
     private void writeConfigForm(PrintWriter out, HttpServletRequest req) throws IOException {
         String uri = req.getRequestURI();
         String dataDir = _manager.getDataDir().getAbsolutePath();
         boolean autoStart = _manager.shouldAutoStart();
-        int seedPct = 0;
+        //int seedPct = 0;
        
         out.write("<form action=\"" + uri + "\" method=\"POST\">\n");
         out.write("<span class=\"snarkConfig\"><hr />\n");
@@ -449,6 +652,7 @@ public class I2PSnarkServlet extends HttpServlet {
         //Auto add: <input type="checkbox" name="autoAdd" value="true" title="If true, automatically add torrents that are found in the data directory" />
         //Auto stop: <input type="checkbox" name="autoStop" value="true" title="If true, automatically stop torrents that are removed from the data directory" />
         //out.write("<br />\n");
+/*
         out.write("Seed percentage: <select name=\"seedPct\" disabled=\"true\" >\n\t");
         if (seedPct <= 0)
             out.write("<option value=\"0\" selected=\"true\">Unlimited</option>\n\t");
@@ -463,6 +667,9 @@ public class I2PSnarkServlet extends HttpServlet {
         else
             out.write("<option value=\"150\">150%</option>\n\t");
         out.write("</select><br />\n");
+*/
+        out.write("Total uploader limit: <input type=\"text\" name=\"upLimit\" value=\""
+                  + I2PSnarkUtil.instance().getMaxUploaders() + "\" size=\"3\" /> peers<br />\n");
         
         //out.write("<hr />\n");
         out.write("EepProxy host: <input type=\"text\" name=\"eepHost\" value=\""
@@ -480,22 +687,23 @@ public class I2PSnarkServlet extends HttpServlet {
             String val = (String)options.get(key);
             opts.append(key).append('=').append(val).append(' ');
         }
-        out.write("I2CP opts: <input type=\"text\" name=\"i2cpOpts\" size=\"40\" value=\""
+        out.write("I2CP opts: <input type=\"text\" name=\"i2cpOpts\" size=\"80\" value=\""
                   + opts.toString() + "\" /><br />\n");
         out.write("<input type=\"submit\" value=\"Save configuration\" name=\"action\" />\n");
         out.write("</span>\n");
         out.write("</form>\n");
     }
     
+    // rounding makes us look faster :)
     private String formatSize(long bytes) {
         if (bytes < 5*1024)
             return bytes + "B";
         else if (bytes < 5*1024*1024)
-            return (bytes/1024) + "KB";
+            return ((bytes + 512)/1024) + "KB";
         else if (bytes < 5*1024*1024*1024l)
-            return (bytes/(1024*1024)) + "MB";
+            return ((bytes + 512*1024)/(1024*1024)) + "MB";
         else
-            return (bytes/(1024*1024*1024)) + "GB";
+            return ((bytes + 512*1024*1024)/(1024*1024*1024)) + "GB";
     }
     
     private static final String HEADER_BEGIN = "<html>\n" +
@@ -540,7 +748,10 @@ public class I2PSnarkServlet extends HttpServlet {
                                          "}\n" +
                                          "th {\n" +
                                          "	background-color: #C7D5D5;\n" +
-                                         "	margin: 0px 0px 0px 0px;\n" +
+                                         "	padding: 0px 7px 0px 3px;\n" +
+                                         "}\n" +
+                                         "td {\n" +
+                                         "	padding: 0px 7px 0px 3px;\n" +
                                          "}\n" +
                                          ".snarkTorrentEven {\n" +
                                          "	background-color: #E7E7E7;\n" +
@@ -550,8 +761,6 @@ public class I2PSnarkServlet extends HttpServlet {
                                          "}\n" +
                                          ".snarkNewTorrent {\n" +
                                          "	font-size: 10pt;\n" +
-                                         "	font-family: monospace;\n" +
-                                         "	background-color: #ADAE9;\n" +
                                          "}\n" +
                                          ".snarkAddInfo {\n" +
                                          "	font-size: 10pt;\n" +
@@ -568,19 +777,26 @@ public class I2PSnarkServlet extends HttpServlet {
                                          "<body>\n";
 
 
-    private static final String TABLE_HEADER = "<table border=\"0\" class=\"snarkTorrents\" width=\"100%\">\n" +
+    private static final String TABLE_HEADER = "<table border=\"0\" class=\"snarkTorrents\" width=\"100%\" cellpadding=\"0 10px\">\n" +
                                                "<thead>\n" +
-                                               "<tr><th align=\"left\" valign=\"top\">Status</th>\n" +
+                                               "<tr><th align=\"left\" valign=\"top\">Status \n";
+
+    private static final String TABLE_HEADER2 = "</th>\n" +
                                                "    <th align=\"left\" valign=\"top\">Torrent</th>\n" +
-                                               "    <th align=\"left\" valign=\"top\">Downloaded</th>\n" +
-                                               "    <th align=\"left\" valign=\"top\">Uploaded</th>\n" +
-                                               //"    <th align=\"left\" valign=\"top\">Rate</th>\n" +
-                                               "    <th>&nbsp;</th></tr>\n" +
-                                               "</thead>\n";
+                                               "    <th align=\"right\" valign=\"top\">ETA</th>\n" +
+                                               "    <th align=\"right\" valign=\"top\">Downloaded</th>\n" +
+                                               "    <th align=\"right\" valign=\"top\">Uploaded</th>\n" +
+                                               "    <th align=\"right\" valign=\"top\">Down Rate</th>\n" +
+                                               "    <th align=\"right\" valign=\"top\">Up Rate</th>\n";
+    
+    private static final String TABLE_TOTAL =  "<tfoot>\n" +
+                                               "<tr><th align=\"left\" valign=\"top\">Totals</th>\n" +
+                                               "    <th>&nbsp;</th>\n" +
+                                               "    <th>&nbsp;</th>\n";
     
    private static final String TABLE_EMPTY  = "<tr class=\"snarkTorrentEven\">" +
                                               "<td class=\"snarkTorrentEven\" align=\"left\"" +
-                                              "    valign=\"top\" colspan=\"5\">No torrents</td></tr>\n";
+                                              "    valign=\"top\" colspan=\"8\">No torrents</td></tr>\n";
 
     private static final String TABLE_FOOTER = "</table>\n";
     

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

@@ -112,6 +112,16 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
          "or naming one of them differently.<P/>")
          .getBytes();
     
+    private final static byte[] ERR_BAD_PROTOCOL =
+        ("HTTP/1.1 403 Bad Protocol\r\n"+
+         "Content-Type: text/html; charset=iso-8859-1\r\n"+
+         "Cache-control: no-cache\r\n"+
+         "\r\n"+
+         "<html><body><H1>I2P ERROR: NON-HTTP PROTOCOL</H1>"+
+         "The request uses a bad protocol. "+
+         "The I2P HTTP Proxy supports http:// requests ONLY. Other protocols such as https:// and ftp:// are not allowed.<BR>")
+        .getBytes();
+    
     /** used to assign unique IDs to the threads / clients.  no logic or functionality */
     private static volatile long __clientId = 0;
 
@@ -483,7 +493,10 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
             if (method == null || destination == null) {
                 l.log("No HTTP method found in the request.");
                 if (out != null) {
-                    out.write(ERR_REQUEST_DENIED);
+                    if ("http://".equalsIgnoreCase(protocol))
+                        out.write(ERR_REQUEST_DENIED);
+                    else
+                        out.write(ERR_BAD_PROTOCOL);
                     out.write("<p /><i>Generated on: ".getBytes());
                     out.write(new Date().toString().getBytes());
                     out.write("</i></body></html>\n".getBytes());
@@ -584,6 +597,9 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
         }
     }
     
+    private static String jumpServers[] = {"http://orion.i2p/jump/",
+                                           "http://trevorreznik.i2p/cgi-bin/jump.php?hostname="
+                                          };
     private static void writeErrorMessage(byte[] errMessage, OutputStream out, String targetRequest,
                                           boolean usingWWWProxy, String wwwProxy, boolean showAddrHelper) throws IOException {
         if (out != null) {
@@ -602,11 +618,16 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
                 out.write("</a>".getBytes());
                 if (usingWWWProxy) out.write(("<br>WWW proxy: " + wwwProxy).getBytes());
                 if (showAddrHelper) {
-                    out.write("<br><br>Click below to try an address helper link:<br><br><a href=\"http://orion.i2p/jump/".getBytes());
-                    out.write(uri.getBytes());
-                    out.write("\">http://orion.i2p/jump/".getBytes());
-                    out.write(uri.getBytes());
-                    out.write("</a>".getBytes());
+                    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++) {
+                        out.write("<br><a href=\"".getBytes());
+                        out.write(jumpServers[i].getBytes());
+                        out.write(uri.getBytes());
+                        out.write("\">".getBytes());
+                        out.write(jumpServers[i].getBytes());
+                        out.write(uri.getBytes());
+                        out.write("</a>".getBytes());
+                    }
                 }
             }
             out.write("</div><p><i>I2P HTTP Proxy Server<br>Generated on: ".getBytes());

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

@@ -27,8 +27,6 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
     protected List dests;
     private static final long DEFAULT_READ_TIMEOUT = 5*60*1000; // -1
     protected long readTimeout = DEFAULT_READ_TIMEOUT;
-    /** this is the pong response the client expects for their last ping.  at least, i hope so... */
-    private String _expectedPong;
 
     /**
      * @throws IllegalArgumentException if the I2PTunnel does not contain
@@ -47,8 +45,6 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
               notifyThis, 
               "IRCHandler " + (++__clientId), tunnel);
         
-        _expectedPong = null;
-
         StringTokenizer tok = new StringTokenizer(destinations, ",");
         dests = new ArrayList(1);
         while (tok.hasMoreTokens()) {
@@ -85,9 +81,10 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
         try {
             i2ps = createI2PSocket(dest);
             i2ps.setReadTimeout(readTimeout);
-            Thread in = new I2PThread(new IrcInboundFilter(s,i2ps));
+            StringBuffer expectedPong = new StringBuffer();
+            Thread in = new I2PThread(new IrcInboundFilter(s,i2ps, expectedPong));
             in.start();
-            Thread out = new I2PThread(new IrcOutboundFilter(s,i2ps));
+            Thread out = new I2PThread(new IrcOutboundFilter(s,i2ps, expectedPong));
             out.start();
         } catch (Exception ex) {
             if (_log.shouldLog(Log.ERROR))
@@ -123,10 +120,12 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
         
         private Socket local;
         private I2PSocket remote;
+        private StringBuffer expectedPong;
                 
-        IrcInboundFilter(Socket _local, I2PSocket _remote) {
+        IrcInboundFilter(Socket _local, I2PSocket _remote, StringBuffer pong) {
             local=_local;
             remote=_remote;
+            expectedPong=pong;
         }
 
         public void run() {
@@ -153,7 +152,7 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
                             inmsg=inmsg.substring(0,inmsg.length()-1);
                         if (_log.shouldLog(Log.DEBUG))
                             _log.debug("in: [" + inmsg + "]");
-                        String outmsg = inboundFilter(inmsg);
+                        String outmsg = inboundFilter(inmsg, expectedPong);
                         if(outmsg!=null)
                         {
                             if(!inmsg.equals(outmsg)) {
@@ -195,10 +194,12 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
                     
             private Socket local;
             private I2PSocket remote;
+            private StringBuffer expectedPong;
                 
-            IrcOutboundFilter(Socket _local, I2PSocket _remote) {
+            IrcOutboundFilter(Socket _local, I2PSocket _remote, StringBuffer pong) {
                 local=_local;
                 remote=_remote;
+                expectedPong=pong;
             }
                 
             public void run() {
@@ -225,7 +226,7 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
                                 inmsg=inmsg.substring(0,inmsg.length()-1);
                             if (_log.shouldLog(Log.DEBUG))
                                 _log.debug("out: [" + inmsg + "]");
-                            String outmsg = outboundFilter(inmsg);
+                            String outmsg = outboundFilter(inmsg, expectedPong);
                             if(outmsg!=null)
                             {
                                 if(!inmsg.equals(outmsg)) {
@@ -264,7 +265,7 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
      *
      */
     
-    public String inboundFilter(String s) {
+    public String inboundFilter(String s, StringBuffer expectedPong) {
         
         String field[]=s.split(" ",4);
         String command;
@@ -281,6 +282,8 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
                 "PART",
                 "WALLOPS",
                 "ERROR",
+                "KICK",
+                "H", // "hide operator status" (after kicking an op)
                 "TOPIC"
         };
         
@@ -311,9 +314,9 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
             // though, does 127.0.0.1 work for irc clients connecting remotely?  and for all of them?  sure would
             // be great if irc clients actually followed the RFCs here, but i guess thats too much to ask.
             // If we haven't PINGed them, or the PING we sent isn't something we know how to filter, this 
-            // is null.
-            String pong = _expectedPong;
-            _expectedPong = null;
+            // is blank.
+            String pong = expectedPong.length() > 0 ? expectedPong.toString() : null;
+            expectedPong.setLength(0);
             return pong;
         }
         
@@ -347,7 +350,7 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
         return null;
     }
     
-    public String outboundFilter(String s) {
+    public String outboundFilter(String s, StringBuffer expectedPong) {
         
         String field[]=s.split(" ",3);
         String command;
@@ -397,24 +400,24 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
             // Yuck.
 
             String rv = null;
+            expectedPong.setLength(0);
             if (field.length == 1) { // PING
                 rv = "PING";
-                _expectedPong = "PONG 127.0.0.1";
+                expectedPong.append("PONG 127.0.0.1");
             } else if (field.length == 2) { // PING nonce
                 rv = "PING " + field[1];
-                _expectedPong = "PONG " + field[1];
+                expectedPong.append("PONG ").append(field[1]);
             } else if (field.length == 3) { // PING nonce serverLocation
                 rv = "PING " + field[1];
-                _expectedPong = "PONG " + field[1];
+                expectedPong.append("PONG ").append(field[1]);
             } else {
                 if (_log.shouldLog(Log.ERROR))
                     _log.error("IRC client sent a PING we don't understand, filtering it (\"" + s + "\")");
                 rv = null;
-                _expectedPong = null;
             }
             
             if (_log.shouldLog(Log.WARN))
-                _log.warn("sending ping " + rv + ", waiting for " + _expectedPong + " orig was [" + s  + "]");
+                _log.warn("sending ping " + rv + ", waiting for " + expectedPong + " orig was [" + s  + "]");
             
             return rv;
         }

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

@@ -190,6 +190,7 @@ public class IndexBean {
     }
     
     private String saveChanges() {
+        // Get current tunnel controller
         TunnelController cur = getController(_tunnel);
         
         Properties config = getConfig();
@@ -205,21 +206,28 @@ public class IndexBean {
         } else {
             cur.setConfig(config, "");
         }
-        
-        if ("ircclient".equals(cur.getType()) || 
-        		"httpclient".equals(cur.getType()) || 
-        		"client".equals(cur.getType())) {
-            // all clients use the same I2CP session, and as such, use the same
-            // I2CP options
+        // Only modify other shared tunnels
+        // if the current tunnel is shared, and of supported type
+        if ("true".equalsIgnoreCase(cur.getSharedClient()) &&
+            ("ircclient".equals(cur.getType()) ||
+             "httpclient".equals(cur.getType()) ||
+             "client".equals(cur.getType()))) {
+            // all clients use the same I2CP session, and as such, use the same I2CP options
             List controllers = _group.getControllers();
+
             for (int i = 0; i < controllers.size(); i++) {
                 TunnelController c = (TunnelController)controllers.get(i);
+
+                // Current tunnel modified by user, skip
                 if (c == cur) continue;
-                //only change when they really are declared of beeing a sharedClient
-                if (("httpclient".equals(c.getType()) || 
-                		"ircclient".equals(c.getType())||
-                		"client".equals(c.getType()) 
-                		) && "true".equalsIgnoreCase(c.getSharedClient())) {
+
+                // Only modify this non-current tunnel
+                // if it belongs to a shared destination, and is of supported type
+                if ("true".equalsIgnoreCase(c.getSharedClient()) &&
+                    ("httpclient".equals(c.getType()) ||
+                     "ircclient".equals(c.getType()) ||
+                     "client".equals(c.getType()))) {
+
                     Properties cOpt = c.getConfig("");
                     if (_tunnelQuantity != null) {
                         cOpt.setProperty("option.inbound.quantity", _tunnelQuantity);

apps/jetty/build.xml

@@ -3,29 +3,30 @@
         
     <target name="all" depends="build" />
     <target name="fetchJettylib" >
-        <available property="jetty.available" file="jetty-5.1.6.zip" />
+        <available property="jetty.available" file="jetty-5.1.12.zip" />
         <ant target="doFetchJettylib" />
     </target>
     <target name="doFetchJettylib" unless="jetty.available" >
-        <echo message="The libraries contained within the fetched file are from Jetty's 5.1.6" />
+        <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.6.zip" verbose="true" dest="jetty-5.1.6.zip" />
+        <get src="http://mesh.dl.sourceforge.net/sourceforge/jetty/jetty-5.1.12.zip" verbose="true" dest="jetty-5.1.12.zip" />
         <ant target="doExtract" />
     </target>
     <target name="doExtract">
-        <unzip src="jetty-5.1.6.zip" dest="." />
+        <unzip src="jetty-5.1.12.zip" dest="." />
         <mkdir dir="jettylib" />
         <copy todir="jettylib">
-            <fileset dir="jetty-5.1.6/lib">
+            <fileset dir="jetty-5.1.12/lib">
                 <include name="*.jar" />
             </fileset>
         </copy>
         <copy todir="jettylib">
-            <fileset dir="jetty-5.1.6/ext">
+            <fileset dir="jetty-5.1.12/ext">
                 <include name="ant.jar" />
                 <include name="commons-el.jar" />
+	        <include name="commons-logging.jar" />
                 <include name="jasper-compiler.jar" />
                 <include name="jasper-runtime.jar" />
                 <include name="javax.servlet.jar" />
@@ -33,9 +34,7 @@
                 <include name="xercesImpl.jar" />
             </fileset>
         </copy>
-	<!-- note the rename, to keep compat with old rev, since we only used the API anyway -->
-	<copy file="jetty-5.1.6/ext/commons-logging-api.jar" tofile="jettylib/commons-logging.jar" />
-        <delete dir="jetty-5.1.6" />
+        <delete dir="jetty-5.1.12" />
     </target>
     <target name="build" depends="fetchJettylib" />
     <target name="builddep" />

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

@@ -37,8 +37,12 @@ public class ConfigNetHandler extends FormHandler {
     private boolean _requireIntroductions;
     private boolean _hiddenMode;
     private boolean _dynamicKeys;
+    private String _ntcpHostname;
+    private String _ntcpPort;
     private String _tcpPort;
     private String _udpPort;
+    private boolean _ntcpAutoIP;
+    private boolean _ntcpAutoPort;
     private String _inboundRate;
     private String _inboundBurstRate;
     private String _inboundBurst;
@@ -51,9 +55,7 @@ public class ConfigNetHandler extends FormHandler {
     private boolean _ratesOnly;
     
     protected void processForm() {
-        if (_reseedRequested) {
-            reseed();
-        } else if (_saveRequested || ( (_action != null) && ("Save changes".equals(_action)) )) {
+        if (_saveRequested || ( (_action != null) && ("Save changes".equals(_action)) )) {
             saveChanges();
         } else if (_recheckReachabilityRequested) {
             recheckReachability();
@@ -62,7 +64,6 @@ public class ConfigNetHandler extends FormHandler {
         }
     }
     
-    public void setReseed(String moo) { _reseedRequested = true; }
     public void setSave(String moo) { _saveRequested = true; }
     public void setEnabletimesync(String moo) { _timeSyncEnabled = true; }
     public void setRecheckReachability(String moo) { _recheckReachabilityRequested = true; }
@@ -71,6 +72,8 @@ public class ConfigNetHandler extends FormHandler {
     public void setDynamicKeys(String moo) { _dynamicKeys = true; }
     public void setUpdateratesonly(String moo) { _ratesOnly = true; }
     public void setEnableloadtesting(String moo) { _enableLoadTesting = true; }
+    public void setNtcpAutoIP(String moo) { _ntcpAutoIP = true; }
+    public void setNtcpAutoPort(String moo) { _ntcpAutoPort = true; }
     
     public void setHostname(String hostname) { 
         _hostname = (hostname != null ? hostname.trim() : null); 
@@ -78,6 +81,12 @@ public class ConfigNetHandler extends FormHandler {
     public void setTcpPort(String port) { 
         _tcpPort = (port != null ? port.trim() : null); 
     }
+    public void setNtcphost(String host) {
+        _ntcpHostname = (host != null ? host.trim() : null);
+    }
+    public void setNtcpport(String port) {
+        _ntcpPort = (port != null ? port.trim() : null);
+    }
     public void setUdpPort(String port) { 
         _udpPort = (port != null ? port.trim() : null); 
     }
@@ -99,95 +108,9 @@ public class ConfigNetHandler extends FormHandler {
     public void setOutboundburstfactor(String factor) { 
         _outboundBurst = (factor != null ? factor.trim() : null); 
     }
-    public void setReseedfrom(String url) { 
-        _reseedFrom = (url != null ? url.trim() : null); 
-    }
     public void setSharePercentage(String pct) {
         _sharePct = (pct != null ? pct.trim() : null);
     }
-
-
-    private static final String DEFAULT_SEED_URL = ReseedHandler.DEFAULT_SEED_URL;
-    /**
-     * Reseed has been requested, so lets go ahead and do it.  Fetch all of
-     * the routerInfo-*.dat files from the specified URL (or the default) and
-     * save them into this router's netDb dir.
-     *
-     */
-    private void reseed() {
-        String seedURL = DEFAULT_SEED_URL;
-        if (_reseedFrom != null)
-            seedURL = _reseedFrom;
-        try {
-            URL dir = new URL(seedURL);
-            String content = new String(readURL(dir));
-            Set urls = new HashSet();
-            int cur = 0;
-            while (true) {
-                int start = content.indexOf("href=\"routerInfo-", cur);
-                if (start < 0)
-                    break;
-
-                int end = content.indexOf(".dat\">", start);
-                String name = content.substring(start+"href=\"routerInfo-".length(), end);
-                urls.add(name);
-                cur = end + 1;
-            }
-
-            int fetched = 0;
-            int errors = 0;
-            for (Iterator iter = urls.iterator(); iter.hasNext(); ) {
-                try {
-                    fetchSeed(seedURL, (String)iter.next());
-                    fetched++;
-                } catch (Exception e) {
-                    errors++;
-                }
-            }
-            addFormNotice("Reseeded with " + fetched + " peers (and " + errors + " failures)");
-        } catch (Throwable t) {
-            _context.logManager().getLog(ConfigNetHandler.class).error("Error reseeding", t);
-            addFormError("Error reseeding (RESEED_EXCEPTION)");
-        }
-    }
-    
-    private void fetchSeed(String seedURL, String peer) throws Exception {
-        URL url = new URL(seedURL + (seedURL.endsWith("/") ? "" : "/") + "routerInfo-" + peer + ".dat");
-
-        byte data[] = readURL(url);
-        writeSeed(peer, data);
-    }
-    
-    private byte[] readURL(URL url) throws Exception {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
-        URLConnection con = url.openConnection();
-        InputStream in = con.getInputStream();
-        byte buf[] = new byte[1024];
-        while (true) {
-            int read = in.read(buf);
-            if (read < 0)
-                break;
-            baos.write(buf, 0, read);
-        }
-        in.close();
-        return baos.toByteArray();
-    }
-    
-    private void writeSeed(String name, byte data[]) throws Exception {
-        // props taken from KademliaNetworkDatabaseFacade...
-        String dirName = _context.getProperty("router.networkDatabase.dbDir", "netDb");
-        File netDbDir = new File(dirName);
-        if (!netDbDir.exists()) {
-            boolean ok = netDbDir.mkdirs();
-            if (ok)
-                addFormNotice("Network database directory created: " + dirName);
-            else
-                addFormNotice("Error creating network database directory: " + dirName);
-        }
-        FileOutputStream fos = new FileOutputStream(new File(netDbDir, "routerInfo-" + name + ".dat"));
-        fos.write(data);
-        fos.close();
-    }
     
     private void recheckReachability() {
         _context.commSystem().recheckReachability();
@@ -222,6 +145,52 @@ public class ConfigNetHandler extends FormHandler {
                     restartRequired = true;
                 }
             }
+            
+            // Normalize some things to make the following code a little easier...
+            String oldNHost = _context.router().getConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_HOSTNAME);
+            if (oldNHost == null) oldNHost = "";
+            String oldNPort = _context.router().getConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_PORT);
+            if (oldNPort == null) oldNPort = "";
+            String sAutoHost = _context.router().getConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_AUTO_IP);
+            String sAutoPort = _context.router().getConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_AUTO_PORT);
+            boolean oldAutoHost = "true".equalsIgnoreCase(sAutoHost);
+            boolean oldAutoPort = "true".equalsIgnoreCase(sAutoPort);
+            if (_ntcpHostname == null) _ntcpHostname = "";
+            if (_ntcpPort == null) _ntcpPort = "";
+
+            if (oldAutoHost != _ntcpAutoIP || ! oldNHost.equalsIgnoreCase(_ntcpHostname)) {
+                if (_ntcpAutoIP) {
+                    _context.router().setConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_AUTO_IP, "true");
+                    _context.router().removeConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_HOSTNAME);
+                    addFormNotice("Updating inbound TCP address to auto");
+                } else if (_ntcpHostname.length() > 0) {
+                    _context.router().setConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_HOSTNAME, _ntcpHostname);
+                    _context.router().removeConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_AUTO_IP);
+                    addFormNotice("Updating inbound TCP address to " + _ntcpHostname);
+                } else {
+                    _context.router().removeConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_HOSTNAME);
+                    _context.router().removeConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_AUTO_IP);
+                    addFormNotice("Disabling inbound TCP");
+                }
+                restartRequired = true;
+            }
+            if (oldAutoPort != _ntcpAutoPort || ! oldNPort.equals(_ntcpPort)) {
+                if ( _ntcpAutoPort ) {
+                    _context.router().setConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_AUTO_PORT, "true");
+                    _context.router().removeConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_PORT);
+                    addFormNotice("Updating inbound TCP port to auto");
+                } else if (_ntcpPort.length() > 0) {
+                    _context.router().setConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_PORT, _ntcpPort);
+                    _context.router().removeConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_AUTO_PORT);
+                    addFormNotice("Updating inbound TCP port to " + _ntcpPort);
+                } else {
+                    _context.router().removeConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_PORT);
+                    _context.router().removeConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_AUTO_PORT);
+                    addFormNotice("Disabling inbound TCP");
+                }
+                restartRequired = true;
+            }
+
             if ( (_udpPort != null) && (_udpPort.length() > 0) ) {
                 String oldPort = _context.router().getConfigSetting(ConfigNetHelper.PROP_I2NP_UDP_PORT);
                 if ( (oldPort == null) && (_udpPort.equals("8887")) ) {

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

@@ -48,6 +48,20 @@ public class ConfigNetHelper {
         }
         return "" + port;
     }
+    public final static String PROP_I2NP_NTCP_HOSTNAME = "i2np.ntcp.hostname";
+    public final static String PROP_I2NP_NTCP_PORT = "i2np.ntcp.port";
+    public final static String PROP_I2NP_NTCP_AUTO_PORT = "i2np.ntcp.autoip";
+    public final static String PROP_I2NP_NTCP_AUTO_IP = "i2np.ntcp.autoport";
+    public String getNtcphostname() {
+        String hostname = _context.getProperty(PROP_I2NP_NTCP_HOSTNAME); 
+        if (hostname == null) return "";
+        return hostname;
+    }
+    public String getNtcpport() { 
+        String port = _context.getProperty(PROP_I2NP_NTCP_PORT); 
+        if (port == null) return "";
+        return port;
+    }
     
     public String getUdpAddress() {
         RouterAddress addr = _context.router().getRouterInfo().getTargetAddress("SSU");
@@ -57,6 +71,26 @@ public class ConfigNetHelper {
         return ua.toString();
     }
     
+    public String getUdpIP() {
+        RouterAddress addr = _context.router().getRouterInfo().getTargetAddress("SSU");
+        if (addr == null)
+            return "unknown";
+        UDPAddress ua = new UDPAddress(addr);
+        if (ua.getHost() == null)
+            return "unknown";
+        return ua.getHost();
+    }
+
+    public String getUdpPort() {
+        RouterAddress addr = _context.router().getRouterInfo().getTargetAddress("SSU");
+        if (addr == null)
+            return "unknown";
+        UDPAddress ua = new UDPAddress(addr);
+        if (ua.getPort() <= 0)
+            return "unknown";
+        return "" + ua.getPort();
+    }
+
     public String getEnableTimeSyncChecked() {
         String disabled = _context.getProperty(Timestamper.PROP_DISABLED, "false");
         if ( (disabled != null) && ("true".equalsIgnoreCase(disabled)) )
@@ -81,6 +115,22 @@ public class ConfigNetHelper {
             return "";
     }
 
+    public String getTcpAutoPortChecked() {
+        String enabled = _context.getProperty(PROP_I2NP_NTCP_AUTO_PORT, "false");
+        if ( (enabled != null) && ("true".equalsIgnoreCase(enabled)) )
+            return " checked ";
+        else
+            return "";
+    }
+
+    public String getTcpAutoIPChecked() {
+        String enabled = _context.getProperty(PROP_I2NP_NTCP_AUTO_IP, "false");
+        if ( (enabled != null) && ("true".equalsIgnoreCase(enabled)) )
+            return " checked ";
+        else
+            return "";
+    }
+
     public String getRequireIntroductionsChecked() {
         short status = _context.commSystem().getReachabilityStatus();
         switch (status) {
@@ -224,4 +274,23 @@ public class ConfigNetHelper {
         buf.append("</select>\n");
         return buf.toString();
     }
+
+    public int getShareBandwidth() {
+        String irate = _context.getProperty(PROP_INBOUND_KBPS);
+        String orate = _context.getProperty(PROP_OUTBOUND_KBPS);
+        String pctStr = _context.getProperty(PROP_SHARE_PERCENTAGE);
+        if ( (irate != null) && (orate != null) && (pctStr != null)) {
+            try {
+                int irateKBps = Integer.parseInt(irate);
+                int orateKBps = Integer.parseInt(orate);
+                if (irateKBps < 0 || orateKBps < 0)
+                    return 0;
+                int pct = Integer.parseInt(pctStr);
+                return (int) (((float) pct) * Math.min(irateKBps, orateKBps) / 100);
+            } catch (NumberFormatException nfe) {
+                // ignore
+            }
+        }
+        return 0;
+    }
 }

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

@@ -17,6 +17,7 @@ import net.i2p.stat.StatManager;
 public class ConfigStatsHandler extends FormHandler {
     private String _filename;
     private List _stats;
+    private String _graphs;
     private boolean _explicitFilter;
     private String _explicitFilterValue;
     
@@ -48,6 +49,25 @@ public class ConfigStatsHandler extends FormHandler {
             _log.debug("Updated stats: " + _stats);
     }
 
+    public void setGraphList(String stats[]) {
+        if (stats != null) {
+            String s = "";
+            for (int i = 0; i < stats.length; i++) {
+                String cur = stats[i].trim();
+                if (cur.length() > 0) {
+                    if (s.length() > 0)
+                        s = s + ",";
+                    s = s + cur;
+                }
+            }
+            _graphs = s;
+        } else {
+            _graphs = "";
+        }
+        if (_log.shouldLog(Log.DEBUG))
+            _log.debug("Updated graphs: " + _graphs);
+    }
+
     public void setExplicitFilter(String foo) { _explicitFilter = true; }
     public void setExplicitFilterValue(String filter) { _explicitFilterValue = filter; }
     
@@ -88,11 +108,13 @@ public class ConfigStatsHandler extends FormHandler {
         }
             
         _context.router().setConfigSetting(StatManager.PROP_STAT_FILTER, stats.toString());
+        _context.router().setConfigSetting("stat.summaries", _graphs);
         boolean ok = _context.router().saveConfig();
         if (ok) 
             addFormNotice("Stat filter and location updated successfully to: " + stats.toString());
         else
             addFormError("Failed to update the stat filter and location");
+        addFormNotice("Graph list updated, may take up to 60s to be reflected here and on the <a href=\"graphs.jsp\">Graphs Page</a>");
     }
     
 }

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

@@ -7,6 +7,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.StringTokenizer;
+import net.i2p.stat.Rate;
 import net.i2p.stat.RateStat;
 import net.i2p.stat.FrequencyStat;
 import net.i2p.router.RouterContext;
@@ -20,12 +21,15 @@ public class ConfigStatsHelper {
     /** list of names of stats which are remaining, ordered by nested groups */
     private List _stats;
     private String _currentStatName;
+    private String _currentGraphName;
     private String _currentStatDescription;
     private String _currentGroup;
     /** true if the current stat is the first in the group */
     private boolean _currentIsFirstInGroup;
     /** true if the stat is being logged */
     private boolean _currentIsLogged;
+    private boolean _currentIsGraphed;
+    private boolean _currentCanBeGraphed;
     
     /**
      * Configure this bean to query a particular router context
@@ -71,6 +75,7 @@ public class ConfigStatsHelper {
     public boolean hasMoreStats() {
         if (_stats.size() <= 0)
             return false;
+        _currentIsGraphed = false;
         _currentStatName = (String)_stats.remove(0);
         RateStat rs = _context.statManager().getRate(_currentStatName);
         if (rs != null) {
@@ -82,6 +87,16 @@ public class ConfigStatsHelper {
             else
                 _currentIsFirstInGroup = false;
             _currentGroup = rs.getGroupName();
+            long period = rs.getPeriods()[0]; // should be the minimum
+            if (period <= 10*60*1000) {
+                Rate r = rs.getRate(period);
+                _currentCanBeGraphed = r != null;
+                if (_currentCanBeGraphed)
+                    _currentIsGraphed = r.getSummaryListener() != null;
+                    _currentGraphName = _currentStatName + "." + period;
+            } else {
+                _currentCanBeGraphed = false;
+            }
         } else {
             FrequencyStat fs = _context.statManager().getFrequency(_currentStatName);
             if (fs != null) {
@@ -93,6 +108,7 @@ public class ConfigStatsHelper {
                 else
                     _currentIsFirstInGroup = false;
                 _currentGroup = fs.getGroupName();
+                _currentCanBeGraphed = false;
             } else {
                 if (_log.shouldLog(Log.ERROR))
                     _log.error("Stat does not exist?!  [" + _currentStatName + "]");
@@ -119,7 +135,10 @@ public class ConfigStatsHelper {
     /** What group is the current stat in */
     public String getCurrentGroupName() { return _currentGroup; }
     public String getCurrentStatName() { return _currentStatName; }
+    public String getCurrentGraphName() { return _currentGraphName; }
     public String getCurrentStatDescription() { return _currentStatDescription; }
     public boolean getCurrentIsLogged() { return _currentIsLogged; }
+    public boolean getCurrentIsGraphed() { return _currentIsGraphed; }
+    public boolean getCurrentCanBeGraphed() { return _currentCanBeGraphed; }
     public String getExplicitFilter() { return _filter; }
 }

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

@@ -55,20 +55,37 @@ public class GraphHelper {
     
     public String getImages() { 
         try {
-            _out.write("<img src=\"viewstat.jsp?stat=bw.combined"
-                           + "&amp;periodCount=" + _periodCount 
-                           + "&amp;width=" + _width
-                           + "&amp;height=" + _height
-                           + "\" title=\"Combined bandwidth graph\" />\n");
-            
             List listeners = StatSummarizer.instance().getListeners();
             TreeSet ordered = new TreeSet(new AlphaComparator());
             ordered.addAll(listeners);
+
+            // go to some trouble to see if we have the data for the combined bw graph
+            boolean hasTx = false;
+            boolean hasRx = false;
+            for (Iterator iter = ordered.iterator(); iter.hasNext(); ) {
+                SummaryListener lsnr = (SummaryListener)iter.next();
+                String title = lsnr.getRate().getRateStat().getName();
+                if (title.equals("bw.sendRate")) hasTx = true;
+                else if (title.equals("bw.recvRate")) hasRx = true;
+            }
+
+            if (hasTx && hasRx && !_showEvents)
+                _out.write("<img width=\""
+                           + (_width + 83) + "\" height=\"" + (_height + 92)
+                           + "\" src=\"viewstat.jsp?stat=bw.combined"
+                           + "&amp;periodCount=" + _periodCount 
+                           + "&amp;width=" + _width
+                           + "&amp;height=" + (_height - 14)
+                           + "\" title=\"Combined bandwidth graph\" />\n");
+            
             for (Iterator iter = ordered.iterator(); iter.hasNext(); ) {
                 SummaryListener lsnr = (SummaryListener)iter.next();
                 Rate r = lsnr.getRate();
                 String title = r.getRateStat().getName() + " for " + DataHelper.formatDuration(_periodCount * r.getPeriod());
-                _out.write("<img src=\"viewstat.jsp?stat=" + r.getRateStat().getName() 
+                _out.write("<img width=\""
+                           + (_width + 83) + "\" height=\"" + (_height + 92)
+                           + "\" src=\"viewstat.jsp?stat="
+                           + r.getRateStat().getName() 
                            + "&amp;showEvents=" + _showEvents
                            + "&amp;period=" + r.getPeriod() 
                            + "&amp;periodCount=" + _periodCount 
@@ -86,6 +103,7 @@ public class GraphHelper {
     }
     public String getForm() { 
         try {
+            _out.write("<p /><a href=\"configstats.jsp\">Select Stats to Graph</a><p />");
             _out.write("<form action=\"graphs.jsp\" method=\"GET\">");
             _out.write("Periods: <input size=\"3\" type=\"text\" name=\"periodCount\" value=\"" + _periodCount + "\" /><br />\n");
             _out.write("Plot averages: <input type=\"radio\" name=\"showEvents\" value=\"false\" " + (_showEvents ? "" : "checked=\"true\" ") + " /> ");
@@ -119,4 +137,4 @@ class AlphaComparator implements Comparator {
         String rName = r.getRate().getRateStat().getName() + "." + r.getRate().getPeriod();
         return lName.compareTo(rName);
     }
-}
+}

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

@@ -3,7 +3,6 @@ package net.i2p.router.web;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.InputStream;
 import java.io.OutputStream;
 
 import java.net.Socket;
@@ -13,17 +12,51 @@ import java.util.Iterator;
 import java.util.Set;
 
 import net.i2p.I2PAppContext;
+import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 import net.i2p.util.I2PThread;
+import net.i2p.util.EepGet;
 
 /**
  * Handler to deal with reseed requests.  This reseed from the URL
- * http://dev.i2p.net/i2pdb2/ unless the java env property "i2p.reseedURL" is
+ * http://dev.i2p.net/i2pdb2/ unless the I2P configuration property "i2p.reseedURL" is
  * set.  It always writes to ./netDb/, so don't mess with that.
  *
  */
 public class ReseedHandler {
-    private static ReseedRunner _reseedRunner = new ReseedRunner();
-    
+    private static ReseedRunner _reseedRunner;
+    private RouterContext _context;
+    private Log _log;
+
+    // Reject unreasonably big files, because we download into a ByteArrayOutputStream.
+    private static final long MAX_RESEED_RESPONSE_SIZE = 8 * 1024 * 1024;
+
+    private static final String DEFAULT_SEED_URL = "http://dev.i2p.net/i2pdb2/";
+
+    public ReseedHandler() {
+        this(ContextHelper.getContext(null));
+    }
+    public ReseedHandler(RouterContext ctx) {
+        _context = ctx;
+        _log = ctx.logManager().getLog(ReseedHandler.class);
+    }
+
+    /**
+     * Configure this bean to query a particular router context
+     *
+     * @param contextId begging few characters of the routerHash, or null to pick
+     *                  the first one we come across.
+     */
+    public void setContextId(String contextId) {
+        try {
+            _context = ContextHelper.getContext(contextId);
+            _log = _context.logManager().getLog(ReseedHandler.class);
+        } catch (Throwable t) {
+            t.printStackTrace();
+        }
+    }
+
+
     public void setReseedNonce(String nonce) { 
         if (nonce == null) return;
         if (nonce.equals(System.getProperty("net.i2p.router.web.ReseedHandler.nonce")) ||
@@ -32,22 +65,28 @@ public class ReseedHandler {
         }
     }
     
-    public static void requestReseed() {
-        synchronized (_reseedRunner) {
+    public void requestReseed() {
+        synchronized (ReseedHandler.class) {
+            if (_reseedRunner == null)
+                _reseedRunner = new ReseedRunner();
             if (_reseedRunner.isRunning()) {
                 return;
             } else {
                 System.setProperty("net.i2p.router.web.ReseedHandler.reseedInProgress", "true");
-                System.out.println("Reseeding");
                 I2PThread reseed = new I2PThread(_reseedRunner, "Reseed");
                 reseed.start();
             }
         }
+
     }
 
-    public static class ReseedRunner implements Runnable {
+    public class ReseedRunner implements Runnable, EepGet.StatusListener {
         private boolean _isRunning;
-        public ReseedRunner() { _isRunning = false; }
+
+        public ReseedRunner() {
+            _isRunning = false; 
+            System.setProperty("net.i2p.router.web.ReseedHandler.statusMessage","Reseeding.");
+        }
         public boolean isRunning() { return _isRunning; }
         public void run() {
             _isRunning = true;
@@ -56,141 +95,148 @@ public class ReseedHandler {
             System.setProperty("net.i2p.router.web.ReseedHandler.reseedInProgress", "false");
             _isRunning = false;
         }
-    }
-    
-    static final String DEFAULT_SEED_URL = "http://dev.i2p.net/i2pdb2/";
-    /**
-     * Reseed has been requested, so lets go ahead and do it.  Fetch all of
-     * the routerInfo-*.dat files from the specified URL (or the default) and
-     * save them into this router's netDb dir.
-     *
-     */
-    private static void reseed(boolean echoStatus) {
-        String seedURL = System.getProperty("i2p.reseedURL", DEFAULT_SEED_URL);
-        if ( (seedURL == null) || (seedURL.trim().length() <= 0) ) 
-            seedURL = DEFAULT_SEED_URL;
-        try {
-            URL dir = new URL(seedURL);
-            byte contentRaw[] = readURL(dir);
-            if (contentRaw == null) return;
-            String content = new String(contentRaw);
-            Set urls = new HashSet();
-            int cur = 0;
-            while (true) {
-                int start = content.indexOf("href=\"routerInfo-", cur);
-                if (start < 0)
-                    break;
 
-                int end = content.indexOf(".dat\">", start);
-                String name = content.substring(start+"href=\"routerInfo-".length(), end);
-                urls.add(name);
-                cur = end + 1;
-            }
+        // EepGet status listeners
+        public void attemptFailed(String url, long bytesTransferred, long bytesRemaining, int currentAttempt, int numRetries, Exception cause) {
+            // Since readURL() runs an EepGet with 0 retries,
+            // we can report errors with attemptFailed() instead of transferFailed().
+            // It has the benefit of providing cause of failure, which helps resolve issues.
+            if (_log.shouldLog(Log.ERROR)) _log.error("EepGet failed on " + url, cause);
+        }
+        public void bytesTransferred(long alreadyTransferred, int currentWrite, long bytesTransferred, long bytesRemaining, String url) {}
+        public void transferComplete(long alreadyTransferred, long bytesTransferred, long bytesRemaining, String url, String outputFile, boolean notModified) {}
+        public void transferFailed(String url, long bytesTransferred, long bytesRemaining, int currentAttempt) {}
+        public void headerReceived(String url, int attemptNum, String key, String val) {}
+        // End of EepGet status listeners
 
-            int fetched = 0;
-            int errors = 0;
-            for (Iterator iter = urls.iterator(); iter.hasNext(); ) {
-                try {
-                    fetchSeed(seedURL, (String)iter.next());
-                    fetched++;
-                    if (echoStatus) {
-                        System.out.print(".");
-                        if (fetched % 60 == 0)
-                            System.out.println();
-                    }
-                } catch (Exception e) {
-                    errors++;
+        /**
+        * Reseed has been requested, so lets go ahead and do it.  Fetch all of
+        * the routerInfo-*.dat files from the specified URL (or the default) and
+        * save them into this router's netDb dir.
+        *
+        */
+        private void reseed(boolean echoStatus) {
+
+            String seedURL = _context.getProperty("i2p.reseedURL", DEFAULT_SEED_URL);
+            if ( (seedURL == null) || (seedURL.trim().length() <= 0) ) 
+                seedURL = DEFAULT_SEED_URL;
+            try {
+                System.setProperty("net.i2p.router.web.ReseedHandler.errorMessage","");
+                System.setProperty("net.i2p.router.web.ReseedHandler.statusMessage","Reseeding: fetching seed URL.");
+                URL dir = new URL(seedURL);
+                byte contentRaw[] = readURL(dir);
+                if (contentRaw == null) {
+                    System.setProperty("net.i2p.router.web.ReseedHandler.errorMessage",
+                        "Last reseed failed fully (failed reading seed URL). " +
+                        "Ensure that nothing blocks outbound HTTP, check <a href=logs.jsp>logs</a> " +
+                        "and if nothing helps, read FAQ about reseeding manually.");
+                    // Logging deprecated here since attemptFailed() provides better info
+                    _log.debug("Failed reading seed URL: " + seedURL);
+                    return;
                 }
-            }
-            if (echoStatus) System.out.println();
-        } catch (Throwable t) {
-            I2PAppContext.getGlobalContext().logManager().getLog(ReseedHandler.class).error("Error reseeding", t);
-        }
-    }
-    
-    private static void fetchSeed(String seedURL, String peer) throws Exception {
-        URL url = new URL(seedURL + (seedURL.endsWith("/") ? "" : "/") + "routerInfo-" + peer + ".dat");
+                String content = new String(contentRaw);
+                Set urls = new HashSet();
+                int cur = 0;
+                while (true) {
+                    int start = content.indexOf("href=\"routerInfo-", cur);
+                    if (start < 0)
+                        break;
 
-        byte data[] = readURL(url);
-        //System.out.println("read: " + (data != null ? data.length : -1));
-        writeSeed(peer, data);
-    }
-    
-    private static byte[] readURL(URL url) throws Exception {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream(4*1024);
-        String hostname = url.getHost();
-        int port = url.getPort();
-        if (port < 0)
-            port = 80;
-        Socket s = new Socket(hostname, port);
-        OutputStream out = s.getOutputStream();
-        InputStream in = s.getInputStream();
-        String request = getRequest(url);
-        //System.out.println("Sending to " + hostname +":"+ port + ": " + request);
-        out.write(request.getBytes());
-        out.flush();
-        // skip the HTTP response headers
-        // (if we were smart, we'd check for HTTP 200, content-length, etc)
-        int consecutiveNL = 0;
-        while (true) {
-            int cur = in.read();
-            switch (cur) {
-                case -1: 
-                    return null;
-                case '\n':
-                case '\r':
-                    consecutiveNL++;
-                    break;
-                default:
-                    consecutiveNL = 0;
+                    int end = content.indexOf(".dat\">", start);
+                    String name = content.substring(start+"href=\"routerInfo-".length(), end);
+                    urls.add(name);
+                    cur = end + 1;
+                }
+                if (urls.size() <= 0) {
+                    _log.error("Read " + contentRaw.length + " bytes from seed " + seedURL + ", but found no routerInfo URLs.");
+                    System.setProperty("net.i2p.router.web.ReseedHandler.errorMessage",
+                        "Last reseed failed fully (no routerInfo URLs at seed URL). " +
+                        "Ensure that nothing blocks outbound HTTP, check <a href=logs.jsp>logs</a> " +
+                        "and if nothing helps, read FAQ about reseeding manually.");
+                    return;
+                }
+
+                int fetched = 0;
+                int errors = 0;
+                for (Iterator iter = urls.iterator(); iter.hasNext(); ) {
+                    try {
+                        System.setProperty("net.i2p.router.web.ReseedHandler.statusMessage",
+                            "Reseeding: fetching router info from seed URL (" +
+                            fetched + " successful, " + errors + " errors, " + urls.size() + " total).");
+
+                        fetchSeed(seedURL, (String)iter.next());
+                        fetched++;
+                        if (echoStatus) {
+                            System.out.print(".");
+                            if (fetched % 60 == 0)
+                                System.out.println();
+                        }
+                    } catch (Exception e) {
+                        errors++;
+                    }
+                }
+                if (echoStatus) System.out.println();
+                if (errors > 0) {
+                    System.setProperty("net.i2p.router.web.ReseedHandler.errorMessage",
+                        "Last reseed failed partly (" + errors + " of " + urls.size() + "). " +
+                        "Ensure that nothing blocks outbound HTTP, check <a href=logs.jsp>logs</a> " +
+                        "and if nothing helps, read FAQ about reseeding manually.");
+                }
+            } catch (Throwable t) {
+                System.setProperty("net.i2p.router.web.ReseedHandler.errorMessage",
+                    "Last reseed failed fully (exception caught). " +
+                    "Ensure that nothing blocks outbound HTTP, check <a href=logs.jsp>logs</a> " +
+                    "and if nothing helps, read FAQ about reseeding manually.");
+                _log.error("Error reseeding", t);
             }
-            if (consecutiveNL == 4)
-                break;
         }
-        // ok, past the headers, grab the goods
-        byte buf[] = new byte[1024];
-        while (true) {
-            int read = in.read(buf);
-            if (read < 0)
-                break;
-            baos.write(buf, 0, read);
+    
+        /* Since we don't return a value, we should always throw an exception if something fails. */
+        private void fetchSeed(String seedURL, String peer) throws Exception {
+            Log log = I2PAppContext.getGlobalContext().logManager().getLog(ReseedHandler.class);
+            URL url = new URL(seedURL + (seedURL.endsWith("/") ? "" : "/") + "routerInfo-" + peer + ".dat");
+
+            byte data[] = readURL(url);
+            if (data == null) {
+                // Logging deprecated here since attemptFailed() provides better info
+                _log.debug("Failed fetching seed: " + url.toString());
+                throw new Exception ("Failed fetching seed.");
+            }
+            //System.out.println("read: " + (data != null ? data.length : -1));
+            writeSeed(peer, data);
         }
-        in.close();
-        s.close();
-        return baos.toByteArray();
-    }
-    
-    private static String getRequest(URL url) {
-        StringBuffer buf = new StringBuffer(512);
-        String path = url.getPath();
-        if ("".equals(path))
-            path = "/";
-        buf.append("GET ").append(path).append(" HTTP/1.0\n");
-        buf.append("Host: ").append(url.getHost());
-        int port = url.getPort();
-        if ( (port > 0) && (port != 80) )
-            buf.append(":").append(port);
-        buf.append("\nConnection: close\n\n");
-        return buf.toString();
-    }
-    
-    private static void writeSeed(String name, byte data[]) throws Exception {
-        String dirName = "netDb"; // _context.getProperty("router.networkDatabase.dbDir", "netDb");
-        File netDbDir = new File(dirName);
-        if (!netDbDir.exists()) {
-            boolean ok = netDbDir.mkdirs();
+
+        private byte[] readURL(URL url) throws Exception {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream(4*1024);
+
+            // Do a non-proxied eepget into our ByteArrayOutputStream with 0 retries
+            EepGet get = new EepGet( I2PAppContext.getGlobalContext(), false, null, -1, 0, 0, MAX_RESEED_RESPONSE_SIZE,
+                null, baos, url.toString(), false, null, null);
+            get.addStatusListener(ReseedRunner.this);
+            if (get.fetch()) return baos.toByteArray(); else return null;
         }
-        FileOutputStream fos = new FileOutputStream(new File(netDbDir, "routerInfo-" + name + ".dat"));
-        fos.write(data);
-        fos.close();
-    }
     
+        private void writeSeed(String name, byte data[]) throws Exception {
+            String dirName = "netDb"; // _context.getProperty("router.networkDatabase.dbDir", "netDb");
+            File netDbDir = new File(dirName);
+            if (!netDbDir.exists()) {
+                boolean ok = netDbDir.mkdirs();
+            }
+            FileOutputStream fos = new FileOutputStream(new File(netDbDir, "routerInfo-" + name + ".dat"));
+            fos.write(data);
+            fos.close();
+        }
+
+    }
+
     public static void main(String args[]) {
         if ( (args != null) && (args.length == 1) && (!Boolean.valueOf(args[0]).booleanValue()) ) {
             System.out.println("Not reseeding, as requested");
             return; // not reseeding on request
         }
         System.out.println("Reseeding");
-        reseed(true);
+        ReseedHandler reseedHandler = new ReseedHandler();
+        reseedHandler.requestReseed();
     }
+
 }

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

@@ -88,7 +88,8 @@ public class RouterConsoleRunner {
             // get i2p started - they can reseed later in the web console)
             String names[] = (netDb.exists() ? netDb.list() : null);
             if ( (names == null) || (names.length < 15) ) {
-                ReseedHandler.requestReseed();
+                ReseedHandler reseedHandler = new ReseedHandler();
+                reseedHandler.requestReseed();
             }
         }
         

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

@@ -45,23 +45,27 @@ public class StatSummarizer implements Runnable {
     
     private static final String DEFAULT_DATABASES = "bw.sendRate.60000" +
                                                     ",bw.recvRate.60000" +
-                                                    ",tunnel.testSuccessTime.60000" +
-                                                    ",udp.outboundActiveCount.60000" +
-                                                    ",udp.receivePacketSize.60000" +
-                                                    ",udp.receivePacketSkew.60000" +
-                                                    ",udp.sendConfirmTime.60000" +
-                                                    ",udp.sendPacketSize.60000" +
-                                                    ",router.activePeers.60000" +
-                                                    ",router.activeSendPeers.60000" +
-                                                    ",tunnel.acceptLoad.60000" +
-                                                    ",tunnel.dropLoadProactive.60000" +
-                                                    ",tunnel.buildExploratorySuccess.60000" +
-                                                    ",tunnel.buildExploratoryReject.60000" +
-                                                    ",tunnel.buildExploratoryExpire.60000" +
-                                                    ",client.sendAckTime.60000" +
-                                                    ",client.dispatchNoACK.60000" +
-                                                    ",transport.sendMessageFailureLifetime.60000" +
-                                                    ",transport.sendProcessingTime.60000";
+//                                                  ",tunnel.testSuccessTime.60000" +
+//                                                  ",udp.outboundActiveCount.60000" +
+//                                                  ",udp.receivePacketSize.60000" +
+//                                                  ",udp.receivePacketSkew.60000" +
+//                                                  ",udp.sendConfirmTime.60000" +
+//                                                  ",udp.sendPacketSize.60000" +
+                                                    ",router.activePeers.60000";
+//                                                  ",router.activeSendPeers.60000" +
+//                                                  ",tunnel.acceptLoad.60000" +
+//                                                  ",tunnel.dropLoadProactive.60000" +
+//                                                  ",tunnel.buildExploratorySuccess.60000" +
+//                                                  ",tunnel.buildExploratoryReject.60000" +
+//                                                  ",tunnel.buildExploratoryExpire.60000" +
+//                                                  ",client.sendAckTime.60000" +
+//                                                  ",client.dispatchNoACK.60000" +
+//                                                  ",ntcp.sendTime.60000" +
+//                                                  ",ntcp.transmitTime.60000" +
+//                                                  ",ntcp.sendBacklogTime.60000" +
+//                                                  ",ntcp.receiveTime.60000" +
+//                                                  ",transport.sendMessageFailureLifetime.60000" +
+//                                                  ",transport.sendProcessingTime.60000";
     
     private String adjustDatabases(String oldSpecs) {
         String spec = _context.getProperty("stat.summaries", DEFAULT_DATABASES);
@@ -138,16 +142,17 @@ public class StatSummarizer implements Runnable {
     }
     
     public boolean renderRatePng(OutputStream out, int width, int height, boolean hideLegend, boolean hideGrid, boolean hideTitle, boolean showEvents, int periodCount, boolean showCredit) throws IOException {
-        long end = _context.clock().now();
+        long end = _context.clock().now() - 60*1000;
         if (periodCount <= 0) periodCount = SummaryListener.PERIODS;
         if (periodCount > SummaryListener.PERIODS)
             periodCount = SummaryListener.PERIODS;
         long period = 60*1000;
         long start = end - period*periodCount;
-        long begin = System.currentTimeMillis();
+        //long begin = System.currentTimeMillis();
         try {
             RrdGraphDef def = new RrdGraphDef();
-            def.setTimePeriod(start/1000, end/1000);
+            def.setTimePeriod(start/1000, 0);
+            def.setBaseValue(1024);
             String title = "Bandwidth usage";
             if (!hideTitle)
                 def.setTitle(title);
@@ -155,15 +160,15 @@ public class StatSummarizer implements Runnable {
             String recvName = SummaryListener.createName(_context, "bw.recvRate.60000");
             def.datasource(sendName, sendName, sendName, "AVERAGE", "MEMORY");
             def.datasource(recvName, recvName, recvName, "AVERAGE", "MEMORY");
-            def.area(sendName, Color.BLUE, "Outbound bytes/second");
-            //def.line(sendName, Color.BLUE, "Outbound bytes/second", 3);
-            //def.line(recvName, Color.RED, "Inbound bytes/second@r", 3);
-            def.area(recvName, Color.RED, "Inbound bytes/second@r");
+            def.area(sendName, Color.BLUE, "Outbound bytes/sec");
+            //def.line(sendName, Color.BLUE, "Outbound bytes/sec", 3);
+            def.line(recvName, Color.RED, "Inbound bytes/sec@r", 3);
+            //def.area(recvName, Color.RED, "Inbound bytes/sec@r");
             if (!hideLegend) {
-                def.gprint(sendName, "AVERAGE", "outbound average: @2@sbytes/second");
-                def.gprint(sendName, "MAX", " max: @2@sbytes/second@r");
-                def.gprint(recvName, "AVERAGE", "inbound average: @2bytes/second@s");
-                def.gprint(recvName, "MAX", " max: @2@sbytes/second@r");
+                def.gprint(sendName, "AVERAGE", "out average: @2@sbytes/sec");
+                def.gprint(sendName, "MAX", " max: @2@sbytes/sec@r");
+                def.gprint(recvName, "AVERAGE", "in average:  @2@sbytes/sec");
+                def.gprint(recvName, "MAX", " max: @2@sbytes/sec@r");
             }
             if (!showCredit)
                 def.setShowSignature(false);
@@ -184,7 +189,7 @@ public class StatSummarizer implements Runnable {
                 data = graph.getPNGBytes();
             else
                 data = graph.getPNGBytes(width, height);
-            long timeToPlot = System.currentTimeMillis() - begin;
+            //long timeToPlot = System.currentTimeMillis() - begin;
             out.write(data);
             //File t = File.createTempFile("jrobinData", ".xml");
             //_listener.getData().dumpXml(new FileOutputStream(t));
@@ -197,6 +202,9 @@ public class StatSummarizer implements Runnable {
         } catch (IOException ioe) {
             _log.error("Error rendering", ioe);
             throw ioe;
+        } catch (OutOfMemoryError oom) {
+            _log.error("Error rendering", oom);
+            throw new IOException("Error plotting: " + oom.getMessage());
         }
     }
     

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

@@ -107,7 +107,8 @@ public class SummaryHelper {
     }
     
     public boolean allowReseed() {
-        return (_context.netDb().getKnownRouters() < 30);
+        return (_context.netDb().getKnownRouters() < 30) ||
+                Boolean.valueOf(_context.getProperty("i2p.alwaysAllowReseed", "false")).booleanValue();
     }
     
     public int getAllPeers() { return _context.netDb().getKnownRouters(); }

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

@@ -154,7 +154,7 @@ class SummaryRenderer {
      *
      */
     public static synchronized void render(I2PAppContext ctx, OutputStream out, String filename) throws IOException {
-        long end = ctx.clock().now();
+        long end = ctx.clock().now() - 60*1000;
         long start = end - 60*1000*SummaryListener.PERIODS;
         long begin = System.currentTimeMillis();
         try {
@@ -174,17 +174,26 @@ class SummaryRenderer {
     }
     public void render(OutputStream out) throws IOException { render(out, -1, -1, false, false, false, false, -1, true); }
     public void render(OutputStream out, int width, int height, boolean hideLegend, boolean hideGrid, boolean hideTitle, boolean showEvents, int periodCount, boolean showCredit) throws IOException {
-        long end = _listener.now();
+        long end = _listener.now() - 60*1000;
         if (periodCount <= 0) periodCount = SummaryListener.PERIODS;
         if (periodCount > SummaryListener.PERIODS)
             periodCount = SummaryListener.PERIODS;
         long start = end - _listener.getRate().getPeriod()*periodCount;
-        long begin = System.currentTimeMillis();
+        //long begin = System.currentTimeMillis();
         try {
             RrdGraphDef def = new RrdGraphDef();
-            def.setTimePeriod(start/1000, end/1000);
-            String title = _listener.getRate().getRateStat().getName() + " averaged for " 
-                           + DataHelper.formatDuration(_listener.getRate().getPeriod());
+            def.setTimePeriod(start/1000, 0);
+            String name = _listener.getRate().getRateStat().getName();
+            // heuristic to set K=1024
+            if ((name.startsWith("bw.") || name.indexOf("Size") >= 0 || name.indexOf("Bps") >= 0)
+                && !showEvents)
+                def.setBaseValue(1024);
+            String title = name;
+            if (showEvents)
+                title = title + " events in ";
+            else
+                title = title + " averaged for ";
+            title = title + DataHelper.formatDuration(_listener.getRate().getPeriod());
             if (!hideTitle)
                 def.setTitle(title);
             String path = _listener.getData().getPath();
@@ -203,8 +212,9 @@ class SummaryRenderer {
             def.datasource(plotName, path, plotName, "AVERAGE", "MEMORY");
             def.area(plotName, Color.BLUE, descr + "@r");
             if (!hideLegend) {
-                def.gprint(plotName, "AVERAGE", "average: @2@s");
-                def.gprint(plotName, "MAX", " max: @2@s@r");
+                def.gprint(plotName, "AVERAGE", "avg: @2@s");
+                def.gprint(plotName, "MAX", " max: @2@s");
+                def.gprint(plotName, "LAST", " now: @2@s@r");
             }
             if (!showCredit)
                 def.setShowSignature(false);
@@ -233,7 +243,7 @@ class SummaryRenderer {
                 data = graph.getPNGBytes();
             else
                 data = graph.getPNGBytes(width, height);
-            long timeToPlot = System.currentTimeMillis() - begin;
+            //long timeToPlot = System.currentTimeMillis() - begin;
             out.write(data);
             //File t = File.createTempFile("jrobinData", ".xml");
             //_listener.getData().dumpXml(new FileOutputStream(t));
@@ -245,6 +255,9 @@ class SummaryRenderer {
         } catch (IOException ioe) {
             _log.error("Error rendering", ioe);
             throw ioe;
+        } catch (OutOfMemoryError oom) {
+            _log.error("Error rendering", oom);
+            throw new IOException("Error plotting: " + oom.getMessage());
         }
     }
 }

apps/routerconsole/jsp/config.jsp

@@ -43,9 +43,21 @@
     A negative rate means a default limit of 16KBytes per second.</i><br />
  Bandwidth share percentage:
    <jsp:getProperty name="nethelper" property="sharePercentageBox" /><br />
- Sharing a higher percentage will improve your anonymity and help the network<br />
+ <% int share = nethelper.getShareBandwidth();
+    if (share < 12) {
+        out.print("<b>NOTE</b>: You have configured I2P to share only " + share + "KBps. ");
+        out.print("I2P requires at least 12KBps to enable sharing. ");
+        out.print("Please enable sharing (participating in tunnels) by configuring more bandwidth. ");
+        out.print("It improves your anonymity by creating cover traffic, and helps the network.<br />");
+    } else {
+        out.print("You have configured I2P to share " + share + "KBps. ");
+        out.print("The higher the share bandwidth the more you improve your anonymity and help the network.<br />");
+    }
+ %>
+ <p>
  <input type="submit" name="save" value="Save changes" /> <input type="reset" value="Cancel" /><br />
  <hr />
+<!--
  <b>Enable load testing: </b>
 <input type="checkbox" name="enableloadtesting" value="true" <jsp:getProperty name="nethelper" property="enableLoadTesting" /> />
  <p>If enabled, your router will periodically anonymously probe some of your peers
@@ -54,6 +66,7 @@
  load testing is fed into the profiles as well as the 
  <a href="oldstats.jsp#test.rtt">test.rtt</a> and related stats.</p>
  <hr />
+-->
  <b>External UDP address:</b> <i><jsp:getProperty name="nethelper" property="udpAddress" /></i><br />
  <b>Require SSU introductions? </b>
 <input type="checkbox" name="requireIntroductions" value="true" <jsp:getProperty name="nethelper" property="requireIntroductionsChecked" /> /><br />
@@ -66,6 +79,28 @@
     Users behind symmetric NATs, such as OpenBSD's pf, are not currently supported.</p>
 <input type="submit" name="recheckReachability" value="Check network reachability..." />
  <hr />
+ <b>Inbound TCP connection configuration:</b><br />
+ Externally reachable hostname or IP address:
+    <input name ="ntcphost" type="text" size="16" value="<jsp:getProperty name="nethelper" property="ntcphostname" />" />
+    (dyndns and the like are fine)<br />
+    OR use IP address detected by SSU
+    (currently <jsp:getProperty name="nethelper" property="udpIP" />)?
+    <input type="checkbox" name="ntcpAutoIP" value="true" <jsp:getProperty name="nethelper" property="tcpAutoIPChecked" /> /><br />
+ <p>
+ Externally reachable TCP port:
+    <input name ="ntcpport" type="text" size="6" value="<jsp:getProperty name="nethelper" property="ntcpport" />" /><br />
+    OR use the same port configured for SSU
+    (currently <jsp:getProperty name="nethelper" property="udpPort" />)?
+    <input type="checkbox" name="ntcpAutoPort" value="true" <jsp:getProperty name="nethelper" property="tcpAutoPortChecked" /> /><br />
+ <p>You do <i>not</i> need to allow inbound TCP connections - outbound connections work with no
+    configuration.  However, if you want to receive inbound TCP connections, you <b>must</b> poke a hole
+    in your NAT or firewall for unsolicited TCP connections.  If you specify the wrong IP address or
+    hostname, or do not properly configure your NAT or firewall, your network performance will degrade
+    substantially.  When in doubt, leave the hostname and port number blank.</p>
+ <p><b>Note: changing any of these settings will terminate all of your connections and effectively
+    restart your router.</b>
+ <hr />
+<!--
  <b>Dynamic Router Keys: </b>
  <input type="checkbox" name="dynamicKeys" value="true" <jsp:getProperty name="nethelper" property="dynamicKeysChecked" /> /><br />
  <p>
@@ -83,6 +118,7 @@
  though such would likely already be the case anyway, since the IP address changed.
  </p>
  <hr />
+-->
  <input type="submit" name="save" value="Save changes" /> <input type="reset" value="Cancel" /><br />
  </form>
 </div>

apps/routerconsole/jsp/configstats.jsp

@@ -78,22 +78,26 @@ function toggleAll(category)
  <table>
  <% while (statshelper.hasMoreStats()) {
       while (statshelper.groupRequired()) { %>
- <tr><td valign="top" align="left" colspan="2">
+ <tr><td valign="top" align="left" colspan="3">
      <b><%=statshelper.getCurrentGroupName()%></b>
      (<a href="javascript: void(null);" onclick="toggleAll('<%=statshelper.getCurrentGroupName()%>')">toggle all</a>)
-     </td></tr><%
+     </td></tr><tr><td>Log</td><td>Graph</td><td></td></tr><%
      } // end iterating over required groups for the current stat %>
  <tr><td valign="top" align="left">
      <input id="<%=statshelper.getCurrentGroupName()%>" type="checkbox" name="statList" value="<%=statshelper.getCurrentStatName()%>" <% 
      if (statshelper.getCurrentIsLogged()) { %>checked="true" <% } %>/></td>
+     <td valign="top" align="left">
+     <% if (statshelper.getCurrentCanBeGraphed()) { %>
+       <input id="<%=statshelper.getCurrentGroupName()%>" type="checkbox" name="graphList" value="<%=statshelper.getCurrentGraphName()%>" <% 
+       if (statshelper.getCurrentIsGraphed()) { %>checked="true" <% } %>/><% } %></td>
      <td valign="top" align="left"><b><%=statshelper.getCurrentStatName()%>:</b><br />
      <%=statshelper.getCurrentStatDescription()%></td></tr><%
     } // end iterating over all stats %>
- <tr><td colspan="2"><hr /></td></tr>
+ <tr><td colspan="3"><hr /></td></tr>
  <tr><td><input type="checkbox" name="explicitFilter" /></td>
-     <td>Advanced filter: 
+     <td colspan="2">Advanced filter: 
      <input type="text" name="explicitFilterValue" value="<%=statshelper.getExplicitFilter()%>" size="40" /></td></tr>
- <tr><td colspan="2"><hr /></td></tr>
+ <tr><td colspan="3"><hr /></td></tr>
  <tr><td><input type="submit" name="shouldsave" value="Save changes" /> </td>
      <td><input type="reset" value="Cancel" /></td></tr>
  </form>
@@ -101,4 +105,4 @@ function toggleAll(category)
 </div>
 
 </body>
-</html>
+</html>

apps/routerconsole/jsp/index.jsp

@@ -5,6 +5,7 @@
 <html><head>
 <title>I2P Router Console - home</title>
 <link rel="stylesheet" href="default.css" type="text/css" />
+<link rel="shortcut icon" href="favicon.ico" />
 </head><body>
 <%
 if (System.getProperty("router.consoleNonce") == null) {

apps/routerconsole/jsp/nav.jsp

@@ -24,7 +24,7 @@
  <!-- Could not find docs/toolbar.html! -->
  <a href="susimail/susimail">Susimail</a> |
  <a href="susidns/index.jsp">SusiDNS</a> |
- <a href="syndie/">Syndie</a> |
+ <!-- <a href="syndie/">Syndie</a> | -->
  <a href="i2psnark/">I2PSnark</a> |
  <a href="http://localhost:7658/">My Eepsite</a> <br>
  <a href="i2ptunnel/index.jsp">I2PTunnel</a> |

apps/routerconsole/jsp/summary.jsp

@@ -13,8 +13,8 @@
  <b>Ident:</b> <jsp:getProperty name="helper" property="ident" /><br />
  <b>Version:</b> <jsp:getProperty name="helper" property="version" /><br />
  <b>Uptime:</b> <jsp:getProperty name="helper" property="uptime" /><br />
- <b>Now:</b> <jsp:getProperty name="helper" property="time" /><br />
- <b>Status:</b> <a href="config.jsp"><jsp:getProperty name="helper" property="reachability" /></a><%
+ <b>Now:</b> <jsp:getProperty name="helper" property="time" /><!--<br />
+ <b>Status:</b> <a href="config.jsp"><jsp:getProperty name="helper" property="reachability" /></a>--><%
     if (helper.updateAvailable()) {
         if ("true".equals(System.getProperty("net.i2p.router.web.UpdateHandler.updateInProgress", "false"))) {
             out.print("<br />" + update.getStatus());
@@ -43,13 +43,16 @@
  <b>Failing:</b> <jsp:getProperty name="helper" property="failingPeers" /><br />
  <!-- <b>Shitlisted:</b> <jsp:getProperty name="helper" property="shitlistedPeers" /><br /> -->
  <b>Known:</b> <jsp:getProperty name="helper" property="allPeers" /><br /><%
-     if (helper.getActivePeers() <= 0) {
+    if (helper.getActivePeers() <= 0) {
         %><b><a href="config.jsp">check your NAT/firewall</a></b><br /><%
-     }
+    }
+    // If showing the reseed link is allowed
     if (helper.allowReseed()) {
         if ("true".equals(System.getProperty("net.i2p.router.web.ReseedHandler.reseedInProgress", "false"))) {
-            out.print(" <i>reseeding</i>");
+            // While reseed occurring, show status message instead
+            out.print("<i>" + System.getProperty("net.i2p.router.web.ReseedHandler.statusMessage","") + "</i><br />");
         } else {
+            // While no reseed occurring, show reseed link
             long nonce = new java.util.Random().nextLong();
             String prev = System.getProperty("net.i2p.router.web.ReseedHandler.nonce");
             if (prev != null) System.setProperty("net.i2p.router.web.ReseedHandler.noncePrev", prev);
@@ -59,7 +62,14 @@
                 uri = uri + "&reseedNonce=" + nonce;
             else
                 uri = uri + "?reseedNonce=" + nonce;
-            out.print(" <a href=\"" + uri + "\">reseed</a>");
+            out.print(" <a href=\"" + uri + "\">reseed</a><br />");
+        }
+    }
+    // If a new reseed ain't running, and the last reseed had errors, show error message
+    if ("false".equals(System.getProperty("net.i2p.router.web.ReseedHandler.reseedInProgress", "false"))) {
+        String reseedErrorMessage = System.getProperty("net.i2p.router.web.ReseedHandler.errorMessage","");
+        if (reseedErrorMessage.length() > 0) {
+            out.print("<i>" + reseedErrorMessage + "</i><br />");
         }
     }
  %><hr />

apps/streaming/java/src/net/i2p/client/streaming/Connection.java

@@ -72,7 +72,7 @@ public class Connection {
     private long _lifetimeDupMessageSent;
     private long _lifetimeDupMessageReceived;
     
-    public static final long MAX_RESEND_DELAY = 10*1000;
+    public static final long MAX_RESEND_DELAY = 45*1000;
     public static final long MIN_RESEND_DELAY = 2*1000;
 
     /** wait up to 5 minutes after disconnection so we can ack/close packets */
@@ -247,6 +247,7 @@ public class Connection {
         }
         long now = _context.clock().now();
         if (_resetSentOn + 10*1000 > now) return; // don't send resets too fast
+        if (_resetReceived) return;
         _resetSent = true;
         if (_resetSentOn <= 0)
             _resetSentOn = now;

apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java

@@ -57,7 +57,7 @@ public class ConnectionOptions extends I2PSocketOptionsImpl {
     static final int INITIAL_WINDOW_SIZE = 12;
     static final int DEFAULT_MAX_SENDS = 8;
     
-    static final int MIN_WINDOW_SIZE = INITIAL_WINDOW_SIZE;
+    static final int MIN_WINDOW_SIZE = 1;
     
     public ConnectionOptions() {
         super();
@@ -205,8 +205,8 @@ public class ConnectionOptions extends I2PSocketOptionsImpl {
     public int getRTT() { return _rtt; }
     public void setRTT(int ms) { 
         if (_rto == 0) {
-            _rttDev = ms;
-            _rto = (int)Connection.MAX_RESEND_DELAY;
+            _rttDev = ms / 2;
+            _rto = ms + ms / 2;
         }
         synchronized (_trend) {
             _trend[0] = _trend[1];

apps/streaming/java/src/net/i2p/client/streaming/I2PSocketFull.java

@@ -29,9 +29,15 @@ public class I2PSocketFull implements I2PSocket {
         if (c == null) return;
         if (c.getIsConnected()) {
             OutputStream out = c.getOutputStream();
-            if (out != null)
-                out.close();
-            c.disconnect(true);
+            if (out != null) {
+                try {
+                    out.close();
+                } catch (IOException ioe) {
+                    // ignore any write error, as we want to keep on and kill the
+                    // con (thanks Complication!)
+                }
+            }
+	    c.disconnect(true);
         } else {
             //throw new IOException("Not connected");
         }

apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java

@@ -19,7 +19,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *  
- * $Revision: 1.7 $
+ * $Revision: 1.1 $
  */
 
 package i2p.susi.dns;
@@ -99,7 +99,6 @@ public class AddressbookBean
 		return ConfigBean.addressbookPrefix + filename;
 	}
 	private Object[] entries;
-	
 	public Object[] getEntries()
 	{
 		return entries;
@@ -130,10 +129,59 @@ public class AddressbookBean
 	public void setSerial(String serial) {
 		this.serial = serial;
 	}
+	/** Load addressbook and apply filter, returning messages about this. */
+	public String getLoadBookMessages()
+	{
+		// Config and addressbook now loaded here, hence not needed in getMessages()
+		loadConfig();
+		addressbook = new Properties();
+		
+		String message = "";
+		
+		try {
+			addressbook.load( new FileInputStream( getFileName() ) );
+			LinkedList list = new LinkedList();
+			Enumeration e = addressbook.keys();
+			while( e.hasMoreElements() ) {
+				String name = (String)e.nextElement();
+				String destination = addressbook.getProperty( name );
+				if( filter != null && filter.length() > 0 ) {
+					if( filter.compareTo( "0-9" ) == 0 ) {
+						char first = name.charAt(0);
+						if( first < '0' || first > '9' )
+							continue;
+					}
+					else if( ! name.toLowerCase().startsWith( filter.toLowerCase() ) ) {
+						continue;
+					}
+				}
+				if( search != null && search.length() > 0 ) {
+					if( name.indexOf( search ) == -1 ) {
+						continue;
+					}
+				}
+				list.addLast( new AddressBean( name, destination ) );
+			}
+			// Format a message about filtered addressbook size, and the number of displayed entries
+			message = "Filtered list contains " + list.size() + " entries";
+			if (list.size() > 300) message += ", displaying the first 300."; else message += ".";
+
+			Object array[] = list.toArray();
+			Arrays.sort( array, sorter );
+			entries = array;
+		}
+		catch (Exception e) {
+			Debug.debug( e.getClass().getName() + ": " + e.getMessage() );
+		}
+		
+		if( message.length() > 0 )
+			message = "<p>" + message + "</p>";
+		return message;
+	}
+	/** Perform actions, returning messages about this. */
 	public String getMessages()
 	{
-		loadConfig();
-		
+		// Loading config and addressbook moved into getLoadBookMessages()
 		String message = "";
 		
 		if( action != null ) {
@@ -175,42 +223,7 @@ public class AddressbookBean
 		}
 		
 		action = null;
-
-		addressbook = new Properties();
 		
-		try {
-			addressbook.load( new FileInputStream( getFileName() ) );
-			LinkedList list = new LinkedList();			
-			Enumeration e = addressbook.keys();
-			while( e.hasMoreElements() ) {
-				String name = (String)e.nextElement();
-				String destination = addressbook.getProperty( name );
-				if( filter != null && filter.length() > 0 ) {
-					if( filter.compareTo( "0-9" ) == 0 ) {
-						char first = name.charAt(0);
-						if( first < '0' || first > '9' )
-							continue;
-					}
-					else if( ! name.toLowerCase().startsWith( filter.toLowerCase() ) ) {
-						continue;
-					}
-				}
-				if( search != null && search.length() > 0 ) {
-					if( name.indexOf( search ) == -1 ) {
-						continue;
-					}
-				}
-				list.addLast( new AddressBean( name, destination ) );
-			}
-			
-			Object array[] = list.toArray();
-			Arrays.sort( array, sorter );
-			entries = array;
-		}
-		catch (Exception e) {
-			Debug.debug( e.getClass().getName() + ": " + e.getMessage() );
-		}
-				
 		if( message.length() > 0 )
 			message = "<p class=\"messages\">" + message + "</p>";
 		return message;
@@ -234,6 +247,10 @@ public class AddressbookBean
 	{
 		return getBook().compareToIgnoreCase( "router" ) == 0;
 	}
+	public boolean isPublished()
+	{
+		return getBook().compareToIgnoreCase( "published" ) == 0;
+	}
 	public void setFilter(String filter) {
 		if( filter != null && ( filter.length() == 0 || filter.compareToIgnoreCase( "none" ) == 0 ) ) {
 			filter = null;

apps/susidns/src/jsp/addressbook.jsp

@@ -20,7 +20,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *  
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
  */
 %>
 <%@ page contentType="text/html"%>
@@ -60,6 +60,8 @@
 
 <div id="messages">${book.messages}</div>
 
+<span>${book.loadBookMessages}</span>
+
 <div id="filter">
 <p>Filter: <a href="addressbook.jsp?filter=a">a</a>
 <a href="addressbook.jsp?filter=b">b</a>
@@ -115,16 +117,17 @@
 <table class="book" cellspacing="0" cellpadding="5">
 <tr class="head">
 
-<c:if test="${book.master || book.router}">
+<c:if test="${book.master || book.router || book.published}">
 <th>&nbsp;</th>
 </c:if>
 
 <th>Name</th>
 <th>Destination</th>
 </tr>
-<c:forEach items="${book.entries}" var="addr">
+<!-- limit iterator to 300, or "Form too large" may result on submit -->
+<c:forEach items="${book.entries}" var="addr" begin="0" end="299">
 <tr class="list${book.trClass}">
-<c:if test="${book.master || book.router}">
+<c:if test="${book.master || book.router || book.published}">
 <td class="checkbox"><input type="checkbox" name="checked" value="${addr.name}" alt="Mark for deletion"></td>
 </c:if>
 <td class="names"><a href="http://${addr.name}/">${addr.name}</a> -
@@ -136,7 +139,7 @@
 </table>
 </div>
 
-<c:if test="${book.master || book.router}">
+<c:if test="${book.master || book.router || book.published}">
 <div id="buttons">
 <p class="buttons"><input type="image" name="action" value="delete" src="images/delete.png" alt="Delete checked" />
 </p>

apps/susimail/src/src/i2p/susi/webmail/pop3/POP3MailBox.java

@@ -19,7 +19,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *  
- * $Revision: 1.8 $
+ * $Revision: 1.1 $
  */
 package i2p.susi.webmail.pop3;
 
@@ -373,8 +373,7 @@ public class POP3MailBox {
 		}
 		if (socket != null) {
 			try {
-				if (sendCmd1a("")
-					&& sendCmd1a("USER " + user)
+				if (sendCmd1a("USER " + user)
 					&& sendCmd1a("PASS " + pass)
 					&& sendCmd1a("STAT") ) {
 

apps/syndie/java/src/net/i2p/syndie/UpdaterServlet.java

@@ -28,10 +28,13 @@ public class UpdaterServlet extends GenericServlet {
             super.init(config);
         } catch (ServletException exp) {
         }
+        /*
         UpdaterThread thread = new UpdaterThread();
         thread.setDaemon(true);
         thread.start();
         System.out.println("INFO: Starting Syndie Updater " + Updater.VERSION);
+         */
+        System.out.println("INFO: Syndie Updater DISABLED.  Use the new Syndie from http://syndie.i2p.net/");
     }
 
 }

apps/syndie/jsp/index.html

@@ -9,6 +9,11 @@
 <a href="blogs.jsp">blogs</a></p>
 <p><a href="post.jsp">Create</a> a new post of your own</p>
 <p><a href="about.html">Learn more</a> about Syndie</p>
+<p><b>NOTE:</b> This version of Syndie is being replaced by
+<a href="http://syndie.i2p.net">the new Syndie</a>!
+The new Syndie is a standalone application under active development.
+Please give the new Syndie a try, as it has lots more traffic
+than this version. Don't expect anybody to see your posts here.</p>
 </td></tr></table>
 </div>
 </body></html>

build.xml

@@ -7,6 +7,7 @@
         <echo message="  installer: build the GUI installer" />
         <echo message="  tarball:   tar the full install into i2p.tar.bz2 (extracts to build a new clean install)" />
         <echo message="  updater:   tar the built i2p specific files into an i2pupdate.zip (extracts safely over existing installs)" />
+        <echo message="  updaterWithJetty:   tar the built i2p specific files and jetty into an i2pupdate.zip (extracts safely over existing installs)" />
         <echo message="  distclean: clean up all derived files" />
         <echo message="  syndie:    generate a standalone syndie install" />
         <echo message="  i2psnark:  generate a standalone i2psnark install" />
@@ -29,7 +30,7 @@
         <ant dir="apps/addressbook/" target="war" />
         <ant dir="apps/susimail/" target="war" />
         <ant dir="apps/susidns/src" target="all" />
-        <ant dir="apps/syndie/java/" target="jar" />
+        <!-- <ant dir="apps/syndie/java/" target="jar" /> -->
         <ant dir="apps/i2psnark/java/" target="standalone" />
     </target>
     <target name="buildrouter">
@@ -102,9 +103,11 @@
         <copy file="apps/addressbook/dist/addressbook.war" todir="build/" />
         <copy file="apps/susimail/susimail.war" todir="build/" />
         <copy file="apps/susidns/src/susidns.war" todir="build/" />
+        <!--
         <copy file="apps/syndie/syndie.war" todir="build/" />
         <copy file="apps/syndie/java/build/syndie.jar" todir="build/" />
         <copy file="apps/syndie/java/build/sucker.jar" todir="build/" />
+        -->
         <copy file="apps/i2psnark/i2psnark.war" todir="build/" />
         <copy file="apps/i2psnark/java/build/i2psnark.jar" todir="build/" />
         <copy file="apps/jdom/jdom.jar" todir="build/" />
@@ -194,7 +197,7 @@
         <copy file="build/routerconsole.jar" todir="pkg-temp/lib/" />
         <copy file="build/sam.jar" todir="pkg-temp/lib/" />
         <copy file="build/systray.jar" todir="pkg-temp/lib" />
-        <copy file="build/sucker.jar" todir="pkg-temp/lib" />
+        <!-- <copy file="build/sucker.jar" todir="pkg-temp/lib" /> -->
         <copy file="build/i2psnark.jar" todir="pkg-temp/lib/" />
         <copy file="i2p.exe" todir="pkg-temp/" failonerror="false" />
         <copy file="installer/resources/runplain.sh" todir="pkg-temp/" />
@@ -208,7 +211,7 @@
         <copy file="build/addressbook.war" todir="pkg-temp/webapps/" />
         <copy file="build/susimail.war" todir="pkg-temp/webapps/" />
         <copy file="build/susidns.war" todir="pkg-temp/webapps/" />
-        <copy file="build/syndie.war" todir="pkg-temp/webapps/" />
+        <!-- <copy file="build/syndie.war" todir="pkg-temp/webapps/" /> -->
         <copy file="build/i2psnark.war" todir="pkg-temp/webapps/" />
         <copy file="apps/i2psnark/java/build/launch-i2psnark.jar" todir="pkg-temp/" />
         <copy file="apps/i2psnark/jetty-i2psnark.xml" todir="pkg-temp/" />
@@ -278,11 +281,13 @@
         <copy file="installer/resources/eepsite_index.html" tofile="pkg-temp/eepsite/docroot/index.html" />
         <copy file="installer/resources/favicon.ico" tofile="pkg-temp/eepsite/docroot/favicon.ico" />
         <copy file="installer/resources/jetty.xml" tofile="pkg-temp/eepsite/jetty.xml" />
+        <!--
 	<mkdir dir="pkg-temp/syndie" />
 	<mkdir dir="pkg-temp/syndie/archive" />
 	<mkdir dir="pkg-temp/syndie/archive/ovpBy2mpO1CQ7deYhQ1cDGAwI6pQzLbWOm1Sdd0W06c=" />
 	<copy file="installer/resources/blogMeta.snm" tofile="pkg-temp/syndie/archive/ovpBy2mpO1CQ7deYhQ1cDGAwI6pQzLbWOm1Sdd0W06c=/meta.snm" />
 	<copy file="installer/resources/blogPost.snd" tofile="pkg-temp/syndie/archive/ovpBy2mpO1CQ7deYhQ1cDGAwI6pQzLbWOm1Sdd0W06c=/1132012800001.snd" />
+        -->
     </target>
     <target name="tarball" depends="preppkg">
         <tar compression="bzip2" destfile="i2p.tar.bz2">
@@ -292,6 +297,9 @@
     <target name="updater" depends="prepupdate">
         <zip destfile="i2pupdate.zip" basedir="pkg-temp" />
     </target>
+    <target name="updaterWithJetty" depends="prepjupdate">
+        <zip destfile="i2pupdate.zip" basedir="pkg-temp" />
+    </target>
     <target name="updateTest" depends="prepupdate">
         <ant dir="core/java/" target="jarTest" />    
         <copy file="core/java/build/i2ptest.jar" todir="pkg-temp/lib" />
@@ -316,7 +324,7 @@
         <copy file="build/addressbook.war" todir="pkg-temp/webapps/" />
         <copy file="build/susimail.war" todir="pkg-temp/webapps/" />
         <copy file="build/susidns.war" todir="pkg-temp/webapps/" />
-        <copy file="build/syndie.war" todir="pkg-temp/webapps/" />
+        <!-- <copy file="build/syndie.war" todir="pkg-temp/webapps/" /> -->
         <copy file="build/i2psnark.war" todir="pkg-temp/webapps/" />
         <!-- <copy file="apps/i2psnark/java/build/launch-i2psnark.jar" todir="pkg-temp/" /> -->
         <copy file="apps/i2psnark/jetty-i2psnark.xml" todir="pkg-temp/" />
@@ -347,11 +355,23 @@
         <mkdir dir="pkg-temp/eepsite" />
         <mkdir dir="pkg-temp/eepsite/webapps" />
         <mkdir dir="pkg-temp/eepsite/cgi-bin" />
+        <!--
 	<mkdir dir="pkg-temp/syndie" />
 	<mkdir dir="pkg-temp/syndie/archive" />
 	<mkdir dir="pkg-temp/syndie/archive/ovpBy2mpO1CQ7deYhQ1cDGAwI6pQzLbWOm1Sdd0W06c=" />
 	<copy file="installer/resources/blogMeta.snm" tofile="pkg-temp/syndie/archive/ovpBy2mpO1CQ7deYhQ1cDGAwI6pQzLbWOm1Sdd0W06c=/meta.snm" />
 	<copy file="installer/resources/blogPost.snd" tofile="pkg-temp/syndie/archive/ovpBy2mpO1CQ7deYhQ1cDGAwI6pQzLbWOm1Sdd0W06c=/1132012800001.snd" />
+        -->
+    </target>
+    <target name="prepjupdate" depends="prepupdate, buildWEB">
+        <copy file="build/ant.jar" todir="pkg-temp/lib/" />
+        <copy file="build/jasper-compiler.jar" todir="pkg-temp/lib/" />
+        <copy file="build/jasper-runtime.jar" todir="pkg-temp/lib/" />
+        <copy file="build/commons-logging.jar" todir="pkg-temp/lib/" />
+        <copy file="build/commons-el.jar" todir="pkg-temp/lib/" />
+        <copy file="build/javax.servlet.jar" todir="pkg-temp/lib/" />
+        <copy file="build/org.mortbay.jetty.jar" todir="pkg-temp/lib/" />
+        <copy file="build/xercesImpl.jar" todir="pkg-temp/lib/" />
     </target>
     <target name="installer" depends="preppkg">
         <taskdef name="izpack" classpath="${basedir}/installer/lib/izpack/standalone-compiler.jar" classname="com.izforge.izpack.ant.IzPackTask" />

core/java/src/freenet/support/CPUInformation/CPUID.java

@@ -32,7 +32,7 @@ public class CPUID {
      * initialization?  this would otherwise use the Log component, but this makes
      * it easier for other systems to reuse this class
      */
-    private static final boolean _doLog = true;
+    private static final boolean _doLog = System.getProperty("jcpuid.dontLog") == null;
 
     //.matches() is a java 1.4+ addition, using a simplified version for 1.3+
     //private static final boolean isX86 = System.getProperty("os.arch").toLowerCase().matches("i?[x0-9]86(_64)?");

core/java/src/gnu/crypto/hash/BaseHashStandalone.java

@@ -1,7 +1,7 @@
 package gnu.crypto.hash;
 
 // ----------------------------------------------------------------------------
-// $Id: BaseHash.java,v 1.10 2005/10/06 04:24:14 rsdio Exp $
+// $Id: BaseHashStandalone.java,v 1.1 2006/02/26 16:30:59 jrandom Exp $
 //
 // Copyright (C) 2001, 2002, Free Software Foundation, Inc.
 //
@@ -46,9 +46,9 @@ package gnu.crypto.hash;
 /**
  * <p>A base abstract class to facilitate hash implementations.</p>
  *
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.1 $
  */
-public abstract class BaseHash implements IMessageDigest {
+public abstract class BaseHashStandalone implements IMessageDigestStandalone {
 
    // Constants and variables
    // -------------------------------------------------------------------------
@@ -78,7 +78,7 @@ public abstract class BaseHash implements IMessageDigest {
     * @param hashSize the block size of the output in bytes.
     * @param blockSize the block size of the internal transform.
     */
-   protected BaseHash(String name, int hashSize, int blockSize) {
+   protected BaseHashStandalone(String name, int hashSize, int blockSize) {
       super();
 
       this.name = name;
@@ -95,7 +95,7 @@ public abstract class BaseHash implements IMessageDigest {
    // Instance methods
    // -------------------------------------------------------------------------
 
-   // IMessageDigest interface implementation ---------------------------------
+   // IMessageDigestStandalone interface implementation ---------------------------------
 
    public String name() {
       return name;

core/java/src/gnu/crypto/hash/IMessageDigestStandalone.java

@@ -1,7 +1,7 @@
 package gnu.crypto.hash;
 
 // ----------------------------------------------------------------------------
-// $Id: IMessageDigest.java,v 1.11 2005/10/06 04:24:14 rsdio Exp $
+// $Id: IMessageDigestStandalone.java,v 1.1 2006/02/26 16:30:59 jrandom Exp $
 //
 // Copyright (C) 2001, 2002, Free Software Foundation, Inc.
 //
@@ -49,9 +49,9 @@ package gnu.crypto.hash;
  * <p>A hash (or message digest) algorithm produces its output by iterating a
  * basic compression function on blocks of data.</p>
  *
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.1 $
  */
-public interface IMessageDigest extends Cloneable {
+public interface IMessageDigestStandalone extends Cloneable {
 
    // Constants
    // -------------------------------------------------------------------------

core/java/src/gnu/crypto/hash/Sha256Standalone.java

@@ -1,7 +1,7 @@
 package gnu.crypto.hash;
 
 // ----------------------------------------------------------------------------
-// $Id: Sha256Standalone.java,v 1.1 2006/02/26 16:30:59 jrandom Exp $
+// $Id: Sha256Standalone.java,v 1.2 2006/03/16 16:45:19 jrandom Exp $
 //
 // Copyright (C) 2003 Free Software Foundation, Inc.
 //
@@ -59,9 +59,9 @@ package gnu.crypto.hash;
  * renamed from Sha256 to avoid conflicts with JVMs using gnu-crypto as their JCE
  * provider.
  *
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
  */
-public class Sha256Standalone extends BaseHash {
+public class Sha256Standalone extends BaseHashStandalone {
    // Constants and variables
    // -------------------------------------------------------------------------
    private static final int[] k = {
@@ -143,7 +143,7 @@ public class Sha256Standalone extends BaseHash {
       return new Sha256Standalone(this);
    }
 
-   // Implementation of concrete methods in BaseHash --------------------------
+   // Implementation of concrete methods in BaseHashStandalone --------------------------
 
    private int transformResult[] = new int[8];
    protected void transform(byte[] in, int offset) {

core/java/src/gnu/crypto/prng/AsyncFortunaStandalone.java

@@ -0,0 +1,175 @@
+package gnu.crypto.prng;
+
+import java.util.*;
+
+/**
+ * fortuna instance that tries to avoid blocking if at all possible by using separate
+ * filled buffer segments rather than one buffer (and blocking when that buffer's data
+ * has been eaten)
+ */
+public class AsyncFortunaStandalone extends FortunaStandalone implements Runnable {
+    private static final int BUFFERS = 16;
+    private static final int BUFSIZE = 256*1024;
+    private final byte asyncBuffers[][] = new byte[BUFFERS][BUFSIZE];
+    private final int status[] = new int[BUFFERS];
+    private int nextBuf = 0;
+
+    private static final int STATUS_NEED_FILL = 0;
+    private static final int STATUS_FILLING = 1;
+    private static final int STATUS_FILLED = 2;
+    private static final int STATUS_LIVE = 3;
+    
+    public AsyncFortunaStandalone() {
+        super();
+        for (int i = 0; i < BUFFERS; i++)
+            status[i] = STATUS_NEED_FILL;
+    }
+    
+    public void startup() {
+        Thread refillThread = new Thread(this, "PRNG");
+        refillThread.setDaemon(true);
+        refillThread.setPriority(Thread.MIN_PRIORITY+1);
+        refillThread.start();
+    }
+
+    /** the seed is only propogated once the prng is started with startup() */
+    public void seed(byte val[]) {
+        Map props = new HashMap(1);
+        props.put(SEED, (Object)val);
+        init(props);
+        //fillBlock();
+    }
+  
+    protected void allocBuffer() {}
+    
+    /**
+     * make the next available filled buffer current, scheduling any unfilled
+     * buffers for refill, and blocking until at least one buffer is ready
+     */
+    protected void rotateBuffer() {
+        synchronized (asyncBuffers) {
+            // wait until we get some filled
+            long before = System.currentTimeMillis();
+            long waited = 0;
+            while (status[nextBuf] != STATUS_FILLED) {
+                //System.out.println(Thread.currentThread().getName() + ": Next PRNG buffer "
+                //                   + nextBuf + " isn't ready (" + status[nextBuf] + ")");
+                //new Exception("source").printStackTrace();
+                asyncBuffers.notifyAll();
+                try {
+                    asyncBuffers.wait();
+                } catch (InterruptedException ie) {}
+                waited = System.currentTimeMillis()-before;
+            }
+            if (waited > 10*1000)
+                System.out.println(Thread.currentThread().getName() + ": Took " + waited
+                                   + "ms for a full PRNG buffer to be found");
+            //System.out.println(Thread.currentThread().getName() + ": Switching to prng buffer " + nextBuf);
+            buffer = asyncBuffers[nextBuf];
+            status[nextBuf] = STATUS_LIVE;
+            int prev=nextBuf-1;
+            if (prev<0)
+                prev = BUFFERS-1;
+            if (status[prev] == STATUS_LIVE)
+                status[prev] = STATUS_NEED_FILL;
+            nextBuf++;
+            if (nextBuf >= BUFFERS)
+                nextBuf = 0;
+            asyncBuffers.notify();
+        }
+    }
+    
+    public void run() {
+        while (true) {
+            int toFill = -1;
+            try {
+                synchronized (asyncBuffers) {
+                    for (int i = 0; i < BUFFERS; i++) {
+                        if (status[i] == STATUS_NEED_FILL) {
+                            status[i] = STATUS_FILLING;
+                            toFill = i;
+                            break;
+                        }
+                    }
+                    if (toFill == -1) {
+                        //System.out.println(Thread.currentThread().getName() + ": All pending buffers full");
+                        asyncBuffers.wait();
+                    }
+                }
+            } catch (InterruptedException ie) {}
+            
+            if (toFill != -1) {
+                //System.out.println(Thread.currentThread().getName() + ": Filling prng buffer " + toFill);
+                long before = System.currentTimeMillis();
+                doFill(asyncBuffers[toFill]);
+                long after = System.currentTimeMillis();
+                synchronized (asyncBuffers) {
+                    status[toFill] = STATUS_FILLED;
+                    //System.out.println(Thread.currentThread().getName() + ": Prng buffer " + toFill + " filled after " + (after-before));
+                    asyncBuffers.notifyAll();
+                }
+                Thread.yield();
+                long waitTime = (after-before)*5;
+                if (waitTime <= 0) // somehow postman saw waitTime show up as negative
+                    waitTime = 50;
+                try { Thread.sleep(waitTime); } catch (InterruptedException ie) {}
+            }
+        }
+    }
+
+    public void fillBlock()
+    {
+        rotateBuffer();
+    }
+    
+    private void doFill(byte buf[]) {
+        long start = System.currentTimeMillis();
+        if (pool0Count >= MIN_POOL_SIZE
+            && System.currentTimeMillis() - lastReseed > 100)
+          {
+            reseedCount++;
+            //byte[] seed = new byte[0];
+            for (int i = 0; i < NUM_POOLS; i++)
+              {
+                if (reseedCount % (1 << i) == 0) {
+                  generator.addRandomBytes(pools[i].digest());
+                }
+              }
+            lastReseed = System.currentTimeMillis();
+          }
+        generator.nextBytes(buf);
+        long now = System.currentTimeMillis();
+        long diff = now-lastRefill;
+        lastRefill = now;
+        long refillTime = now-start;
+        //System.out.println("Refilling " + (++refillCount) + " after " + diff + " for the PRNG took " + refillTime);
+    }
+    
+    public static void main(String args[]) {
+        try {
+            AsyncFortunaStandalone rand = new AsyncFortunaStandalone();
+            
+            byte seed[] = new byte[1024];
+            rand.seed(seed);
+            System.out.println("Before starting prng");
+            rand.startup();
+            System.out.println("Starting prng, waiting 1 minute");
+            try { Thread.sleep(60*1000); } catch (InterruptedException ie) {}
+            System.out.println("PRNG started, beginning test");
+
+            long before = System.currentTimeMillis();
+            byte buf[] = new byte[1024];
+            java.io.ByteArrayOutputStream baos = new java.io.ByteArrayOutputStream();
+            java.util.zip.GZIPOutputStream gos = new java.util.zip.GZIPOutputStream(baos);
+            for (int i = 0; i < 1024; i++) {
+                rand.nextBytes(buf);
+                gos.write(buf);
+            }
+            long after = System.currentTimeMillis();
+            gos.finish();
+            byte compressed[] = baos.toByteArray();
+            System.out.println("Compressed size of 1MB: " + compressed.length + " took " + (after-before));
+        } catch (Exception e) { e.printStackTrace(); }
+        try { Thread.sleep(5*60*1000); } catch (InterruptedException ie) {}
+    }
+}

core/java/src/gnu/crypto/prng/BasePRNGStandalone.java

@@ -49,7 +49,7 @@ import java.util.Map;
  * Modified slightly by jrandom for I2P (removing unneeded exceptions)
  * @version $Revision: 1.1 $
  */
-public abstract class BasePRNGStandalone implements IRandom {
+public abstract class BasePRNGStandalone implements IRandomStandalone {
 
    // Constants and variables
    // -------------------------------------------------------------------------
@@ -88,7 +88,7 @@ public abstract class BasePRNGStandalone implements IRandom {
    // Instance methods
    // -------------------------------------------------------------------------
 
-   // IRandom interface implementation ----------------------------------------
+   // IRandomStandalone interface implementation ----------------------------------------
 
    public String name() {
       return name;

core/java/src/gnu/crypto/prng/FortunaStandalone.java

@@ -97,20 +97,22 @@ import net.i2p.crypto.CryptixAESKeyCache;
  * gnu-crypto implementation, which has been imported into GNU/classpath
  *
  */
-public class FortunaStandalone extends BasePRNGStandalone implements Serializable, RandomEventListener
+public class FortunaStandalone extends BasePRNGStandalone implements Serializable, RandomEventListenerStandalone
 {
 
   private static final long serialVersionUID = 0xFACADE;
 
   private static final int SEED_FILE_SIZE = 64;
-  private static final int NUM_POOLS = 32;
-  private static final int MIN_POOL_SIZE = 64;
-  private final Generator generator;
-  private final Sha256Standalone[] pools;
-  private long lastReseed;
-  private int pool;
-  private int pool0Count;
-  private int reseedCount;
+  static final int NUM_POOLS = 32;
+  static final int MIN_POOL_SIZE = 64;
+  final Generator generator;
+  final Sha256Standalone[] pools;
+  long lastReseed;
+  int pool;
+  int pool0Count;
+  int reseedCount;
+  static long refillCount = 0;
+  static long lastRefill = System.currentTimeMillis();
 
   public static final String SEED = "gnu.crypto.prng.fortuna.seed";
 
@@ -124,6 +126,9 @@ public class FortunaStandalone extends BasePRNGStandalone implements Serializabl
     lastReseed = 0;
     pool = 0;
     pool0Count = 0;
+    allocBuffer();
+  }
+  protected void allocBuffer() {
     buffer = new byte[4*1024*1024]; //256]; // larger buffer to reduce churn
   }
 
@@ -145,6 +150,7 @@ public class FortunaStandalone extends BasePRNGStandalone implements Serializabl
 
   public void fillBlock()
   {
+    long start = System.currentTimeMillis();
     if (pool0Count >= MIN_POOL_SIZE
         && System.currentTimeMillis() - lastReseed > 100)
       {
@@ -159,6 +165,11 @@ public class FortunaStandalone extends BasePRNGStandalone implements Serializabl
         lastReseed = System.currentTimeMillis();
       }
     generator.nextBytes(buffer);
+    long now = System.currentTimeMillis();
+    long diff = now-lastRefill;
+    lastRefill = now;
+    long refillTime = now-start;
+    System.out.println("Refilling " + (++refillCount) + " after " + diff + " for the PRNG took " + refillTime);
   }
 
   public void addRandomByte(byte b)
@@ -177,7 +188,7 @@ public class FortunaStandalone extends BasePRNGStandalone implements Serializabl
     pool = (pool + 1) % NUM_POOLS;
   }
 
-  public void addRandomEvent(RandomEvent event)
+  public void addRandomEvent(RandomEventStandalone event)
   {
     if (event.getPoolNumber() < 0 || event.getPoolNumber() >= pools.length)
       throw new IllegalArgumentException("pool number out of range: "
@@ -338,6 +349,34 @@ public class FortunaStandalone extends BasePRNGStandalone implements Serializabl
   }
   
   public static void main(String args[]) {
+      byte in[] = new byte[16];
+      byte out[] = new byte[16];
+      byte key[] = new byte[32];
+      try {
+          CryptixAESKeyCache.KeyCacheEntry buf = CryptixAESKeyCache.createNew();
+          Object cryptixKey = CryptixRijndael_Algorithm.makeKey(key, 16, buf);
+          long beforeAll = System.currentTimeMillis();
+          for (int i = 0; i < 256; i++) {
+              //long before =System.currentTimeMillis();
+              for (int j = 0; j < 1024; j++)
+                CryptixRijndael_Algorithm.blockEncrypt(in, out, 0, 0, cryptixKey);
+              //long after = System.currentTimeMillis();
+              //System.out.println("encrypting 16KB took " + (after-before));
+          }
+          long after = System.currentTimeMillis();
+          System.out.println("encrypting 4MB took " + (after-beforeAll));
+      } catch (Exception e) { e.printStackTrace(); }
+      
+      try {
+        CryptixAESKeyCache.KeyCacheEntry buf = CryptixAESKeyCache.createNew();
+        Object cryptixKey = CryptixRijndael_Algorithm.makeKey(key, 16, buf);
+        byte data[] = new byte[4*1024*1024];
+        long beforeAll = System.currentTimeMillis();
+        //CryptixRijndael_Algorithm.ecbBulkEncrypt(data, data, cryptixKey);
+          long after = System.currentTimeMillis();
+          System.out.println("encrypting 4MB took " + (after-beforeAll));
+      } catch (Exception e) { e.printStackTrace(); }
+      /*
       FortunaStandalone f = new FortunaStandalone();
       java.util.HashMap props = new java.util.HashMap();
       byte initSeed[] = new byte[1234];
@@ -351,5 +390,6 @@ public class FortunaStandalone extends BasePRNGStandalone implements Serializabl
       }
       long time = System.currentTimeMillis() - before;
       System.out.println("512MB took " + time + ", or " + (8*64d)/((double)time/1000d) +"MBps");
+       */
   }
 }

core/java/src/gnu/crypto/prng/IRandomStandalone.java

@@ -1,7 +1,7 @@
 package gnu.crypto.prng;
 
 // ----------------------------------------------------------------------------
-// $Id: IRandom.java,v 1.12 2005/10/06 04:24:17 rsdio Exp $
+// $Id: IRandomStandalone.java,v 1.1 2005/10/22 13:10:00 jrandom Exp $
 //
 // Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
 //
@@ -82,9 +82,9 @@ import java.util.Map;
  *    Menezes, A., van Oorschot, P. and S. Vanstone.</li>
  * </ol>
  *
- * @version $Revision: 1.12 $
+ * @version $Revision: 1.1 $
  */
-public interface IRandom extends Cloneable {
+public interface IRandomStandalone extends Cloneable {
 
    // Constants
    // -------------------------------------------------------------------------
@@ -110,32 +110,32 @@ public interface IRandom extends Cloneable {
    void init(Map attributes);
 
    /**
-    * <p>Returns the next 8 bits of random data generated from this instance.</p>
-    *
-    * @return the next 8 bits of random data generated from this instance.
-    * @exception IllegalStateException if the instance is not yet initialised.
-    * @exception LimitReachedException if this instance has reached its
-    * theoretical limit for generating non-repetitive pseudo-random data.
-    */
-   byte nextByte() throws IllegalStateException, LimitReachedException;
+     * <p>Returns the next 8 bits of random data generated from this instance.</p>
+     * 
+     * @return the next 8 bits of random data generated from this instance.
+     * @exception IllegalStateException if the instance is not yet initialised.
+     * @exception LimLimitReachedExceptionStandalone this instance has reached its
+     * theoretical limit for generating non-repetitive pseudo-random data.
+     */
+   byte nextByte() throws IllegalStateException, LimitReachedExceptionStandalone;
 
    /**
-    * <p>Fills the designated byte array, starting from byte at index
-    * <code>offset</code>, for a maximum of <code>length</code> bytes with the
-    * output of this generator instance.
-    *
-    * @param out the placeholder to contain the generated random bytes.
-    * @param offset the starting index in <i>out</i> to consider. This method
-    * does nothing if this parameter is not within <code>0</code> and
-    * <code>out.length</code>.
-    * @param length the maximum number of required random bytes. This method
-    * does nothing if this parameter is less than <code>1</code>.
-    * @exception IllegalStateException if the instance is not yet initialised.
-    * @exception LimitReachedException if this instance has reached its
-    * theoretical limit for generating non-repetitive pseudo-random data.
-    */
+     * <p>Fills the designated byte array, starting from byte at index
+     * <code>offset</code>, for a maximum of <code>length</code> bytes with the
+     * output of this generator instance.
+     * 
+     * @param out the placeholder to contain the generated random bytes.
+     * @param offset the starting index in <i>out</i> to consider. This method
+     * does nothing if this parameter is not within <code>0</code> and
+     * <code>out.length</code>.
+     * @param length the maximum number of required random bytes. This method
+     * does nothing if this parameter is less than <code>1</code>.
+     * @exception IllegalStateException if the instance is not yet initialised.
+     * @exception LimitLimitReachedExceptionStandalonehis instance has reached its
+     * theoretical limit for generating non-repetitive pseudo-random data.
+     */
    void nextBytes(byte[] out, int offset, int length)
-   throws IllegalStateException, LimitReachedException;
+   throws IllegalStateException, LimitReachedExceptionStandalone;
 
    /**
     * <p>Supplement, or possibly replace, the random state of this PRNG with

core/java/src/gnu/crypto/prng/LimitReachedExceptionStandalone.java

@@ -1,7 +1,7 @@
 package gnu.crypto.prng;
 
 // ----------------------------------------------------------------------------
-// $Id: LimitReachedException.java,v 1.5 2005/10/06 04:24:17 rsdio Exp $
+// $Id: LimitReachedExceptionStandalone.java,v 1.1 2005/10/22 13:10:00 jrandom Exp $
 //
 // Copyright (C) 2001, 2002, Free Software Foundation, Inc.
 //
@@ -47,9 +47,9 @@ package gnu.crypto.prng;
  * A checked exception that indicates that a pseudo random number generated has
  * reached its theoretical limit in generating random bytes.
  *
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.1 $
  */
-public class LimitReachedException extends Exception {
+public class LimitReachedExceptionStandalone extends Exception {
 
    // Constants and variables
    // -------------------------------------------------------------------------
@@ -57,11 +57,11 @@ public class LimitReachedException extends Exception {
    // Constructor(s)
    // -------------------------------------------------------------------------
 
-   public LimitReachedException() {
+   public LimitReachedExceptionStandalone() {
       super();
    }
 
-   public LimitReachedException(String msg) {
+   public LimitReachedExceptionStandalone(String msg) {
       super(msg);
    }
 

core/java/src/gnu/crypto/prng/RandomEventListenerStandalone.java

@@ -1,4 +1,4 @@
-/* RandomEventListener.java -- event listener
+/* RandomEventListenerStandalone.java -- event listener
    Copyright (C) 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Crypto.
@@ -47,7 +47,7 @@ import java.util.EventListener;
  * An interface for entropy accumulators that will be notified of random
  * events.
  */
-public interface RandomEventListener extends EventListener
+public interface RandomEventListenerStandalone extends EventListener
 {
-  void addRandomEvent(RandomEvent event);
+  void addRandomEvent(RandomEventStandalone event);
 }

core/java/src/gnu/crypto/prng/RandomEventStandalone.java

@@ -1,4 +1,4 @@
-/* RandomEvent.java -- a random event.
+/* RandomEventStandalone.java -- a random event.
    Copyright (C) 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Crypto.
@@ -47,14 +47,14 @@ import java.util.EventObject;
  * An interface for entropy accumulators that will be notified of random
  * events.
  */
-public class RandomEvent extends EventObject
+public class RandomEventStandalone extends EventObject
 {
 
   private final byte sourceNumber;
   private final byte poolNumber;
   private final byte[] data;
 
-  public RandomEvent(Object source, byte sourceNumber, byte poolNumber,
+  public RandomEventStandalone(Object source, byte sourceNumber, byte poolNumber,
                      byte[] data)
   {
     super(source);

core/java/src/net/i2p/CoreVersion.java

@@ -14,8 +14,8 @@ package net.i2p;
  *
  */
 public class CoreVersion {
-    public final static String ID = "$Revision: 1.61 $ $Date: 2006/05/09 16:17:19 $";
-    public final static String VERSION = "0.6.1.19";
+    public final static String ID = "$Revision: 1.71 $ $Date: 2007-03-17 16:19:10 $";
+    public final static String VERSION = "0.6.1.29";
 
     public static void main(String args[]) {
         System.out.println("I2P Core version: " + VERSION);

core/java/src/net/i2p/I2PAppContext.java

@@ -14,6 +14,7 @@ import net.i2p.crypto.DummyElGamalEngine;
 import net.i2p.crypto.DummyPooledRandomSource;
 import net.i2p.crypto.ElGamalAESEngine;
 import net.i2p.crypto.ElGamalEngine;
+import net.i2p.crypto.HMAC256Generator;
 import net.i2p.crypto.HMACGenerator;
 import net.i2p.crypto.KeyGenerator;
 import net.i2p.crypto.PersistentSessionKeyManager;
@@ -67,8 +68,9 @@ public class I2PAppContext {
     private AESEngine _AESEngine;
     private LogManager _logManager;
     private HMACGenerator _hmac;
+    private HMAC256Generator _hmac256;
     private SHA256Generator _sha;
-    private Clock _clock;
+    protected Clock _clock; // overridden in RouterContext
     private DSAEngine _dsa;
     private RoutingKeyGenerator _routingKeyGenerator;
     private RandomSource _random;
@@ -82,8 +84,9 @@ public class I2PAppContext {
     private volatile boolean _AESEngineInitialized;
     private volatile boolean _logManagerInitialized;
     private volatile boolean _hmacInitialized;
+    private volatile boolean _hmac256Initialized;
     private volatile boolean _shaInitialized;
-    private volatile boolean _clockInitialized;
+    protected volatile boolean _clockInitialized; // used in RouterContext
     private volatile boolean _dsaInitialized;
     private volatile boolean _routingKeyGeneratorInitialized;
     private volatile boolean _randomInitialized;
@@ -353,6 +356,19 @@ public class I2PAppContext {
             _hmacInitialized = true;
         }
     }
+
+    public HMAC256Generator hmac256() {
+        if (!_hmac256Initialized) initializeHMAC256();
+        return _hmac256;
+    }
+    private void initializeHMAC256() {
+        synchronized (this) {
+            if (_hmac256 == null) {
+                _hmac256 = new HMAC256Generator(this);
+            }
+            _hmac256Initialized = true;
+        }
+    }
     
     /**
      * Our SHA256 instance (see the hmac discussion for why its context specific)
@@ -411,11 +427,11 @@ public class I2PAppContext {
      * enable simulators to play with clock skew among different instances.
      *
      */
-    public Clock clock() { 
+    public Clock clock() { // overridden in RouterContext
         if (!_clockInitialized) initializeClock();
         return _clock;
     }
-    private void initializeClock() {
+    protected void initializeClock() { // overridden in RouterContext
         synchronized (this) {
             if (_clock == null)
                 _clock = new Clock(this);

core/java/src/net/i2p/crypto/DHSessionKeyBuilder.java

@@ -320,9 +320,9 @@ public class DHSessionKeyBuilder {
             if (_myPrivateValue == null) generateMyValue();
             _sessionKey = calculateSessionKey(_myPrivateValue, _peerValue);
         } else {
-            System.err.println("Not ready yet.. privateValue and peerValue must be set ("
-                               + (_myPrivateValue != null ? "set" : "null") + ","
-                               + (_peerValue != null ? "set" : "null") + ")");
+            //System.err.println("Not ready yet.. privateValue and peerValue must be set ("
+            //                   + (_myPrivateValue != null ? "set" : "null") + ","
+            //                   + (_peerValue != null ? "set" : "null") + ")");
         }
         return _sessionKey;
     }

core/java/src/net/i2p/crypto/HMAC256Generator.java

@@ -0,0 +1,51 @@
+package net.i2p.crypto;
+
+import gnu.crypto.hash.Sha256Standalone;
+import net.i2p.I2PAppContext;
+import net.i2p.data.Base64;
+import net.i2p.data.Hash;
+import net.i2p.data.SessionKey;
+import org.bouncycastle.crypto.Digest;
+import org.bouncycastle.crypto.macs.HMac;
+
+/**
+ * Calculate the HMAC-SHA256 of a key+message.  All the good stuff occurs
+ * in {@link org.bouncycastle.crypto.macs.HMac} and 
+ * {@link org.bouncycastle.crypto.digests.MD5Digest}.
+ *
+ */
+public class HMAC256Generator extends HMACGenerator {
+    public HMAC256Generator(I2PAppContext context) { super(context); }
+    
+    protected HMac acquire() {
+        synchronized (_available) {
+            if (_available.size() > 0)
+                return (HMac)_available.remove(0);
+        }
+        // the HMAC is hardcoded to use SHA256 digest size
+        // for backwards compatability.  next time we have a backwards
+        // incompatible change, we should update this by removing ", 32"
+        return new HMac(new Sha256ForMAC());
+    }
+    
+    private class Sha256ForMAC extends Sha256Standalone implements Digest {
+        public String getAlgorithmName() { return "sha256 for hmac"; }
+        public int getDigestSize() { return 32; }
+        public int doFinal(byte[] out, int outOff) {
+            byte rv[] = digest();
+            System.arraycopy(rv, 0, out, outOff, rv.length);
+            reset();
+            return rv.length;
+        }
+        
+    }
+    
+    public static void main(String args[]) {
+        I2PAppContext ctx = I2PAppContext.getGlobalContext();
+        byte data[] = new byte[64];
+        ctx.random().nextBytes(data);
+        SessionKey key = ctx.keyGenerator().generateSessionKey();
+        Hash mac = ctx.hmac256().calculate(key, data);
+        System.out.println(Base64.encode(mac.getData()));
+    }
+}

core/java/src/net/i2p/crypto/HMACGenerator.java

@@ -20,7 +20,7 @@ import org.bouncycastle.crypto.macs.HMac;
 public class HMACGenerator {
     private I2PAppContext _context;
     /** set of available HMAC instances for calculate */
-    private List _available;
+    protected List _available;
     /** set of available byte[] buffers for verify */
     private List _availableTmp;
     
@@ -85,7 +85,7 @@ public class HMACGenerator {
         return eq;
     }
     
-    private HMac acquire() {
+    protected HMac acquire() {
         synchronized (_available) {
             if (_available.size() > 0)
                 return (HMac)_available.remove(0);

core/java/src/net/i2p/crypto/KeyGenerator.java

@@ -9,10 +9,13 @@ package net.i2p.crypto;
  *
  */
 
+import gnu.crypto.hash.Sha256Standalone;
 import java.math.BigInteger;
 
 import net.i2p.I2PAppContext;
+import net.i2p.data.Base64;
 import net.i2p.data.DataHelper;
+import net.i2p.data.Hash;
 import net.i2p.data.PrivateKey;
 import net.i2p.data.PublicKey;
 import net.i2p.data.SessionKey;
@@ -53,6 +56,18 @@ public class KeyGenerator {
         return key;
     }
     
+    private static final int PBE_ROUNDS = 1000;
+    /** PBE the passphrase with the salt */
+    public SessionKey generateSessionKey(byte salt[], byte passphrase[]) {
+        byte salted[] = new byte[16+passphrase.length];
+        System.arraycopy(salt, 0, salted, 0, Math.min(salt.length, 16));
+        System.arraycopy(passphrase, 0, salted, 16, passphrase.length);
+        byte h[] = _context.sha().calculateHash(salted).getData();
+        for (int i = 1; i < PBE_ROUNDS; i++)
+            _context.sha().calculateHash(h, 0, Hash.HASH_LENGTH, h, 0);
+        return new SessionKey(h);
+    }
+    
     /** standard exponent size */
     private static final int PUBKEY_EXPONENT_SIZE_FULL = 2048;
     /** 
@@ -95,7 +110,7 @@ public class KeyGenerator {
      * @return the corresponding PublicKey object
      */
     public static PublicKey getPublicKey(PrivateKey priv) {
-        BigInteger a = new NativeBigInteger(priv.toByteArray());
+        BigInteger a = new NativeBigInteger(1, priv.toByteArray());
         BigInteger aalpha = CryptoConstants.elgg.modPow(a, CryptoConstants.elgp);
         PublicKey pub = new PublicKey();
         byte [] pubBytes = aalpha.toByteArray();
@@ -132,7 +147,7 @@ public class KeyGenerator {
      * @return a SigningPublicKey object
      */
     public static SigningPublicKey getSigningPublicKey(SigningPrivateKey priv) {
-        BigInteger x = new NativeBigInteger(priv.toByteArray());
+        BigInteger x = new NativeBigInteger(1, priv.toByteArray());
         BigInteger y = CryptoConstants.dsag.modPow(x, CryptoConstants.dsap);
         SigningPublicKey pub = new SigningPublicKey();
         byte [] pubBytes = padBuffer(y.toByteArray(), SigningPublicKey.KEYSIZE_BYTES);

core/java/src/net/i2p/crypto/TransientSessionKeyManager.java

@@ -67,7 +67,7 @@ class TransientSessionKeyManager extends SessionKeyManager {
         _log = context.logManager().getLog(TransientSessionKeyManager.class);
         _context = context;
         _outboundSessions = new HashMap(1024);
-        _inboundTagSets = new HashMap(64*1024);
+        _inboundTagSets = new HashMap(1024);
         context.statManager().createRateStat("crypto.sessionTagsExpired", "How many tags/sessions are expired?", "Encryption", new long[] { 10*60*1000, 60*60*1000, 3*60*60*1000 });
         context.statManager().createRateStat("crypto.sessionTagsRemaining", "How many tags/sessions are remaining after a cleanup?", "Encryption", new long[] { 10*60*1000, 60*60*1000, 3*60*60*1000 });
         SimpleTimer.getInstance().addEvent(new CleanupEvent(), 60*1000);

core/java/src/net/i2p/data/DataHelper.java

@@ -9,6 +9,7 @@ package net.i2p.data;
  *
  */
 
+import gnu.crypto.hash.Sha256Standalone;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.ByteArrayInputStream;
@@ -770,9 +771,11 @@ public class DataHelper {
      * Read a newline delimited line from the stream, returning the line (without
      * the newline), or null if EOF reached before the newline was found
      */
-    public static String readLine(InputStream in) throws IOException {
+    public static String readLine(InputStream in) throws IOException { return readLine(in, (Sha256Standalone)null); }
+    /** update the hash along the way */
+    public static String readLine(InputStream in, Sha256Standalone hash) throws IOException {
         StringBuffer buf = new StringBuffer(128);
-        boolean ok = readLine(in, buf);
+        boolean ok = readLine(in, buf, hash);
         if (ok)
             return buf.toString();
         else
@@ -785,8 +788,13 @@ public class DataHelper {
      *              newline was found
      */
     public static boolean readLine(InputStream in, StringBuffer buf) throws IOException {
+        return readLine(in, buf, null);
+    }
+    /** update the hash along the way */
+    public static boolean readLine(InputStream in, StringBuffer buf, Sha256Standalone hash) throws IOException {
         int c = -1;
         while ( (c = in.read()) != -1) {
+            if (hash != null) hash.update((byte)c);
             if (c == '\n')
                 break;
             buf.append((char)c);
@@ -797,6 +805,10 @@ public class DataHelper {
             return true;
     }
     
+    public static void write(OutputStream out, byte data[], Sha256Standalone hash) throws IOException {
+        hash.update(data);
+        out.write(data);
+    }
 
     public static List sortStructures(Collection dataStructures) {
         if (dataStructures == null) return new ArrayList();
@@ -822,6 +834,8 @@ public class DataHelper {
             return (ms / (60 * 1000)) + "m";
         } else if (ms < 3 * 24 * 60 * 60 * 1000) {
             return (ms / (60 * 60 * 1000)) + "h";
+        } else if (ms > 365l * 24l * 60l * 60l * 1000l) {
+            return "n/a";
         } else {
             return (ms / (24 * 60 * 60 * 1000)) + "d";
         }

core/java/src/net/i2p/data/PrivateKey.java

@@ -32,6 +32,7 @@ public class PrivateKey extends DataStructureImpl {
     public PrivateKey() {
         setData(null);
     }
+    public PrivateKey(byte data[]) { setData(data); }
 
     /** constructs from base64
      * @param base64Data a string of base64 data (the output of .toBase64() called

core/java/src/net/i2p/data/PublicKey.java

@@ -31,6 +31,11 @@ public class PublicKey extends DataStructureImpl {
     public PublicKey() {
         setData(null);
     }
+    public PublicKey(byte data[]) {
+        if ( (data == null) || (data.length != KEYSIZE_BYTES) )
+            throw new IllegalArgumentException("Data must be specified, and the correct size");
+        setData(data);
+    }
 
     /** constructs from base64
      * @param base64Data a string of base64 data (the output of .toBase64() called

core/java/src/net/i2p/data/RouterIdentity.java

@@ -86,7 +86,7 @@ public class RouterIdentity extends DataStructureImpl {
 
     public void writeBytes(OutputStream out) throws DataFormatException, IOException {
         if ((_certificate == null) || (_publicKey == null) || (_signingKey == null))
-            throw new DataFormatException("Not enough data to format the destination");
+            throw new DataFormatException("Not enough data to format the router identity");
         _publicKey.writeBytes(out);
         _signingKey.writeBytes(out);
         _certificate.writeBytes(out);

core/java/src/net/i2p/data/RouterInfo.java

@@ -53,6 +53,9 @@ public class RouterInfo extends DataStructureImpl {
     public static final String PROP_CAPABILITIES = "caps";
     public static final char CAPABILITY_HIDDEN = 'H';
 
+    // Public string of chars which serve as bandwidth capacity markers
+    // NOTE: individual chars defined in Router.java
+    public static final String BW_CAPABILITY_CHARS = "KLMNO";
     
     public RouterInfo() {
         setIdentity(null);
@@ -179,6 +182,12 @@ public class RouterInfo extends DataStructureImpl {
             return (Properties) _options.clone();
         }
     }
+    public String getOption(String opt) {
+        if (_options == null) return null;
+        synchronized (_options) {
+            return _options.getProperty(opt);
+        }
+    }
 
     /**
      * Configure a set of options or statistics that the router can expose
@@ -334,6 +343,24 @@ public class RouterInfo extends DataStructureImpl {
         return (getCapabilities().indexOf(CAPABILITY_HIDDEN) != -1);
     }
 
+    /**
+     * Return a string representation of this node's bandwidth tier,
+     * or "Unknown"
+     */
+    public String getBandwidthTier() {
+        String bwTiers = BW_CAPABILITY_CHARS;
+        String bwTier = "Unknown";
+        String capabilities = getCapabilities();
+        // Iterate through capabilities, searching for known bandwidth tier
+        for (int i = 0; i < capabilities.length(); i++) {
+            if (bwTiers.indexOf(String.valueOf(capabilities.charAt(i))) != -1) {
+                bwTier = String.valueOf(capabilities.charAt(i));
+                break;
+            }
+        }
+        return (bwTier);
+    }
+
     public void addCapability(char cap) {
         if (_options == null) _options = new OrderedProperties();
         synchronized (_options) {

core/java/src/net/i2p/stat/Rate.java

@@ -184,6 +184,7 @@ public class Rate {
     private static final int SLACK = 2000;
     public void coalesce() {
         long now = now();
+        double correctedTotalValue; // for summaryListener which divides by rounded EventCount
         synchronized (_lock) {
             long measuredPeriod = now - _lastCoalesceDate;
             if (measuredPeriod < _period - SLACK) {
@@ -198,9 +199,14 @@ public class Rate {
             // how much were we off by?  (so that we can sample down the measured values)
             double periodFactor = measuredPeriod / (double)_period;
             _lastTotalValue = _currentTotalValue / periodFactor;
-            _lastEventCount = (long) ( (_currentEventCount + periodFactor - 1) / periodFactor);
+            _lastEventCount = (long) (0.499999 + (_currentEventCount / periodFactor));
             _lastTotalEventTime = (long) (_currentTotalEventTime / periodFactor);
             _lastCoalesceDate = now;
+            if (_currentEventCount == 0)
+                correctedTotalValue = 0;
+            else
+                correctedTotalValue = _currentTotalValue *
+                                      (_lastEventCount / (double) _currentEventCount);
 
             if (_lastTotalValue > _extremeTotalValue) {
                 _extremeTotalValue = _lastTotalValue;
@@ -213,7 +219,7 @@ public class Rate {
             _currentTotalEventTime = 0;
         }
         if (_summaryListener != null)
-            _summaryListener.add(_lastTotalValue, _lastEventCount, _lastTotalEventTime, _period);
+            _summaryListener.add(correctedTotalValue, _lastEventCount, _lastTotalEventTime, _period);
     }
 
     public void setSummaryListener(RateSummaryListener listener) { _summaryListener = listener; }

core/java/src/net/i2p/stat/StatManager.java

@@ -43,7 +43,7 @@ public class StatManager {
         _log = context.logManager().getLog(StatManager.class);
         _context = context;
         _frequencyStats = Collections.synchronizedMap(new HashMap(128));
-        _rateStats = Collections.synchronizedMap(new HashMap(128));
+        _rateStats = new HashMap(128); // synchronized only on add //Collections.synchronizedMap(new HashMap(128));
         _statLog = new BufferedStatLog(context);
     }
     
@@ -80,10 +80,12 @@ public class StatManager {
      * @param periods array of period lengths (in milliseconds)
      */
     public void createRateStat(String name, String description, String group, long periods[]) {
-        if (_rateStats.containsKey(name)) return;
-        RateStat rs = new RateStat(name, description, group, periods);
-        if (_statLog != null) rs.setStatLog(_statLog);
-        _rateStats.put(name, rs);
+        synchronized (_rateStats) {
+            if (_rateStats.containsKey(name)) return;
+            RateStat rs = new RateStat(name, description, group, periods);
+            if (_statLog != null) rs.setStatLog(_statLog);
+            _rateStats.put(name, rs);
+        }
     }
 
     /** update the given frequency statistic, taking note that an event occurred (and recalculating all frequencies) */
@@ -94,7 +96,7 @@ public class StatManager {
 
     /** update the given rate statistic, taking note that the given data point was received (and recalculating all rates) */
     public void addRateData(String name, long data, long eventDuration) {
-        RateStat stat = (RateStat) _rateStats.get(name);
+        RateStat stat = (RateStat) _rateStats.get(name); // unsynchronized
         if (stat != null) stat.addData(data, eventDuration);
     }
 

core/java/src/net/i2p/time/NtpClient.java

@@ -112,11 +112,19 @@ public class NtpClient {
 
             // Process response
             NtpMessage msg = new NtpMessage(packet.getData());
+
             double roundTripDelay = (destinationTimestamp-msg.originateTimestamp) -
                                     (msg.receiveTimestamp-msg.transmitTimestamp);
             double localClockOffset = ((msg.receiveTimestamp - msg.originateTimestamp) +
                                        (msg.transmitTimestamp - destinationTimestamp)) / 2;
             socket.close();
+
+            // Stratum must be between 1 (atomic) and 15 (maximum defined value)
+            // Anything else is right out, treat such responses like errors
+            if ((msg.stratum < 1) || (msg.stratum > 15)) {
+                //System.out.println("Response from NTP server of unacceptable stratum " + msg.stratum + ", failing.");
+                return(-1);
+            }
             
             long rv = (long)(System.currentTimeMillis() + localClockOffset*1000);
             //System.out.println("host: " + address.getHostAddress() + " rtt: " + roundTripDelay + " offset: " + localClockOffset + " seconds");

core/java/src/net/i2p/time/Timestamper.java

@@ -26,7 +26,7 @@ public class Timestamper implements Runnable {
     private boolean _initialized;
     
     private static final int DEFAULT_QUERY_FREQUENCY = 5*60*1000;
-    private static final String DEFAULT_SERVER_LIST = "pool.ntp.org, pool.ntp.org, pool.ntp.org";
+    private static final String DEFAULT_SERVER_LIST = "0.pool.ntp.org, 1.pool.ntp.org, 2.pool.ntp.org";
     private static final boolean DEFAULT_DISABLED = true;
     /** how many times do we have to query if we are changing the clock? */
     private static final int DEFAULT_CONCURRING_SERVERS = 3;

core/java/src/net/i2p/util/Clock.java

@@ -13,12 +13,16 @@ import net.i2p.time.Timestamper;
  * between the local computer's current time and the time as known by some reference
  * (such as an NTP synchronized clock).
  *
+ * Protected members are used in the subclass RouterClock,
+ * which has access to a router's transports (particularly peer clock skews)
+ * to second-guess the sanity of clock adjustments.
+ *
  */
 public class Clock implements Timestamper.UpdateListener {
-    private I2PAppContext _context;
+    protected I2PAppContext _context;
     private Timestamper _timestamper;
-    private long _startedOn;
-    private boolean _statCreated;
+    protected long _startedOn;
+    protected boolean _statCreated;
     
     public Clock(I2PAppContext context) {
         _context = context;
@@ -36,10 +40,10 @@ public class Clock implements Timestamper.UpdateListener {
     public Timestamper getTimestamper() { return _timestamper; }
     
     /** we fetch it on demand to avoid circular dependencies (logging uses the clock) */
-    private Log getLog() { return _context.logManager().getLog(Clock.class); }
+    protected Log getLog() { return _context.logManager().getLog(Clock.class); }
     
-    private volatile long _offset;
-    private boolean _alreadyChanged;
+    protected volatile long _offset;
+    protected boolean _alreadyChanged;
     private Set _listeners;
 
     /** if the clock is skewed by 3+ days, fuck 'em */
@@ -132,7 +136,7 @@ public class Clock implements Timestamper.UpdateListener {
         }
     }
 
-    private void fireOffsetChanged(long delta) {
+    protected void fireOffsetChanged(long delta) {
         synchronized (_listeners) {
             for (Iterator iter = _listeners.iterator(); iter.hasNext();) {
                 ClockUpdateListener lsnr = (ClockUpdateListener) iter.next();

core/java/src/net/i2p/util/EepGet.java

@@ -33,7 +33,10 @@ public class EepGet {
     private String _proxyHost;
     private int _proxyPort;
     private int _numRetries;
+    private long _minSize; // minimum and maximum acceptable response size, -1 signifies unlimited,
+    private long _maxSize; // applied both against whole responses and chunks
     private String _outputFile;
+    private OutputStream _outputStream;
     private String _url;
     private String _postData;
     private boolean _allowCaching;
@@ -53,35 +56,48 @@ public class EepGet {
     private boolean _notModified;
     private String _contentType;
     
+    // Constructor 7, calls 3 with: do proxy
     public EepGet(I2PAppContext ctx, String proxyHost, int proxyPort, int numRetries, String outputFile, String url) {
         this(ctx, true, proxyHost, proxyPort, numRetries, outputFile, url);
     }
+    // Constructor 6, calls 1 with: do proxy, no etag
     public EepGet(I2PAppContext ctx, String proxyHost, int proxyPort, int numRetries, String outputFile, String url, boolean allowCaching) {
         this(ctx, true, proxyHost, proxyPort, numRetries, outputFile, url, allowCaching, null);
     }
+    // Constructor 5, calls 3 with: no proxy
     public EepGet(I2PAppContext ctx, int numRetries, String outputFile, String url) {
         this(ctx, false, null, -1, numRetries, outputFile, url);
     }
+    // Constructor 4, calls 1 with: no proxy, no etag
     public EepGet(I2PAppContext ctx, int numRetries, String outputFile, String url, boolean allowCaching) {
         this(ctx, false, null, -1, numRetries, outputFile, url, allowCaching, null);
     }
+    // Constructor 3, calls 1 with: do caching, no etag
     public EepGet(I2PAppContext ctx, boolean shouldProxy, String proxyHost, int proxyPort, int numRetries, String outputFile, String url) {
         this(ctx, shouldProxy, proxyHost, proxyPort, numRetries, outputFile, url, true, null);
     }
+    // Constructor 2, calls 0 with: no output buffer, do caching, no etag
     public EepGet(I2PAppContext ctx, boolean shouldProxy, String proxyHost, int proxyPort, int numRetries, String outputFile, String url, String postData) {
-        this(ctx, shouldProxy, proxyHost, proxyPort, numRetries, outputFile, url, true, null, postData);
+        this(ctx, shouldProxy, proxyHost, proxyPort, numRetries, -1, -1, outputFile, null, url, true, null, postData);
     }
+    // Constructor 1, calls 0 with: no output buffer, no postdata
     public EepGet(I2PAppContext ctx, boolean shouldProxy, String proxyHost, int proxyPort, int numRetries, String outputFile, String url, boolean allowCaching, String etag) {
-        this(ctx, shouldProxy, proxyHost, proxyPort, numRetries, outputFile, url, allowCaching, etag, null);
+        this(ctx, shouldProxy, proxyHost, proxyPort, numRetries, -1, -1, outputFile, null, url, allowCaching, etag, null);
     }
-    public EepGet(I2PAppContext ctx, boolean shouldProxy, String proxyHost, int proxyPort, int numRetries, String outputFile, String url, boolean allowCaching, String etag, String postData) {
+    // Constructor 0, real constructor
+    public EepGet(I2PAppContext ctx, boolean shouldProxy, String proxyHost, int proxyPort, int numRetries, long minSize, long maxSize,
+                  String outputFile, OutputStream outputStream, String url, boolean allowCaching,
+                  String etag, String postData) {
         _context = ctx;
         _log = ctx.logManager().getLog(EepGet.class);
         _shouldProxy = shouldProxy;
         _proxyHost = proxyHost;
         _proxyPort = proxyPort;
         _numRetries = numRetries;
-        _outputFile = outputFile;
+        _minSize = minSize;
+        _maxSize = maxSize;
+        _outputFile = outputFile;     // if outputFile is set, outputStream must be null
+        _outputStream = outputStream; // if both are set, outputStream overrides outputFile
         _url = url;
         _postData = postData;
         _alreadyTransferred = 0;
@@ -352,14 +368,20 @@ public class EepGet {
         return false;
     }
 
-    /** return true if the URL was completely retrieved */
+    /** a single fetch attempt */
     private void doFetch() throws IOException {
         readHeaders();
         if (_log.shouldLog(Log.DEBUG))
             _log.debug("Headers read completely, reading " + _bytesRemaining);
         
         boolean strictSize = (_bytesRemaining >= 0);
-            
+
+        // If minimum or maximum size defined, ensure they aren't exceeded
+        if ((_minSize > -1) && (_bytesRemaining < _minSize))
+            throw new IOException("HTTP response size " + _bytesRemaining + " violates minimum of " + _minSize + " bytes");
+        if ((_maxSize > -1) && (_bytesRemaining > _maxSize))
+            throw new IOException("HTTP response size " + _bytesRemaining + " violates maximum of " + _maxSize + " bytes");
+
         int remaining = (int)_bytesRemaining;
         byte buf[] = new byte[1024];
         while (_keepFetching && ( (remaining > 0) || !strictSize )) {
@@ -371,6 +393,11 @@ public class EepGet {
                 break;
             _out.write(buf, 0, read);
             _bytesTransferred += read;
+            // This seems necessary to properly resume a partial download into a stream,
+            // as nothing else increments _alreadyTransferred, and there's no file length to check.
+            // Hopefully this won't break compatibility with existing status listeners
+            // (cause them to behave weird, or show weird numbers).
+            _alreadyTransferred += read;
             remaining -= read;
             if (remaining==0 && _encodingChunked) {
                 if(_proxyIn.read()=='\r' && _proxyIn.read()=='\n') {
@@ -419,12 +446,14 @@ public class EepGet {
         boolean rcOk = false;
         switch (responseCode) {
             case 200: // full
-                _out = new FileOutputStream(_outputFile, false);
+                if (_outputStream != null) _out = _outputStream;
+                    else _out = new FileOutputStream(_outputFile, false);
                 _alreadyTransferred = 0;
                 rcOk = true;
                 break;
             case 206: // partial
-                _out = new FileOutputStream(_outputFile, true);
+                if (_outputStream != null) _out = _outputStream;
+                    else _out = new FileOutputStream(_outputFile, true);
                 rcOk = true;
                 break;
             case 304: // not modified
@@ -588,9 +617,16 @@ public class EepGet {
     private boolean isNL(byte b) { return (b == NL); }
 
     private void sendRequest() throws IOException {
-        File outFile = new File(_outputFile);
-        if (outFile.exists())
-            _alreadyTransferred = outFile.length();
+        if (_outputStream != null) {
+            // We are reading into a stream supplied by a caller,
+            // for which we cannot easily determine how much we've written.
+            // Assume that _alreadyTransferred holds the right value
+            // (we should never be restarted to work on an old stream).
+        } else {
+            File outFile = new File(_outputFile);
+            if (outFile.exists())
+                _alreadyTransferred = outFile.length();
+        }
 
         String req = getRequest();
 

core/java/src/net/i2p/util/EepPost.java

@@ -13,6 +13,7 @@ import net.i2p.util.Log;
 public class EepPost {
     private I2PAppContext _context;
     private Log _log;
+    private static final String CRLF = "\r\n";
     
     public EepPost() {
         this(I2PAppContext.getGlobalContext());
@@ -65,6 +66,7 @@ public class EepPost {
             _onCompletion = onCompletion;
         }
         public void run() {
+            if (_log.shouldLog(Log.DEBUG)) _log.debug("Running the post task");
             Socket s = null;
             try {
                 URL u = new URL(_url);
@@ -81,17 +83,20 @@ public class EepPost {
                     _proxyPort = p;
                 }
 
+                if (_log.shouldLog(Log.DEBUG)) _log.debug("Connecting to the server/proxy...");
                 s = new Socket(_proxyHost, _proxyPort);
+                if (_log.shouldLog(Log.DEBUG)) _log.debug("Connected");
                 OutputStream out = s.getOutputStream();
                 String sep = getSeparator();
                 long length = calcContentLength(sep, _fields);
+                if (_log.shouldLog(Log.DEBUG)) _log.debug("Separator: " + sep + " content length: " + length);
                 String header = getHeader(isProxy, path, h, p, sep, length);
                 if (_log.shouldLog(Log.DEBUG))
                     _log.debug("Header: \n" + header);
                 out.write(header.getBytes());
                 out.flush();
                 if (false) {
-                    out.write(("--" + sep + "\ncontent-disposition: form-data; name=\"field1\"\n\nStuff goes here\n--" + sep + "--\n").getBytes()); 
+                    out.write(("--" + sep + CRLF + "content-disposition: form-data; name=\"field1\"" + CRLF + CRLF + "Stuff goes here" + CRLF + "--" + sep + "--" + CRLF).getBytes()); 
                 } else {
                     sendFields(out, sep, _fields);
                 }
@@ -121,18 +126,18 @@ public class EepPost {
             Object val = fields.get(key);
             if (val instanceof File) {
                 File f = (File)val;
-                len += ("--" + sep + "\nContent-Disposition: form-data; name=\"" + key + "\"; filename=\"" + f.getName() + "\"\n").length();
+                len += ("--" + sep + CRLF + "Content-Disposition: form-data; name=\"" + key + "\"; filename=\"" + f.getName() + "\"" + CRLF).length();
                 //len += ("Content-length: " + f.length() + "\n").length();
-                len += ("Content-Type: application/octet-stream\n\n").length();
+                len += ("Content-Type: application/octet-stream" + CRLF + CRLF).length();
                 len += f.length();
-                len += 1; // nl
+                len += CRLF.length(); // nl
             } else {
-                len += ("--" + sep + "\nContent-Disposition: form-data; name=\"" + key + "\"\n\n").length();
+                len += ("--" + sep + CRLF + "Content-Disposition: form-data; name=\"" + key + "\"" + CRLF + CRLF).length();
                 len += val.toString().length();
-                len += 1; // nl
+                len += CRLF.length(); // nl
             }
         }
-        len += 2 + sep.length() + 2;
+        len += 2 + sep.length() + 2 + CRLF.length(); //2 + sep.length() + 2;
         //len += 2;
         return len;
     }
@@ -145,29 +150,29 @@ public class EepPost {
             else
                 sendField(out, separator, field, val.toString());
         }
-        out.write(("--" + separator + "--\n").getBytes());
+        out.write(("--" + separator + "--" + CRLF).getBytes());
     }
     
     private void sendFile(OutputStream out, String separator, String field, File file) throws IOException {
         long len = file.length();
-        out.write(("--" + separator + "\n").getBytes());
-        out.write(("Content-Disposition: form-data; name=\"" + field + "\"; filename=\"" + file.getName() + "\"\n").getBytes());
+        out.write(("--" + separator + CRLF).getBytes());
+        out.write(("Content-Disposition: form-data; name=\"" + field + "\"; filename=\"" + file.getName() + "\"" + CRLF).getBytes());
         //out.write(("Content-length: " + len + "\n").getBytes());
-        out.write(("Content-Type: application/octet-stream\n\n").getBytes());
+        out.write(("Content-Type: application/octet-stream" + CRLF + CRLF).getBytes());
         FileInputStream in = new FileInputStream(file);
         byte buf[] = new byte[1024];
         int read = -1;
         while ( (read = in.read(buf)) != -1)
             out.write(buf, 0, read);
-        out.write("\n".getBytes());
+        out.write(CRLF.getBytes());
         in.close();
     }
     
     private void sendField(OutputStream out, String separator, String field, String val) throws IOException {
-        out.write(("--" + separator + "\n").getBytes());
-        out.write(("Content-Disposition: form-data; name=\"" + field + "\"\n\n").getBytes());
+        out.write(("--" + separator + CRLF).getBytes());
+        out.write(("Content-Disposition: form-data; name=\"" + field + "\"" + CRLF + CRLF).getBytes());
         out.write(val.getBytes());
-        out.write("\n".getBytes());
+        out.write(CRLF.getBytes());
     }
     
     private String getHeader(boolean isProxy, String path, String host, int port, String separator, long length) {
@@ -179,16 +184,16 @@ public class EepPost {
                 buf.append(":").append(port);
         }
         buf.append(path);
-        buf.append(" HTTP/1.1\n");
+        buf.append(" HTTP/1.1" + CRLF);
         buf.append("Host: ").append(host);
         if (port != 80)
             buf.append(":").append(port);
-        buf.append("\n");
-        buf.append("Connection: close\n");
-        buf.append("Content-length: ").append(length).append("\n");
+        buf.append(CRLF);
+        buf.append("Connection: close" + CRLF);
+        buf.append("Content-length: ").append(length).append(CRLF);
         buf.append("Content-type: multipart/form-data, boundary=").append(separator);
-        buf.append("\n");
-        buf.append("\n");
+        buf.append(CRLF);
+        buf.append(CRLF);
         return buf.toString();
     }
     

core/java/src/net/i2p/util/Executor.java

@@ -0,0 +1,51 @@
+package net.i2p.util;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import net.i2p.I2PAppContext;
+
+class Executor implements Runnable {
+    private I2PAppContext _context;
+    private Log _log;
+    private List _readyEvents;
+    public Executor(I2PAppContext ctx, Log log, List events) {
+        _context = ctx;
+        _readyEvents = events;
+    }
+    public void run() {
+        while (true) {
+            SimpleTimer.TimedEvent evt = null;
+            synchronized (_readyEvents) {
+                if (_readyEvents.size() <= 0) 
+                    try { _readyEvents.wait(); } catch (InterruptedException ie) {}
+                if (_readyEvents.size() > 0) 
+                    evt = (SimpleTimer.TimedEvent)_readyEvents.remove(0);
+            }
+
+            if (evt != null) {
+                long before = _context.clock().now();
+                try {
+                    evt.timeReached();
+                } catch (Throwable t) {
+                    log("wtf, event borked: " + evt, t);
+                }
+                long time = _context.clock().now() - before;
+                if ( (time > 1000) && (_log != null) && (_log.shouldLog(Log.WARN)) )
+                    _log.warn("wtf, event execution took " + time + ": " + evt);
+            }
+        }
+    }
+    
+    private void log(String msg, Throwable t) {
+        synchronized (this) {
+            if (_log == null) 
+                _log = I2PAppContext.getGlobalContext().logManager().getLog(SimpleTimer.class);
+        }
+        _log.log(Log.CRIT, msg, t);
+    }
+}

core/java/src/net/i2p/util/FortunaRandomSource.java

@@ -14,7 +14,7 @@ import java.security.SecureRandom;
 import net.i2p.I2PAppContext;
 import net.i2p.crypto.EntropyHarvester;
 
-import gnu.crypto.prng.FortunaStandalone;
+import gnu.crypto.prng.AsyncFortunaStandalone;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -26,13 +26,13 @@ import java.io.IOException;
  *
  */
 public class FortunaRandomSource extends RandomSource implements EntropyHarvester {
-    private FortunaStandalone _fortuna;
+    private AsyncFortunaStandalone _fortuna;
     private double _nextGaussian;
     private boolean _haveNextGaussian;
 
     public FortunaRandomSource(I2PAppContext context) {
         super(context);
-        _fortuna = new FortunaStandalone();
+        _fortuna = new AsyncFortunaStandalone();
         byte seed[] = new byte[1024];
         if (initSeed(seed)) {
             _fortuna.seed(seed);
@@ -41,6 +41,7 @@ public class FortunaRandomSource extends RandomSource implements EntropyHarveste
             sr.nextBytes(seed);
             _fortuna.seed(seed);
         }
+        _fortuna.startup();
         // kickstart it
         _fortuna.nextBytes(seed);
         _haveNextGaussian = false;
@@ -202,6 +203,13 @@ public class FortunaRandomSource extends RandomSource implements EntropyHarveste
     public static void main(String args[]) {
         try {
             RandomSource rand = I2PAppContext.getGlobalContext().random();
+            if (true) {
+                for (int i = 0; i < 1000; i++)
+                    if (rand.nextFloat() < 0)
+                        throw new RuntimeException("negative!");
+                System.out.println("All positive");
+                return;
+            }
             java.io.ByteArrayOutputStream baos = new java.io.ByteArrayOutputStream();
             java.util.zip.GZIPOutputStream gos = new java.util.zip.GZIPOutputStream(baos);
             for (int i = 0; i < 1024*1024; i++) {

core/java/src/net/i2p/util/I2PThread.java

@@ -48,6 +48,12 @@ public class I2PThread extends Thread {
         if ( (_log == null) || (_log.shouldLog(Log.DEBUG)) )
             _createdBy = new Exception("Created by");
     }
+    public I2PThread(Runnable r, String name, boolean isDaemon) {
+        super(r, name);
+	setDaemon(isDaemon);
+        if ( (_log == null) || (_log.shouldLog(Log.DEBUG)) )
+            _createdBy = new Exception("Created by");
+    }
     
     private void log(int level, String msg) { log(level, msg, null); }
     private void log(int level, String msg, Throwable t) {
@@ -113,4 +119,4 @@ public class I2PThread extends Thread {
         } catch (Throwable tt) { // nop
         }
     }
-}
+}

core/java/src/net/i2p/util/NativeBigInteger.java

@@ -91,7 +91,7 @@ public class NativeBigInteger extends BigInteger {
      * initialization?  this would otherwise use the Log component, but this makes
      * it easier for other systems to reuse this class
      */
-    private static final boolean _doLog = true;
+    private static final boolean _doLog = System.getProperty("jbigi.dontLog") == null;
     
     private final static String JBIGI_OPTIMIZATION_K6         = "k6";
     private final static String JBIGI_OPTIMIZATION_K6_2       = "k62";

core/java/src/net/i2p/util/SimpleTimer.java

@@ -31,14 +31,14 @@ public class SimpleTimer {
         _context = I2PAppContext.getGlobalContext();
         _log = _context.logManager().getLog(SimpleTimer.class);
         _events = new TreeMap();
-        _eventTimes = new HashMap(1024);
+        _eventTimes = new HashMap(256);
         _readyEvents = new ArrayList(4);
         I2PThread runner = new I2PThread(new SimpleTimerRunner());
         runner.setName(name);
         runner.setDaemon(true);
         runner.start();
         for (int i = 0; i < 3; i++) {
-            I2PThread executor = new I2PThread(new Executor());
+            I2PThread executor = new I2PThread(new Executor(_context, _log, _readyEvents));
             executor.setName(name + "Executor " + i);
             executor.setDaemon(true);
             executor.start();
@@ -114,7 +114,7 @@ public class SimpleTimer {
         long timeToAdd = System.currentTimeMillis() - now;
         if (timeToAdd > 50) {
             if (_log.shouldLog(Log.WARN))
-                _log.warn("timer contention: took " + timeToAdd + "ms to add a job");
+                _log.warn("timer contention: took " + timeToAdd + "ms to add a job with " + totalEvents + " queued");
         }
             
     }
@@ -141,14 +141,6 @@ public class SimpleTimer {
         public void timeReached();
     }
     
-    private void log(String msg, Throwable t) {
-        synchronized (this) {
-            if (_log == null) 
-                _log = I2PAppContext.getGlobalContext().logManager().getLog(SimpleTimer.class);
-        }
-        _log.log(Log.CRIT, msg, t);
-    }
-    
     private long _occurredTime;
     private long _occurredEventCount;
     private TimedEvent _recentEvents[] = new TimedEvent[5];
@@ -228,30 +220,5 @@ public class SimpleTimer {
             }
         }
     }
-    
-    private class Executor implements Runnable {
-        public void run() {
-            while (true) {
-                TimedEvent evt = null;
-                synchronized (_readyEvents) {
-                    if (_readyEvents.size() <= 0) 
-                        try { _readyEvents.wait(); } catch (InterruptedException ie) {}
-                    if (_readyEvents.size() > 0) 
-                        evt = (TimedEvent)_readyEvents.remove(0);
-                }
-                
-                if (evt != null) {
-                    long before = _context.clock().now();
-                    try {
-                        evt.timeReached();
-                    } catch (Throwable t) {
-                        log("wtf, event borked: " + evt, t);
-                    }
-                    long time = _context.clock().now() - before;
-                    if ( (time > 1000) && (_log != null) && (_log.shouldLog(Log.WARN)) )
-                        _log.warn("wtf, event execution took " + time + ": " + evt);
-                }
-            }
-        }
-    }
 }
+

history.txt

@@ -1,4 +1,555 @@
-$Id: history.txt,v 1.478 2006-05-17 22:42:57 complication Exp $
+$Id: history.txt,v 1.583 2007-08-13 14:42:59 zzz Exp $
+
+* 2007-08-23  0.6.1.29 released
+
+2007-08-12  zzz
+    * readme.html - Add inproxy.tino.i2p, replace search.i2p with eepsites.i2p,
+      tweak the eepsite and troubleshooting sections
+
+2007-08-11  zzz
+    * Add stats for individual tunnel rates (nice when graphed)
+    * i2psnark: Fix outbound tunnel nickname
+
+2007-08-05  Complication
+    * Update the sharing calculator on config.jsp
+      and explain the trade-off even more thoroughly.
+
+2007-08-04  Complication
+    * Lower the threshold between the K and L bandwidth class,
+      so that K is now < 12 KB/s, instead of <= 16 KB/s.
+      Hopefully this lets people with 128 kbit/s (16 KB/s) upload lines
+      participate in routing, if they keep the default share percentage.
+
+2007-07-16  zzz
+    * i2psnark: Add tooltip info for choked/uninterested
+
+2007-07-16  zzz
+    * Make selection of graphed data configurable via configstats.jsp,
+      remove most of the default graphs to save some memory
+
+2007-07-15  zzz
+    * Add current values to graph legends
+    * Fix up previous Rate fix to check for divide by zero
+
+2007-07-14  Complication
+    * Take the post-download routerInfo size check back out of ReseedHandler,
+      since it wasn't helpful, and a lower limit caused false warnings.
+    * Give EepGet ability to enforce a min/max HTTP response size.
+    * Enforce a maximum response size of 8 MB when ReseedHandler
+      downloads into a ByteArrayOutputStream.
+    * Refactor ReseedHandler/ReseedRunner from static to ordinary classes,
+      change invocation from RouterConsoleRunner accordingly.
+    * Add an EepGet status listener to ReseedHandler to log causes of reseed failure,
+      provide status reports to indicate the progress of reseeding.
+    * Enable icon for default eepsite, and the index page
+      of the router console (more later).
+
+2007-07-14  zzz
+    * Clean up graphs.jsp - set K=1024 where appropriate,
+      output image sizes in html, catch ooms, other minor tweaks
+    * Fix current event count truncation which fixes graphs with low
+      60-sec event counts displaying high values
+      (bw.* and router.* graphs for example were 1.5x too high)
+      Affects all "events per period" (non-lifetime) counts.
+
+2007-07-09  zzz
+    * i2psnark: give a better error message for a non-i2p torrent
+
+2007-07-07  zzz
+    * Add auto-detect IP/Port to NTCP. When enabled on config.jsp,
+      SSU will notify/restart NTCP when the external address changes.
+      Now you can enable inbound TCP without a static IP or dyndns service.
+
+2007-07-04  zzz
+    * Display calculated share bandwidth and remove load testing
+      on config.jsp
+
+2007-07-01  zzz
+    * Replace broken option i2np.udp.alwaysPreferred with
+      i2np.udp.preferred and adjust UDP bids; possible settings are
+      "false" (default), "true", and "always".
+      Default setting results in same behavior as before
+      (NTCP is preferred unless it isn't established and UDP is established).
+      Use to compare NTCP and UDP transports.
+
+2007-06-27  jrandom
+    * fix for a streaming lib bug that could leave a thread waiting
+      indefinitely (thanks Complication!)
+
+2007-06-16  Complication
+    * First pass on EepGet and ReseedHandler improvements,
+      please avoid use on routers which matter!
+    * Give EepGet ability of downloading into an OutputStream,
+      such as the ByteArrayOutputStream of ReseedHandler.
+    * Detect failure to reseed better, report it persistently
+      and more verbosely, provide a link to logs
+      and suggest manual reseed.
+
+2007-05-06  Complication
+    * Fix the build.xml file, so the preppkg build target won't try copying files
+      which became deprecated with the old Syndie (thanks for alerting, itsu!)
+
+2007-03-31  zzz
+    * Add trevorreznik jump server to the http proxy error page
+    * Add anonymity to the trackers supporting details links in i2psnark
+
+2007-03-24  zzz
+    * Remove Syndie from build targets and navbar
+
+2007-03-22  zzz
+    * i2psnark tracker handling tweaks:
+    -   Add link to tracker details page (Postman only for now, requires bytemonsoon patch)
+    -   Add Base URL to tracker list configuration
+    -   Web page links built from tracker list Base URLs
+    -   Only build and sort tracker list once
+    -   Add anonymityWeb tracker to default list
+    -   Add tooltip info for TrackerErrs
+    -   Stop torrent if not registered with tracker
+    -   Mark temp files as delete on exit
+
+2007-03-18  zzz
+    * i2psnark: Cleanup some handling of saved partial pieces
+    * i2psnark: Put bit counting in Bitfield.java for efficiency
+    * i2psnark: Save torrent completion state in i2psnark.config
+
+* 2007-03-17  0.6.1.28 released
+
+2007-03-13  zzz
+    * i2psnark: Make max total uploaders configurable (thanks Amiga4000!)
+
+2007-03-12  jrandom
+    * dodge a race on startup (thanks zzz!)
+
+2007-03-10  zzz
+    * Streaming lib: Change initial RTT deviation from RTT to RTT/2
+      (RFC 2988) to reduce early RTO values
+
+2007-03-08  zzz
+    * i2psnark changes to improve upload performance:
+    *  Implement total uploader limit (10)
+    *  Don't timeout non-piece messages out
+    *  Change chunk size to 32K (was 64K)
+    *  Change request limit to 64K (was 256K)
+    * i2psnark: Disconnect from seeds when complete
+
+2007-03-07  zzz
+    * Remove dynamic router keys from config.jsp
+
+2007-03-07  zzz
+    * Streaming lib changes to improve upstream performance during congestion:
+    *   Change min window size from 12 to 1
+    *   Change max timeout from 10 to 45 sec
+    *   Change initial timeout from 10 to 15 sec
+    *   Change intial window size for i2psnark from 12 to 1
+    *   Change slow start growth rate for i2psnark from 1/2 to 1
+
+2007-03-04  zzz
+    * Update eepsite_index.html
+
+2007-03-03  zzz
+    * Upgrade from Jetty 5.1.6 to 5.1.12 which fixes spaces in URL
+    * Add a updaterWithJetty build target
+
+2007-03-03  zzz
+    * Implement priority sending for NTCP
+    * Disable trimForOverload() in tunnel BuildExecutor which
+      was preventing tunnel builds when outbound traffic was high
+      (i.e. most of the time when running i2psnark)
+
+2007-02-28  zzz
+    * i2psnark: File reopen cleanup
+
+2007-02-28  zzz
+    * i2psnark: Add peer details to web page
+
+* 2007-02-15  0.6.1.27 released
+
+2007-02-15  jrandom
+    * Limit the whispering floodfill sends to at most 3 randomly
+      chosen from the known floodfill peers
+
+2007-02-14  jrandom
+    * Don't filter out KICK and H(ide oper status) IRC messages
+      (thanks Takk and postman!)
+
+2007-02-13  jrandom
+    * Tell our peers about who we know in the floodfill netDb every
+      6 hours or so, mitigating the situation where peers lose track
+      of floodfill routers.
+    * Disable the Syndie updater (people should use the new Syndie,
+      not this one)
+    * Disable the eepsite tunnel by default
+
+2007-01-30  zzz
+    * i2psnark: Don't hold _snarks lock while checking a snark,
+      so web page is responsive at startup
+
+2007-01-29  zzz
+    * i2psnark: Add NickyB tracker
+
+2007-01-28  zzz
+    * i2psnark: Don't hold sendQueue lock while flushing output,
+      to make everything run smoother
+
+2007-01-27  zzz
+    * i2psnark: Fix orphaned Snark reader tasks leading to OOMs
+
+2007-01-20  Complication
+    * Drop overlooked comment
+
+2007-01-20  Complication
+    * Modify ReseedHandler to query the "i2p.reseedURL" property from I2PAppContext
+      instead of System, so setting a reseed URL in advanced configuration has effect.
+    * Clean out obsolete reseed code from ConfigNetHandler.
+
+2007-01-20  zzz
+    * i2psnark: More choking rotation tweaks
+    * Improve performance by not reading in the whole
+      piece from disk for each request. A huge memory savings
+      on 1MB torrents with many peers.
+
+2007-01-17  zzz
+    * Add new HTTP Proxy error message for non-http protocols
+
+2007-01-17  zzz
+    * Add note on Syndie index.html steering people to new Syndie
+
+2007-01-16  zzz
+    * i2psnark: Fix crash when autostart off and
+      tcrrent started manually
+
+2007-01-16  zzz
+    * i2psnark: Fix bug caused by last i2psnark checkin
+      (ConnectionAcceptor not started)
+    * Don't start PeerCoordinator, ConnectionAcceptor,
+      and TrackerClient unless starting torrent
+
+2007-01-15  jrandom
+    * small guard against unnecessary streaming lib reset packets
+      (thanks Complication!)
+
+2007-01-15  zzz
+    * i2psnark: Add 'Stop All' link on web page
+    * Add some links to trackers and forum on web page
+    * Don't start tunnel if 'Autostart' unchecked
+    * Fix torrent restart bug by reopening file descriptors
+
+2007-01-14  zzz
+    * i2psnark: Improvements for torrents with > 4 leechers:
+      choke based on upload rate when seeding, and
+      be smarter and fairer about rotating choked peers.
+    * Handle two common i2psnark OOM situations rather
+      than shutting down the whole thing.
+    * Fix reporting to tracker of remaining bytes for
+      torrents > 4GB (but ByteMonsoon still has a bug)
+
+2006-10-29  zzz
+    * i2psnark: Fix and enable generation of multifile torrents,
+      print error if no tracker selected at create-torrent,
+      fix stopping a torrent that hasn't started successfully,
+      add eBook and GayTorrents trackers to form,
+      web page formatting tweaks
+
+* 2006-10-10  0.6.1.26 released
+
+2006-10-29  Complication
+    * Ensure we get NTP samples from more diverse sources
+      (0.pool.ntp.org, 1.pool.ntp.org, etc)
+    * Discard median-based peer skew calculator as framed average works,
+      and adjusting its percentage can make it behave median-like
+    * Require more data points (from at least 20 peers)
+      before considering a peer skew measurement reliable
+
+2006-10-10  jrandom
+    * Removed the status display from the console, as its more confusing
+      than informative (though the content is still displayed in the HTML)
+
+2006-10-08  Complication
+    * Add a framed average peer clock skew calculator
+    * Add config property "router.clockOffsetSanityCheck" to determine
+      if NTP-suggested clock offsets get sanity checked (default "true")
+    * Reject NTP-suggested clock offsets if they'd increase peer clock skew
+      by more than 5 seconds, or make it more than 20 seconds total
+    * Decrease log level in getMedianPeerClockSkew()
+
+2006-09-29  zzz
+    * i2psnark: Second try at synchronization fix - synch addRequest()
+      completely rather than just portions of it and requestNextPiece()
+
+2006-09-27  jrandom
+    * added HMAC-SHA256
+    * properly use CRLF with EepPost
+    * suppress jbigi/jcpuid messages if jbigi.dontLog/jcpuid.dontLog is set
+    * PBE session key generation (with 1000 rounds of SHA256)
+    * misc SDK helper functions
+
+2006-09-26  Complication
+    * Take back another inadverent logging change in NTCPConnection
+
+2006-09-26  Complication
+    * Take back an accidental log level change
+
+2006-09-26  Complication
+    * Subclass from Clock a RouterClock which can access router transports,
+      with the goal of developing it to second-guess NTP results
+    * Make transports report clock skew in seconds
+    * Adjust renderStatusHTML() methods accordingly
+    * Show average for NTCP clock skews too
+    * Give transports a getClockSkews() method to report clock skews
+    * Give transport manager a getClockSkews() method to aggregate results
+    * Give comm system facade a getMedianPeerClockSkew() method which RouterClock calls
+      (to observe results, add "net.i2p.router.transport.CommSystemFacadeImpl=WARN" to logging)
+    * Extra explicitness in NTCP classes to denote unit of time.
+    * Fix some places in NTCPConnection where milliseconds and seconds were confused
+
+2006-09-25  zzz
+    * i2psnark: Paranoid copy before writing pieces,
+      recheck files on completion, redownload bad pieces
+    * i2psnark: Don't contact tracker as often when seeding
+
+2006-09-24  zzz
+    * i2psnark: Add some synchronization to prevent rare problem
+      after restoring orphan piece
+
+2006-09-20  zzz
+    * i2psnark: Eliminate duplicate requests caused by i2p-bt's
+      rapid choke/unchokes
+    * i2psnark: Truncate long TrackerErr messages on web page
+
+2006-09-16  zzz
+    * i2psnark: Implement retransmission of requests. This
+      eliminates one cause of complete stalls with a peer.
+      This problem is common on torrents with a small number of
+      active peers where there are no choke/unchokes to kickstart things.
+
+2006-09-13  zzz
+    * i2psnark: Fix restoral of partial pieces broken by last patch
+
+2006-09-13  zzz
+    * i2psnark: Mark a peer's requests as unrequested on disconnect,
+      preventing premature end game
+    * i2psnark: Randomize selection of next piece during end game
+    * i2psnark: Don't restore a partial piece to a peer that is already working on it
+    * i2psnark: strip ".torrent" on web page
+    * i2psnark: Limit piece size in generated torrent to 1MB max
+
+2006-09-09  zzz
+    * i2psnark: Add "Stalled" indication and stat totals on web page
+
+2006-09-09  zzz
+    * i2psnark: Fix bug where new peers would always be sent an "interested"
+      regardless of actual interest
+    * i2psnark: Reduce max piece size from 10MB to 1MB; larger may have severe
+      memory and efficiency problems
+
+* 2006-09-09  0.6.1.25 released
+
+2006-09-08  jrandom
+    * Tweak the PRNG logging so it only displays error messages if there are
+      problems
+    * Disable dynamic router keys for the time being, as they don't offer
+      meaningful security, may hurt the router, and makes it harder to
+      determine the network health.  The code to restart on SSU IP change is
+      still enabled however.
+    * Disable tunnel load testing, leaning back on the tiered selection for
+      the time being.
+    * Spattering of bugfixes
+
+2006-09-07  zzz
+    * i2psnark: Increase output timeout from 2 min to 4 min
+    * i2psnark: Orphan debug msg cleanup
+    * i2psnark: More web rate report cleanup
+
+2006-09-05  zzz
+    * i2psnark: Implement basic partial-piece saves across connections
+    * i2psnark: Implement keep-alive sending. This will keep non-i2psnark clients
+      from dropping us for inactivity but also renders the 2-minute transmit-inactivity
+      code in i2psnark ineffective. Will have to research why there is transmit but
+      not receive inactivity code. With the current connection limit of 24 peers
+      we aren't in any danger of keeping out new peers by keeping inactive ones.
+    * i2psnark: Increase CHECK_PERIOD from 20 to 40 since nothing happens in 20 seconds
+    * i2psnark: Fix dropped chunk handling
+    * i2psnark: Web rate report cleanup
+
+2006-09-04  zzz
+    * i2psnark: Report cleared trackerErr immediately
+    * i2psnark: Add trackerErr reporting after previous success; retry more quickly
+    * i2psnark: Set up new connections more quickly
+    * i2psnark: Don't delay tracker fetch when setting up lots of connections
+    * i2psnark: Reduce MAX_UPLOADERS from 12 to 4
+
+2006-09-04  zzz
+    * Enable pipelining in i2psnark
+    * Make i2psnark tunnel default be 1 + 0-1
+
+2006-09-03  zzz
+    * Add rate reporting to i2psnark
+
+2006-09-03  Complication
+    * Limit form size in SusiDNS to avoid exceeding a POST size limit on postback
+    * Print messages about addressbook size to give better overview
+    * Enable delete function in published addressbook
+
+2006-08-21  Complication
+    * Fix error reporting discrepancy (thanks for helping notice, yojoe!)
+
+2006-08-03  jrandom
+    * Decrease the recently modified tunnel building timeout, though keep
+      the scaling on their processing
+
+2006-07-31  jrandom
+    * Increase the tunnel building timeout
+    * Avoid a rare race (thanks bar!)
+    * Fix the bandwidth capacity publishing code to factor in share percentage
+      and outbound throttling (oops)
+
+2006-07-29  Complication
+    * Treat NTP responses from unexpected stratums like failures
+
+* 2006-07-28  0.6.1.24 released
+
+2006-07-28  jrandom
+    * Don't try to reverify too many netDb entries at once (thanks
+      cervantes and Complication!)
+
+2006-07-28  jrandom
+    * Actually fix the threading deadlock issue in the netDb (removing
+      the synchronized access to individual kbuckets while validating
+      individual entries) (thanks cervantes, postman, frosk, et al!)
+
+* 2006-07-27  0.6.1.23 released
+
+2006-07-27  jrandom
+    * Cut down NTCP connection establishments once we know the peer is skewed
+      (rather than wait for full establishment before verifying)
+    * Removed a lock on the stats framework when accessing rates, which
+      shouldn't be a problem, assuming rates are created (pretty much) all at
+      once and merely updated during the lifetime of the jvm.
+
+2006-07-27  jrandom
+    * Further NTCP write status cleanup
+    * Handle more oddly-timed NTCP disconnections (thanks bar!)
+
+2006-07-26  jrandom
+    * When dropping a netDb router reference, only accept newer
+      references as part of the update check
+    * If we have been up for a while, don't accept really old
+      router references (published 2 or more days ago)
+    * Drop router references once they are no longer valid, even if
+      they were allowed in due to the lax restrictions on startup
+
+2006-07-26  jrandom
+    * Every time we create a new router identity, add an entry to the
+      new "identlog.txt" text file in the I2P install directory.  For
+      debugging purposes, publish the count of how many identities the
+      router has cycled through, though not the identities itself.
+    * Cleaned up the way the multitransport shitlisting worked, and
+      added per-transport shitlists
+    * When dropping a router reference locally, first fire a netDb
+      lookup for the entry
+    * Take the peer selection filters into account when organizing the
+      profiles (thanks Complication!)
+    * Avoid some obvious configuration errors for the NTCP transport
+      (invalid ports, "null" ip, etc)
+    * Deal with some small NTCP bugs found in the wild (unresolveable
+      hosts, strange network discons, etc)
+    * Send our netDb info to peers we have direct NTCP connections to
+      after each 6-12 hours of connection uptime
+    * Clean up the NTCP reading and writing queue logic to avoid some
+      potential delays
+    * Allow people to specify the IP that the SSU transport binds on
+      locally, via the advanced config "i2np.udp.bindInterface=1.2.3.4"
+
+* 2006-07-18  0.6.1.22 released
+
+2006-07-18  jrandom
+    * Add a failsafe to the NTCP transport to make sure we keep
+      pumping writes when we should.
+    * Properly reallow 16-32KBps routers in the default config
+      (thanks Complication!)
+
+2006-07-16  Complication
+    * Collect tunnel build agree/reject/expire statistics
+      for each bandwidth tier of peers (and peers of unknown tiers,
+      even if those shouldn't exist)
+
+2006-07-14  jrandom
+    * Improve the multitransport shitlisting (thanks Complication!)
+    * Allow routers with a capacity of 16-32KBps to be used in tunnels under
+      the default configuration (thanks for the stats Complication!)
+    * Properly allow older router references to load on startup
+      (thanks bar, Complication, et al!)
+    * Add a new "i2p.alwaysAllowReseed" advanced config property, though
+      hopefully today's changes should make this unnecessary (thanks void!)
+    * Improved NTCP buffering
+    * Close NTCP connections if we are too backlogged when writing to them
+
+2006-07-04  jrandom
+    * New NIO-based tcp transport (NTCP), enabled by default for outbound
+      connections only.  Those who configure their NAT/firewall to allow
+      inbound connections and specify the external host and port
+      (dyndns/etc is ok) on /config.jsp can receive inbound connections.
+      SSU is still enabled for use by default for all users as a fallback.
+    * Substantial bugfix to the tunnel gateway processing to transfer
+      messages sequentially instead of interleaved
+    * Renamed GNU/crypto classes to avoid name clashes with kaffe and other
+      GNU/Classpath based JVMs
+    * Adjust the Fortuna PRNG's pooling system to reduce contention on
+      refill with a background thread to refill the output buffer
+    * Add per-transport support for the shitlist
+    * Add a new async pumped tunnel gateway to reduce tunnel dispatcher
+      contention
+
+2006-07-01  Complication
+    * Ensure that the I2PTunnel web interface won't update tunnel settings
+      for shared clients when a non-shared client is modified
+      (thanks for spotting, BarkerJr!)
+
+2006-06-14  cervantes
+    * Small tweak to I2PTunnel CSS, so it looks better with desktops
+      that use Bitstream Vera fonts @ 96 dpi
+
+* 2006-06-14  0.6.1.21 released
+
+2006-06-13  jrandom
+    * Use a minimum uptime of 2 hours, not 4 (oops)
+
+2006-06-13  jrandom
+    * Cut down the proactive rejections due to queue size - if we are
+      at the point of having decrypted the request off the queue, might
+      as well let it through, rather than waste that decryption
+
+2006-06-11  Kloug
+    * Bugfix to the I2PTunnel IRC filter to support multiple concurrent
+      outstanding pings/pongs
+
+2006-06-10  jrandom
+    * Further reduction in proactive rejections
+
+2006-06-09  jrandom
+    * Don't let the pending tunnel request queue grow beyond reason
+      (letting things sit for up to 30s when they fail after 10s
+      seems a bit... off)
+
+2006-06-08  jrandom
+    * Be more conservative in the proactive rejections
+
+2006-06-04  Complication
+    * Trim out sending a blank line before USER in susimail.
+      Seemed to break in rare cases, thanks for reporting, Brachtus!
+
+* 2006-06-04  0.6.1.20 released
+
+2006-06-04  jrandom
+    * Reduce the SSU ack frequency
+    * Tweaked the tunnel rejection settings to reject less aggressively
+
+2006-05-31  jrandom
+    * Only send netDb searches to the floodfill peers for the time being
+    * Add some proof of concept filters for tunnel participation.  By default,
+      it will skip peers with an advertised bandwith of less than 32KBps or
+      an advertised uptime of less than 2 hours.  If this is sufficient, a
+      safer implementation of these filters will be implemented.
 
 * 2006-05-18  0.6.1.19 released
 

hosts.txt

@@ -1,6 +1,9 @@
 ; TC's hosts.txt guaranteed freshness
-; $Id: hosts.txt,v 1.166 2006/01/23 10:29:36 cervantes Exp $
+; $Id: hosts.txt,v 1.169 2006-12-16 17:31:07 jrandom Exp $
 ; changelog:
+; (1.191) added trac.i2p
+; (1.190) added archive.syndie.i2p
+; (1.189) added mtn.i2p
 ; (1.188) added downloads.legion.i2p, politguy.i2p, ninja.i2p
 ; (1.187) added hidden.i2p, bk1k.i2p, antipiracyagency.i2p
 ; (1.186) added decadence.i2p, freedomarchives.i2p, closedshop.i2p
@@ -498,4 +501,7 @@ antipiracyagency.i2p=lnOKgQBEcsbZHgsuN5rJQA5mXK59fWPoCtag-EGfgYkbO1YbbPAqUZHqF4a
 downloads.legion.i2p=p0eQqZscgqFvpoQtftNXFVRJpNzMkW1gx0cEmVz5xcpT195DxoVEwGlQ34mP4Da5nnUggcCaHzW9JBduqxiZU73quiO6VYeE65b70EhS0mRgsoVaU9-nsqo7ikYZ0-Rr6Qrhn32M6vktf4b2KljmpHgaBnJzMsFiMaEj3QuxGY8Q4tH6P34tgKiv2hYzZ8DGCj9bcmzzW0LX8XwA9tufi4XGM31qAZu~CiW14J5I8AwDUQRnyaWiZ8OzN~o3qTbkPyMAfXnAewcoA~GJPF9oAb-lHdESGeSEE38Krk2OYv3gQNUTiZcVaEck3VktqFmQiHCWDtAO0z8DIv9qmSjCI41w0MTCVlXNPRDO-YCE9JHlZv5zvS1~uCKltJwKGAHxHv~8N4oKMjJiB52XHXo3sWk503NTF-OK29ng~T4qfDQgEL6mm~jFhF3X-aruSkbn3OcRhWEgSJ2YdQYERnSwZn8gg4k78kvx02reisAHBN04UKa9YW95~Tz4S5Mqn8lrAAAA
 politguy.i2p=nyQ37u3uP7Zm5YoFXL4MFEjJH6iQhrMs0K~Bk57fEIYRGJIG31~tqScmDLOUPjxiwzHEsbbLJo-o9rll7744HMOHmlfNGegKMO-n7~pWCVRW2XtMQL17NnZl97bPiDdymTVJoAKrs2ZfEayDYiiBxKbUlbcnT51O0~aTymSmlyh1i0VQajbQOveEdN-QDiOWEdBLZCQx7lg4BXT78Sb76qQVj4c6jdYRxP~q1nL1XHyjp~qd0jjLFNeTqS8YPdEDJFWAKo7M1bIYV4SUcj40GzGIuWRnaSY-utizQFrRUC0NcdwZK7Mo1JivGC0TFtWFJsQ-xx5ix4vP4vYeQ8rGiyED32s1kwII9rCBu9DmLLTwGBjTX0yjXI4XEH2Q-C0fgIw6YniDYQj50a3q1KTkaqiXm~EtnWqkv9dGvSYY8-mfBlRKD8k1X83-MhycdZHNrsWhGxA~zpBmKcMVHD0CDbW2ZF6sHyS3wPZiQ2haeBJL6mm7ZWQT6J875w3SP-nnAAAA
 ninja.i2p=XhyN8MgL6DwWE98g2DJlDLHy~02g58IF14LTb472cmSLRj~cHv7wyi1mxy21vtf12oPWRquwMqpn4vJbKtnoQrLqRBgKAWtHgvUWOKPA8HqOmP4g9di3vGLefUNHUjkZWPXANBs-HwWH~~zPV0zwjN5keEZLVNQKfUkc0-qJ77zfxrDAPVjUBlyx1nlH7HcSxgzXS8qNlQuxWEqlqOiPushnalVFZSul-kVzG0Zo1PIQQHDKA1kpmwr2EX5xvCq0PgDZgj~xc3xkTzBMXC-m~NnmB1NRrH80lpY3nWMo-ySTVS7KcHH--zPUkvQhE2PCjLcSQsqpK2xsq0XEQOeAqoeDhosc3XxQDnDTmgBC0Bnus4N6RMBZgBRpniFT4ofwgGmFS1nDGkI-F4fLJSQ4f~P4sUR6HCZnwWIEvcr7lJgr26RP584nev9Dzhr4dq1hfTesShfluB19KJ17eBsimy1xIGDbiAeCSVtUjEviyb1lm7C~we3c0oCUUt2NvOGWAAAA
+mtn.i2p=RqXC4xbFK6t3g2wk9SO4RjY7mj1c0DmtMra5c1Md8t-DcNPSjQFmqT97pcZ5IR1JDKqyCO7RI~aATTTMPQexoEeqK9-6Poeh2RA1C81FzcA9sHvjLeg3eB1Cju-sE-IDeFntEvCC4w7wWnpmLzCfdXK7OjSK1wYc6OkqPOLVDEy-N-4UUPlZFWWUghpjBGXGayXz6JRKtoMIwhFQaiKdRvAs32ozM9RM0NWzrCaRLZBIQ6Gg1Ys1wF0-oBJgC4T4CN6SxJNaz9Dfw4GNtPyD6lq3S1osY1ccflm3itvUt3JC1J9ypoXzylBE5MuS-LTgbgbMdMFty07AoWB~EY8TwW8EQQO07GSzB7hm53u0iCEH44GexhKHtQP-hYbIr3mklo89BvfWIRGMTwUkAzYojzC-vOyIh16LWrQQhGbLvByKQSdWk9nInm3GEfqRVtSpuqd4m6iHzrBDZ3fvKjbuywot3hDNHitOHOedmBNA8neCzLkod8b0Z4xx~qRIEObxAAAA
+archive.syndie.i2p=iXX0DadZTJQpPr1to0OmQ4xokHgx1HYd5ec7~zIjQ80W~p4kRCYJmEzibH2Kn59Gi04SAXeA2O9i3bNqfGCQjsbz7UcjPGrW6-UrckXVXW67Moxp7QWY6i-aKuVYM3bqYxUL2mWvcDzJ8D0ecMpvasxhxwXpdFn2J6CGboMxeGV8R3hwwlNYbYoKgHr74qEJaIZpm1FrRWvNHV5cMv363iWnPy72XspQefk79-VOjPsxfummosU7gqlxl5teyiGKNzMs3G6iJyfVHO8IlKtdn~P~ET9p7zWlTPgV8NTyCVB-Wn5S3JMkMGOFZR7wSlxSwGFpTFQKc7mxVTtLZ5nWcV2OhvOIxRZ31RvGJZyVs562RC5aMfyqcM5IHQiZVlmkhzJKIy9VDw8tKayQtRM-xeN5k6Qr7iMmYIRORwuAODkYApoMD9a0eJ6ZYOSgBMOCSvYcwfT8axRY~GabiHm0QC82mo-nDgrUypGKtOPMI9MIqMTsb8Yl-UGWn6twBAIzAAAA
+trac.i2p=OBnF9NtkEsPij2F-lp3bWDVrJsPQQPdq6adlpq0N4BY1XRjtDBZl~EpDdk7roq49~ptKAQG2cNUeBEKIIrdlZhJio5pMwUl6YinizzkNTFfZipB5OKoB7PBulxkw-N9mKMhS1btd9ajcV8tiP3xiv7VSlgiDwbdKg1fmkvNrVrJnzkN3-ey2kebYnbh7jjU2gPFUl~CwSEkIi6AK9EfqmFR-DUVohyygqAY~fi4EMeTVXGUqftXSNFYUwpRJgFrWRPTurtZnJK5403q67oEk0eWrPIZ8ytJWSBfffAXL3ts~0O1FZeKXUccsAl33j70~lklSolNVLJ40y-6X5ZLWajmX0ONU3j0qI5A~7fgNgsg-vKypPDuzl8ug-D~BmhqdAf0sRYmziDVwTgU~WRB6IzhhXFR6CbwrGXdgOGg2qNT1eOnMwGo3SMMJ7kK88VC5LdYg2dyiyjZATuvT92QdZglrVQIeBqAehcFjOBuycC1ED3AOak8D9Xplj7V6hN-HAAAA
 

initialNews.xml

@@ -1,5 +1,5 @@
-<i2p.news date="$Date: 2006/05/09 16:17:17 $">
- <i2p.release version="0.6.1.19" date="2006/05/18" minVersion="0.6"
+<i2p.news date="$Date: 2007-03-17 20:47:59 $">
+ <i2p.release version="0.6.1.29" date="2007/02/15" minVersion="0.6"
               anonurl="http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/i2p/i2pupdate.sud"
               publicurl="http://dev.i2p.net/i2p/i2pupdate.sud"
               anonannouncement="http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/pipermail/i2p/2005-September/000878.html" 

installer/install.xml

@@ -4,7 +4,7 @@
 
     <info>
         <appname>i2p</appname>
-        <appversion>0.6.1.19</appversion>
+        <appversion>0.6.1.29</appversion>
         <authors>
             <author name="I2P" email="support@i2p.net"/>
         </authors>

installer/resources/eepsite_index.html

@@ -1,28 +1,27 @@
 <html>
  <head>
   <title>Welcome to your eepsite</title>
+  <link rel="shortcut icon" href="favicon.ico" />
  </head>
  <body>
  <h1>Welcome to your eepsite</h1>
 
  <p>This is your eepsite - simply edit the files under ./eepsite/docroot/ 
- and they'll be reachable.  The 'key' to your eepsite that you need to
- give to other people is shown on the eepsite's I2PTunnel
- <a href="http://localhost:7657/i2ptunnel/edit.jsp?tunnel=3">configuration page</a>). </p>
- <p>
- If you have any standard java web applications (.war files) such as 
- <a href="http://wiki.blojsom.com/wiki/display/blojsom/About%2Bblojsom">blojsom</a>
- or <a href="http://snipsnap.org/space/start">SnipSnap</a>, simply drop their .war
- file into ./eepsite/webapps/ and they'll be reachable at 
- http://$yourEeepsite/warFileName/</p>
- 
+ and they'll be reachable by others once you follow the instructions below.
+ In I2P, eepsites are addressed using a 'key', which is represented as a really long Base64 string.
+ (The 'key' is somewhat analogous to an IP address, and
+ is shown on the eepsite's I2PTunnel
+ <a href="http://localhost:7657/i2ptunnel/edit.jsp?tunnel=3">configuration page</a>).
+ The instructions below detail how to assign a name like "mysite.i2p" to your key and
+ start up your eepsite.</p>
  <p>You can also reach your eepsite locally through 
  <a href="http://localhost:7658/">http://localhost:7658/</a>.  If you 
  want to change the port number, edit the file ./eepsite/jetty.xml and 
  update the I2PTunnel configuration accordingly.</p>
 
- <h2>Step-by-step instructions for announcing your new eepsite to the I2P community</h2>
- Your eepsite is up and running but it will be hard for other people to find because it
+ <h2>Step-by-step instructions for starting your new eepsite and announcing it to the I2P community</h2>
+ Your eepsite is stopped by default.
+ After you start it, it will be difficult for other people to find because it
  doesn't have a name and they don't have your really long Base64 key.
  You could just tell people that really long key but thankfully i2p has an address book
  and several easy ways to tell people about your eepsite. Here's detailed instructions.
@@ -34,7 +33,13 @@
      Enter the new name for your eepsite on the
      <a href="http://localhost:7657/i2ptunnel/edit.jsp?tunnel=3">eepsite i2ptunnel configuration page</a>
      where it says "Website name". This will replace the default "mysite.i2p".
+     Also, check the "Auto Start" box. Your eepsite will now start every time you start your router.
      Be sure and click "Save".
+ <li>Click the start button for your eepsite on the
+     <a href="http://localhost:7657/i2ptunnel/index.jsp">main i2ptunnel configuration page</a>.
+     You should now see "eepsite" listed under "Local Destinations" on the left side of the
+     <a href="http://localhost:7657/index.jsp">I2P Router Console</a>.
+     Your eepsite is now running.
  <li>Highlight the entire "Local destination" key on the
      <a href="http://localhost:7657/i2ptunnel/edit.jsp?tunnel=3">eepsite i2ptunnel configuration page</a>.
      and copy it for
@@ -68,8 +73,7 @@
      <li>Post a message on the <a href="http://forum.i2p/viewforum.php?f=16">Eepsite announce forum</a>
          on <a href="http://forum.i2p/">forum.i2p</a>.
      <li>Tell people about it on the #i2p or #i2p-chat channels on IRC.
-     <li>Put it in <a href="http://localhost:7657/syndie/post.jsp">new post</a> on
-                   <a href="http://localhost:7657/syndie/">Syndie</a>.
+     <li>Put it in a new post on <a href="syndie.i2p.net">the new Syndie</a>.
      <li>Put it in <a href="http://ugha.i2p/EepsiteIndex">Ugha's Eepsite Index Wiki</a>
      </ul>
      Note that some sites recommend pasting in that really long destination key.

installer/resources/i2ptunnel.config

@@ -55,7 +55,7 @@ tunnel.3.i2cpHost=127.0.0.1
 tunnel.3.i2cpPort=7654
 tunnel.3.option.inbound.nickname=eepsite
 tunnel.3.option.outbound.nickname=eepsite
-tunnel.3.startOnLoad=true
+tunnel.3.startOnLoad=false
 
 # postman's SMTP server - see www.postman.i2p
 tunnel.4.description=smtp server

installer/resources/themes/console/defCon1/i2ptunnel.css

@@ -138,7 +138,7 @@
 #tunnelListPage .footer label {
     text-align : right;
     height : 24px;
-    width : 160px;
+    width : 360px;
     float : left;
 
 }

installer/resources/themes/console/i2ptunnel.css

@@ -122,7 +122,7 @@
 #tunnelListPage .footer label {
     text-align : right;
     height : 24px;
-    width : 160px;
+    width : 360px;
     float : left;
 
 }

news.xml

@@ -1,5 +1,5 @@
-<i2p.news date="$Date: 2006/05/09 21:38:42 $">
- <i2p.release version="0.6.1.19" date="2006/05/18" minVersion="0.6"
+<i2p.news date="$Date: 2007-07-19 13:05:44 $">
+ <i2p.release version="0.6.1.29" date="2007/02/15" minVersion="0.6"
               anonurl="http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/i2p/i2pupdate.sud"
               publicurl="http://dev.i2p.net/i2p/i2pupdate.sud"
               anonannouncement="http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/pipermail/i2p/2005-September/000878.html" 
@@ -10,13 +10,26 @@
             anonlogs="http://i2p/Nf3ab-ZFkmI-LyMt7GjgT-jfvZ3zKDl0L96pmGQXF1B82W2Bfjf0n7~288vafocjFLnQnVcmZd~-p0-Oolfo9aW2Rm-AhyqxnxyLlPBqGxsJBXjPhm1JBT4Ia8FB-VXt0BuY0fMKdAfWwN61-tj4zIcQWRxv3DFquwEf035K~Ra4SWOqiuJgTRJu7~o~DzHVljVgWIzwf8Z84cz0X33pv-mdG~~y0Bsc2qJVnYwjjR178YMcRSmNE0FVMcs6f17c6zqhMw-11qjKpY~EJfHYCx4lBWF37CD0obbWqTNUIbL~78vxqZRT3dgAgnLixog9nqTO-0Rh~NpVUZnoUi7fNR~awW5U3Cf7rU7nNEKKobLue78hjvRcWn7upHUF45QqTDuaM3yZa7OsjbcH-I909DOub2Q0Dno6vIwuA7yrysccN1sbnkwZbKlf4T6~iDdhaSLJd97QCyPOlbyUfYy9QLNExlRqKgNVJcMJRrIual~Lb1CLbnzt0uvobM57UpqSAAAA/meeting141"
             publiclogs="http://www.i2p.net/meeting141" />
 &#149;
-2006-05-09: 0.6.1.18 <a href="http://dev.i2p/pipermail/i2p/2006-May/001287.html">released</a>
-with changes to help reduce periodism, congestion and lease failure.
+2007-07-19:
+We need bandwidth!
+Please help the network by
+<a href="/config.jsp">increasing your bandwidth limits and share percentage</a>.
+Unless the share percentage times the minimum rate is more than 16KBps,
+you are not sharing at all!
+Increasing your rate limits will also help your own transfer rates.
+Thanks!
 <br />
 &#149;
-2006-05-09:
-<a href="http://dev.i2p/pipermail/i2p/2006-May/001288.html">status notes</a>
+2007-03-17: 0.6.1.28
+<a href="http://dev.i2p/pipermail/i2p/2007-March/001340.html">released</a>
+with
+streaming lib optimizations, i2psnark
+improvements, and priority operation within the router.
+<br />
+&#149;
+2007-04-10:
+<a href="http://dev.i2p/pipermail/i2p/2007-April/001343.html">status notes</a>
 and
-<a href="http://www.i2p/meeting179">meeting log</a>
+<a href="http://www.i2p/meeting206">meeting log</a>
 <br />
 </i2p.news>

readme.html

@@ -1,9 +1,9 @@
-<p>If you've just started I2P, the Active: number on the left should start to
-grow over the next few minutes and you'll see some local "destinations" listed
+<p>If you've just started I2P, the Active: numbers on the left should start to
+grow over the next few minutes and you'll see a "shared clients" local destination listed
 on the left (if not, <a href="#trouble">see below</a>).  Once those show up,
 you can:</p>
 <ul>
- <li><b>blog anonymously</b> - check out <a href="/syndie/">Syndie</a></li>
+ <li><b>blog anonymously</b> - check out <a href="http://syndie.i2p/">Syndie</a></li>
  <li><b>chat anonymously</b> - fire up your own IRC client and connect to the 
      server at <b>localhost port 6668</b>.  This points at one of two anonymously hosted
      IRC servers, but neither you nor they know where the other is.</li>
@@ -12,9 +12,10 @@ you can:</p>
      browse to an eepsite - 
      <ul>
          <li><a href="http://orion.i2p/">orion.i2p</a>: a site which tracks eepsite uptime and changes</li>
+         <li><a href="http://inproxy.tino.i2p/status.php">inproxy.tino.i2p</a>: a site which tracks active eepsites</li>
          <li><a href="http://forum.i2p/">forum.i2p</a>: a secure and anonymous connection to <a href="http://forum.i2p.net/">forum.i2p.net</a></li>
          <li><a href="http://www.i2p/">www.i2p</a>: a secure and anonymous connection to <a href="http://www.i2p.net/">www.i2p.net</a></li>
-         <li><a href="http://search.i2p/">search.i2p</a>: an anonymously hosted search engine of eepsites</li>
+         <li><a href="http://eepsites.i2p/">eepsites.i2p</a>: an anonymously hosted search engine of eepsites</li>
          <li><a href="http://ugha.i2p/">ugha.i2p</a>: ugha's eepsite, a wiki that anyone can edit, and lots of links</li>
          <li><a href="http://dev.i2p/">dev.i2p</a>: a secure and anonymous connection to <a href="http://dev.i2p.net/">dev.i2p.net</a></li>
          <li>Freenet proxy: <a href="http://fproxy.tino.i2p">fproxy.tino.i2p</a></li>
@@ -27,8 +28,7 @@ you can:</p>
      through the I2P network.</li>
  <li><b>transfer files</b> - there is an integrated <a href="i2psnark/">port</a> of the
      <a href="http://www.klomp.org/snark/">Snark</a> <a href="http://www.bittorrent.com/">BitTorrent</a>
-     client, which is compatible with the Python 
-     <a href="http://i2p-bt.postman.i2p/">mainline I2P-BT</a>.</li>
+     client.</li>
  <li><b>use anonymous email</b> - postman has created a mail system compatible with normal mail
      clients (POP3 / SMTP) that allows email within I2P as well as mail from and to the normal
      internet!  get your account at <a href="http://hq.postman.i2p/">hq.postman.i2p</a>.
@@ -44,19 +44,20 @@ you can:</p>
 <a href="http://localhost:7658/">http://localhost:7658/</a>.  Simply place your files in
 the <code>eepsite/docroot/</code> directory (or place any standard JSP/Servlet <code>.war</code>
 files under <code>eepsite/webapps</code>, or standard CGI script under <code>eepsite/cgi-bin</code>) 
-and they'll show up.  Your eepsite's 
-<i>destination</i> (which uniquely and securely identifies it) can be found via the I2PTunnel
-<a href="/i2ptunnel/">configuration page</a> - on the details page of the "eepsite" tunnel.
-If you want other people to see your eepsite,
-you need to give them that really huge string.  Just paste it into the 
-<a href="http://forum.i2p/viewforum.php?f=16">Eepsite announce</a> forum, add it to
-ugha's <a href="http://ugha.i2p/I2pLinks">wiki</a>, <a href="http://orion.i2p/">orion's list</a>, or paste it in the #i2p or #i2p-chat channels on
-IRC (be sure to split it into two lines, as its too long for one).</p>
+and they'll show up.  After starting up an <a href="/i2ptunnel/">eepsite tunnel</a> pointing at it, your eepsite
+will be visible to others.
+Detailed instructions for starting your eepsite are on
+<a href="http://localhost:7658/">your temporary eepsite page</a>.
+</p>
 
 <h2><a name="trouble">Troubleshooting</a></h2>
 
-<p>If, after 5 or 10 minutes, your Active: x/y count has less than 20 active
-peers, you may want to review the information on the 
+<p>Be patient - I2P may be slow to start the first time as it searches for peers.
+If, after 30 minutes, your Active: connected/recent count has less than 10 connected
+peers, you should open port 8887 on your firewall for better connectivity.
+If you cannot see any eepsites at all (even <a href="http://www.i2p">www.i2p</a>),
+be sure your browser proxy is set to localhost port 4444.
+You may also want to review the information on the 
 <a href="http://www.i2p.net/">I2P website</a>, post up messages to the 
 <a href="http://forum.i2p.net/">I2P discussion forum</a>, or swing by #i2p or
 #i2p-chat on IRC at <a href="irc://irc.freenode.net/#i2p">irc.freenode.net</a>, irc.postman.i2p or irc.freshcoffee.i2p (they're linked together).</p>

router/java/src/net/i2p/data/i2np/I2NPMessageHandler.java

@@ -95,8 +95,18 @@ public class I2NPMessageHandler {
         cur++;
         _lastReadBegin = System.currentTimeMillis();
         I2NPMessage msg = I2NPMessageImpl.createMessage(_context, type);
-        if (msg == null)
-            throw new I2NPMessageException("The type "+ type + " is an unknown I2NP message");
+        if (msg == null) {
+            int sz = data.length-offset;
+            boolean allZero = false;
+            for (int i = offset; i < data.length; i++) {
+                if (data[i] != 0) {
+                    allZero = false;
+                    break;
+                }
+            }
+            throw new I2NPMessageException("The type "+ type + " is an unknown I2NP message (remaining sz=" 
+                                           + sz + " all zeros? " + allZero + ")");
+        }
         try {
             _lastSize = msg.readBytes(data, type, cur);
             cur += _lastSize;

router/java/src/net/i2p/router/CommSystemFacade.java

@@ -14,6 +14,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import net.i2p.data.RouterAddress;
 
 /**
  * Manages the communication subsystem between peers, including connections, 
@@ -33,6 +34,18 @@ public abstract class CommSystemFacade implements Service {
     public int countActiveSendPeers() { return 0; }
     public List getMostRecentErrorMessages() { return Collections.EMPTY_LIST; }
     
+    /**
+     * Median clock skew of connected peers in seconds, or null if we cannot answer.
+     * CommSystemFacadeImpl overrides this.
+     */
+    public Long getMedianPeerClockSkew() { return null; }
+    
+    /**
+     * Return framed average clock skew of connected peers in seconds, or null if we cannot answer.
+     * CommSystemFacadeImpl overrides this.
+     */
+    public Long getFramedAveragePeerClockSkew(int percentToInclude) { return null; }
+    
     /**
      * Determine under what conditions we are remotely reachable.
      *
@@ -40,6 +53,10 @@ public abstract class CommSystemFacade implements Service {
     public short getReachabilityStatus() { return STATUS_OK; }
     public void recheckReachability() {}
     
+    /** 
+     * Tell other transports our address changed
+     */
+    public void notifyReplaceAddress(RouterAddress UDPAddr) {}
     /** 
      * We are able to receive unsolicited connections
      */

router/java/src/net/i2p/router/LoadTestManager.java

@@ -78,7 +78,11 @@ public class LoadTestManager {
     
     private static final boolean DEFAULT_ENABLE = false;
 
+    /** disable all load testing for the moment */
+    private static final boolean FORCE_DISABLE = true;
+
     public static boolean isEnabled(I2PAppContext ctx) { 
+        if (FORCE_DISABLE) return false;
         String enable = ctx.getProperty("router.enableLoadTesting");
         if ( (DEFAULT_ENABLE) && (enable != null) && (!Boolean.valueOf(enable).booleanValue()) )
             return false;
@@ -130,6 +134,7 @@ public class LoadTestManager {
      * Actually send the messages through the given tunnel
      */
     private void runTest(LoadTestTunnelConfig tunnel) {
+        if (!isEnabled(_context)) return;
         log(tunnel, "start");
         int peerMessages = getPeerMessages();
         if (_log.shouldLog(Log.DEBUG))
@@ -208,9 +213,17 @@ public class LoadTestManager {
             
             // this should take into consideration both the inbound and outbound tunnels
             // ... but it doesn't, yet.
-            _context.messageRegistry().registerPending(new Selector(tunnel, payloadMessage.getUniqueId()),
-                                                       new SendAgain(_context, tunnel, payloadMessage.getUniqueId(), true),
-                                                       new SendAgain(_context, tunnel, payloadMessage.getUniqueId(), false),
+            long uniqueId = -1;
+            if (payloadMessage != null) {
+                uniqueId = payloadMessage.getUniqueId();
+            } else {
+                tunnel.logComplete();
+                _active.remove(tunnel);
+                return;
+            }
+            _context.messageRegistry().registerPending(new Selector(tunnel, uniqueId),
+                                                       new SendAgain(_context, tunnel, uniqueId, true),
+                                                       new SendAgain(_context, tunnel, uniqueId, false),
                                                        10*1000);
             _context.tunnelDispatcher().dispatchOutbound(payloadMessage, outbound.getSendTunnelId(0),
                                                          inbound.getReceiveTunnelId(0),

router/java/src/net/i2p/router/OutNetMessage.java

@@ -48,6 +48,7 @@ public class OutNetMessage {
     private MessageSelector _replySelector;
     private Set _failedTransports;
     private long _sendBegin;
+    private long _transmitBegin;
     private Exception _createdBy;
     private long _created;
     /** for debugging, contains a mapping of even name to Long (e.g. "begin sending", "handleOutbound", etc) */
@@ -57,6 +58,10 @@ public class OutNetMessage {
      * (some JVMs have less than 10ms resolution, so the Long above doesn't guarantee order)
      */
     private List _timestampOrder;
+    private int _queueSize;
+    private long _prepareBegin;
+    private long _prepareEnd;
+    private Object _preparationBuf;
     
     public OutNetMessage(RouterContext context) {
         _context = context;
@@ -148,6 +153,7 @@ public class OutNetMessage {
             _messageType = msg.getClass().getName();
             _messageTypeId = msg.getType();
             _messageId = msg.getUniqueId();
+            _messageSize = _message.getMessageSize();
         }
     }
     
@@ -235,9 +241,31 @@ public class OutNetMessage {
     /** when did the sending process begin */
     public long getSendBegin() { return _sendBegin; }
     public void beginSend() { _sendBegin = _context.clock().now(); }
+    public void beginTransmission() { _transmitBegin = _context.clock().now(); }
+    public void beginPrepare() { _prepareBegin = _context.clock().now(); }
+    public void prepared() { prepared(null); }
+    public void prepared(Object buf) { 
+        _prepareEnd = _context.clock().now();
+        _preparationBuf = buf;
+    }
+    public Object releasePreparationBuffer() { 
+        Object rv = _preparationBuf;
+        _preparationBuf = null;
+        return rv;
+    }
     
     public long getCreated() { return _created; }
+    /** time since the message was created */
     public long getLifetime() { return _context.clock().now() - _created; }
+    /** time the transport tries to send the message (including any queueing) */
+    public long getSendTime() { return _context.clock().now() - _sendBegin; }
+    /** time during which the i2np message is actually in flight */
+    public long getTransmissionTime() { return _context.clock().now() - _transmitBegin; }
+    /** how long it took to prepare the i2np message for transmission (including serialization and transport layer encryption) */
+    public long getPreparationTime() { return _prepareEnd - _prepareBegin; }
+    /** number of messages ahead of this one going to the targetted peer when it is first enqueued */
+    public int getQueueSize() { return _queueSize; }
+    public void setQueueSize(int size) { _queueSize = size; }
     
     /** 
      * We've done what we need to do with the data from this message, though
@@ -245,6 +273,8 @@ public class OutNetMessage {
      */
     public void discardData() {
         long timeToDiscard = _context.clock().now() - _created;
+        if ( (_message != null) && (_messageSize <= 0) )
+            _messageSize = _message.getMessageSize();
         if (_log.shouldLog(Log.DEBUG))
             _log.debug("Discard " + _messageSize + "byte " + _messageType + " message after " 
                        + timeToDiscard);

router/java/src/net/i2p/router/Router.java

@@ -225,7 +225,10 @@ public class Router {
     
     public long getWhenStarted() { return _started; }
     /** wall clock uptime */
-    public long getUptime() { return _context.clock().now() - _context.clock().getOffset() - _started; }
+    public long getUptime() { 
+        if ( (_context == null) || (_context.clock() == null) ) return 1; // racing on startup
+        return _context.clock().now() - _context.clock().getOffset() - _started;
+    }
     
     public RouterContext getContext() { return _context; }
     
@@ -240,8 +243,10 @@ public class Router {
         readConfig();
         
         setupHandlers();
-        if ("true".equalsIgnoreCase(_context.getProperty(Router.PROP_HIDDEN, "false")))
-            killKeys();
+        if (ALLOW_DYNAMIC_KEYS) {
+            if ("true".equalsIgnoreCase(_context.getProperty(Router.PROP_HIDDEN, "false")))
+                killKeys();
+        }
 
         _context.messageValidator().startup();
         _context.tunnelDispatcher().startup();
@@ -323,6 +328,7 @@ public class Router {
             ri.setPublished(_context.clock().now());
             Properties stats = _context.statPublisher().publishStatistics();
             stats.setProperty(RouterInfo.PROP_NETWORK_ID, NETWORK_ID+"");
+            
             ri.setOptions(stats);
             ri.setAddresses(_context.commSystem().createAddresses());
 
@@ -357,7 +363,7 @@ public class Router {
     
     // publicize our ballpark capacity - this does not affect anything at
     // the moment
-    public static final char CAPABILITY_BW16 = 'K';
+    public static final char CAPABILITY_BW12 = 'K';
     public static final char CAPABILITY_BW32 = 'L';
     public static final char CAPABILITY_BW64 = 'M';
     public static final char CAPABILITY_BW128 = 'N';
@@ -371,12 +377,13 @@ public class Router {
     
     public void addCapabilities(RouterInfo ri) {
         int bwLim = Math.min(_context.bandwidthLimiter().getInboundKBytesPerSecond(),
-                             _context.bandwidthLimiter().getInboundKBytesPerSecond());
+                             _context.bandwidthLimiter().getOutboundKBytesPerSecond());
+        bwLim = (int)(((float)bwLim) * getSharePercentage());
         if (_log.shouldLog(Log.WARN))
             _log.warn("Adding capabilities w/ bw limit @ " + bwLim, new Exception("caps"));
         
-        if (bwLim <= 16) {
-            ri.addCapability(CAPABILITY_BW16);
+        if (bwLim < 12) {
+            ri.addCapability(CAPABILITY_BW12);
         } else if (bwLim <= 32) {
             ri.addCapability(CAPABILITY_BW32);
         } else if (bwLim <= 64) {
@@ -444,15 +451,32 @@ public class Router {
                                                                  "keyBackup/publicSigning.key",
                                                                  "sessionKeys.dat" };
 
+    static final String IDENTLOG = "identlog.txt";
     public static void killKeys() {
+        new Exception("Clearing identity files").printStackTrace();
+        int remCount = 0;
         for (int i = 0; i < _rebuildFiles.length; i++) {
             File f = new File(_rebuildFiles[i]);
             if (f.exists()) {
                 boolean removed = f.delete();
-                if (removed)
+                if (removed) {
                     System.out.println("INFO:  Removing old identity file: " + _rebuildFiles[i]);
-                else
+                    remCount++;
+                } else {
                     System.out.println("ERROR: Could not remove old identity file: " + _rebuildFiles[i]);
+                }
+            }
+        }
+        if (remCount > 0) {
+            FileOutputStream log = null;
+            try {
+                log = new FileOutputStream(IDENTLOG, true);
+                log.write((new Date() + ": Old router identity keys cleared\n").getBytes());
+            } catch (IOException ioe) {
+                // ignore
+            } finally {
+                if (log != null)
+                    try { log.close(); } catch (IOException ioe) {}
             }
         }
     }
@@ -796,11 +820,19 @@ public class Router {
         finalShutdown(exitCode);
     }
 
+    /**
+     * disable dynamic key functionality for the moment, as it may be harmful and doesn't
+     * add meaningful anonymity
+     */
+    private static final boolean ALLOW_DYNAMIC_KEYS = false;
+
     public void finalShutdown(int exitCode) {
         _log.log(Log.CRIT, "Shutdown(" + exitCode + ") complete", new Exception("Shutdown"));
         try { _context.logManager().shutdown(); } catch (Throwable t) { }
-        if ("true".equalsIgnoreCase(_context.getProperty(PROP_DYNAMIC_KEYS, "false")))
-            killKeys();
+        if (ALLOW_DYNAMIC_KEYS) {
+            if ("true".equalsIgnoreCase(_context.getProperty(PROP_DYNAMIC_KEYS, "false")))
+                killKeys();
+        }
 
         File f = new File(getPingFile());
         f.delete();
@@ -1300,4 +1332,4 @@ class PersistRouterInfoJob extends JobImpl {
             if (fos != null) try { fos.close(); } catch (IOException ioe) {}
         }
     }
-}
+}

router/java/src/net/i2p/router/RouterClock.java

@@ -0,0 +1,104 @@
+package net.i2p.router;
+
+import net.i2p.util.Log;
+import net.i2p.I2PAppContext;
+import net.i2p.router.RouterContext;
+import net.i2p.util.Clock;
+
+/**
+ * Alternate location for determining the time which takes into account an offset.
+ * This offset will ideally be periodically updated so as to serve as the difference
+ * between the local computer's current time and the time as known by some reference
+ * (such as an NTP synchronized clock).
+ *
+ * RouterClock is a subclass of Clock with access to router transports.
+ * Configuration permitting, it will block clock offset changes
+ * which would increase peer clock skew.
+ */
+public class RouterClock extends Clock {
+
+    RouterContext _context;
+
+    public RouterClock(RouterContext context) {
+        super(context);
+        _context = context;
+    }
+
+    /**
+     * Specify how far away from the "correct" time the computer is - a positive
+     * value means that we are slow, while a negative value means we are fast.
+     *
+     */
+    public void setOffset(long offsetMs, boolean force) {
+
+        if (false) return;
+        long delta = offsetMs - _offset;
+        if (!force) {
+            if ((offsetMs > MAX_OFFSET) || (offsetMs < 0 - MAX_OFFSET)) {
+                getLog().error("Maximum offset shift exceeded [" + offsetMs + "], NOT HONORING IT");
+                return;
+            }
+            
+            // only allow substantial modifications before the first 10 minutes
+            if (_alreadyChanged && (System.currentTimeMillis() - _startedOn > 10 * 60 * 1000)) {
+                if ( (delta > MAX_LIVE_OFFSET) || (delta < 0 - MAX_LIVE_OFFSET) ) {
+                    getLog().log(Log.CRIT, "The clock has already been updated, but you want to change it by "
+                                           + delta + " to " + offsetMs + "?  Did something break?");
+                    return;
+                }
+            }
+            
+            if ((delta < MIN_OFFSET_CHANGE) && (delta > 0 - MIN_OFFSET_CHANGE)) {
+                getLog().debug("Not changing offset since it is only " + delta + "ms");
+                _alreadyChanged = true;
+                return;
+            }
+
+            // If so configured, check sanity of proposed clock offset
+            if (Boolean.valueOf(_context.getProperty("router.clockOffsetSanityCheck","true")).booleanValue() == true) {
+
+                // Try calculating peer clock skew
+                Long peerClockSkew = _context.commSystem().getFramedAveragePeerClockSkew(50);
+
+                if (peerClockSkew != null) {
+
+                    // Predict the effect of applying the proposed clock offset
+                    long currentPeerClockSkew = peerClockSkew.longValue();
+                    long predictedPeerClockSkew = currentPeerClockSkew + (delta / 1000l);
+
+                    // Fail sanity check if applying the offset would increase peer clock skew
+                    if ((Math.abs(predictedPeerClockSkew) > (Math.abs(currentPeerClockSkew) + 5)) ||
+                        (Math.abs(predictedPeerClockSkew) > 20)) {
+
+                        getLog().error("Ignoring clock offset " + offsetMs + "ms (current " + _offset +
+                                       "ms) since it would increase peer clock skew from " + currentPeerClockSkew +
+                                       "s to " + predictedPeerClockSkew + "s. Broken server in pool.ntp.org?");
+                        return;
+                    } else {
+                        getLog().debug("Approving clock offset " + offsetMs + "ms (current " + _offset +
+                                       "ms) since it would decrease peer clock skew from " + currentPeerClockSkew +
+                                       "s to " + predictedPeerClockSkew + "s.");
+                    }
+                }
+            } // check sanity
+        }
+
+        if (_alreadyChanged) {
+            if (delta > 15*1000)
+                getLog().log(Log.CRIT, "Updating clock offset to " + offsetMs + "ms from " + _offset + "ms");
+            else if (getLog().shouldLog(Log.INFO))
+                getLog().info("Updating clock offset to " + offsetMs + "ms from " + _offset + "ms");
+            
+            if (!_statCreated)
+                _context.statManager().createRateStat("clock.skew", "How far is the already adjusted clock being skewed?", "Clock", new long[] { 10*60*1000, 3*60*60*1000, 24*60*60*60 });
+                _statCreated = true;
+            _context.statManager().addRateData("clock.skew", delta, 0);
+        } else {
+            getLog().log(Log.INFO, "Initializing clock offset to " + offsetMs + "ms from " + _offset + "ms");
+        }
+        _alreadyChanged = true;
+        _offset = offsetMs;
+        fireOffsetChanged(delta);
+    }
+
+}

router/java/src/net/i2p/router/RouterContext.java

@@ -26,6 +26,8 @@ import net.i2p.router.transport.OutboundMessageRegistry;
 import net.i2p.router.transport.VMCommSystem;
 import net.i2p.router.tunnel.pool.TunnelPoolManager;
 import net.i2p.router.tunnel.TunnelDispatcher;
+import net.i2p.util.Clock;
+import net.i2p.router.RouterClock;
 
 /**
  * Build off the core I2P context to provide a root for a router instance to
@@ -59,13 +61,15 @@ public class RouterContext extends I2PAppContext {
     private MessageValidator _messageValidator;
     private MessageStateMonitor _messageStateMonitor;
     private RouterThrottle _throttle;
+    private RouterClock _clock;
     private Calculator _isFailingCalc;
     private Calculator _integrationCalc;
     private Calculator _speedCalc;
     private Calculator _reliabilityCalc;
     private Calculator _capacityCalc;
     private Calculator _oldSpeedCalc;
-    
+
+
     private static List _contexts = new ArrayList(1);
     
     public RouterContext(Router router) { this(router, null); }
@@ -323,4 +327,25 @@ public class RouterContext extends I2PAppContext {
         }
         return super.getProperty(propName, defaultVal);
     }
+
+    /**
+     * The context's synchronized clock, which is kept context specific only to
+     * enable simulators to play with clock skew among different instances.
+     *
+     * It wouldn't be necessary to override clock(), except for the reason
+     * that it triggers initializeClock() of which we definitely
+     * need the local version to run.
+     */
+    public Clock clock() {
+        if (!_clockInitialized) initializeClock();
+        return _clock;
+    }
+    protected void initializeClock() {
+        synchronized (this) {
+            if (_clock == null)
+                _clock = new RouterClock(this);
+            _clockInitialized = true;
+        }
+    }
+
 }

router/java/src/net/i2p/router/RouterThrottleImpl.java

@@ -105,7 +105,7 @@ class RouterThrottleImpl implements RouterThrottle {
 
         if (numTunnels > getMinThrottleTunnels()) {
             double tunnelGrowthFactor = getTunnelGrowthFactor();
-            Rate avgTunnels = _context.statManager().getRate("tunnel.participatingTunnels").getRate(60*60*1000);
+            Rate avgTunnels = _context.statManager().getRate("tunnel.participatingTunnels").getRate(10*60*1000);
             if (avgTunnels != null) {
                 double avg = 0;
                 if (avgTunnels.getLastEventCount() > 0) 
@@ -142,37 +142,37 @@ class RouterThrottleImpl implements RouterThrottle {
         
         double tunnelTestTimeGrowthFactor = getTunnelTestTimeGrowthFactor();
         Rate tunnelTestTime1m = _context.statManager().getRate("tunnel.testSuccessTime").getRate(1*60*1000);
-        Rate tunnelTestTime60m = _context.statManager().getRate("tunnel.testSuccessTime").getRate(60*60*1000);
-        if ( (tunnelTestTime1m != null) && (tunnelTestTime60m != null) && (tunnelTestTime1m.getLastEventCount() > 0) ) {
+        Rate tunnelTestTime10m = _context.statManager().getRate("tunnel.testSuccessTime").getRate(10*60*1000);
+        if ( (tunnelTestTime1m != null) && (tunnelTestTime10m != null) && (tunnelTestTime1m.getLastEventCount() > 0) ) {
             double avg1m = tunnelTestTime1m.getAverageValue();
-            double avg60m = 0;
-            if (tunnelTestTime60m.getLastEventCount() > 0)
-                avg60m = tunnelTestTime60m.getAverageValue();
+            double avg10m = 0;
+            if (tunnelTestTime10m.getLastEventCount() > 0)
+                avg10m = tunnelTestTime10m.getAverageValue();
             else
-                avg60m = tunnelTestTime60m.getLifetimeAverageValue();
+                avg10m = tunnelTestTime10m.getLifetimeAverageValue();
 
-            if (avg60m < 2000)
-                avg60m = 2000; // minimum before complaining
+            if (avg10m < 5000)
+                avg10m = 5000; // minimum before complaining
 
-            if ( (avg60m > 0) && (avg1m > avg60m * tunnelTestTimeGrowthFactor) ) {
-                double probAccept = (avg60m*tunnelTestTimeGrowthFactor)/avg1m;
+            if ( (avg10m > 0) && (avg1m > avg10m * tunnelTestTimeGrowthFactor) ) {
+                double probAccept = (avg10m*tunnelTestTimeGrowthFactor)/avg1m;
                 probAccept = probAccept * probAccept; // square the decelerator for test times
                 int v = _context.random().nextInt(100);
                 if (v < probAccept*100) {
                     // ok
                     if (_log.shouldLog(Log.INFO))
                         _log.info("Probabalistically accept tunnel request (p=" + probAccept 
-                                  + " v=" + v + " test time avg 1m=" + avg1m + " 60m=" + avg60m + ")");
-                } else {
+                                  + " v=" + v + " test time avg 1m=" + avg1m + " 10m=" + avg10m + ")");
+                } else if (false) {
                     if (_log.shouldLog(Log.WARN))
                         _log.warn("Probabalistically refusing tunnel request (test time avg 1m=" + avg1m
-                                  + " 60m=" + avg60m + ")");
-                    _context.statManager().addRateData("router.throttleTunnelProbTestSlow", (long)(avg1m-avg60m), 0);
+                                  + " 10m=" + avg10m + ")");
+                    _context.statManager().addRateData("router.throttleTunnelProbTestSlow", (long)(avg1m-avg10m), 0);
                     return TunnelHistory.TUNNEL_REJECT_PROBABALISTIC_REJECT;
                 }
             } else {
                 if (_log.shouldLog(Log.INFO))
-                    _log.info("Accepting tunnel request, since 60m test time average is " + avg60m
+                    _log.info("Accepting tunnel request, since 60m test time average is " + avg10m
                               + " and past 1m only has " + avg1m + ")");
             }
         }
@@ -227,8 +227,12 @@ class RouterThrottleImpl implements RouterThrottle {
             else
                 timePerRequest = (int)rs.getLifetimeAverageValue();
         }
-        float pctFull = (queuedRequests * timePerRequest) / (10*1000f);
-        float pReject = 1 - ((1-pctFull) * (1-pctFull));
+        float pctFull = (queuedRequests * timePerRequest) / (4*1000f);
+        double pReject = Math.pow(pctFull, 16); //1 - ((1-pctFull) * (1-pctFull));
+        // let it in because we drop overload- rejecting may be overkill,
+        // especially since we've done the cpu-heavy lifting to figure out
+        // whats up
+        /*
         if ( (pctFull >= 1) || (pReject >= _context.random().nextFloat()) ) {
             if (_log.shouldLog(Log.WARN))
                 _log.warn("Rejecting a new tunnel request because we have too many pending requests (" + queuedRequests 
@@ -236,6 +240,7 @@ class RouterThrottleImpl implements RouterThrottle {
             _context.statManager().addRateData("router.throttleTunnelQueueOverload", queuedRequests, timePerRequest);
             return TunnelHistory.TUNNEL_REJECT_TRANSIENT_OVERLOAD;
         }
+        */
 
         // ok, all is well, let 'er in
         _context.statManager().addRateData("tunnel.bytesAllocatedAtAccept", (long)bytesAllocated, 60*10*1000);
@@ -260,7 +265,7 @@ class RouterThrottleImpl implements RouterThrottle {
         int used1s = _context.router().get1sRate(); // dont throttle on the 1s rate, its too volatile
         int used15s = _context.router().get15sRate();
         int used1m = _context.router().get1mRate(); // dont throttle on the 1m rate, its too slow
-        int used = used15s;
+        int used = Math.min(used15s,used1s);
 
         double share = _context.router().getSharePercentage();
         int availBps = (int)(((maxKBps*1024)*share) - used); //(int)(((maxKBps*1024) - used) * getSharePercentage());
@@ -269,8 +274,11 @@ class RouterThrottleImpl implements RouterThrottle {
         _context.statManager().addRateData("router.throttleTunnelBytesUsed", used, maxKBps);
         _context.statManager().addRateData("router.throttleTunnelBytesAllowed", availBps, (long)bytesAllocated);
 
-        if (used1s > (maxKBps*1024)) {
-            if (_log.shouldLog(Log.WARN)) _log.warn("Reject tunnel, 1s rate (" + used1s + ") indicates overload.");
+        long overage = used1m - (maxKBps*1024);
+        if ( (overage > 0) && 
+             ((overage/(float)(maxKBps*1024f)) > _context.random().nextFloat()) ) {
+                
+            if (_log.shouldLog(Log.WARN)) _log.warn("Reject tunnel, 1m rate (" + used1m + ") indicates overload.");
             return false;
         }
 
@@ -342,9 +350,9 @@ class RouterThrottleImpl implements RouterThrottle {
     /** dont ever probabalistically throttle tunnels if we have less than this many */
     private int getMinThrottleTunnels() { 
         try {
-            return Integer.parseInt(_context.getProperty("router.minThrottleTunnels", "40"));
+            return Integer.parseInt(_context.getProperty("router.minThrottleTunnels", "1000"));
         } catch (NumberFormatException nfe) {
-            return 40;
+            return 1000;
         }
     }
     

router/java/src/net/i2p/router/RouterVersion.java

@@ -15,8 +15,8 @@ import net.i2p.CoreVersion;
  *
  */
 public class RouterVersion {
-    public final static String ID = "$Revision: 1.418 $ $Date: 2006-05-17 22:42:57 $";
-    public final static String VERSION = "0.6.1.19";
+    public final static String ID = "$Revision: 1.518 $ $Date: 2007-08-13 14:43:01 $";
+    public final static String VERSION = "0.6.1.29";
     public final static long BUILD = 0;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION + "-" + BUILD);

router/java/src/net/i2p/router/Shitlist.java

@@ -10,47 +10,85 @@ package net.i2p.router;
 
 import java.io.IOException;
 import java.io.Writer;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+import java.util.*;
+import net.i2p.data.DataHelper;
 
 import net.i2p.data.Hash;
 import net.i2p.router.peermanager.PeerProfile;
 import net.i2p.util.Log;
 
 /**
- * Manage in memory the routers we are oh so fond of.
- * This needs to get a little bit more sophisticated... currently there is no
- * way out of the shitlist
- *
+ * Routers are shitlisted only if none of our transports can talk to them
+ * or their signed router info is completely screwy.  Individual transports
+ * manage their own unreachable lists and do not generally add to the overall
+ * shitlist.
  */
 public class Shitlist {
     private Log _log;
     private RouterContext _context;
-    private Map _shitlist; // H(routerIdent) --> Date
-    private Map _shitlistCause; // H(routerIdent) --> String
+    private Map _entries;
+    
+    private class Entry {
+        /** when it should expire, per the i2p clock */
+        long expireOn;
+        /** why they were shitlisted */
+        String cause;
+        /** what transports they were shitlisted for (String), or null for all transports */
+        Set transports;
+    }
     
     public final static long SHITLIST_DURATION_MS = 4*60*1000; // 4 minute shitlist
     
     public Shitlist(RouterContext context) {
         _context = context;
         _log = context.logManager().getLog(Shitlist.class);
-        _shitlist = new HashMap(5);
-        _shitlistCause = new HashMap(5);
+        _entries = new HashMap(32);
+        _context.jobQueue().addJob(new Cleanup(_context));
+    }
+    
+    private class Cleanup extends JobImpl {
+        private List _toUnshitlist;
+        public Cleanup(RouterContext ctx) {
+            super(ctx);
+            _toUnshitlist = new ArrayList(4);
+        }
+        public String getName() { return "Cleanup shitlist"; }
+        public void runJob() {
+            _toUnshitlist.clear();
+            long now = getContext().clock().now();
+            synchronized (_entries) {
+                for (Iterator iter = _entries.keySet().iterator(); iter.hasNext(); ) {
+                    Hash peer = (Hash)iter.next();
+                    Entry entry = (Entry)_entries.get(peer);
+                    if (entry.expireOn <= now) {
+                        iter.remove();
+                        _toUnshitlist.add(peer);
+                    }
+                }
+            }
+            for (int i = 0; i < _toUnshitlist.size(); i++) {
+                Hash peer = (Hash)_toUnshitlist.get(i);
+                PeerProfile prof = _context.profileOrganizer().getProfile(peer);
+                if (prof != null)
+                    prof.unshitlist();
+                _context.messageHistory().unshitlist(peer);
+            }
+            
+            requeue(30*1000);
+        }
     }
     
     public int getRouterCount() {
-        purge();
-        synchronized (_shitlist) {
-            return _shitlist.size();
+        synchronized (_entries) {
+            return _entries.size();
         }
     }
     
     public boolean shitlistRouter(Hash peer) {
         return shitlistRouter(peer, null);
     }
-    public boolean shitlistRouter(Hash peer, String reason) {
+    public boolean shitlistRouter(Hash peer, String reason) { return shitlistRouter(peer, reason, null); }
+    public boolean shitlistRouter(Hash peer, String reason, String transport) {
         if (peer == null) {
             _log.error("wtf, why did we try to shitlist null?", new Exception("shitfaced"));
             return false;
@@ -73,18 +111,33 @@ public class Shitlist {
         if (period > 60*60*1000)
             period = 60*60*1000;
         
-        synchronized (_shitlist) {
-            Date oldDate = (Date)_shitlist.put(peer, new Date(_context.clock().now() + period));
-            wasAlready = (null == oldDate);
-            if (reason != null) {
-                if (!wasAlready || (!_shitlistCause.containsKey(peer)) )
-                    _shitlistCause.put(peer, reason);
-            } else {
-                _shitlistCause.remove(peer);
+        Entry e = new Entry();
+        e.expireOn = _context.clock().now() + period;
+        e.cause = reason;
+        e.transports = null;
+        if (transport != null) {
+            e.transports = new HashSet(1);
+            e.transports.add(transport);
+        }
+        
+        synchronized (_entries) {
+            Entry old = (Entry)_entries.put(peer, e);
+            if (old != null) {
+                wasAlready = true;
+                _entries.put(peer, old);
+                if (e.transports == null) {
+                    old.transports = null;
+                } else if (old.transports != null) {
+                    old.transports.addAll(e.transports);
+                }
+                e = old;
             }
         }
         
-        _context.netDb().fail(peer);
+        if (transport == null) {
+            // we hate the peer on *any* transport
+            _context.netDb().fail(peer);
+        }
         //_context.tunnelManager().peerFailed(peer);
         //_context.messageRegistry().peerFailed(peer);
         if (!wasAlready)
@@ -95,91 +148,107 @@ public class Shitlist {
     public void unshitlistRouter(Hash peer) {
         unshitlistRouter(peer, true);
     }
-    private void unshitlistRouter(Hash peer, boolean realUnshitlist) {
+    private void unshitlistRouter(Hash peer, boolean realUnshitlist) { unshitlistRouter(peer, realUnshitlist, null); }
+    public void unshitlistRouter(Hash peer, String transport) { unshitlistRouter(peer, true, transport); }
+    private void unshitlistRouter(Hash peer, boolean realUnshitlist, String transport) {
         if (peer == null) return;
         if (_log.shouldLog(Log.INFO))
-            _log.info("Unshitlisting router " + peer.toBase64());
-        synchronized (_shitlist) {
-            _shitlist.remove(peer);
-            _shitlistCause.remove(peer);
+            _log.info("Unshitlisting router " + peer.toBase64()
+                      + (transport != null ? "/" + transport : ""));
+        boolean fully = false;
+        synchronized (_entries) {
+            Entry e = (Entry)_entries.remove(peer);
+            if ( (e == null) || (e.transports == null) || (transport == null) || (e.transports.size() <= 1) ) {
+                // fully unshitlisted
+                fully = true;
+            } else {
+                e.transports.remove(transport);
+                if (e.transports.size() <= 0)
+                    fully = true;
+                else
+                    _entries.put(peer, e);
+            }
         }
-        if (realUnshitlist) {
+        if (fully) {
+            if (realUnshitlist) {
+                PeerProfile prof = _context.profileOrganizer().getProfile(peer);
+                if (prof != null)
+                    prof.unshitlist();
+            }
+            _context.messageHistory().unshitlist(peer);
+        }
+    }
+    
+    public boolean isShitlisted(Hash peer) { return isShitlisted(peer, null); }
+    public boolean isShitlisted(Hash peer, String transport) {
+        boolean rv = false;
+        boolean unshitlist = false;
+        synchronized (_entries) {
+            Entry entry = (Entry)_entries.get(peer);
+            if (entry == null) {
+                rv = false;
+            } else {
+                if (entry.expireOn <= _context.clock().now()) {
+                    _entries.remove(peer);
+                    unshitlist = true;
+                    rv = false;
+                } else {
+                    if (entry.transports == null) {
+                        rv = true;
+                    } else if (entry.transports.contains(transport)) {
+                        rv = true;
+                    } else {
+                        rv = false;
+                    }
+                }
+            }
+        }
+        
+        if (unshitlist) {
             PeerProfile prof = _context.profileOrganizer().getProfile(peer);
             if (prof != null)
                 prof.unshitlist();
-        }
-        _context.messageHistory().unshitlist(peer);
-    }
-    
-    public boolean isShitlisted(Hash peer) {
-        Date shitlistDate = null;
-        synchronized (_shitlist) {
-            shitlistDate = (Date)_shitlist.get(peer);
-        }
-        if (shitlistDate == null) return false;
-        
-        // check validity
-        if (shitlistDate.getTime() > _context.clock().now()) {
-            return true;
-        } else {
-            unshitlistRouter(peer, false);
-            return false;
-        }
-    }
-    
-    /**
-     * We already unshitlist on isShitlisted, but this purge
-     * lets us get the correct value when rendering the HTML or
-     * getting the shitlist count.  wheee
-     *
-     */
-    private void purge()  {
-        Map shitlist = null;
-        synchronized (_shitlist) {
-            shitlist = new HashMap(_shitlist);
+            _context.messageHistory().unshitlist(peer);
         }
         
-        long limit = _context.clock().now();
-        
-        for (Iterator iter = shitlist.keySet().iterator(); iter.hasNext(); ) {
-            Hash key = (Hash)iter.next();
-            Date shitDate = (Date)shitlist.get(key);
-            if (shitDate.getTime() < limit) {
-                unshitlistRouter(key, false);
-            }
-        }
+        return rv;
     }
-
     
     public void renderStatusHTML(Writer out) throws IOException {
         StringBuffer buf = new StringBuffer(1024);
         buf.append("<h2>Shitlist</h2>");
-        Map shitlist = null;
-        Map causes = null;
+        Map entries = null;
         
-        purge();
-        
-        synchronized (_shitlist) {
-            shitlist = new HashMap(_shitlist);
-            causes = new HashMap(_shitlistCause);
+        synchronized (_entries) {
+            entries = new HashMap(_entries);
         }
         buf.append("<ul>");
         
-        for (Iterator iter = shitlist.keySet().iterator(); iter.hasNext(); ) {
+        int partial = 0;
+        for (Iterator iter = entries.keySet().iterator(); iter.hasNext(); ) {
             Hash key = (Hash)iter.next();
-            Date shitDate = (Date)shitlist.get(key);
+            Entry entry = (Entry)entries.get(key);
+            if ( (entry.transports != null) && (entry.transports.size() > 0) ) {
+                partial++;
+                continue;
+            }
             buf.append("<li><b>").append(key.toBase64()).append("</b>");
             buf.append(" <a href=\"netdb.jsp#").append(key.toBase64().substring(0, 6)).append("\">(?)</a>");
-            buf.append(" expiring on ");
-            buf.append(shitDate);
-            String cause = (String)causes.get(key);
-            if (cause != null) {
+            buf.append(" expiring in ");
+            buf.append(DataHelper.formatDuration(entry.expireOn-_context.clock().now()));
+            Set transports = entry.transports;
+            if ( (transports != null) && (transports.size() > 0) )
+                buf.append(" on the following transports: ").append(transports);
+            if (entry.cause != null) {
                 buf.append("<br />\n");
-                buf.append(cause);
+                buf.append(entry.cause);
             }
             buf.append("</li>\n");
         }
         buf.append("</ul>\n");
+        buf.append("<i>Partial shitlisted peers (only blocked on some transports): ");
+        buf.append(partial);
+        buf.append("</i>\n");
         out.write(buf.toString());
         out.flush();
     }

router/java/src/net/i2p/router/StatisticsManager.java

@@ -8,6 +8,8 @@ package net.i2p.router;
  *
  */
 
+import java.io.FileInputStream;
+import java.io.IOException;
 import java.io.Writer;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
@@ -100,7 +102,28 @@ public class StatisticsManager implements Service {
         // No longer expose, to make build tracking more expensive
         // stats.setProperty("router.id", RouterVersion.ID);
         // stats.setProperty("core.id", CoreVersion.ID);
-	
+
+        int newlines = 0;
+        FileInputStream in = null;
+        try {
+            in = new FileInputStream(Router.IDENTLOG);
+            int c = -1;
+            // perhaps later filter this to only include ident changes this
+            // day/week/month
+            while ( (c = in.read()) != -1) {
+                if (c == '\n')
+                    newlines++;
+            }
+        } catch (IOException ioe) {
+            // ignore
+        } finally {
+            if (in != null)
+                try { in.close(); } catch (IOException ioe) {}
+        }
+        if (newlines > 0)
+            stats.setProperty("stat_identities", newlines+"");
+
+        
         if (_includePeerRankings) {
             if (false)
                 stats.putAll(_context.profileManager().summarizePeers(_publishedStats));