* 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

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

@@ -48,10 +48,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;
@@ -80,14 +77,6 @@ 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++;
 
             long upload = peer.getUploaded();
             uploaded += upload;
@@ -111,7 +100,7 @@ class PeerCheckerTask extends TimerTask
             // interested peers try to make some room.
             // (Note use of coordinator.uploaders)
             if (coordinator.uploaders >= PeerCoordinator.MAX_UPLOADERS
-                && interested > PeerCoordinator.MAX_UPLOADERS
+                && coordinator.interestedAndChoking > 0
                 && !peer.isChoking())
               {
                 // Check if it still wants pieces from us.
@@ -128,7 +117,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)
@@ -136,6 +125,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();
@@ -152,17 +156,25 @@ 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();
@@ -172,9 +184,9 @@ class PeerCheckerTask extends TimerTask
         // (can shift a bit by disconnecting peers)
         coordinator.uploaders = uploaders;
 
-        // Remove the worst downloader if needed.
+        // Remove the worst downloader if needed. (uploader if seeding)
         if (uploaders >= PeerCoordinator.MAX_UPLOADERS
-            && interested > PeerCoordinator.MAX_UPLOADERS
+            && coordinator.interestedAndChoking > 0
             && worstDownloader != null)
           {
             if (Snark.debug >= Snark.DEBUG)
@@ -183,6 +195,7 @@ class PeerCheckerTask extends TimerTask
 
             worstDownloader.setChoking(true);
             coordinator.uploaders--;
+            removedCount++;
 
             // Put it at the back of the list
             coordinator.peers.remove(worstDownloader);
@@ -196,6 +209,7 @@ 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);

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);
@@ -387,7 +398,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

@@ -44,6 +44,7 @@ public class PeerCoordinator implements PeerListener
   // 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;
@@ -132,7 +133,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);
   }
 
   /**
@@ -336,19 +337,23 @@ 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;
         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 < MAX_UPLOADERS)
+                  {
+                    if (!peer.isChoked())
+                      interested.add(unchokedCount++, peer);
+                    else
+                      interested.add(peer);
+                  }
               }
           }
 
@@ -359,11 +364,13 @@ public class PeerCoordinator implements PeerListener
               _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;
     }
   }
 
@@ -479,14 +486,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)
       {

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.
@@ -167,5 +169,4 @@ public interface PeerListener
    * @param peer the peer that is disconnecting
    */
   void markUnrequested(Peer peer);
-
 }

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

@@ -184,7 +184,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 +194,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))
@@ -537,7 +537,14 @@ class PeerState
                 && (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);

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 call trackerclient.start() which 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;
@@ -371,14 +378,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 +398,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 +434,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();

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

