From 2a72e8574b7c8277749a555de3b1d1d44eb1f2cf Mon Sep 17 00:00:00 2001
From: zzz <zzz>
Date: Tue, 10 Jul 2007 01:20:37 +0000
Subject: [PATCH] 2007-07-09  zzz     * i2psnark: give a better error message
 for a non-i2p torrent

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

diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
index d9864c809..df723b419 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
@@ -452,6 +452,11 @@ public class SnarkManager implements Snark.CompleteListener {
     }
     
     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";
diff --git a/history.txt b/history.txt
index e50c332f3..b04513b67 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,7 @@
-$Id: history.txt,v 1.572 2007-07-04 17:58:50 zzz Exp $
+$Id: history.txt,v 1.573 2007-07-07 15:03:52 zzz Exp $
+
+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,
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index d9e723954..7b010d919 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.507 $ $Date: 2007-07-04 17:58:48 $";
+    public final static String ID = "$Revision: 1.508 $ $Date: 2007-07-07 15:03:50 $";
     public final static String VERSION = "0.6.1.28";
-    public final static long BUILD = 10;
+    public final static long BUILD = 11;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
         System.out.println("Router ID: " + RouterVersion.ID);