i2psnark:

- Add new opentrackers, remove welterde
  - Support multiple default opentrackers
  - Don't link to opentrackers at the top

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

@@ -3,12 +3,15 @@ package org.klomp.snark;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
+
 import net.i2p.I2PAppContext;
 import net.i2p.I2PException;
 import net.i2p.client.I2PSession;
@@ -71,7 +74,6 @@ public class I2PSnarkUtil {
     private static final int EEPGET_CONNECT_TIMEOUT_SHORT = 5*1000;
     public static final int DEFAULT_STARTUP_DELAY = 3;
     public static final boolean DEFAULT_USE_OPENTRACKERS = true;
-    public static final String DEFAULT_OPENTRACKERS = "http://tracker.welterde.i2p/a";
     public static final int DEFAULT_MAX_UP_BW = 8;  //KBps
     public static final int MAX_CONNECTIONS = 16; // per torrent
     public static final String PROP_MAX_BW = "i2cp.outboundBytesPerSecond";
@@ -99,8 +101,7 @@ public class I2PSnarkUtil {
         _maxConnections = MAX_CONNECTIONS;
         _startupDelay = DEFAULT_STARTUP_DELAY;
         _shouldUseOT = DEFAULT_USE_OPENTRACKERS;
-        // FIXME split if default has more than one
-        _openTrackers = Collections.singletonList(DEFAULT_OPENTRACKERS);
+        _openTrackers = Collections.emptyList();
         _shouldUseDHT = DEFAULT_USE_DHT;
         // This is used for both announce replies and .torrent file downloads,
         // so it must be available even if not connected to I2CP.
@@ -565,12 +566,12 @@ public class I2PSnarkUtil {
         return rv;
     }
     
-    /** @param ot non-null */
+    /** @param ot non-null list of announce URLs */
     public void setOpenTrackers(List<String> ot) { 
         _openTrackers = ot;
     }
 
-    /** List of open trackers to use as backups
+    /** List of open tracker announce URLs to use as backups
      *  @return non-null, possibly unmodifiable, empty if disabled
      */
     public List<String> getOpenTrackers() { 
@@ -580,7 +581,22 @@ public class I2PSnarkUtil {
     }
 
     /**
-     *  List of open trackers to use as backups even if disabled
+     *  Is this announce URL probably for an open tracker?
+     *
+     *  @since 0.9.17
+     */
+    public boolean isKnownOpenTracker(String url) { 
+        try {
+           URL u = new URL(url);
+           String host = u.getHost();
+           return host != null && SnarkManager.KNOWN_OPENTRACKERS.contains(host);
+        } catch (MalformedURLException mue) {
+           return false;
+        }
+    }
+
+    /**
+     *  List of open tracker announce URLs to use as backups even if disabled
      *  @return non-null
      *  @since 0.9.4
      */