@@ -16,6 +16,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;
@@ -34,12 +35,13 @@ public class SnarkManager implements Snark.CompleteListener {
     
     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();
@@ -269,7 +271,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) {
@@ -289,7 +291,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);
@@ -305,7 +316,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());
@@ -315,9 +328,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);
@@ -446,10 +459,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...
@@ -466,6 +478,9 @@ 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"
+       , "eBook Tracker", "http://E71FRom6PZNEqTN2Lr8P-sr23b7HJVC32KoGnVQjaX6zJiXwhJy2HsXob36Qmj81TYFZdewFZa9mSJ533UZgGyQkXo2ahctg82JKYZfDe5uDxAn1E9YPjxZCWJaFJh0S~UwSs~9AZ7UcauSJIoNtpxrtbmRNVFLqnkEDdLZi26TeucfOmiFmIWnVblLniWv3tG1boE9Abd-6j3FmYVrRucYuepAILYt6katmVNOk6sXmno1Eynrp~~MBuFq0Ko6~jsc2E2CRVYXDhGHEMdt-j6JUz5D7S2RIVzDRqQyAZLKJ7OdQDmI31przzmne1vOqqqLC~1xUumZVIvF~yOeJUGNjJ1Vx0J8i2BQIusn1pQJ6UCB~ZtZZLQtEb8EPVCfpeRi2ri1M5CyOuxN0V5ekmPHrYIBNevuTCRC26NP7ZS5VDgx1~NaC3A-CzJAE6f1QXi0wMI9aywNG5KGzOPifcsih8eyGyytvgLtrZtV7ykzYpPCS-rDfITncpn5hliPUAAAA.i2p/pub/bt/announce.php"
+       , "Gaytorrents Tracker", "http://uxPWHbK1OIj9HxquaXuhMiIvi21iK0~ZiG9d8G0840ZXIg0r6CbiV71xlsqmdnU6wm0T2LySriM0doW2gUigo-5BNkUquHwOjLROiETnB3ZR0Ml4IGa6QBPn1aAq2d9~g1r1nVjLE~pcFnXB~cNNS7kIhX1d6nLgYVZf0C2cZopEow2iWVUggGGnAA9mHjE86zLEnTvAyhbAMTqDQJhEuLa0ZYSORqzJDMkQt90MV4YMjX1ICY6RfUSFmxEqu0yWTrkHsTtRw48l~dz9wpIgc0a0T9C~eeWvmBFTqlJPtQZwntpNeH~jF7nlYzB58olgV2HHFYpVYD87DYNzTnmNWxCJ5AfDorm6AIUCV2qaE7tZtI1h6fbmGpGlPyW~Kw5GXrRfJwNvr6ajwAVi~bPVnrBwDZezHkfW4slOO8FACPR28EQvaTu9nwhAbqESxV2hCTq6vQSGjuxHeOuzBOEvRWkLKOHWTC09t2DbJ94FSqETmZopTB1ukEmaxRWbKSIaAAAA.i2p/announce.php"
+       , "NickyB Tracker", "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"
        , "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"
 //       , "The freak's tracker", "http://mHKva9x24E5Ygfey2llR1KyQHv5f8hhMpDMwJDg1U-hABpJ2NrQJd6azirdfaR0OKt4jDlmP2o4Qx0H598~AteyD~RJU~xcWYdcOE0dmJ2e9Y8-HY51ie0B1yD9FtIV72ZI-V3TzFDcs6nkdX9b81DwrAwwFzx0EfNvK1GLVWl59Ow85muoRTBA1q8SsZImxdyZ-TApTVlMYIQbdI4iQRwU9OmmtefrCe~ZOf4UBS9-KvNIqUL0XeBSqm0OU1jq-D10Ykg6KfqvuPnBYT1BYHFDQJXW5DdPKwcaQE4MtAdSGmj1epDoaEBUa9btQlFsM2l9Cyn1hzxqNWXELmx8dRlomQLlV4b586dRzW~fLlOPIGC13ntPXogvYvHVyEyptXkv890jC7DZNHyxZd5cyrKC36r9huKvhQAmNABT2Y~pOGwVrb~RpPwT0tBuPZ3lHYhBFYmD8y~AOhhNHKMLzea1rfwTvovBMByDdFps54gMN1mX4MbCGT4w70vIopS9yAAAA.i2p/bytemonsoon/announce.php"
     };

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

@@ -156,7 +156,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++)
@@ -184,7 +184,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++)
@@ -219,6 +219,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++;
@@ -335,6 +337,49 @@ public class Storage
     checkCreateFiles();
   }
 
+  /**
+   * 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 (!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 = createFileFromNames(base, (List)files.get(i));
+            if (!f.exists())
+                throw new IOException("Could not reopen file " + f);
+            if (!f.canWrite()) // see above re: only seeding
+                rafs[i] = new RandomAccessFile(f, "r");
+            else
+                rafs[i] = new RandomAccessFile(f, "rw");
+          }
+
+      }
+  }
+
   /**
    * Removes 'suspicious' characters from the give file name.
    */
