From 8bfe3f632e5f51928ecd965a4c3b315e768088be Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sun, 14 Apr 2013 14:00:47 +0000
Subject: [PATCH]  * i2psnark:    - Set unique tunnel nickname for additional
 instances    - Increase page size to 50    - Restore 1-arg SnarkManager
 constructor for compatibility    - Add note about DHT file w/ multiple
 instances, to be fixed    - Log tweak

---
 apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java | 4 ++--
 apps/i2psnark/java/src/org/klomp/snark/Peer.java         | 2 +-
 apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java | 9 +++++++++
 .../java/src/org/klomp/snark/dht/PersistDHT.java         | 1 +
 .../java/src/org/klomp/snark/web/I2PSnarkServlet.java    | 2 +-
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java b/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java
index 6ea7498b4..837176920 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java
@@ -226,9 +226,9 @@ public class I2PSnarkUtil {
                 }
             }
             if (opts.getProperty("inbound.nickname") == null)
-                opts.setProperty("inbound.nickname", "I2PSnark");
+                opts.setProperty("inbound.nickname", _baseName.replace("i2psnark", "I2PSnark"));
             if (opts.getProperty("outbound.nickname") == null)
-                opts.setProperty("outbound.nickname", "I2PSnark");
+                opts.setProperty("outbound.nickname", _baseName.replace("i2psnark", "I2PSnark"));
             if (opts.getProperty("outbound.priority") == null)
                 opts.setProperty("outbound.priority", "-10");
             // Dont do this for now, it is set in I2PSocketEepGet for announces,
diff --git a/apps/i2psnark/java/src/org/klomp/snark/Peer.java b/apps/i2psnark/java/src/org/klomp/snark/Peer.java
index 8f33c01a7..cdcac3343 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/Peer.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/Peer.java
@@ -359,7 +359,7 @@ public class Peer implements Comparable
     String bittorrentProtocol = new String(bs, "UTF-8");
     if (!"BitTorrent protocol".equals(bittorrentProtocol))
       throw new IOException("Handshake failure, expected "
-                            + "'Bittorrent protocol', got '"
+                            + "'BitTorrent protocol', got '"
                             + bittorrentProtocol + "'");
     
     // Handshake read - options
diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
index a79ec3e49..1749c2f40 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
@@ -131,8 +131,17 @@ public class SnarkManager implements CompleteListener {
     public static final String PROP_TRACKERS = "i2psnark.trackers";
 
     /**
+     *  For embedded.
+     */
+    public SnarkManager(I2PAppContext ctx) {
+        this(ctx, "/i2psnark", "i2psnark");
+    }
+
+    /**
+     *  For webapp.
      *  @param ctxPath generally "/i2psnark"
      *  @param ctxName generally "i2psnark"
+     *  @since 0.9.6
      */
     public SnarkManager(I2PAppContext ctx, String ctxPath, String ctxName) {
         _snarks = new ConcurrentHashMap();
diff --git a/apps/i2psnark/java/src/org/klomp/snark/dht/PersistDHT.java b/apps/i2psnark/java/src/org/klomp/snark/dht/PersistDHT.java
index 7ad643d91..491312989 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/dht/PersistDHT.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/dht/PersistDHT.java
@@ -57,6 +57,7 @@ abstract class PersistDHT {
     }
 
     /**
+     *  TODO - multiple instances overwrite each other
      *  @param saveAll if true, don't check last seen time
      */
     public static synchronized void saveDHT(DHTNodes nodes, boolean saveAll, File file) {
diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
index af36f010d..53ff2ff27 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -61,7 +61,7 @@ public class I2PSnarkServlet extends BasicServlet {
     
     private static final String DEFAULT_NAME = "i2psnark";
     public static final String PROP_CONFIG_FILE = "i2psnark.configFile";
-    private static final int PAGE_SIZE = 20;
+    private static final int PAGE_SIZE = 50;
  
     public I2PSnarkServlet() {
         super();