From c9d8e796c601ea81250119d025e0e23168e7af7b Mon Sep 17 00:00:00 2001
From: zzz <zzz>
Date: Sat, 9 Sep 2006 22:15:05 +0000
Subject: [PATCH] (zzz)     * i2psnark: Fix bug where new peers would always be
 set to "interested"       regardless of actual interest     * i2psnark:
 Reduce max piece size from 10MB to 1MB; larger may have severe       memory
 and efficiency problems

---
 .../java/src/org/klomp/snark/PeerCoordinator.java         | 3 ++-
 apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java  | 2 +-
 history.txt                                               | 8 +++++++-
 router/java/src/net/i2p/router/RouterVersion.java         | 4 ++--
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java b/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java
index 98c02c906..7ae7f44b1 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java
@@ -396,9 +396,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;
diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
index 9a8f29a64..0e0d3434a 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
@@ -335,7 +335,7 @@ public class SnarkManager implements Snark.CompleteListener {
             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());
diff --git a/history.txt b/history.txt
index 911414435..378987d0e 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,10 @@
-$Id: history.txt,v 1.515 2006-09-08 20:41:57 jrandom Exp $
+$Id: history.txt,v 1.516 2006-09-09 12:46:21 jrandom Exp $
+
+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
 
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 27a9dd268..f20c741fa 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
  *
  */
 public class RouterVersion {
-    public final static String ID = "$Revision: 1.453 $ $Date: 2006-09-08 20:42:03 $";
+    public final static String ID = "$Revision: 1.454 $ $Date: 2006-09-09 12:46:29 $";
     public final static String VERSION = "0.6.1.25";
-    public final static long BUILD = 0;
+    public final static long BUILD = 1;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
         System.out.println("Router ID: " + RouterVersion.ID);