@@ -400,7 +445,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)
               {
@@ -463,16 +508,23 @@ public class Storage
   }
 
   /**
-   * 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;
   }
 
@@ -565,15 +617,20 @@ public class Storage
     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)
@@ -591,7 +648,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/TrackerClient.java

@@ -153,7 +153,10 @@ public class TrackerClient extends I2PThread
                 coordinator.trackerProblems = ioe.getMessage();
               }
 
-            if (!started && !stop)
+            if (stop)
+              break;
+       
+            if (!started)
               {
                 Snark.debug("         Retrying in one minute...", Snark.DEBUG);
                 try

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

@@ -56,10 +56,19 @@ public class I2PSnarkServlet extends HttpServlet {
         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() + "\" class=\"snarkRefresh\">Refresh</a><br />\n");
+        out.write("<td><a href=\"http://forum.i2p/viewforum.php?f=21\" class=\"snarkRefresh\">Forum</a><br />\n");
+        out.write("<tr><td><a href=\"http://de-ebook-archiv.i2p/pub/bt/\" class=\"snarkRefresh\">eBook</a><br />\n");
+        out.write("<td><a href=\"http://gaytorrents.i2p/\" class=\"snarkRefresh\">GayTorrents</a><br />\n");
+        out.write("<tr><td><a href=\"http://nickyb.i2p/bittorrent/\" class=\"snarkRefresh\">NickyB</a><br />\n");
+        out.write("<td><a href=\"http://orion.i2p/bt/\" class=\"snarkRefresh\">Orion</a><br />\n");
+        out.write("<tr><td><a href=\"http://tracker.postman.i2p/\" class=\"snarkRefresh\">Postman</a><br />\n");
+        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);
@@ -67,10 +76,16 @@ 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);
+        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, stats);
@@ -249,7 +264,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();
@@ -267,12 +284,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");
+            }
         }
     }
     
@@ -305,16 +332,23 @@ public class I2PSnarkServlet extends HttpServlet {
         long remaining = (long) snark.storage.needed() * (long) snark.meta.getPieceLength(0); 
         if (remaining > total)
             remaining = total;
-        long downBps = snark.coordinator.getDownloadRate();
-        long upBps = snark.coordinator.getUploadRate();
+        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;
-        long uploaded = snark.coordinator.getUploaded();
         boolean isRunning = !snark.stopped;
-        stats[0] += snark.coordinator.getDownloaded();
+        long uploaded = 0;
+        if (snark.coordinator != null) {
+            uploaded = snark.coordinator.getUploaded();
+            stats[0] += snark.coordinator.getDownloaded();
+        }
         stats[1] += uploaded;
         if (isRunning) {
             stats[2] += downBps;
@@ -324,9 +358,14 @@ public class I2PSnarkServlet extends HttpServlet {
         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) {
@@ -418,7 +457,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");
@@ -433,10 +473,11 @@ 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 
@@ -517,7 +558,7 @@ 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");
@@ -590,8 +631,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" +
@@ -616,9 +655,7 @@ public class I2PSnarkServlet extends HttpServlet {
                                                "    <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" +
-                                               "    <th>&nbsp;</th></tr>\n" +
-                                               "</thead>\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" +

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());

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

@@ -282,6 +282,8 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
                 "PART",
                 "WALLOPS",
                 "ERROR",
+                "KICK",
+                "H", // "hide operator status" (after kicking an op)
                 "TOPIC"
         };
         

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

@@ -53,9 +53,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();
@@ -64,7 +62,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; }
@@ -107,95 +104,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();

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

@@ -22,6 +22,7 @@ import net.i2p.util.I2PThread;
  *
  */
 public class ReseedHandler {
+
     private static ReseedRunner _reseedRunner = new ReseedRunner();
     
     public void setReseedNonce(String nonce) { 
@@ -66,7 +67,7 @@ public class ReseedHandler {
      *
      */
     private static void reseed(boolean echoStatus) {
-        String seedURL = System.getProperty("i2p.reseedURL", DEFAULT_SEED_URL);
+        String seedURL = I2PAppContext.getGlobalContext().getProperty("i2p.reseedURL", DEFAULT_SEED_URL);
         if ( (seedURL == null) || (seedURL.trim().length() <= 0) ) 
             seedURL = DEFAULT_SEED_URL;
         try {

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

@@ -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/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>

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

@@ -14,8 +14,8 @@ package net.i2p;
  *
  */
 public class CoreVersion {
-    public final static String ID = "$Revision: 1.8 $ $Date: 2006-09-09 12:46:25 $";
-    public final static String VERSION = "0.6.1.26";
+    public final static String ID = "$Revision: 1.69 $ $Date: 2006-10-08 20:44:55 $";
+    public final static String VERSION = "0.6.1.27";
 
     public static void main(String args[]) {
         System.out.println("I2P Core version: " + VERSION);

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;

history.txt

@@ -1,7 +1,103 @@
-$Id: history.txt,v 1.531 2006-10-08 17:52:59 complication Exp $
+$Id: history.txt,v 1.550 2007-02-14 16:35:43 jrandom Exp $
+
+* 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)

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-07-29 13:03:16 $">
- <i2p.release version="0.6.1.25" date="2006/07/29" minVersion="0.6"
+<i2p.news date="$Date: 2006-10-09 00:10:22 $">
+ <i2p.release version="0.6.1.27" 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.26</appversion>
+        <appversion>0.6.1.27</appversion>
         <authors>
             <author name="I2P" email="support@i2p.net"/>
         </authors>

installer/resources/eepsite_index.html

@@ -9,13 +9,6 @@
  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>
- 
  <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 

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

news.xml

@@ -1,5 +1,5 @@
-<i2p.news date="$Date: 2006-09-13 22:16:53 $">
- <i2p.release version="0.6.1.25" date="2006/07/29" minVersion="0.6"
+<i2p.news date="$Date: 2007-02-13 22:04:11 $">
+ <i2p.release version="0.6.1.27" 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,15 +10,13 @@
             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-09-09: 0.6.1.25 <a href="http://dev.i2p/pipermail/i2p/2006-September/001306.html">released</a>
-with i2psnark, SusiDNS, NTP, and other fixes.
+2006-10-09: 0.6.1.26 <a href="http://dev.i2p/pipermail/i2p/2006-October/001312.html">released</a>
+with i2psnark and NTP fixes.
 <br />
 &#149;
-2006-09-12:
-<a href="http://www.i2p/meeting184">meeting log</a>
-<br />
-&#149;
-2006-10-03:
-<a href="http://dev.i2p/pipermail/i2p/2006-October/001309.html">status notes</a>
+2007-02-13:
+<a href="http://dev.i2p/pipermail/i2p/2007-February/001334.html">status notes</a>
+and
+<a href="http://www.i2p/meeting200">meeting log</a>
 <br />
 </i2p.news>

readme.html

@@ -3,7 +3,7 @@ grow over the next few minutes and you'll see some local "destinations" 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.i2pt/">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>
@@ -44,9 +44,8 @@ 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.
+and they'll show up.  After starting up an <a href="/i2ptunnel/">eepsite tunnel</a> pointing at it, your eepsite's 
+<i>destination</i> (which uniquely and securely identifies it) will be visible.
 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

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.466 $ $Date: 2006-10-08 17:53:00 $";
-    public final static String VERSION = "0.6.1.26";
+    public final static String ID = "$Revision: 1.486 $ $Date: 2007-02-14 16:35:44 $";
+    public final static String VERSION = "0.6.1.27";
     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/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java

@@ -227,7 +227,7 @@ public class FloodfillNetworkDatabaseFacade extends KademliaNetworkDatabaseFacad
     }
     
     /** list of the Hashes of currently known floodfill peers */
-    List getFloodfillPeers() {
+    public List getFloodfillPeers() {
         FloodfillPeerSelector sel = (FloodfillPeerSelector)getPeerSelector();
         return sel.selectFloodfillParticipants(getKBuckets());
     }

router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java

@@ -59,35 +59,6 @@ public class CommSystemFacadeImpl extends CommSystemFacade {
     
     public int countActivePeers() { return (_manager == null ? 0 : _manager.countActivePeers()); }
     public int countActiveSendPeers() { return (_manager == null ? 0 : _manager.countActiveSendPeers()); } 
-
-    /**
-     * Median clock skew of connected peers in seconds, or null if we cannot answer.
-     */
-    public Long getMedianPeerClockSkew() {
-        if (_manager == null) {
-            if (_log.shouldLog(Log.INFO))
-                _log.info("Returning null for median peer clock skew (no transport manager)!");
-            return null;
-        }
-        Vector skews = _manager.getClockSkews();
-        if (skews == null) {
-            if (_log.shouldLog(Log.ERROR))
-                _log.error("Returning null for median peer clock skew (no data)!");
-            return null;
-        }
-        if (skews.size() < 5) {
-            if (_log.shouldLog(Log.ERROR))
-                _log.error("Returning null for median peer clock skew (only " + skews.size() + " peers)!");
-            return null;
-        }
-        // Going to calculate, let's sort them
-        Collections.sort(skews);
-        // Pick out median
-        Long medianPeerClockSkew = (Long) (skews.get(skews.size() / 2));
-        if (_log.shouldLog(Log.INFO))
-            _log.info("Our median peer clock skew is " + medianPeerClockSkew + " s.");
-        return medianPeerClockSkew;
-    }
     
     /**
      * Framed average clock skew of connected peers in seconds, or null if we cannot answer.
@@ -105,9 +76,9 @@ public class CommSystemFacadeImpl extends CommSystemFacade {
                 _log.error("Returning null for framed average peer clock skew (no data)!");
             return null;
         }
-        if (skews.size() < 5) {
-            if (_log.shouldLog(Log.ERROR))
-                _log.error("Returning null for framed average peer clock skew (only " + skews.size() + " peers)!");
+        if (skews.size() < 20) {
+            if (_log.shouldLog(Log.WARN))
+                _log.warn("Returning null for framed average peer clock skew (only " + skews.size() + " peers)!");
             return null;
         }
         // Going to calculate, sort them

router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java

@@ -11,6 +11,7 @@ import java.util.*;
 import java.util.zip.Adler32;
 import net.i2p.data.Base64;
 import net.i2p.data.DataHelper;
+import net.i2p.data.Hash;
 import net.i2p.data.RouterIdentity;
 import net.i2p.data.RouterInfo;
 import net.i2p.data.SessionKey;
@@ -21,6 +22,7 @@ import net.i2p.data.i2np.I2NPMessageHandler;
 import net.i2p.router.OutNetMessage;
 import net.i2p.router.Router;
 import net.i2p.router.RouterContext;
+import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade;
 import net.i2p.router.transport.FIFOBandwidthLimiter;
 import net.i2p.util.Log;
 
@@ -350,6 +352,8 @@ public class NTCPConnection implements FIFOBandwidthLimiter.CompleteListener {
             infoMsg.beginSend();
             _context.statManager().addRateData("ntcp.infoMessageEnqueued", 1, 0);
             send(infoMsg);
+            
+            enqueueFloodfillMessage(target);
         } else {
             if (_isInbound) {
                 // ok, we shouldn't have enqueued it yet, as we havent received their info
@@ -358,6 +362,39 @@ public class NTCPConnection implements FIFOBandwidthLimiter.CompleteListener {
             }
         }
     }
+
+    private static final int PEERS_TO_FLOOD = 3;
+
+    /**
+     * to prevent people from losing track of the floodfill peers completely, lets periodically
+     * send those we are connected to references to the floodfill peers that we know
+     */
+    private void enqueueFloodfillMessage(RouterInfo target) {
+        FloodfillNetworkDatabaseFacade fac = (FloodfillNetworkDatabaseFacade)_context.netDb();
+        List peers = fac.getFloodfillPeers();
+        Collections.shuffle(peers);
+        for (int i = 0; i < peers.size() && i < PEERS_TO_FLOOD; i++) {
+            Hash peer = (Hash)peers.get(i);
+            
+            // we already sent our own info, and no need to tell them about themselves
+            if (peer.equals(_context.routerHash()) || peer.equals(target.calculateHash()))
+                continue;
+            
+            RouterInfo info = fac.lookupRouterInfoLocally(peer);
+
+            OutNetMessage infoMsg = new OutNetMessage(_context);
+            infoMsg.setExpiration(_context.clock().now()+10*1000);
+            DatabaseStoreMessage dsm = new DatabaseStoreMessage(_context);
+            dsm.setKey(peer);
+            dsm.setRouterInfo(info);
+            infoMsg.setMessage(dsm);
+            infoMsg.setPriority(100);
+            infoMsg.setTarget(target);
+            infoMsg.beginSend();
+            _context.statManager().addRateData("ntcp.floodInfoMessageEnqueued", 1, 0);
+            send(infoMsg);
+        }
+    }
     
     /** 
      * @param clockSkew alice's clock minus bob's clock in seconds (may be negative, obviously, but |val| should

router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java

@@ -87,6 +87,7 @@ public class NTCPTransport extends TransportImpl {
         _context.statManager().createRateStat("ntcp.inboundEstablished", "", "ntcp", new long[] { 60*1000, 10*60*1000 });
         _context.statManager().createRateStat("ntcp.inboundEstablishedDuplicate", "", "ntcp", new long[] { 60*1000, 10*60*1000 });
         _context.statManager().createRateStat("ntcp.infoMessageEnqueued", "", "ntcp", new long[] { 60*1000, 10*60*1000 });
+        _context.statManager().createRateStat("ntcp.floodInfoMessageEnqueued", "", "ntcp", new long[] { 60*1000, 10*60*1000 });
         _context.statManager().createRateStat("ntcp.invalidDH", "", "ntcp", new long[] { 60*1000, 10*60*1000 });
         _context.statManager().createRateStat("ntcp.invalidHXY", "", "ntcp", new long[] { 60*1000, 10*60*1000 });
         _context.statManager().createRateStat("ntcp.invalidHXxorBIH", "", "ntcp", new long[] { 60*1000, 10*60*1000 });