diff --git a/apps/addressbook/build.xml b/apps/addressbook/build.xml
index ad27a009059cb83d09cdaebac3cab0e145e93160..beff280f8c33227ad719c922d6fa51c31c636ee0 100644
--- a/apps/addressbook/build.xml
+++ b/apps/addressbook/build.xml
@@ -56,6 +56,7 @@
<manifest>
<attribute name="Main-Class" value="addressbook.Daemon"/>
<attribute name="Implementation-Version" value="${full.version}" />
+ <attribute name="Built-By" value="${build.built-by}" />
<attribute name="Build-Date" value="${build.timestamp}" />
<attribute name="Base-Revision" value="${workspace.version}" />
<attribute name="Workspace-Changes" value="${workspace.changes}" />
@@ -75,6 +76,7 @@
<war basedir="${dist}/tmp" webxml="web.xml" destfile="${dist}/${war}">
<manifest>
<attribute name="Implementation-Version" value="${full.version}" />
+ <attribute name="Built-By" value="${build.built-by}" />
<attribute name="Build-Date" value="${build.timestamp}" />
<attribute name="Base-Revision" value="${workspace.version}" />
<attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
diff --git a/apps/i2psnark/_icons/application.png b/apps/i2psnark/icons/application.png
similarity index 100%
rename from apps/i2psnark/_icons/application.png
rename to apps/i2psnark/icons/application.png
diff --git a/apps/i2psnark/_icons/cancel.png b/apps/i2psnark/icons/cancel.png
similarity index 100%
rename from apps/i2psnark/_icons/cancel.png
rename to apps/i2psnark/icons/cancel.png
diff --git a/apps/i2psnark/_icons/cd.png b/apps/i2psnark/icons/cd.png
similarity index 100%
rename from apps/i2psnark/_icons/cd.png
rename to apps/i2psnark/icons/cd.png
diff --git a/apps/i2psnark/_icons/clock.png b/apps/i2psnark/icons/clock.png
similarity index 100%
rename from apps/i2psnark/_icons/clock.png
rename to apps/i2psnark/icons/clock.png
diff --git a/apps/i2psnark/_icons/clock_red.png b/apps/i2psnark/icons/clock_red.png
similarity index 100%
rename from apps/i2psnark/_icons/clock_red.png
rename to apps/i2psnark/icons/clock_red.png
diff --git a/apps/i2psnark/_icons/compress.png b/apps/i2psnark/icons/compress.png
similarity index 100%
rename from apps/i2psnark/_icons/compress.png
rename to apps/i2psnark/icons/compress.png
diff --git a/apps/i2psnark/_icons/film.png b/apps/i2psnark/icons/film.png
similarity index 100%
rename from apps/i2psnark/_icons/film.png
rename to apps/i2psnark/icons/film.png
diff --git a/apps/i2psnark/_icons/folder.png b/apps/i2psnark/icons/folder.png
similarity index 100%
rename from apps/i2psnark/_icons/folder.png
rename to apps/i2psnark/icons/folder.png
diff --git a/apps/i2psnark/_icons/html.png b/apps/i2psnark/icons/html.png
similarity index 100%
rename from apps/i2psnark/_icons/html.png
rename to apps/i2psnark/icons/html.png
diff --git a/apps/i2psnark/_icons/magnet.png b/apps/i2psnark/icons/magnet.png
similarity index 100%
rename from apps/i2psnark/_icons/magnet.png
rename to apps/i2psnark/icons/magnet.png
diff --git a/apps/i2psnark/_icons/music.png b/apps/i2psnark/icons/music.png
similarity index 100%
rename from apps/i2psnark/_icons/music.png
rename to apps/i2psnark/icons/music.png
diff --git a/apps/i2psnark/_icons/package.png b/apps/i2psnark/icons/package.png
similarity index 100%
rename from apps/i2psnark/_icons/package.png
rename to apps/i2psnark/icons/package.png
diff --git a/apps/i2psnark/_icons/page.png b/apps/i2psnark/icons/page.png
similarity index 100%
rename from apps/i2psnark/_icons/page.png
rename to apps/i2psnark/icons/page.png
diff --git a/apps/i2psnark/_icons/page_white.png b/apps/i2psnark/icons/page_white.png
similarity index 100%
rename from apps/i2psnark/_icons/page_white.png
rename to apps/i2psnark/icons/page_white.png
diff --git a/apps/i2psnark/_icons/page_white_acrobat.png b/apps/i2psnark/icons/page_white_acrobat.png
similarity index 100%
rename from apps/i2psnark/_icons/page_white_acrobat.png
rename to apps/i2psnark/icons/page_white_acrobat.png
diff --git a/apps/i2psnark/_icons/photo.png b/apps/i2psnark/icons/photo.png
similarity index 100%
rename from apps/i2psnark/_icons/photo.png
rename to apps/i2psnark/icons/photo.png
diff --git a/apps/i2psnark/_icons/plugin.png b/apps/i2psnark/icons/plugin.png
similarity index 100%
rename from apps/i2psnark/_icons/plugin.png
rename to apps/i2psnark/icons/plugin.png
diff --git a/apps/i2psnark/_icons/tick.png b/apps/i2psnark/icons/tick.png
similarity index 100%
rename from apps/i2psnark/_icons/tick.png
rename to apps/i2psnark/icons/tick.png
diff --git a/apps/i2psnark/java/build.xml b/apps/i2psnark/java/build.xml
index c5a3b106fd7fd5e3d44efcb0184818a04652c005..94dd809b6e528dfab3eaa711e343e70e82b840d7 100644
--- a/apps/i2psnark/java/build.xml
+++ b/apps/i2psnark/java/build.xml
@@ -61,6 +61,7 @@
<attribute name="Main-Class" value="org.klomp.snark.Snark" />
<attribute name="Class-Path" value="i2p.jar mstreaming.jar streaming.jar" />
<attribute name="Implementation-Version" value="${full.version}" />
+ <attribute name="Built-By" value="${build.built-by}" />
<attribute name="Build-Date" value="${build.timestamp}" />
<attribute name="Base-Revision" value="${workspace.version}" />
<attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
@@ -95,11 +96,16 @@
<target name="war" depends="jar, bundle, warUpToDate, listChangedFiles" unless="war.uptodate" >
<!-- set if unset -->
<property name="workspace.changes.tr" value="" />
- <war destfile="../i2psnark.war" webxml="../web.xml" basedir="../" includes="_icons/*" >
+ <copy todir="build/icons/.icons" >
+ <fileset dir="../icons/" />
+ </copy>
+ <war destfile="../i2psnark.war" webxml="../web.xml" >
<!-- include only the web stuff, as of 0.7.12 the router will add i2psnark.jar to the classpath for the war -->
<classes dir="./build/obj" includes="**/web/*.class" />
+ <fileset dir="build/icons/" />
<manifest>
<attribute name="Implementation-Version" value="${full.version}" />
+ <attribute name="Built-By" value="${build.built-by}" />
<attribute name="Build-Date" value="${build.timestamp}" />
<attribute name="Base-Revision" value="${workspace.version}" />
<attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
@@ -109,7 +115,7 @@
<target name="warUpToDate">
<uptodate property="war.uptodate" targetfile="../i2psnark.war" >
- <srcfiles dir= "." includes="build/obj/org/klomp/snark/web/*.class ../_icons/* ../web.xml" />
+ <srcfiles dir= "." includes="build/obj/org/klomp/snark/web/*.class ../icons/* ../web.xml" />
</uptodate>
</target>
diff --git a/apps/i2psnark/java/src/org/klomp/snark/ExtensionHandler.java b/apps/i2psnark/java/src/org/klomp/snark/ExtensionHandler.java
index b3770070f4e99436f747a1ca8aee559b64bc51f5..3d68677646b9c0ce54463cb32bbd172768ad7368 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/ExtensionHandler.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/ExtensionHandler.java
@@ -39,15 +39,19 @@ abstract class ExtensionHandler {
/**
* @param metasize -1 if unknown
+ * @param pexAndMetadata advertise these capabilities
* @return bencoded outgoing handshake message
*/
- public static byte[] getHandshake(int metasize) {
+ public static byte[] getHandshake(int metasize, boolean pexAndMetadata) {
Map<String, Object> handshake = new HashMap();
Map<String, Integer> m = new HashMap();
- m.put(TYPE_METADATA, Integer.valueOf(ID_METADATA));
- m.put(TYPE_PEX, Integer.valueOf(ID_PEX));
- if (metasize >= 0)
- handshake.put("metadata_size", Integer.valueOf(metasize));
+ if (pexAndMetadata) {
+ m.put(TYPE_METADATA, Integer.valueOf(ID_METADATA));
+ m.put(TYPE_PEX, Integer.valueOf(ID_PEX));
+ if (metasize >= 0)
+ handshake.put("metadata_size", Integer.valueOf(metasize));
+ }
+ // include the map even if empty so the far-end doesn't NPE
handshake.put("m", m);
handshake.put("p", Integer.valueOf(6881));
handshake.put("v", "I2PSnark");
diff --git a/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java b/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java
index 254f74c44b38de1510f458878f4c198fe409de48..81c56a1947d0b9a1214f1548d29aa6e4c613b742 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java
@@ -219,6 +219,10 @@ public class I2PSnarkUtil {
// opts.setProperty("i2p.streaming.writeTimeout", "90000");
//if (opts.getProperty("i2p.streaming.readTimeout") == null)
// opts.setProperty("i2p.streaming.readTimeout", "120000");
+ if (opts.getProperty("i2p.streaming.maxConnsPerMinute") == null)
+ opts.setProperty("i2p.streaming.maxConnsPerMinute", "2");
+ if (opts.getProperty("i2p.streaming.maxTotalConnsPerMinute") == null)
+ opts.setProperty("i2p.streaming.maxTotalConnsPerMinute", "6");
_manager = I2PSocketManagerFactory.createManager(_i2cpHost, _i2cpPort, opts);
}
// FIXME this only instantiates krpc once, left stuck with old manager
diff --git a/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java b/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java
index 28677addaf2d361a291eee0590ef0187558feb39..648a055243f25dd3668421154382c7b362bbb78f 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java
@@ -61,6 +61,7 @@ public class MetaInfo
private final int piece_length;
private final byte[] piece_hashes;
private final long length;
+ private final boolean privateTorrent;
private Map<String, BEValue> infoMap;
/**
@@ -71,7 +72,7 @@ public class MetaInfo
* @param lengths null for single-file torrent
*/
MetaInfo(String announce, String name, String name_utf8, List<List<String>> files, List<Long> lengths,
- int piece_length, byte[] piece_hashes, long length)
+ int piece_length, byte[] piece_hashes, long length, boolean privateTorrent)
{
this.announce = announce;
this.name = name;
@@ -82,6 +83,7 @@ public class MetaInfo
this.piece_length = piece_length;
this.piece_hashes = piece_hashes;
this.length = length;
+ this.privateTorrent = privateTorrent;
// TODO if we add a parameter for other keys
//if (other != null) {
@@ -160,6 +162,10 @@ public class MetaInfo
else
name_utf8 = null;
+ // BEP 27
+ val = info.get("private");
+ privateTorrent = val != null && val.getString().equals("1");
+
val = info.get("piece length");
if (val == null)
throw new InvalidBEncodingException("Missing piece length number");
@@ -318,6 +324,14 @@ public class MetaInfo
return name;
}
+ /**
+ * Is it a private torrent?
+ * @since 0.9
+ */
+ public boolean isPrivate() {
+ return privateTorrent;
+ }
+
/**
* Returns a list of lists of file name hierarchies or null if it is
* a single name. It has the same size as the list returned by
@@ -439,7 +453,7 @@ public class MetaInfo
{
return new MetaInfo(announce, name, name_utf8, files,
lengths, piece_length,
- piece_hashes, length);
+ piece_hashes, length, privateTorrent);
}
/**
@@ -475,6 +489,10 @@ public class MetaInfo
info.put("name", name);
if (name_utf8 != null)
info.put("name.utf-8", name_utf8);
+ // BEP 27
+ if (privateTorrent)
+ info.put("private", "1");
+
info.put("piece length", Integer.valueOf(piece_length));
info.put("pieces", piece_hashes);
if (files == null)
diff --git a/apps/i2psnark/java/src/org/klomp/snark/Peer.java b/apps/i2psnark/java/src/org/klomp/snark/Peer.java
index 5489148121228bab903e2c4ac79ef7c1c03b979b..1330365ce879d6aa28d4524001265b70b7c96897 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/Peer.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/Peer.java
@@ -268,7 +268,8 @@ public class Peer implements Comparable
if (_log.shouldLog(Log.DEBUG))
_log.debug("Peer supports extensions, sending reply message");
int metasize = metainfo != null ? metainfo.getInfoBytes().length : -1;
- out.sendExtension(0, ExtensionHandler.getHandshake(metasize));
+ boolean pexAndMetadata = metainfo == null || !metainfo.isPrivate();
+ out.sendExtension(0, ExtensionHandler.getHandshake(metasize, pexAndMetadata));
}
if ((options & OPTION_I2P_DHT) != 0 && util.getDHT() != null) {
diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java b/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java
index b87c7af3af4b0a69720354ec11988dc4309066c7..c9f70ba251777c2106d602b1735770d6f9fbce2b 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java
@@ -1186,6 +1186,8 @@ public class PeerCoordinator implements PeerListener
* @since 0.8.4
*/
void sendPeers(Peer peer) {
+ if (metainfo != null && metainfo.isPrivate())
+ return;
Map<String, BEValue> handshake = peer.getHandshakeMap();
if (handshake == null)
return;
diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerState.java b/apps/i2psnark/java/src/org/klomp/snark/PeerState.java
index 111ddbbe61095716afb728fe84eea237e3cc685e..c83a43b19173786decf0ae70651ebdf69d825bea 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/PeerState.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/PeerState.java
@@ -489,6 +489,13 @@ class PeerState implements DataLoader
/** @since 0.8.2 */
void extensionMessage(int id, byte[] bs)
{
+ if (metainfo != null && metainfo.isPrivate() &&
+ (id == ExtensionHandler.ID_METADATA || id == ExtensionHandler.ID_PEX)) {
+ // shouldn't get this since we didn't advertise it but they could send it anyway
+ if (_log.shouldLog(Log.WARN))
+ _log.warn("Private torrent, ignoring ext msg " + id);
+ return;
+ }
ExtensionHandler.handleMessage(peer, listener, id, bs);
// Peer coord will get metadata from MagnetState,
// verify, and then call gotMetaInfo()
diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
index 0dd3e0731d5b9366266a78554b58cad2d878b6e8..4c46ec6f040291f2fc584dc10124e9fddcfbfbab 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
@@ -8,6 +8,8 @@ import java.io.FilenameFilter;
import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -35,8 +37,6 @@ import net.i2p.util.SecureFileOutputStream;
* Manage multiple snarks
*/
public class SnarkManager implements Snark.CompleteListener {
- private static SnarkManager _instance = new SnarkManager();
- public static SnarkManager instance() { return _instance; }
/**
* Map of (canonical) filename of the .torrent file to Snark instance.
@@ -57,6 +57,7 @@ public class SnarkManager implements Snark.CompleteListener {
private ConnectionAcceptor _connectionAcceptor;
private Thread _monitor;
private volatile boolean _running;
+ private final Map<String, String> _trackerMap;
public static final String PROP_I2CP_HOST = "i2psnark.i2cpHost";
public static final String PROP_I2CP_PORT = "i2psnark.i2cpPort";
@@ -89,6 +90,34 @@ public class SnarkManager implements Snark.CompleteListener {
public static final int DEFAULT_STARTUP_DELAY = 3;
public static final int DEFAULT_REFRESH_DELAY_SECS = 60;
+ /**
+ * "name", "announceURL=websiteURL" pairs
+ * '=' in announceURL must be escaped as ,
+ */
+ private static final String DEFAULT_TRACKERS[] = {
+// "Postman", "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=http://tracker.postman.i2p/"
+// , "eBook", "http://E71FRom6PZNEqTN2Lr8P-sr23b7HJVC32KoGnVQjaX6zJiXwhJy2HsXob36Qmj81TYFZdewFZa9mSJ533UZgGyQkXo2ahctg82JKYZfDe5uDxAn1E9YPjxZCWJaFJh0S~UwSs~9AZ7UcauSJIoNtpxrtbmRNVFLqnkEDdLZi26TeucfOmiFmIWnVblLniWv3tG1boE9Abd-6j3FmYVrRucYuepAILYt6katmVNOk6sXmno1Eynrp~~MBuFq0Ko6~jsc2E2CRVYXDhGHEMdt-j6JUz5D7S2RIVzDRqQyAZLKJ7OdQDmI31przzmne1vOqqqLC~1xUumZVIvF~yOeJUGNjJ1Vx0J8i2BQIusn1pQJ6UCB~ZtZZLQtEb8EPVCfpeRi2ri1M5CyOuxN0V5ekmPHrYIBNevuTCRC26NP7ZS5VDgx1~NaC3A-CzJAE6f1QXi0wMI9aywNG5KGzOPifcsih8eyGyytvgLtrZtV7ykzYpPCS-rDfITncpn5hliPUAAAA.i2p/pub/bt/announce.php=http://de-ebook-archiv.i2p/pub/bt/"
+// , "Gaytorrents", "http://uxPWHbK1OIj9HxquaXuhMiIvi21iK0~ZiG9d8G0840ZXIg0r6CbiV71xlsqmdnU6wm0T2LySriM0doW2gUigo-5BNkUquHwOjLROiETnB3ZR0Ml4IGa6QBPn1aAq2d9~g1r1nVjLE~pcFnXB~cNNS7kIhX1d6nLgYVZf0C2cZopEow2iWVUggGGnAA9mHjE86zLEnTvAyhbAMTqDQJhEuLa0ZYSORqzJDMkQt90MV4YMjX1ICY6RfUSFmxEqu0yWTrkHsTtRw48l~dz9wpIgc0a0T9C~eeWvmBFTqlJPtQZwntpNeH~jF7nlYzB58olgV2HHFYpVYD87DYNzTnmNWxCJ5AfDorm6AIUCV2qaE7tZtI1h6fbmGpGlPyW~Kw5GXrRfJwNvr6ajwAVi~bPVnrBwDZezHkfW4slOO8FACPR28EQvaTu9nwhAbqESxV2hCTq6vQSGjuxHeOuzBOEvRWkLKOHWTC09t2DbJ94FSqETmZopTB1ukEmaxRWbKSIaAAAA.i2p/announce.php=http://gaytorrents.i2p/"
+// , "NickyB", "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=http://nickyb.i2p/bittorrent/"
+// , "Orion", "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=http://orion.i2p/bt/"
+// , "anonymity", "http://8EoJZIKrWgGuDrxA3nRJs1jsPfiGwmFWL91hBrf0HA7oKhEvAna4Ocx47VLUR9retVEYBAyWFK-eZTPcvhnz9XffBEiJQQ~kFSCqb1fV6IfPiV3HySqi9U5Caf6~hC46fRd~vYnxmaBLICT3N160cxBETqH3v2rdxdJpvYt8q4nMk9LUeVXq7zqCTFLLG5ig1uKgNzBGe58iNcsvTEYlnbYcE930ABmrzj8G1qQSgSwJ6wx3tUQNl1z~4wSOUMan~raZQD60lRK70GISjoX0-D0Po9WmPveN3ES3g72TIET3zc3WPdK2~lgmKGIs8GgNLES1cXTolvbPhdZK1gxddRMbJl6Y6IPFyQ9o4-6Rt3Lp-RMRWZ2TG7j2OMcNSiOmATUhKEFBDfv-~SODDyopGBmfeLw16F4NnYednvn4qP10dyMHcUASU6Zag4mfc2-WivrOqeWhD16fVAh8MoDpIIT~0r9XmwdaVFyLcjbXObabJczxCAW3fodQUnvuSkwzAAAA.i2p/anonymityTracker/announce.php=http://anonymityweb.i2p/anonymityTracker/"
+// , "The freak's tracker", "http://mHKva9x24E5Ygfey2llR1KyQHv5f8hhMpDMwJDg1U-hABpJ2NrQJd6azirdfaR0OKt4jDlmP2o4Qx0H598~AteyD~RJU~xcWYdcOE0dmJ2e9Y8-HY51ie0B1yD9FtIV72ZI-V3TzFDcs6nkdX9b81DwrAwwFzx0EfNvK1GLVWl59Ow85muoRTBA1q8SsZImxdyZ-TApTVlMYIQbdI4iQRwU9OmmtefrCe~ZOf4UBS9-KvNIqUL0XeBSqm0OU1jq-D10Ykg6KfqvuPnBYT1BYHFDQJXW5DdPKwcaQE4MtAdSGmj1epDoaEBUa9btQlFsM2l9Cyn1hzxqNWXELmx8dRlomQLlV4b586dRzW~fLlOPIGC13ntPXogvYvHVyEyptXkv890jC7DZNHyxZd5cyrKC36r9huKvhQAmNABT2Y~pOGwVrb~RpPwT0tBuPZ3lHYhBFYmD8y~AOhhNHKMLzea1rfwTvovBMByDdFps54gMN1mX4MbCGT4w70vIopS9yAAAA.i2p/bytemonsoon/announce.php"
+// , "mastertracker", "http://VzXD~stRKbL3MOmeTn1iaCQ0CFyTmuFHiKYyo0Rd~dFPZFCYH-22rT8JD7i-C2xzYFa4jT5U2aqHzHI-Jre4HL3Ri5hFtZrLk2ax3ji7Qfb6qPnuYkuiF2E2UDmKUOppI8d9Ye7tjdhQVCy0izn55tBaB-U7UWdcvSK2i85sauyw3G0Gfads1Rvy5-CAe2paqyYATcDmGjpUNLoxbfv9KH1KmwRTNH6k1v4PyWYYnhbT39WfKMbBjSxVQRdi19cyJrULSWhjxaQfJHeWx5Z8Ev4bSPByBeQBFl2~4vqy0S5RypINsRSa3MZdbiAAyn5tr5slWR6QdoqY3qBQgBJFZppy-3iWkFqqKgSxCPundF8gdDLC5ddizl~KYcYKl42y9SGFHIukH-TZs8~em0~iahzsqWVRks3zRG~tlBcX2U3M2~OJs~C33-NKhyfZT7-XFBREvb8Szmd~p66jDxrwOnKaku-G6DyoQipJqIz4VHmY9-y5T8RrUcJcM-5lVoMpAAAA.i2p/announce.php=http://tracker.mastertracker.i2p/"
+// , "Galen", "http://5jpwQMI5FT303YwKa5Rd38PYSX04pbIKgTaKQsWbqoWjIfoancFdWCShXHLI5G5ofOb0Xu11vl2VEMyPsg1jUFYSVnu4-VfMe3y4TKTR6DTpetWrnmEK6m2UXh91J5DZJAKlgmO7UdsFlBkQfR2rY853-DfbJtQIFl91tbsmjcA5CGQi4VxMFyIkBzv-pCsuLQiZqOwWasTlnzey8GcDAPG1LDcvfflGV~6F5no9mnuisZPteZKlrv~~TDoXTj74QjByWc4EOYlwqK8sbU9aOvz~s31XzErbPTfwiawiaZ0RUI-IDrKgyvmj0neuFTWgjRGVTH8bz7cBZIc3viy6ioD-eMQOrXaQL0TCWZUelRwHRvgdPiQrxdYQs7ixkajeHzxi-Pq0EMm5Vbh3j3Q9kfUFW3JjFDA-MLB4g6XnjCbM5J1rC0oOBDCIEfhQkszru5cyLjHiZ5yeA0VThgu~c7xKHybv~OMXION7V8pBKOgET7ZgAkw1xgYe3Kkyq5syAAAA.i2p/tr/announce.php=http://galen.i2p/tr/"
+ "Postman", "http://tracker2.postman.i2p/announce.php=http://tracker2.postman.i2p/"
+ ,"Welterde", "http://tracker.welterde.i2p/a=http://tracker.welterde.i2p/stats?mode=top5"
+ ,"Diftracker", "http://n--XWjHjUPjnMNrSwXA2OYXpMIUL~u4FNXnrt2HtjK3y6j~4SOClyyeKzd0zRPlixxkCe2wfBIYye3bZsaqAD8bd0QMmowxbq91WpjsPfKMiphJbePKXtYAVARiy0cqyvh1d2LyDE-6wkvgaw45hknmS0U-Dg3YTJZbAQRU2SKXgIlAbWCv4R0kDFBLEVpReDiJef3rzAWHiW8yjmJuJilkYjMwlfRjw8xx1nl2s~yhlljk1pl13jGYb0nfawQnuOWeP-ASQWvAAyVgKvZRJE2O43S7iveu9piuv7plXWbt36ef7ndu2GNoNyPOBdpo9KUZ-NOXm4Kgh659YtEibL15dEPAOdxprY0sYUurVw8OIWqrpX7yn08nbi6qHVGqQwTpxH35vkL8qrCbm-ym7oQJQnNmSDrNTyWYRFSq5s5~7DAdFDzqRPW-pX~g0zEivWj5tzkhvG9rVFgFo0bpQX3X0PUAV9Xbyf8u~v8Zbr9K1pCPqBq9XEr4TqaLHw~bfAAAA.i2p/announce.php=http://diftracker.i2p/"
+// , "CRSTRACK", "http://b4G9sCdtfvccMAXh~SaZrPqVQNyGQbhbYMbw6supq2XGzbjU4NcOmjFI0vxQ8w1L05twmkOvg5QERcX6Mi8NQrWnR0stLExu2LucUXg1aYjnggxIR8TIOGygZVIMV3STKH4UQXD--wz0BUrqaLxPhrm2Eh9Hwc8TdB6Na4ShQUq5Xm8D4elzNUVdpM~RtChEyJWuQvoGAHY3ppX-EJJLkiSr1t77neS4Lc-KofMVmgI9a2tSSpNAagBiNI6Ak9L1T0F9uxeDfEG9bBSQPNMOSUbAoEcNxtt7xOW~cNOAyMyGydwPMnrQ5kIYPY8Pd3XudEko970vE0D6gO19yoBMJpKx6Dh50DGgybLQ9CpRaynh2zPULTHxm8rneOGRcQo8D3mE7FQ92m54~SvfjXjD2TwAVGI~ae~n9HDxt8uxOecAAvjjJ3TD4XM63Q9TmB38RmGNzNLDBQMEmJFpqQU8YeuhnS54IVdUoVQFqui5SfDeLXlSkh4vYoMU66pvBfWbAAAA.i2p/tracker/announce.php=http://crstrack.i2p/tracker/"
+// ,"Exotrack", "http://blbgywsjubw3d2zih2giokakhe3o2cko7jtte4risb3hohbcoyva.b32.i2p/announce.php=http://exotrack.i2p/"
+ };
+
+ /** comma delimited list of name=announceURL=baseURL for the trackers to be displayed */
+ public static final String PROP_TRACKERS = "i2psnark.trackers";
+
+ private static final SnarkManager _instance = new SnarkManager();
+
+ public static SnarkManager instance() { return _instance; }
+
private SnarkManager() {
_snarks = new ConcurrentHashMap();
_magnets = new ConcurrentHashSet();
@@ -100,6 +129,7 @@ public class SnarkManager implements Snark.CompleteListener {
_configFile = new File(CONFIG_FILE);
if (!_configFile.isAbsolute())
_configFile = new File(_context.getConfigDir(), CONFIG_FILE);
+ _trackerMap = Collections.synchronizedMap(new TreeMap(new IgnoreCaseComparator()));
loadConfig(null);
}
@@ -312,6 +342,7 @@ public class SnarkManager implements Snark.CompleteListener {
boolean bOT = useOT == null || Boolean.valueOf(useOT).booleanValue();
_util.setUseOpenTrackers(bOT);
getDataDir().mkdirs();
+ initTrackerMap();
}
private int getInt(String prop, int defaultVal) {
@@ -663,7 +694,9 @@ public class SnarkManager implements Snark.CompleteListener {
}
if (!TrackerClient.isValidAnnounce(info.getAnnounce())) {
- if (_util.shouldUseOpenTrackers() && _util.getOpenTrackers() != null) {
+ if (info.isPrivate()) {
+ addMessage(_("ERROR - No I2P trackers in private torrent \"{0}\"", info.getName()));
+ } else if (_util.shouldUseOpenTrackers() && _util.getOpenTrackers() != null) {
//addMessage(_("Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and DHT only.", info.getName()));
addMessage(_("Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers only.", info.getName()));
//} else if (_util.getDHT() != null) {
@@ -1356,57 +1389,59 @@ public class SnarkManager implements Snark.CompleteListener {
}
/**
- * "name", "announceURL=websiteURL" pairs
+ * Sorted map of name to announceURL=baseURL
+ * Modifiable, not a copy
*/
- private static final String DEFAULT_TRACKERS[] = {
-// "Postman", "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=http://tracker.postman.i2p/"
-// , "eBook", "http://E71FRom6PZNEqTN2Lr8P-sr23b7HJVC32KoGnVQjaX6zJiXwhJy2HsXob36Qmj81TYFZdewFZa9mSJ533UZgGyQkXo2ahctg82JKYZfDe5uDxAn1E9YPjxZCWJaFJh0S~UwSs~9AZ7UcauSJIoNtpxrtbmRNVFLqnkEDdLZi26TeucfOmiFmIWnVblLniWv3tG1boE9Abd-6j3FmYVrRucYuepAILYt6katmVNOk6sXmno1Eynrp~~MBuFq0Ko6~jsc2E2CRVYXDhGHEMdt-j6JUz5D7S2RIVzDRqQyAZLKJ7OdQDmI31przzmne1vOqqqLC~1xUumZVIvF~yOeJUGNjJ1Vx0J8i2BQIusn1pQJ6UCB~ZtZZLQtEb8EPVCfpeRi2ri1M5CyOuxN0V5ekmPHrYIBNevuTCRC26NP7ZS5VDgx1~NaC3A-CzJAE6f1QXi0wMI9aywNG5KGzOPifcsih8eyGyytvgLtrZtV7ykzYpPCS-rDfITncpn5hliPUAAAA.i2p/pub/bt/announce.php=http://de-ebook-archiv.i2p/pub/bt/"
-// , "Gaytorrents", "http://uxPWHbK1OIj9HxquaXuhMiIvi21iK0~ZiG9d8G0840ZXIg0r6CbiV71xlsqmdnU6wm0T2LySriM0doW2gUigo-5BNkUquHwOjLROiETnB3ZR0Ml4IGa6QBPn1aAq2d9~g1r1nVjLE~pcFnXB~cNNS7kIhX1d6nLgYVZf0C2cZopEow2iWVUggGGnAA9mHjE86zLEnTvAyhbAMTqDQJhEuLa0ZYSORqzJDMkQt90MV4YMjX1ICY6RfUSFmxEqu0yWTrkHsTtRw48l~dz9wpIgc0a0T9C~eeWvmBFTqlJPtQZwntpNeH~jF7nlYzB58olgV2HHFYpVYD87DYNzTnmNWxCJ5AfDorm6AIUCV2qaE7tZtI1h6fbmGpGlPyW~Kw5GXrRfJwNvr6ajwAVi~bPVnrBwDZezHkfW4slOO8FACPR28EQvaTu9nwhAbqESxV2hCTq6vQSGjuxHeOuzBOEvRWkLKOHWTC09t2DbJ94FSqETmZopTB1ukEmaxRWbKSIaAAAA.i2p/announce.php=http://gaytorrents.i2p/"
-// , "NickyB", "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=http://nickyb.i2p/bittorrent/"
-// , "Orion", "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=http://orion.i2p/bt/"
-// , "anonymity", "http://8EoJZIKrWgGuDrxA3nRJs1jsPfiGwmFWL91hBrf0HA7oKhEvAna4Ocx47VLUR9retVEYBAyWFK-eZTPcvhnz9XffBEiJQQ~kFSCqb1fV6IfPiV3HySqi9U5Caf6~hC46fRd~vYnxmaBLICT3N160cxBETqH3v2rdxdJpvYt8q4nMk9LUeVXq7zqCTFLLG5ig1uKgNzBGe58iNcsvTEYlnbYcE930ABmrzj8G1qQSgSwJ6wx3tUQNl1z~4wSOUMan~raZQD60lRK70GISjoX0-D0Po9WmPveN3ES3g72TIET3zc3WPdK2~lgmKGIs8GgNLES1cXTolvbPhdZK1gxddRMbJl6Y6IPFyQ9o4-6Rt3Lp-RMRWZ2TG7j2OMcNSiOmATUhKEFBDfv-~SODDyopGBmfeLw16F4NnYednvn4qP10dyMHcUASU6Zag4mfc2-WivrOqeWhD16fVAh8MoDpIIT~0r9XmwdaVFyLcjbXObabJczxCAW3fodQUnvuSkwzAAAA.i2p/anonymityTracker/announce.php=http://anonymityweb.i2p/anonymityTracker/"
-// , "The freak's tracker", "http://mHKva9x24E5Ygfey2llR1KyQHv5f8hhMpDMwJDg1U-hABpJ2NrQJd6azirdfaR0OKt4jDlmP2o4Qx0H598~AteyD~RJU~xcWYdcOE0dmJ2e9Y8-HY51ie0B1yD9FtIV72ZI-V3TzFDcs6nkdX9b81DwrAwwFzx0EfNvK1GLVWl59Ow85muoRTBA1q8SsZImxdyZ-TApTVlMYIQbdI4iQRwU9OmmtefrCe~ZOf4UBS9-KvNIqUL0XeBSqm0OU1jq-D10Ykg6KfqvuPnBYT1BYHFDQJXW5DdPKwcaQE4MtAdSGmj1epDoaEBUa9btQlFsM2l9Cyn1hzxqNWXELmx8dRlomQLlV4b586dRzW~fLlOPIGC13ntPXogvYvHVyEyptXkv890jC7DZNHyxZd5cyrKC36r9huKvhQAmNABT2Y~pOGwVrb~RpPwT0tBuPZ3lHYhBFYmD8y~AOhhNHKMLzea1rfwTvovBMByDdFps54gMN1mX4MbCGT4w70vIopS9yAAAA.i2p/bytemonsoon/announce.php"
-// , "mastertracker", "http://VzXD~stRKbL3MOmeTn1iaCQ0CFyTmuFHiKYyo0Rd~dFPZFCYH-22rT8JD7i-C2xzYFa4jT5U2aqHzHI-Jre4HL3Ri5hFtZrLk2ax3ji7Qfb6qPnuYkuiF2E2UDmKUOppI8d9Ye7tjdhQVCy0izn55tBaB-U7UWdcvSK2i85sauyw3G0Gfads1Rvy5-CAe2paqyYATcDmGjpUNLoxbfv9KH1KmwRTNH6k1v4PyWYYnhbT39WfKMbBjSxVQRdi19cyJrULSWhjxaQfJHeWx5Z8Ev4bSPByBeQBFl2~4vqy0S5RypINsRSa3MZdbiAAyn5tr5slWR6QdoqY3qBQgBJFZppy-3iWkFqqKgSxCPundF8gdDLC5ddizl~KYcYKl42y9SGFHIukH-TZs8~em0~iahzsqWVRks3zRG~tlBcX2U3M2~OJs~C33-NKhyfZT7-XFBREvb8Szmd~p66jDxrwOnKaku-G6DyoQipJqIz4VHmY9-y5T8RrUcJcM-5lVoMpAAAA.i2p/announce.php=http://tracker.mastertracker.i2p/"
-// , "Galen", "http://5jpwQMI5FT303YwKa5Rd38PYSX04pbIKgTaKQsWbqoWjIfoancFdWCShXHLI5G5ofOb0Xu11vl2VEMyPsg1jUFYSVnu4-VfMe3y4TKTR6DTpetWrnmEK6m2UXh91J5DZJAKlgmO7UdsFlBkQfR2rY853-DfbJtQIFl91tbsmjcA5CGQi4VxMFyIkBzv-pCsuLQiZqOwWasTlnzey8GcDAPG1LDcvfflGV~6F5no9mnuisZPteZKlrv~~TDoXTj74QjByWc4EOYlwqK8sbU9aOvz~s31XzErbPTfwiawiaZ0RUI-IDrKgyvmj0neuFTWgjRGVTH8bz7cBZIc3viy6ioD-eMQOrXaQL0TCWZUelRwHRvgdPiQrxdYQs7ixkajeHzxi-Pq0EMm5Vbh3j3Q9kfUFW3JjFDA-MLB4g6XnjCbM5J1rC0oOBDCIEfhQkszru5cyLjHiZ5yeA0VThgu~c7xKHybv~OMXION7V8pBKOgET7ZgAkw1xgYe3Kkyq5syAAAA.i2p/tr/announce.php=http://galen.i2p/tr/"
- "Postman", "http://tracker2.postman.i2p/announce.php=http://tracker2.postman.i2p/"
- ,"Welterde", "http://tracker.welterde.i2p/a=http://tracker.welterde.i2p/stats?mode=top5"
- ,"Diftracker", "http://n--XWjHjUPjnMNrSwXA2OYXpMIUL~u4FNXnrt2HtjK3y6j~4SOClyyeKzd0zRPlixxkCe2wfBIYye3bZsaqAD8bd0QMmowxbq91WpjsPfKMiphJbePKXtYAVARiy0cqyvh1d2LyDE-6wkvgaw45hknmS0U-Dg3YTJZbAQRU2SKXgIlAbWCv4R0kDFBLEVpReDiJef3rzAWHiW8yjmJuJilkYjMwlfRjw8xx1nl2s~yhlljk1pl13jGYb0nfawQnuOWeP-ASQWvAAyVgKvZRJE2O43S7iveu9piuv7plXWbt36ef7ndu2GNoNyPOBdpo9KUZ-NOXm4Kgh659YtEibL15dEPAOdxprY0sYUurVw8OIWqrpX7yn08nbi6qHVGqQwTpxH35vkL8qrCbm-ym7oQJQnNmSDrNTyWYRFSq5s5~7DAdFDzqRPW-pX~g0zEivWj5tzkhvG9rVFgFo0bpQX3X0PUAV9Xbyf8u~v8Zbr9K1pCPqBq9XEr4TqaLHw~bfAAAA.i2p/announce.php=http://diftracker.i2p/"
-// , "CRSTRACK", "http://b4G9sCdtfvccMAXh~SaZrPqVQNyGQbhbYMbw6supq2XGzbjU4NcOmjFI0vxQ8w1L05twmkOvg5QERcX6Mi8NQrWnR0stLExu2LucUXg1aYjnggxIR8TIOGygZVIMV3STKH4UQXD--wz0BUrqaLxPhrm2Eh9Hwc8TdB6Na4ShQUq5Xm8D4elzNUVdpM~RtChEyJWuQvoGAHY3ppX-EJJLkiSr1t77neS4Lc-KofMVmgI9a2tSSpNAagBiNI6Ak9L1T0F9uxeDfEG9bBSQPNMOSUbAoEcNxtt7xOW~cNOAyMyGydwPMnrQ5kIYPY8Pd3XudEko970vE0D6gO19yoBMJpKx6Dh50DGgybLQ9CpRaynh2zPULTHxm8rneOGRcQo8D3mE7FQ92m54~SvfjXjD2TwAVGI~ae~n9HDxt8uxOecAAvjjJ3TD4XM63Q9TmB38RmGNzNLDBQMEmJFpqQU8YeuhnS54IVdUoVQFqui5SfDeLXlSkh4vYoMU66pvBfWbAAAA.i2p/tracker/announce.php=http://crstrack.i2p/tracker/"
-// ,"Exotrack", "http://blbgywsjubw3d2zih2giokakhe3o2cko7jtte4risb3hohbcoyva.b32.i2p/announce.php=http://exotrack.i2p/"
- };
-
- /** comma delimited list of name=announceURL=baseURL for the trackers to be displayed */
- public static final String PROP_TRACKERS = "i2psnark.trackers";
- private static Map<String, String> trackerMap = null;
- /** sorted map of name to announceURL=baseURL */
public Map<String, String> getTrackers() {
- if (trackerMap != null) // only do this once, can't be updated while running
- return trackerMap;
- Map<String, String> rv = new TreeMap();
+ return _trackerMap;
+ }
+
+ /** @since 0.9 */
+ private void initTrackerMap() {
String trackers = _config.getProperty(PROP_TRACKERS);
if ( (trackers == null) || (trackers.trim().length() <= 0) )
trackers = _context.getProperty(PROP_TRACKERS);
+ _trackerMap.clear();
if ( (trackers == null) || (trackers.trim().length() <= 0) ) {
for (int i = 0; i < DEFAULT_TRACKERS.length; i += 2)
- rv.put(DEFAULT_TRACKERS[i], DEFAULT_TRACKERS[i+1]);
+ _trackerMap.put(DEFAULT_TRACKERS[i], DEFAULT_TRACKERS[i+1]);
} else {
- StringTokenizer tok = new StringTokenizer(trackers, ",");
- while (tok.hasMoreTokens()) {
- String pair = tok.nextToken();
- int split = pair.indexOf('=');
- if (split <= 0)
- continue;
- String name = pair.substring(0, split).trim();
- String url = pair.substring(split+1).trim();
+ String[] toks = trackers.split(",");
+ for (int i = 0; i < toks.length; i += 2) {
+ String name = toks[i].trim().replace(",", ",");
+ String url = toks[i+1].trim().replace(",", ",");
if ( (name.length() > 0) && (url.length() > 0) )
- rv.put(name, url);
+ _trackerMap.put(name, url);
}
}
-
- trackerMap = rv;
- return trackerMap;
}
-
+
+ /** @since 0.9 */
+ public void setDefaultTrackerMap() {
+ _trackerMap.clear();
+ for (int i = 0; i < DEFAULT_TRACKERS.length; i += 2) {
+ _trackerMap.put(DEFAULT_TRACKERS[i], DEFAULT_TRACKERS[i+1]);
+ }
+ if (_config.remove(PROP_TRACKERS) != null) {
+ saveConfig();
+ }
+ }
+
+ /** @since 0.9 */
+ public void saveTrackerMap() {
+ StringBuilder buf = new StringBuilder(2048);
+ boolean comma = false;
+ for (Map.Entry<String, String> e : _trackerMap.entrySet()) {
+ if (comma)
+ buf.append(',');
+ else
+ comma = true;
+ buf.append(e.getKey().replace(",", ",")).append(',').append(e.getValue().replace(",", ","));
+ }
+ _config.setProperty(PROP_TRACKERS, buf.toString());
+ saveConfig();
+ }
+
private static class TorrentFilenameFilter implements FilenameFilter {
private static final TorrentFilenameFilter _filter = new TorrentFilenameFilter();
public static TorrentFilenameFilter instance() { return _filter; }
@@ -1426,4 +1461,14 @@ public class SnarkManager implements Snark.CompleteListener {
}
}
}
+
+ /**
+ * ignore case, current locale
+ * @since 0.9
+ */
+ private static class IgnoreCaseComparator implements Comparator<String> {
+ public int compare(String l, String r) {
+ return l.toLowerCase().compareTo(r.toLowerCase());
+ }
+ }
}
diff --git a/apps/i2psnark/java/src/org/klomp/snark/Storage.java b/apps/i2psnark/java/src/org/klomp/snark/Storage.java
index 804f4c304c0815a00d8a53cd0bdc4520603ec47a..36fdd748cdb5eabfbe9fc6c5345de8a82e8a4d22 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/Storage.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/Storage.java
@@ -101,7 +101,8 @@ public class Storage
* @param announce may be null
* @param listener may be null
*/
- public Storage(I2PSnarkUtil util, File baseFile, String announce, StorageListener listener)
+ public Storage(I2PSnarkUtil util, File baseFile, String announce,
+ boolean privateTorrent, StorageListener listener)
throws IOException
{
_util = util;
@@ -157,7 +158,7 @@ public class Storage
byte[] piece_hashes = fast_digestCreate();
metainfo = new MetaInfo(announce, baseFile.getName(), null, files,
- lengthsList, piece_size, piece_hashes, total);
+ lengthsList, piece_size, piece_hashes, total, privateTorrent);
}
diff --git a/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java b/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java
index 3f7c6b8bd16965bbe7f0177cd28f13ce54c083bc..2007fb84f2812bfb3b6c93f899b4a555311930b4 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java
@@ -156,7 +156,7 @@ public class TrackerClient extends I2PAppThread
primary = "";
}
List tlist = _util.getOpenTrackers();
- if (tlist != null) {
+ if (tlist != null && !meta.isPrivate()) {
for (int i = 0; i < tlist.size(); i++) {
String url = (String)tlist.get(i);
if (!isValidAnnounce(url)) {
@@ -348,7 +348,7 @@ public class TrackerClient extends I2PAppThread
} // *** end of trackers loop here
// Get peers from PEX
- if (left > 0 && coordinator.needPeers() && !stop) {
+ if (left > 0 && coordinator.needPeers() && (!meta.isPrivate()) && !stop) {
Set<PeerID> pids = coordinator.getPEXPeers();
if (!pids.isEmpty()) {
_util.debug("Got " + pids.size() + " from PEX", Snark.INFO);
@@ -370,7 +370,7 @@ public class TrackerClient extends I2PAppThread
// Get peers from DHT
// FIXME this needs to be in its own thread
- if (_util.getDHT() != null && !stop) {
+ if (_util.getDHT() != null && (!meta.isPrivate()) && !stop) {
int numwant;
if (left == 0 || event.equals(STOPPED_EVENT) || !coordinator.needPeers())
numwant = 1;
@@ -444,22 +444,33 @@ public class TrackerClient extends I2PAppThread
long downloaded, long left, String event)
throws IOException
{
+ StringBuilder buf = new StringBuilder(512);
+ buf.append(tr.announce);
+ if (tr.announce.contains("?"))
+ buf.append('&');
+ else
+ buf.append('?');
+ buf.append("info_hash=").append(infoHash)
+ .append("&peer_id=").append(peerID)
+ .append("&port=").append(port)
+ .append("&ip=" ).append(_util.getOurIPString()).append(".i2p")
+ .append("&uploaded=").append(uploaded)
+ .append("&downloaded=").append(downloaded)
+ .append("&left=");
// What do we send for left in magnet mode? Can we omit it?
- long tleft = left >= 0 ? left : 1;
- String s = tr.announce
- + "?info_hash=" + infoHash
- + "&peer_id=" + peerID
- + "&port=" + port
- + "&ip=" + _util.getOurIPString() + ".i2p"
- + "&uploaded=" + uploaded
- + "&downloaded=" + downloaded
- + "&left=" + tleft
- + "&compact=1" // NOTE: opentracker will return 400 for &compact alone
- + ((! event.equals(NO_EVENT)) ? ("&event=" + event) : "");
+ if (left >= 0)
+ buf.append(left);
+ else
+ buf.append('1');
+ buf.append("&compact=1"); // NOTE: opentracker will return 400 for &compact alone
+ if (! event.equals(NO_EVENT))
+ buf.append("&event=").append(event);
+ buf.append("&numwant=");
if (left == 0 || event.equals(STOPPED_EVENT) || !coordinator.needPeers())
- s += "&numwant=0";
+ buf.append('0');
else
- s += "&numwant=" + _util.getMaxConnections();
+ buf.append(_util.getMaxConnections());
+ String s = buf.toString();
_util.debug("Sending TrackerClient request: " + s, Snark.INFO);
tr.lastRequestTime = System.currentTimeMillis();
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 7f3839ec943472a227612fe6bed573977a329500..24094515c5696cc322b3e8cf892cfc2e323b9320 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -102,7 +102,8 @@ public class I2PSnarkServlet extends Default {
protected Resource getResource(String pathInContext) throws IOException
{
if (pathInContext == null || pathInContext.equals("/") || pathInContext.equals("/index.jsp") ||
- pathInContext.equals("/index.html") || pathInContext.startsWith("/_icons/"))
+ pathInContext.equals("/index.html") || pathInContext.startsWith("/.icons/") ||
+ pathInContext.startsWith("/.js/") || pathInContext.startsWith("/.ajax/"))
return super.getResource(pathInContext);
// files in the i2psnark/ directory
return _resourceBase.addPath(pathInContext);
@@ -151,6 +152,19 @@ public class I2PSnarkServlet extends Default {
_imgPath = _themePath + "images/";
// this is the part after /i2psnark
String path = req.getServletPath();
+
+ // AJAX for mainsection
+ if ("/.ajax/xhr1.html".equals(path)) {
+ resp.setCharacterEncoding("UTF-8");
+ resp.setContentType("text/html; charset=UTF-8");
+ PrintWriter out = resp.getWriter();
+ //if (_log.shouldLog(Log.DEBUG))
+ // _manager.addMessage((_context.clock().now() / 1000) + " xhr1 p=" + req.getParameter("p"));
+ writeMessages(out);
+ writeTorrents(out, req);
+ return;
+ }
+
boolean isConfigure = "/configure".equals(path);
// index.jsp doesn't work, it is grabbed by the war handler before here
if (!(path == null || path.equals("/") || path.equals("/index.jsp") || path.equals("/index.html") || path.equals("/_post") || isConfigure)) {
@@ -192,7 +206,8 @@ public class I2PSnarkServlet extends Default {
String peerParam = req.getParameter("p");
String peerString;
- if (peerParam == null || !_manager.util().connected()) {
+ if (peerParam == null || (!_manager.util().connected()) ||
+ peerParam.replaceAll("[a-zA-Z0-9~=-]", "").length() > 0) { // XSS
peerString = "";
} else {
peerString = "?p=" + peerParam;
@@ -208,13 +223,23 @@ public class I2PSnarkServlet extends Default {
out.write("</title>\n");
// we want it to go to the base URI so we don't refresh with some funky action= value
+ int delay = 0;
if (!isConfigure) {
- int delay = _manager.getRefreshDelaySeconds();
- if (delay > 0)
- out.write("<meta http-equiv=\"refresh\" content=\"" + delay + ";/i2psnark/" + peerString + "\">\n");
+ delay = _manager.getRefreshDelaySeconds();
+ if (delay > 0) {
+ //out.write("<meta http-equiv=\"refresh\" content=\"" + delay + ";/i2psnark/" + peerString + "\">\n");
+ out.write("<script src=\"/js/ajax.js\" type=\"text/javascript\"></script>\n" +
+ "<script type=\"text/javascript\">\n" +
+ "function requestAjax1() { ajax(\"/i2psnark/.ajax/xhr1.html" + peerString + "\", \"mainsection\", " + (delay*1000) + "); }\n" +
+ "function initAjax(delayMs) { setTimeout(requestAjax1, " + (delay*1000) +"); }\n" +
+ "</script>\n");
+ }
}
- out.write(HEADER_A + _themePath + HEADER_B);
- out.write("</head><body>");
+ out.write(HEADER_A + _themePath + HEADER_B + "</head>\n");
+ if (isConfigure || delay <= 0)
+ out.write("<body>");
+ else
+ out.write("<body onload=\"initAjax()\">");
out.write("<center>");
if (isConfigure) {
out.write("<div class=\"snarknavbar\"><a href=\"/i2psnark/\" title=\"");
@@ -249,34 +274,44 @@ public class I2PSnarkServlet extends Default {
String newURL = req.getParameter("newURL");
if (newURL != null && newURL.trim().length() > 0 && req.getMethod().equals("GET"))
_manager.addMessage(_("Click \"Add torrent\" button to fetch torrent"));
- out.write("<div class=\"page\"><div class=\"mainsection\"><div class=\"snarkMessages\"><table><tr><td align=\"left\"><pre>");
- List msgs = _manager.getMessages();
- for (int i = msgs.size()-1; i >= 0; i--) {
- String msg = (String)msgs.get(i);
- out.write(msg + "\n");
- }
- out.write("</pre></td></tr></table></div>");
+ out.write("<div class=\"page\"><div id=\"mainsection\" class=\"mainsection\">");
+
+ writeMessages(out);
if (isConfigure) {
+ // end of mainsection div
out.write("<div class=\"logshim\"></div></div>\n");
writeConfigForm(out, req);
+ writeTrackerForm(out, req);
} else {
writeTorrents(out, req);
- out.write("</div>\n");
+ // end of mainsection div
+ out.write("</div><div id=\"lowersection\">\n");
writeAddForm(out, req);
writeSeedForm(out, req);
writeConfigLink(out);
+ // end of lowersection div
+ out.write("</div>\n");
}
out.write(FOOTER);
}
+ private void writeMessages(PrintWriter out) throws IOException {
+ out.write("<div class=\"snarkMessages\"><table><tr><td align=\"left\"><pre>");
+ List msgs = _manager.getMessages();
+ for (int i = msgs.size()-1; i >= 0; i--) {
+ String msg = (String)msgs.get(i);
+ out.write(msg + "\n");
+ }
+ out.write("</pre></td></tr></table></div>");
+ }
+
private void writeTorrents(PrintWriter out, HttpServletRequest req) throws IOException {
/** dl, ul, down rate, up rate, peers, size */
final long stats[] = {0,0,0,0,0,0};
String peerParam = req.getParameter("p");
List snarks = getSortedSnarks(req);
- String uri = req.getRequestURI();
boolean isForm = _manager.util().connected() || !snarks.isEmpty();
if (isForm) {
out.write("<form action=\"_post\" method=\"POST\">\n");
@@ -390,6 +425,7 @@ public class I2PSnarkServlet extends Default {
out.write(" ");
}
out.write("</th></tr></thead>\n");
+ String uri = "/i2psnark/";
for (int i = 0; i < snarks.size(); i++) {
Snark snark = (Snark)snarks.get(i);
boolean showDebug = "2".equals(peerParam);
@@ -650,14 +686,19 @@ public class I2PSnarkServlet extends Default {
_manager.updateConfig(dataDir, filesPublic, autoStart, refreshDel, startupDel,
seedPct, eepHost, eepPort, i2cpHost, i2cpPort, i2cpOpts,
upLimit, upBW, useOpenTrackers, openTrackers, theme);
+ } else if ("Save2".equals(action)) {
+ String taction = req.getParameter("taction");
+ if (taction != null)
+ processTrackerForm(taction, req);
} else if ("Create".equals(action)) {
String baseData = req.getParameter("baseFile");
if (baseData != null && baseData.trim().length() > 0) {
File baseFile = new File(_manager.getDataDir(), baseData);
String announceURL = req.getParameter("announceURL");
- String announceURLOther = req.getParameter("announceURLOther");
- if ( (announceURLOther != null) && (announceURLOther.trim().length() > "http://.i2p/announce".length()) )
- announceURL = announceURLOther;
+ // make the user add a tracker on the config form now
+ //String announceURLOther = req.getParameter("announceURLOther");
+ //if ( (announceURLOther != null) && (announceURLOther.trim().length() > "http://.i2p/announce".length()) )
+ // announceURL = announceURLOther;
if (announceURL == null || announceURL.length() <= 0)
_manager.addMessage(_("Error creating torrent - you must select a tracker"));
@@ -668,7 +709,7 @@ public class I2PSnarkServlet extends Default {
try {
// This may take a long time to check the storage, but since it already exists,
// it shouldn't be THAT bad, so keep it in this thread.
- Storage s = new Storage(_manager.util(), baseFile, announceURL, null);
+ Storage s = new Storage(_manager.util(), baseFile, announceURL, req.getParameter("private") != null, null);
s.close(); // close the files... maybe need a way to pass this Storage to addTorrent rather than starting over
MetaInfo info = s.getMetaInfo();
File torrentFile = new File(_manager.getDataDir(), s.getBaseName() + ".torrent");
@@ -713,6 +754,54 @@ public class I2PSnarkServlet extends Default {
_manager.addMessage("Unknown POST action: \"" + action + '\"');
}
}
+
+ /** @since 0.9 */
+ private void processTrackerForm(String action, HttpServletRequest req) {
+ if (action.equals(_("Delete selected"))) {
+ boolean changed = false;
+ Map<String, String> trackers = _manager.getTrackers();
+ Enumeration e = req.getParameterNames();
+ while (e.hasMoreElements()) {
+ Object o = e.nextElement();
+ if (!(o instanceof String))
+ continue;
+ String k = (String) o;
+ if (!k.startsWith("delete_"))
+ continue;
+ k = k.substring(7);
+ if (trackers.remove(k) != null) {
+ _manager.addMessage(_("Removed") + ": " + k);
+ changed = true;
+ }
+ }
+ if (changed) {
+ _manager.saveTrackerMap();
+ }
+ } else if (action.equals(_("Add tracker"))) {
+ String name = req.getParameter("tname");
+ String hurl = req.getParameter("thurl");
+ String aurl = req.getParameter("taurl");
+ if (name != null && hurl != null && aurl != null) {
+ name = name.trim();
+ hurl = hurl.trim();
+ aurl = aurl.trim().replace("=", "=");
+ if (name.length() > 0 && hurl.startsWith("http://") && aurl.startsWith("http://")) {
+ Map<String, String> trackers = _manager.getTrackers();
+ trackers.put(name, aurl + '=' + hurl);
+ _manager.saveTrackerMap();
+ } else {
+ _manager.addMessage(_("Enter valid tracker name and URLs"));
+ }
+ } else {
+ _manager.addMessage(_("Enter valid tracker name and URLs"));
+ }
+ } else if (action.equals(_("Restore defaults"))) {
+ _manager.setDefaultTrackerMap();
+ _manager.addMessage(_("Restored default trackers"));
+ } else {
+ _manager.addMessage("Unknown POST action: \"" + action + '\"');
+ }
+ }
private static final String iopts[] = {"inbound.length", "inbound.quantity",
"outbound.length", "outbound.quantity" };
@@ -1222,7 +1311,7 @@ public class I2PSnarkServlet extends Default {
out.write("\"> \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>");
- out.write("<input type=\"submit\" value=\"");
+ out.write("<input type=\"submit\" class=\"add\" value=\"");
out.write(_("Add torrent"));
out.write("\" name=\"foo\" ><br>\n");
out.write("<tr><td> <td><span class=\"snarkAddInfo\">");
@@ -1269,31 +1358,40 @@ public class I2PSnarkServlet extends Default {
//out.write(_("Open trackers and DHT only"));
out.write(_("Open trackers only"));
out.write("</option>\n");
- Map trackers = _manager.getTrackers();
- for (Iterator iter = trackers.entrySet().iterator(); iter.hasNext(); ) {
- Map.Entry entry = (Map.Entry)iter.next();
- String name = (String)entry.getKey();
- String announceURL = (String)entry.getValue();
+ Map<String, String> trackers = _manager.getTrackers();
+ for (Map.Entry<String, String> entry : trackers.entrySet()) {
+ String name = entry.getKey();
+ String announceURL = entry.getValue();
int e = announceURL.indexOf('=');
if (e > 0)
- announceURL = announceURL.substring(0, e);
+ announceURL = announceURL.substring(0, e).replace("=", "=");
if (announceURL.equals(_lastAnnounceURL))
announceURL += "\" selected=\"selected";
out.write("\t<option value=\"" + announceURL + "\">" + name + "</option>\n");
}
out.write("</select>\n");
- out.write(_("or"));
- out.write(" <input type=\"text\" name=\"announceURLOther\" size=\"57\" value=\"http://\" " +
- "title=\"");
- out.write(_("Specify custom tracker announce URL"));
- out.write("\" > " +
- "<input type=\"submit\" value=\"");
+ // make the user add a tracker on the config form now
+ //out.write(_("or"));
+ //out.write(" <input type=\"text\" name=\"announceURLOther\" size=\"57\" value=\"http://\" " +
+ // "title=\"");
+ //out.write(_("Specify custom tracker announce URL"));
+ //out.write("\" > " +
+ out.write(" <input type=\"submit\" class=\"create\" value=\"");
out.write(_("Create torrent"));
- out.write("\" name=\"foo\" ></table>\n" +
+ out.write("\" name=\"foo\" >\n" +
+ "</td></tr><tr><td>");
+ out.write(_("Private?"));
+ out.write(" </td><td> <input type=\"checkbox\" class=\"optbox\" name=\"private\" value=\"true\" title=\"");
+ out.write(_("Use for private trackers"));
+ out.write("\"");
+ if (req.getParameter("private") != null)
+ out.write(" checked");
+ out.write("></td></tr>" +
+ "</table>\n" +
"</form></div></div>");
}
- private static final int[] times = { 30, 60, 2*60, 5*60, 10*60, 30*60, -1 };
+ private static final int[] times = { 5, 15, 30, 60, 2*60, 5*60, 10*60, 30*60, -1 };
private void writeConfigForm(PrintWriter out, HttpServletRequest req) throws IOException {
String dataDir = _manager.getDataDir().getAbsolutePath();
@@ -1356,7 +1454,7 @@ public class I2PSnarkServlet extends Default {
out.write(Integer.toString(times[i]));
out.write("\"");
if (times[i] == delay)
- out.write(" selected=\"true\"");
+ out.write(" selected=\"selected\"");
out.write(">");
if (times[i] > 0)
out.write(DataHelper.formatDuration2(times[i] * 1000));
@@ -1379,15 +1477,15 @@ public class I2PSnarkServlet extends Default {
/*
out.write("Seed percentage: <select name=\"seedPct\" disabled=\"true\" >\n\t");
if (seedPct <= 0)
- out.write("<option value=\"0\" selected=\"true\">Unlimited</option>\n\t");
+ out.write("<option value=\"0\" selected=\"selected\">Unlimited</option>\n\t");
else
out.write("<option value=\"0\">Unlimited</option>\n\t");
if (seedPct == 100)
- out.write("<option value=\"100\" selected=\"true\">100%</option>\n\t");
+ out.write("<option value=\"100\" selected=\"selected\">100%</option>\n\t");
else
out.write("<option value=\"100\">100%</option>\n\t");
if (seedPct == 150)
- out.write("<option value=\"150\" selected=\"true\">150%</option>\n\t");
+ out.write("<option value=\"150\" selected=\"selected\">150%</option>\n\t");
else
out.write("<option value=\"150\">150%</option>\n\t");
out.write("</select><br>\n");
@@ -1473,6 +1571,57 @@ public class I2PSnarkServlet extends Default {
"</table></div></div></form>");
}
+ /** @since 0.9 */
+ private void writeTrackerForm(PrintWriter out, HttpServletRequest req) throws IOException {
+ StringBuilder buf = new StringBuilder(1024);
+ buf.append("<form action=\"/i2psnark/configure\" method=\"POST\">\n" +
+ "<div class=\"configsectionpanel\"><div class=\"snarkConfig\">\n" +
+ "<input type=\"hidden\" name=\"nonce\" value=\"" + _nonce + "\" >\n" +
+ "<input type=\"hidden\" name=\"action\" value=\"Save2\" >\n" +
+ "<span class=\"snarkConfigTitle\">" +
+ "<img alt=\"\" border=\"0\" src=\"" + _imgPath + "config.png\"> ");
+ buf.append(_("Trackers"));
+ buf.append("</span><hr>\n" +
+ "<table><tr><th>")
+ //.append(_("Remove"))
+ .append("</th><th>")
+ .append(_("Name"))
+ .append("</th><th>")
+ .append(_("Website URL"))
+ .append("</th><th>")
+ .append(_("Announce URL"))
+ .append("</th></tr>\n");
+ Map<String, String> trackers = _manager.getTrackers();
+ for (Map.Entry<String, String> entry : trackers.entrySet()) {
+ String name = entry.getKey();
+ String announceURL = entry.getValue();
+ int e = announceURL.indexOf('=');
+ if (e <= 0)
+ continue;
+ String homeURL = announceURL.substring(e + 1);
+ announceURL = announceURL.substring(0, e).replace("=", "=");
+ buf.append("<tr><td align=\"center\"><input type=\"checkbox\" class=\"optbox\" name=\"delete_")
+ .append(name).append("\">" +
+ "</td><td align=\"left\">").append(name)
+ .append("</td><td align=\"left\">").append(urlify(homeURL, 35))
+ .append("</td><td align=\"left\">").append(urlify(announceURL, 35))
+ .append("</td></tr>\n");
+ }
+ buf.append("<tr><td align=\"center\"><b>")
+ .append(_("Add")).append(":</b></td>" +
+ "<td align=\"left\"><input type=\"text\" size=\"16\" name=\"tname\"></td>" +
+ "<td align=\"left\"><input type=\"text\" size=\"40\" name=\"thurl\"></td>" +
+ "<td align=\"left\"><input type=\"text\" size=\"40\" name=\"taurl\"></td></tr>\n" +
+ "<tr><td colspan=\"2\"></td><td colspan=\"2\" align=\"left\">\n" +
+ "<input type=\"submit\" name=\"taction\" class=\"default\" value=\"").append(_("Add tracker")).append("\">\n" +
+ "<input type=\"submit\" name=\"taction\" class=\"delete\" value=\"").append(_("Delete selected")).append("\">\n" +
+ // "<input type=\"reset\" class=\"cancel\" value=\"").append(_("Cancel")).append("\">\n" +
+ "<input type=\"submit\" name=\"taction\" class=\"reload\" value=\"").append(_("Restore defaults")).append("\">\n" +
+ "<input type=\"submit\" name=\"taction\" class=\"add\" value=\"").append(_("Add tracker")).append("\">\n" +
+ "</td></tr></table></div></div></form>\n");
+ out.write(buf.toString());
+ }
+
private void writeConfigLink(PrintWriter out) throws IOException {
out.write("<div class=\"configsection\"><span class=\"snarkConfig\">\n" +
"<span class=\"snarkConfigTitle\"><a href=\"configure\">" +
@@ -1574,7 +1723,7 @@ public class I2PSnarkServlet extends Default {
for (int i = min; i <= max; i++) {
buf.append("<option value=\"").append(i).append("\" ");
if (i == now)
- buf.append("selected=\"true\" ");
+ buf.append("selected=\"selected\" ");
// constants to prevent tagging
buf.append(">").append(ngettext(DUMMY1 + name, DUMMY0 + name + 's', i));
buf.append("</option>\n");
@@ -1622,10 +1771,20 @@ public class I2PSnarkServlet extends Default {
/** @since 0.7.14 */
private static String urlify(String s) {
+ return urlify(s, 100);
+ }
+
+ /** @since 0.9 */
+ private static String urlify(String s, int max) {
StringBuilder buf = new StringBuilder(256);
// browsers seem to work without doing this but let's be strict
String link = urlEncode(s);
- buf.append("<a href=\"").append(link).append("\">").append(link).append("</a>");
+ String display;
+ if (s.length() <= max)
+ display = link;
+ else
+ display = urlEncode(s.substring(0, max)) + "…";
+ buf.append("<a href=\"").append(link).append("\">").append(display).append("</a>");
return buf.toString();
}
@@ -1991,12 +2150,12 @@ public class I2PSnarkServlet extends Default {
/** @since 0.7.14 */
private static String toImg(String icon) {
- return "<img alt=\"\" height=\"16\" width=\"16\" src=\"/i2psnark/_icons/" + icon + ".png\">";
+ return "<img alt=\"\" height=\"16\" width=\"16\" src=\"/i2psnark/.icons/" + icon + ".png\">";
}
/** @since 0.8.2 */
private static String toImg(String icon, String altText) {
- return "<img alt=\"" + altText + "\" height=\"16\" width=\"16\" src=\"/i2psnark/_icons/" + icon + ".png\">";
+ return "<img alt=\"" + altText + "\" height=\"16\" width=\"16\" src=\"/i2psnark/.icons/" + icon + ".png\">";
}
/** @since 0.8.1 */
diff --git a/apps/i2ptunnel/java/build.xml b/apps/i2ptunnel/java/build.xml
index 1b62279145de25669f48b9c6356ee25069488ba1..df8387b6d2d9d0bda087c6559fc7ffc4c3bfc624 100644
--- a/apps/i2ptunnel/java/build.xml
+++ b/apps/i2ptunnel/java/build.xml
@@ -63,6 +63,7 @@
<attribute name="Main-Class" value="net.i2p.i2ptunnel.I2PTunnel" />
<attribute name="Class-Path" value="i2p.jar mstreaming.jar" />
<attribute name="Implementation-Version" value="${full.version}" />
+ <attribute name="Built-By" value="${build.built-by}" />
<attribute name="Build-Date" value="${build.timestamp}" />
<attribute name="Base-Revision" value="${workspace.version}" />
<attribute name="Workspace-Changes" value="${workspace.changes.j.tr}" />
@@ -136,6 +137,7 @@
basedir="../jsp/" excludes="web.xml, web-fragment.xml, web-out.xml, **/*.java, *.jsp">
<manifest>
<attribute name="Implementation-Version" value="${full.version}" />
+ <attribute name="Built-By" value="${build.built-by}" />
<attribute name="Build-Date" value="${build.timestamp}" />
<attribute name="Base-Revision" value="${workspace.version}" />
<attribute name="Workspace-Changes" value="${workspace.changes.w.tr}" />
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
index b3bce9cbcdaa8da754503cc4635bba8adc14576d..ba47c5c37a14008a53945e83bbb9a01c00017662 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
@@ -13,6 +13,8 @@ import java.io.InputStreamReader;
import java.io.OutputStream;
import java.net.Socket;
import java.net.SocketException;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@@ -36,8 +38,8 @@ import net.i2p.data.DataFormatException;
import net.i2p.data.DataHelper;
import net.i2p.data.Destination;
import net.i2p.data.Hash;
+import net.i2p.i2ptunnel.localServer.LocalHTTPServer;
import net.i2p.util.EventDispatcher;
-import net.i2p.util.FileUtil;
import net.i2p.util.Log;
import net.i2p.util.PortMapper;
import net.i2p.util.Translate;
@@ -61,6 +63,10 @@ import net.i2p.util.Translate;
* in browsers or other user-visible applications, as relative links will not
* resolve correctly, cookies won't work, etc.
*
+ * Note that http://$b64key/... and http://$b64key.i2p/... are NOT supported, as
+ * a b64 key may contain '=' and '~', both of which are illegal host name characters.
+ * Rewrite as http://i2p/$b64key/...
+ *
* If the $site resolves with the I2P naming service, then it is directed towards
* that eepsite, otherwise it is directed towards this client's outproxy (typically
* "squid.i2p"). Only HTTP is supported (no HTTPS, ftp, mailto, etc). Both GET
@@ -102,7 +108,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
"That I2P Destination was not found. Perhaps you pasted in the "+
"wrong BASE64 I2P Destination or the link you are following is "+
"bad. The host (or the WWW proxy, if you're using one) could also "+
- "be temporarily offline. You may want to <b>retry</b>. "+
+ "be temporarily offline. You may want to <b>retry</b>. "+
"Could not find the following Destination:<BR><BR><div>")
.getBytes();
@@ -309,7 +315,8 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
return rv;
}
- private static final String LOCAL_SERVER = "proxy.i2p";
+ private static final String HELPER_PARAM = "i2paddresshelper";
+ public static final String LOCAL_SERVER = "proxy.i2p";
private static final boolean DEFAULT_GZIP = true;
/** all default to false */
public static final String PROP_REFERER = "i2ptunnel.httpclient.sendReferer";
@@ -321,11 +328,19 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
protected void clientConnectionRun(Socket s) {
InputStream in = null;
OutputStream out = null;
+
+ /**
+ * The URL after fixup, always starting with http://
+ */
String targetRequest = null;
+
boolean usingWWWProxy = false;
boolean usingInternalServer = false;
+ String internalPath = null;
+ String internalRawQuery = null;
String currentProxy = null;
long requestId = ++__requestId;
+
try {
out = s.getOutputStream();
InputReader reader = new InputReader(s.getInputStream());
@@ -351,79 +366,84 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
if (_log.shouldLog(Log.DEBUG))
_log.debug(getPrefix(requestId) + "First line [" + line + "]");
- int pos = line.indexOf(" ");
- if (pos == -1) break;
- method = line.substring(0, pos);
- // TODO use Java URL class to make all this simpler and more robust
- // That will also fix IPV6 [a:b:c]
- String request = line.substring(pos + 1);
+ String[] params = line.split(" ", 3);
+ if (params.length != 3)
+ break;
+ String request = params[1];
+
+ // various obscure fixups
if (request.startsWith("/") && getTunnel().getClientOptions().getProperty("i2ptunnel.noproxy") != null) {
// what is this for ???
request = "http://i2p" + request;
} else if (request.startsWith("/eepproxy/")) {
- // /eepproxy/foo.i2p/bar/baz.html HTTP/1.0
+ // Deprecated
+ // /eepproxy/foo.i2p/bar/baz.html
String subRequest = request.substring("/eepproxy/".length());
- int protopos = subRequest.indexOf(" ");
- String uri = subRequest.substring(0, protopos);
- if (uri.indexOf("/") == -1) {
- uri = uri + "/";
- }
- // "http://" + "foo.i2p/bar/baz.html" + " HTTP/1.0"
- request = "http://" + uri + subRequest.substring(protopos);
+ if (subRequest.indexOf("/") == -1)
+ subRequest += "/";
+ request = "http://" + subRequest;
+ /****
} else if (request.toLowerCase(Locale.US).startsWith("http://i2p/")) {
- // http://i2p/b64key/bar/baz.html HTTP/1.0
+ // http://i2p/b64key/bar/baz.html
+ // we can't do this now by setting the URI host to the b64key, as
+ // it probably contains '=' and '~' which are illegal,
+ // and a host may not include escaped octets
+ // This will get undone below.
String subRequest = request.substring("http://i2p/".length());
- int protopos = subRequest.indexOf(" ");
- String uri = subRequest.substring(0, protopos);
- if (uri.indexOf("/") == -1) {
- uri = uri + "/";
- }
- // "http://" + "b64key/bar/baz.html" + " HTTP/1.0"
- request = "http://" + uri + subRequest.substring(protopos);
+ if (subRequest.indexOf("/") == -1)
+ subRequest += "/";
+ "http://" + "b64key/bar/baz.html"
+ request = "http://" + subRequest;
+ } else if (request.toLowerCase(Locale.US).startsWith("http://")) {
+ // Unsupported
+ // http://$b64key/...
+ // This probably used to work, rewrite it so that
+ // we can create a URI without illegal characters
+ // This will get undone below.
+ String oldPath = request.substring(7);
+ int slash = oldPath.indexOf("/");
+ if (slash < 0)
+ slash = oldPath.length();
+ if (slash >= 516 && !oldPath.substring(0, slash).contains("."))
+ request = "http://i2p/" + oldPath;
+ ****/
}
- pos = request.indexOf("//");
- if (pos == -1) {
- method = null;
+ // Now use the Java URI parser
+ // This will be the incoming URI but will then get modified
+ // to be the outgoing URI (with http:// if going to outproxy, otherwise without)
+ URI requestURI;
+ try {
+ requestURI = new URI(request);
+ if (requestURI.getRawUserInfo() != null || requestURI.getRawFragment() != null) {
+ // these should never be sent to the proxy in the request line
+ if (_log.shouldLog(Log.WARN))
+ _log.warn(getPrefix(requestId) + "Removing userinfo or fragment [" + request + "]");
+ requestURI = changeURI(requestURI, null, 0, null);
+ }
+ if (requestURI.getPath() == null || requestURI.getPath().length() <= 0) {
+ // Add a path
+ if (_log.shouldLog(Log.WARN))
+ _log.warn(getPrefix(requestId) + "Adding / path to [" + request + "]");
+ requestURI = changeURI(requestURI, null, 0, "/");
+ }
+ } catch (URISyntaxException use) {
+ if (_log.shouldLog(Log.WARN))
+ _log.warn(getPrefix(requestId) + "Bad request [" + request + "]", use);
break;
}
- protocol = request.substring(0, pos + 2);
- request = request.substring(pos + 2);
-
- // "foo.i2p/bar/baz HTTP/1.1", with any i2paddresshelper parameter removed
- targetRequest = request;
+ method = params[0];
+ String protocolVersion = params[2];
- // pos is the start of the path
- pos = request.indexOf("/");
- if (pos == -1) {
- //pos = request.length();
+ protocol = requestURI.getScheme();
+ host = requestURI.getHost();
+ if (protocol == null || host == null) {
+ _log.warn("Null protocol or host: " + request);
method = null;
break;
}
- host = request.substring(0, pos);
- // parse port
- int posPort = host.indexOf(":");
- int port = 80;
- if(posPort != -1) {
- String[] parts = host.split(":");
- try {
- host = parts[0];
- } catch (ArrayIndexOutOfBoundsException ex) {
- if (out != null) {
- out.write(getErrorPage("denied", ERR_REQUEST_DENIED));
- writeFooter(out);
- }
- s.close();
- return;
-
- }
- try {
- port = Integer.parseInt(parts[1]);
- } catch(Exception exc) {
- // TODO: log this
- }
- }
+ int port = requestURI.getPort();
// Go through the various types of host names, set
// the host and destination variables accordingly,
@@ -433,115 +453,142 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
// in our addressbook (all naming is local),
// and it is removed from the request line.
- if (host.length() >= 516 && host.indexOf(".") < 0) {
- // http://b64key/bar/baz.html
- destination = host;
- host = getHostName(destination);
- line = method + ' ' + request.substring(pos);
- } else if (host.toLowerCase(Locale.US).equals(LOCAL_SERVER)) {
+ String hostLowerCase = host.toLowerCase(Locale.US);
+ if (hostLowerCase.equals(LOCAL_SERVER)) {
// so we don't do any naming service lookups
destination = host;
usingInternalServer = true;
- } else if (host.toLowerCase(Locale.US).endsWith(".i2p")) {
+ internalPath = requestURI.getPath();
+ internalRawQuery = requestURI.getRawQuery();
+ } else if (hostLowerCase.equals("i2p")) {
+ // pull the b64 dest out of the first path element
+ String oldPath = requestURI.getPath().substring(1);
+ int slash = oldPath.indexOf("/");
+ if (slash < 0) {
+ slash = oldPath.length();
+ oldPath += "/";
+ }
+ String dest = oldPath.substring(0, slash);
+ if (slash >= 516 && !dest.contains(".")) {
+ // possible alternative:
+ // redirect to b32
+ destination = dest;
+ host = getHostName(destination);
+ targetRequest = requestURI.toASCIIString();
+ String newURI = oldPath.substring(slash);
+ String query = requestURI.getRawQuery();
+ if (query != null)
+ newURI += '?' + query;
+ try {
+ requestURI = new URI(newURI);
+ } catch (URISyntaxException use) {
+ // shouldnt happen
+ _log.warn(request, use);
+ method = null;
+ break;
+ }
+ } else {
+ _log.warn("Bad http://i2p/b64dest " + request);
+ host = null;
+ break;
+ }
+ } else if (hostLowerCase.endsWith(".i2p")) {
// Destination gets the host name
destination = host;
// Host becomes the destination's "{b32}.b32.i2p" string, or "i2p" on lookup failure
host = getHostName(destination);
- int pos2;
- if ((pos2 = request.indexOf("?")) != -1) {
- // Try to find an address helper in the fragments
- // and split the request into it's component parts for rebuilding later
+ if (requestURI.getPort() >= 0) {
+ // TODO support I2P ports someday
+ //if (port >= 0)
+ // host = host + ':' + port;
+ if (_log.shouldLog(Log.WARN))
+ _log.warn(getPrefix(requestId) + "Removing port from [" + request + "]");
+ try {
+ requestURI = changeURI(requestURI, null, -1, null);
+ } catch (URISyntaxException use) {
+ _log.warn(request, use);
+ method = null;
+ break;
+ }
+ }
+
+ String query = requestURI.getRawQuery();
+ if (query != null) {
boolean ahelperConflict = false;
- String fragments = request.substring(pos2 + 1);
- String uriPath = request.substring(0, pos2);
- pos2 = fragments.indexOf(" ");
- String protocolVersion = fragments.substring(pos2 + 1);
- String urlEncoding = "";
- fragments = fragments.substring(0, pos2);
- String initialFragments = fragments;
- // FIXME split on ';' also
- fragments = fragments + "&";
- String fragment;
- while(fragments.length() > 0) {
- pos2 = fragments.indexOf("&");
- fragment = fragments.substring(0, pos2);
- fragments = fragments.substring(pos2 + 1);
-
- // Fragment looks like addresshelper key
- if (fragment.startsWith("i2paddresshelper=") &&
- !Boolean.valueOf(getTunnel().getClientOptions().getProperty(PROP_DISABLE_HELPER)).booleanValue()) {
- pos2 = fragment.indexOf("=");
- ahelperKey = fragment.substring(pos2 + 1);
- // Key contains data, lets not ignore it
- if (ahelperKey != null) {
- if(ahelperKey.endsWith(".i2p")) {
- // allow i2paddresshelper=<b32>.b32.i2p syntax.
- /*
- also i2paddresshelper=name.i2p for aliases
- i.e. on your eepsite put
- <a href="?i2paddresshelper=name.i2p">This is the name I want to be called.</a>
- */
- Destination dest = _context.namingService().lookup(ahelperKey);
- if(dest==null) {
- if (_log.shouldLog(Log.WARN))
- _log.warn(getPrefix(requestId) + "Could not find destination for "+ahelperKey);
- byte[] header = getErrorPage("ahelper-notfound", ERR_AHELPER_NOTFOUND);
- out.write(header);
- out.write(("<p>" + _("This seems to be a bad destination:") + " " + ahelperKey + " " + _("i2paddresshelper cannot help you with a destination like that!") + "</p>").getBytes("UTF-8"));
- writeFooter(out);
- // XXX: should closeSocket(s) be in a finally block?
- closeSocket(s);
- return;
- }
- ahelperKey = dest.toBase64();
- }
-
- ahelperPresent = true;
- // ahelperKey will be validated later
- if (host == null || "i2p".equals(host)) {
- // Host lookup failed - resolvable only with addresshelper
- // Store in local HashMap unless there is conflict
- String old = addressHelpers.putIfAbsent(destination.toLowerCase(Locale.US), ahelperKey);
- ahelperNew = old == null;
- if ((!ahelperNew) && !old.equals(ahelperKey)) {
+ // Try to find an address helper in the query
+ String[] helperStrings = removeHelper(query);
+ if (helperStrings != null &&
+ !Boolean.valueOf(getTunnel().getClientOptions().getProperty(PROP_DISABLE_HELPER)).booleanValue()) {
+ query = helperStrings[0];
+ if (query.equals(""))
+ query = null;
+ try {
+ requestURI = replaceQuery(requestURI, query);
+ } catch (URISyntaxException use) {
+ // shouldn't happen
+ _log.warn(request, use);
+ method = null;
+ break;
+ }
+ ahelperKey = helperStrings[1];
+ // Key contains data, lets not ignore it
+ if (ahelperKey.length() > 0) {
+ if(ahelperKey.endsWith(".i2p")) {
+ // allow i2paddresshelper=<b32>.b32.i2p syntax.
+ /*
+ also i2paddresshelper=name.i2p for aliases
+ i.e. on your eepsite put
+ <a href="?i2paddresshelper=name.i2p">This is the name I want to be called.</a>
+ */
+ Destination dest = _context.namingService().lookup(ahelperKey);
+ if(dest==null) {
+ if (_log.shouldLog(Log.WARN))
+ _log.warn(getPrefix(requestId) + "Could not find destination for "+ahelperKey);
+ byte[] header = getErrorPage("ahelper-notfound", ERR_AHELPER_NOTFOUND);
+ out.write(header);
+ out.write(("<p>" + _("This seems to be a bad destination:") + " " + ahelperKey + " " + _("i2paddresshelper cannot help you with a destination like that!") + "</p>").getBytes("UTF-8"));
+ writeFooter(out);
+ // XXX: should closeSocket(s) be in a finally block?
+ closeSocket(s);
+ return;
+ }
+ ahelperKey = dest.toBase64();
+ }
+
+ ahelperPresent = true;
+ // ahelperKey will be validated later
+ if (host == null || "i2p".equals(host)) {
+ // Host lookup failed - resolvable only with addresshelper
+ // Store in local HashMap unless there is conflict
+ String old = addressHelpers.putIfAbsent(destination.toLowerCase(Locale.US), ahelperKey);
+ ahelperNew = old == null;
+ if ((!ahelperNew) && !old.equals(ahelperKey)) {
+ // Conflict: handle when URL reconstruction done
+ ahelperConflict = true;
+ if (_log.shouldLog(Log.WARN))
+ _log.warn(getPrefix(requestId) + "Addresshelper key conflict for site [" + destination +
+ "], trusted key [" + old + "], specified key [" + ahelperKey + "].");
+ }
+ } else {
+ // If the host is resolvable from database, verify addresshelper key
+ // Silently bypass correct keys, otherwise alert
+ Destination hostDest = _context.namingService().lookup(destination);
+ if (hostDest != null) {
+ String destB64 = hostDest.toBase64();
+ if (destB64 != null && !destB64.equals(ahelperKey)) {
// Conflict: handle when URL reconstruction done
ahelperConflict = true;
if (_log.shouldLog(Log.WARN))
_log.warn(getPrefix(requestId) + "Addresshelper key conflict for site [" + destination +
- "], trusted key [" + old + "], specified key [" + ahelperKey + "].");
- }
- } else {
- // If the host is resolvable from database, verify addresshelper key
- // Silently bypass correct keys, otherwise alert
- Destination hostDest = _context.namingService().lookup(destination);
- if (hostDest != null) {
- String destB64 = hostDest.toBase64();
- if (destB64 != null && !destB64.equals(ahelperKey)) {
- // Conflict: handle when URL reconstruction done
- ahelperConflict = true;
- if (_log.shouldLog(Log.WARN))
- _log.warn(getPrefix(requestId) + "Addresshelper key conflict for site [" + destination +
- "], trusted key [" + destB64 + "], specified key [" + ahelperKey + "].");
-
- }
+ "], trusted key [" + destB64 + "], specified key [" + ahelperKey + "].");
+
}
}
- } // ahelperKey
- } else {
- // Other fragments, just pass along
- // Append each fragment to urlEncoding
- if ("".equals(urlEncoding)) {
- urlEncoding = "?" + fragment;
- } else {
- urlEncoding = urlEncoding + "&" + fragment;
}
- }
- }
- // Reconstruct the request minus the i2paddresshelper GET var
- request = uriPath + urlEncoding + " " + protocolVersion;
- targetRequest = request;
+ } // ahelperKey
+ } // helperstrings
// Did addresshelper key conflict?
if (ahelperConflict) {
@@ -553,9 +600,17 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
byte[] header = getErrorPage("dnfb", ERR_DESTINATION_UNKNOWN);
writeErrorMessage(header, out, targetRequest, false, destination, null);
} else {
- String trustedURL = protocol + uriPath + urlEncoding;
- // Fixme - any path is lost
- String conflictURL = protocol + alias + '/' + urlEncoding;
+ String trustedURL = requestURI.toASCIIString();
+ URI conflictURI;
+ try {
+ conflictURI = changeURI(requestURI, alias, 0, null);
+ } catch (URISyntaxException use) {
+ // shouldn't happen
+ _log.warn(request, use);
+ method = null;
+ break;
+ }
+ String conflictURL = conflictURI.toASCIIString();
byte[] header = getErrorPage("ahelper-conflict", ERR_AHELPER_CONFLICT);
out.write(header);
out.write(_("To visit the destination in your host database, click <a href=\"{0}\">here</a>. To visit the conflicting addresshelper destination, click <a href=\"{1}\">here</a>.", trustedURL, conflictURL).getBytes("UTF-8"));
@@ -572,11 +627,24 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
if (addressHelper != null)
host = getHostName(addressHelper);
- line = method + " " + request.substring(pos);
+ // now strip everything but path and query from URI
+ targetRequest = requestURI.toASCIIString();
+ String newURI = requestURI.getRawPath();
+ if (query != null)
+ newURI += '?' + query;
+ try {
+ requestURI = new URI(newURI);
+ } catch (URISyntaxException use) {
+ // shouldnt happen
+ _log.warn(request, use);
+ method = null;
+ break;
+ }
+
// end of (host endsWith(".i2p"))
- } else if (host.toLowerCase(Locale.US).equals("localhost") || host.equals("127.0.0.1") ||
- host.startsWith("192.168.")) {
+ } else if (hostLowerCase.equals("localhost") || host.equals("127.0.0.1") ||
+ host.startsWith("192.168.") || host.equals("[::1]")) {
// if somebody is trying to get to 192.168.example.com, oh well
if (out != null) {
out.write(getErrorPage("localhost", ERR_LOCALHOST));
@@ -584,9 +652,9 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
}
s.close();
return;
- } else if (host.indexOf(".") != -1) {
- // rebuild host
- host = host + ":" + port;
+ } else if (host.contains(".") || host.startsWith("[")) {
+ if (port >= 0)
+ host = host + ':' + port;
// The request must be forwarded to a WWW proxy
if (_log.shouldLog(Log.DEBUG))
_log.debug("Before selecting outproxy for " + host);
@@ -606,36 +674,23 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
}
destination = currentProxy;
usingWWWProxy = true;
+ targetRequest = requestURI.toASCIIString();
if (_log.shouldLog(Log.DEBUG))
- _log.debug(getPrefix(requestId) + "Host doesnt end with .i2p and it contains a period [" + host + "]: wwwProxy!");
+ _log.debug(getPrefix(requestId) + " [" + host + "]: wwwProxy!");
} else {
// what is left for here? a hostname with no dots, and != "i2p"
// and not a destination ???
// Perhaps something in privatehosts.txt ...
- request = request.substring(pos + 1);
- pos = request.indexOf("/");
- if (pos < 0) {
- l.log("Invalid request url [" + request + "]");
- if (out != null) {
- out.write(getErrorPage("denied", ERR_REQUEST_DENIED));
- writeFooter(out);
- }
- s.close();
- return;
- }
- destination = request.substring(0, pos);
- host = getHostName(destination);
- line = method + " " + request.substring(pos);
- } // end host name processing
-
- if (port != 80 && !usingWWWProxy) {
+ // Rather than look it up, just bail out.
+ if (_log.shouldLog(Log.WARN))
+ _log.warn("NODOTS, NOI2P: " + request);
if (out != null) {
out.write(getErrorPage("denied", ERR_REQUEST_DENIED));
writeFooter(out);
}
s.close();
return;
- }
+ } // end host name processing
boolean isValid = usingWWWProxy || usingInternalServer || isSupportedAddress(host, protocol);
if (!isValid) {
@@ -645,18 +700,10 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
break;
}
- // don't do this, it forces yet another hostname lookup,
- // and in all cases host was already set above
- //if ((!usingWWWProxy) && (!usingInternalServer)) {
- // String oldhost = host;
- // host = getHostName(destination); // hide original host
- // if (_log.shouldLog(Log.INFO))
- // _log.info(getPrefix(requestId) + " oldhost " + oldhost + " newhost " + host + " dest " + destination);
- //}
+ line = method + ' ' + requestURI.toASCIIString() + ' ' + protocolVersion;
if (_log.shouldLog(Log.DEBUG)) {
- _log.debug(getPrefix(requestId) + "METHOD: \"" + method + "\"");
- _log.debug(getPrefix(requestId) + "PROTOC: \"" + protocol + "\"");
+ _log.debug(getPrefix(requestId) + "NEWREQ: \"" + line + "\"");
_log.debug(getPrefix(requestId) + "HOST : \"" + host + "\"");
_log.debug(getPrefix(requestId) + "DEST : \"" + destination + "\"");
}
@@ -763,7 +810,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
if (method == null || destination == null) {
//l.log("No HTTP method found in the request.");
if (out != null) {
- if (protocol != null && "http://".equals(protocol.toLowerCase(Locale.US)))
+ if (protocol != null && "http".equals(protocol.toLowerCase(Locale.US)))
out.write(getErrorPage("denied", ERR_REQUEST_DENIED));
else
out.write(getErrorPage("protocol", ERR_BAD_PROTOCOL));
@@ -794,11 +841,11 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
// Ignore all the headers
if (usingInternalServer) {
// disable the add form if address helper is disabled
- if (targetRequest.startsWith(LOCAL_SERVER + "/add?") &&
+ if (internalPath.equals("/add") &&
Boolean.valueOf(getTunnel().getClientOptions().getProperty(PROP_DISABLE_HELPER)).booleanValue()) {
out.write(ERR_HELPER_DISABLED);
} else {
- serveLocalFile(out, method, targetRequest, _proxyNonce);
+ LocalHTTPServer.serveLocalFile(out, method, internalPath, internalRawQuery, _proxyNonce);
}
s.close();
return;
@@ -812,9 +859,16 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
String addressHelper = addressHelpers.get(destination.toLowerCase(Locale.US));
if (addressHelper != null) {
clientDest = _context.namingService().lookup(addressHelper);
- // remove bad entries
- if (clientDest == null)
+ if (clientDest == null) {
+ // remove bad entries
addressHelpers.remove(destination.toLowerCase(Locale.US));
+ if (_log.shouldLog(Log.WARN))
+ _log.warn(getPrefix(requestId) + "Could not find destination for " + addressHelper);
+ byte[] header = getErrorPage("ahelper-notfound", ERR_AHELPER_NOTFOUND);
+ writeErrorMessage(header, out, targetRequest, false, destination, null);
+ s.close();
+ return;
+ }
} else if ("i2p".equals(host)) {
clientDest = null;
} else if (destination.length() == 60 && destination.toLowerCase(Locale.US).endsWith(".b32.i2p")) {
@@ -865,7 +919,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
if (ahelperNew && "GET".equals(method) &&
(userAgent == null || !userAgent.startsWith("Wget")) &&
!Boolean.valueOf(getTunnel().getClientOptions().getProperty(PROP_DISABLE_HELPER)).booleanValue()) {
- writeHelperSaveForm(out, destination, ahelperKey, protocol + targetRequest);
+ writeHelperSaveForm(out, destination, ahelperKey, targetRequest);
s.close();
return;
}
@@ -875,10 +929,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
// This also prevents the not-found error page from looking bad
// Syndie can't handle a redirect of a POST
if (ahelperPresent && !"POST".equals(method)) {
- String uri = protocol + targetRequest;
- int spc = uri.indexOf(" ");
- if (spc >= 0)
- uri = uri.substring(0, spc);
+ String uri = targetRequest;
if (_log.shouldLog(Log.DEBUG))
_log.debug("Auto redirecting to " + uri);
out.write(("HTTP/1.1 301 Address Helper Accepted\r\n"+
@@ -928,10 +979,6 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
private void writeHelperSaveForm(OutputStream out, String destination, String ahelperKey, String targetRequest) throws IOException {
if (out == null)
return;
- // strip HTTP/1.1
- int protopos = targetRequest.indexOf(" ");
- if (protopos >= 0)
- targetRequest = targetRequest.substring(0, protopos);
byte[] header = getErrorPage("ahelper-new", ERR_AHELPER_NEW);
out.write(header);
out.write(("<table><tr><td class=\"mediumtags\" align=\"right\">" + _("Host") + "</td><td class=\"mediumtags\">" + destination + "</td></tr>\n" +
@@ -939,6 +986,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
"<textarea rows=\"1\" style=\"height: 4em; min-width: 0; min-height: 0;\" cols=\"70\" wrap=\"off\" readonly=\"readonly\" >" +
ahelperKey + "</textarea></td></tr></table>\n" +
"<hr><div class=\"formaction\">"+
+ // FIXME if there is a query remaining it is lost
"<form method=\"GET\" action=\"" + targetRequest + "\">" +
"<button type=\"submit\" class=\"go\">" + _("Continue to {0} without saving", destination) + "</button>" +
"</form>\n<form method=\"GET\" action=\"http://" + LOCAL_SERVER + "/add\">" +
@@ -1046,7 +1094,10 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
// we won't ever get here
}
- private static void writeFooter(OutputStream out) throws IOException {
+ /**
+ * Public only for LocalHTTPServer, not for general use
+ */
+ public static void writeFooter(OutputStream out) throws IOException {
// the css is hiding this div for now, but we'll keep it here anyway
out.write("<div class=\"proxyfooter\"><p><i>I2P HTTP Proxy Server<br>Generated on: ".getBytes());
out.write(new Date().toString().getBytes());
@@ -1091,15 +1142,10 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
if (out != null) {
out.write(errMessage);
if (targetRequest != null) {
- int protopos = targetRequest.indexOf(" ");
- String uri;
- if (protopos >= 0)
- uri = targetRequest.substring(0, protopos);
- else
- uri = targetRequest;
- out.write("<a href=\"http://".getBytes());
+ String uri = targetRequest;
+ out.write("<a href=\"".getBytes());
out.write(uri.getBytes());
- out.write("\">http://".getBytes());
+ out.write("\">".getBytes());
out.write(uri.getBytes());
out.write("</a>".getBytes());
if (usingWWWProxy) {
@@ -1193,23 +1239,9 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
}
}
****/
- return protocol.toLowerCase(Locale.US).equals("http://");
+ return protocol.toLowerCase(Locale.US).equals("http");
}
- private final static byte[] ERR_404 =
- ("HTTP/1.1 404 Not Found\r\n"+
- "Content-Type: text/plain\r\n"+
- "\r\n"+
- "HTTP Proxy local file not found")
- .getBytes();
-
- private final static byte[] ERR_ADD =
- ("HTTP/1.1 409 Bad\r\n"+
- "Content-Type: text/plain\r\n"+
- "\r\n"+
- "Add to addressbook failed - bad parameters")
- .getBytes();
-
private final static byte[] ERR_HELPER_DISABLED =
("HTTP/1.1 403 Disabled\r\n"+
"Content-Type: text/plain\r\n"+
@@ -1218,185 +1250,127 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
.getBytes();
/**
- * Very simple web server.
+ * Change various parts of the URI.
+ * String parameters are all non-encoded.
*
- * Serve local files in the docs/ directory, for CSS and images in
- * error pages, using the reserved address proxy.i2p
- * (similar to p.p in privoxy).
- * This solves the problems with including links to the router console,
- * as assuming the router console is at 127.0.0.1 leads to broken
- * links if it isn't.
+ * Scheme always preserved.
+ * Userinfo always cleared.
+ * Host changed if non-null.
+ * Port changed if non-zero.
+ * Path changed if non-null.
+ * Query always preserved.
+ * Fragment always cleared.
*
- * Ignore all request headers (If-Modified-Since, etc.)
- *
- * There is basic protection here -
- * FileUtil.readFile() prevents traversal above the base directory -
- * but inproxy/gateway ops would be wise to block proxy.i2p to prevent
- * exposing the docs/ directory or perhaps other issues through
- * uncaught vulnerabilities.
- * Restrict to the /themes/ directory for now.
+ * @since 0.9
+ */
+ private static URI changeURI(URI uri, String host, int port, String path) throws URISyntaxException {
+ return new URI(uri.getScheme(),
+ null,
+ host != null ? host : uri.getHost(),
+ port != 0 ? port : uri.getPort(),
+ path != null ? path : uri.getPath(),
+ // FIXME this breaks encoded =, &
+ uri.getQuery(),
+ null);
+ }
+
+ /**
+ * Replace query in the URI.
+ * Userinfo cleared if uri contained a query.
+ * Fragment cleared if uri contained a query.
*
- * @param targetRequest "proxy.i2p/themes/foo.png HTTP/1.1"
+ * @param query an ENCODED query, removed if null
+ * @since 0.9
*/
- private static void serveLocalFile(OutputStream out, String method, String targetRequest, String proxyNonce) {
- //System.err.println("targetRequest: \"" + targetRequest + "\"");
- // a home page message for the curious...
- if (targetRequest.startsWith(LOCAL_SERVER + "/ ")) {
- try {
- out.write(("HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nCache-Control: max-age=86400\r\n\r\nI2P HTTP proxy OK").getBytes());
- out.flush();
- } catch (IOException ioe) {}
- return;
- }
- if ((method.equals("GET") || method.equals("HEAD")) &&
- targetRequest.startsWith(LOCAL_SERVER + "/themes/") &&
- !targetRequest.contains("..")) {
- int space = targetRequest.indexOf(' ');
- String filename = null;
- try {
- filename = targetRequest.substring(LOCAL_SERVER.length() + 8, space); // "/themes/".length
- } catch (IndexOutOfBoundsException ioobe) {
- return;
- }
- // theme hack
- if (filename.startsWith("console/default/"))
- filename = filename.replaceFirst("default", I2PAppContext.getGlobalContext().getProperty("routerconsole.theme", "light"));
- File themesDir = new File(_errorDir, "themes");
- File file = new File(themesDir, filename);
- if (file.exists() && !file.isDirectory()) {
- String type;
- if (filename.endsWith(".css"))
- type = "text/css";
- else if (filename.endsWith(".ico"))
- type = "image/x-icon";
- else if (filename.endsWith(".png"))
- type = "image/png";
- else if (filename.endsWith(".jpg"))
- type = "image/jpeg";
- else type = "text/html";
- try {
- out.write("HTTP/1.1 200 OK\r\nContent-Type: ".getBytes());
- out.write(type.getBytes());
- out.write("\r\nCache-Control: max-age=86400\r\n\r\n".getBytes());
- FileUtil.readFile(filename, themesDir.getAbsolutePath(), out);
- } catch (IOException ioe) {}
- return;
- }
+ private static URI replaceQuery(URI uri, String query) throws URISyntaxException {
+ URI rv = uri;
+ if (rv.getRawQuery() != null) {
+ rv = new URI(rv.getScheme(),
+ null,
+ uri.getHost(),
+ uri.getPort(),
+ uri.getPath(),
+ null,
+ null);
}
-
- // Add to addressbook (form submit)
- // Parameters are url, host, dest, nonce, and master | router | private.
- // Do the add and redirect.
- if (targetRequest.startsWith(LOCAL_SERVER + "/add?")) {
- int spc = targetRequest.indexOf(' ');
- String query = targetRequest.substring(LOCAL_SERVER.length() + 5, spc); // "/add?".length()
- Map<String, String> opts = new HashMap(8);
- StringTokenizer tok = new StringTokenizer(query, "=&;");
- while (tok.hasMoreTokens()) {
- String k = tok.nextToken();
- if (!tok.hasMoreTokens())
- break;
- String v = tok.nextToken();
- opts.put(decode(k), decode(v));
- }
-
- String url = opts.get("url");
- String host = opts.get("host");
- String b64Dest = opts.get("dest");
- String nonce = opts.get("nonce");
- String book = "privatehosts.txt";
- if (opts.get("master") != null)
- book = "userhosts.txt";
- else if (opts.get("router") != null)
- book = "hosts.txt";
- Destination dest = null;
- if (b64Dest != null) {
- try {
- dest = new Destination(b64Dest);
- } catch (DataFormatException dfe) {
- System.err.println("Bad dest to save?" + b64Dest);
- }
- }
- //System.err.println("url : \"" + url + "\"");
- //System.err.println("host : \"" + host + "\"");
- //System.err.println("b64dest : \"" + b64Dest + "\"");
- //System.err.println("book : \"" + book + "\"");
- //System.err.println("nonce : \"" + nonce + "\"");
- if (proxyNonce.equals(nonce) && url != null && host != null && dest != null) {
- try {
- NamingService ns = I2PAppContext.getGlobalContext().namingService();
- Properties nsOptions = new Properties();
- nsOptions.setProperty("list", book);
- nsOptions.setProperty("s", _("Added via address helper"));
- boolean success = ns.put(host, dest, nsOptions);
- writeRedirectPage(out, success, host, book, url);
- return;
- } catch (IOException ioe) {}
- }
- try {
- out.write(ERR_ADD);
- out.flush();
- } catch (IOException ioe) {}
- return;
+ if (query != null) {
+ String newURI = rv.toASCIIString() + '?' + query;
+ rv = new URI(newURI);
}
- try {
- out.write(ERR_404);
- out.flush();
- } catch (IOException ioe) {}
- }
-
- /** @since 0.8.7 */
- private static void writeRedirectPage(OutputStream out, boolean success, String host, String book, String url) throws IOException {
- out.write(("HTTP/1.1 200 OK\r\n"+
- "Content-Type: text/html; charset=UTF-8\r\n"+
- "\r\n"+
- "<html><head>"+
- "<title>" + _("Redirecting to {0}", host) + "</title>\n" +
- "<link rel=\"shortcut icon\" href=\"http://proxy.i2p/themes/console/images/favicon.ico\" >\n" +
- "<link href=\"http://proxy.i2p/themes/console/default/console.css\" rel=\"stylesheet\" type=\"text/css\" >\n" +
- "<meta http-equiv=\"Refresh\" content=\"1; url=" + url + "\">\n" +
- "</head><body>\n" +
- "<div class=logo>\n" +
- "<a href=\"http://127.0.0.1:7657/\" title=\"" + _("Router Console") + "\"><img src=\"http://proxy.i2p/themes/console/images/i2plogo.png\" alt=\"I2P Router Console\" border=\"0\"></a><hr>\n" +
- "<a href=\"http://127.0.0.1:7657/config\">" + _("Configuration") + "</a> <a href=\"http://127.0.0.1:7657/help.jsp\">" + _("Help") + "</a> <a href=\"http://127.0.0.1:7657/susidns/index\">" + _("Addressbook") + "</a>\n" +
- "</div>" +
- "<div class=warning id=warning>\n" +
- "<h3>" +
- (success ?
- _("Saved {0} to the {1} addressbook, redirecting now.", host, book) :
- _("Failed to save {0} to the {1} addressbook, redirecting now.", host, book)) +
- "</h3>\n<p><a href=\"" + url + "\">" +
- _("Click here if you are not redirected automatically.") +
- "</a></p></div>").getBytes("UTF-8"));
- writeFooter(out);
- out.flush();
+ return rv;
}
/**
- * Decode %xx encoding
- * @since 0.8.7
+ * Remove the address helper from an encoded query.
+ *
+ * @param query an ENCODED query, removed if null
+ * @return rv[0] is ENCODED query with helper removed, non-null but possibly empty;
+ * rv[1] is DECODED helper value, non-null but possibly empty;
+ * rv null if no helper present
+ * @since 0.9
*/
- private static String decode(String s) {
- if (!s.contains("%"))
- return s;
- StringBuilder buf = new StringBuilder(s.length());
- for (int i = 0; i < s.length(); i++) {
- char c = s.charAt(i);
- if (c != '%') {
- buf.append(c);
- } else {
- try {
- buf.append((char) Integer.parseInt(s.substring(++i, (++i) + 1), 16));
- } catch (IndexOutOfBoundsException ioobe) {
- break;
- } catch (NumberFormatException nfe) {
- break;
+ private static String[] removeHelper(String query) {
+ int keystart = 0;
+ int valstart = -1;
+ String key = null;
+ for (int i = 0; i <= query.length(); i++) {
+ char c = i < query.length() ? query.charAt(i) : '&';
+ if (c == ';' || c == '&') {
+ // end of key or value
+ if (valstart < 0)
+ key = query.substring(keystart, i);
+ String decodedKey = LocalHTTPServer.decode(key);
+ if (decodedKey.equals(HELPER_PARAM)) {
+ String newQuery = keystart > 0 ? query.substring(0, keystart - 1) : "";
+ if (i < query.length() - 1) {
+ if (keystart > 0)
+ newQuery += query.substring(i);
+ else
+ newQuery += query.substring(i + 1);
+ }
+ String value = valstart >= 0 ? query.substring(valstart, i) : "";
+ String helperValue = LocalHTTPServer.decode(value);
+ return new String[] { newQuery, helperValue };
}
+ keystart = i + 1;
+ valstart = -1;
+ } else if (c == '=') {
+ // end of key
+ key = query.substring(keystart, i);
+ valstart = i + 1;
}
}
- return buf.toString();
+ return null;
+ }
+
+/****
+ private static String[] tests = {
+ "", "foo", "foo=bar", "&", "&=&", "===", "&&",
+ "i2paddresshelper=foo",
+ "i2paddresshelpe=foo",
+ "2paddresshelper=foo",
+ "i2paddresshelper=%66oo",
+ "%692paddresshelper=foo",
+ "i2paddresshelper=foo&a=b",
+ "a=b&i2paddresshelper=foo",
+ "a=b&i2paddresshelper&c=d",
+ "a=b&i2paddresshelper=foo&c=d",
+ "a=b;i2paddresshelper=foo;c=d",
+ "a=b&i2paddresshelper=foo&c"
+ };
+
+ public static void main(String[] args) {
+ for (int i = 0; i < tests.length; i++) {
+ String[] s = removeHelper(tests[i]);
+ if (s != null)
+ System.out.println("Test \"" + tests[i] + "\" q=\"" + s[0] + "\" h=\"" + s[1] + "\"");
+ else
+ System.out.println("Test \"" + tests[i] + "\" no match");
+ }
}
+****/
+ /** */
private static final String BUNDLE_NAME = "net.i2p.i2ptunnel.web.messages";
/** lang in routerconsole.lang property, else current locale */
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java
new file mode 100644
index 0000000000000000000000000000000000000000..7c68c4e4062525dbc55a5b1780943cf4a51b6c3d
--- /dev/null
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java
@@ -0,0 +1,247 @@
+/* I2PTunnel is GPL'ed (with the exception mentioned in I2PTunnel.java)
+ * (c) 2003 - 2004 mihi
+ */
+package net.i2p.i2ptunnel.localServer;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.StringTokenizer;
+
+import net.i2p.I2PAppContext;
+import net.i2p.client.naming.NamingService;
+import net.i2p.data.DataFormatException;
+import net.i2p.data.Destination;
+import net.i2p.i2ptunnel.I2PTunnelHTTPClient;
+import net.i2p.util.FileUtil;
+import net.i2p.util.Log;
+import net.i2p.util.Translate;
+
+/**
+ * Very simple web server.
+ *
+ * Serve local files in the docs/ directory, for CSS and images in
+ * error pages, using the reserved address proxy.i2p
+ * (similar to p.p in privoxy).
+ * This solves the problems with including links to the router console,
+ * as assuming the router console is at 127.0.0.1 leads to broken
+ * links if it isn't.
+ *
+ * @since 0.7.6, moved from I2PTunnelHTTPClient in 0.9
+ */
+public abstract class LocalHTTPServer {
+
+ private final static byte[] ERR_404 =
+ ("HTTP/1.1 404 Not Found\r\n"+
+ "Content-Type: text/plain\r\n"+
+ "\r\n"+
+ "HTTP Proxy local file not found")
+ .getBytes();
+
+ private final static byte[] ERR_ADD =
+ ("HTTP/1.1 409 Bad\r\n"+
+ "Content-Type: text/plain\r\n"+
+ "\r\n"+
+ "Add to addressbook failed - bad parameters")
+ .getBytes();
+
+ /**
+ * Very simple web server.
+ *
+ * Serve local files in the docs/ directory, for CSS and images in
+ * error pages, using the reserved address proxy.i2p
+ * (similar to p.p in privoxy).
+ * This solves the problems with including links to the router console,
+ * as assuming the router console is at 127.0.0.1 leads to broken
+ * links if it isn't.
+ *
+ * Ignore all request headers (If-Modified-Since, etc.)
+ *
+ * There is basic protection here -
+ * FileUtil.readFile() prevents traversal above the base directory -
+ * but inproxy/gateway ops would be wise to block proxy.i2p to prevent
+ * exposing the docs/ directory or perhaps other issues through
+ * uncaught vulnerabilities.
+ * Restrict to the /themes/ directory for now.
+ *
+ * @param targetRequest decoded path only, non-null
+ * @param query raw (encoded), may be null
+ */
+ public static void serveLocalFile(OutputStream out, String method, String targetRequest, String query, String proxyNonce) {
+ //System.err.println("targetRequest: \"" + targetRequest + "\"");
+ // a home page message for the curious...
+ if (targetRequest.equals("/")) {
+ try {
+ out.write(("HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nCache-Control: max-age=86400\r\n\r\nI2P HTTP proxy OK").getBytes());
+ out.flush();
+ } catch (IOException ioe) {}
+ return;
+ }
+ if ((method.equals("GET") || method.equals("HEAD")) &&
+ targetRequest.startsWith("/themes/") &&
+ !targetRequest.contains("..")) {
+ String filename = null;
+ try {
+ filename = targetRequest.substring(8); // "/themes/".length
+ } catch (IndexOutOfBoundsException ioobe) {
+ return;
+ }
+ // theme hack
+ if (filename.startsWith("console/default/"))
+ filename = filename.replaceFirst("default", I2PAppContext.getGlobalContext().getProperty("routerconsole.theme", "light"));
+ File themesDir = new File(I2PAppContext.getGlobalContext().getBaseDir(), "docs/themes");
+ File file = new File(themesDir, filename);
+ if (file.exists() && !file.isDirectory()) {
+ String type;
+ if (filename.endsWith(".css"))
+ type = "text/css";
+ else if (filename.endsWith(".ico"))
+ type = "image/x-icon";
+ else if (filename.endsWith(".png"))
+ type = "image/png";
+ else if (filename.endsWith(".jpg"))
+ type = "image/jpeg";
+ else type = "text/html";
+ try {
+ out.write("HTTP/1.1 200 OK\r\nContent-Type: ".getBytes());
+ out.write(type.getBytes());
+ out.write("\r\nCache-Control: max-age=86400\r\n\r\n".getBytes());
+ FileUtil.readFile(filename, themesDir.getAbsolutePath(), out);
+ } catch (IOException ioe) {}
+ return;
+ }
+ }
+
+ // Add to addressbook (form submit)
+ // Parameters are url, host, dest, nonce, and master | router | private.
+ // Do the add and redirect.
+ if (targetRequest.equals("/add")) {
+ Map<String, String> opts = new HashMap(8);
+ // this only works if all keys are followed by =value
+ StringTokenizer tok = new StringTokenizer(query, "=&;");
+ while (tok.hasMoreTokens()) {
+ String k = tok.nextToken();
+ if (!tok.hasMoreTokens())
+ break;
+ String v = tok.nextToken();
+ opts.put(decode(k), decode(v));
+ }
+
+ String url = opts.get("url");
+ String host = opts.get("host");
+ String b64Dest = opts.get("dest");
+ String nonce = opts.get("nonce");
+ String book = "privatehosts.txt";
+ if (opts.get("master") != null)
+ book = "userhosts.txt";
+ else if (opts.get("router") != null)
+ book = "hosts.txt";
+ Destination dest = null;
+ if (b64Dest != null) {
+ try {
+ dest = new Destination(b64Dest);
+ } catch (DataFormatException dfe) {
+ System.err.println("Bad dest to save?" + b64Dest);
+ }
+ }
+ //System.err.println("url : \"" + url + "\"");
+ //System.err.println("host : \"" + host + "\"");
+ //System.err.println("b64dest : \"" + b64Dest + "\"");
+ //System.err.println("book : \"" + book + "\"");
+ //System.err.println("nonce : \"" + nonce + "\"");
+ if (proxyNonce.equals(nonce) && url != null && host != null && dest != null) {
+ try {
+ NamingService ns = I2PAppContext.getGlobalContext().namingService();
+ Properties nsOptions = new Properties();
+ nsOptions.setProperty("list", book);
+ nsOptions.setProperty("s", _("Added via address helper"));
+ boolean success = ns.put(host, dest, nsOptions);
+ writeRedirectPage(out, success, host, book, url);
+ return;
+ } catch (IOException ioe) {}
+ }
+ try {
+ out.write(ERR_ADD);
+ out.flush();
+ } catch (IOException ioe) {}
+ return;
+ }
+ try {
+ out.write(ERR_404);
+ out.flush();
+ } catch (IOException ioe) {}
+ }
+
+ /** @since 0.8.7 */
+ private static void writeRedirectPage(OutputStream out, boolean success, String host, String book, String url) throws IOException {
+ out.write(("HTTP/1.1 200 OK\r\n"+
+ "Content-Type: text/html; charset=UTF-8\r\n"+
+ "\r\n"+
+ "<html><head>"+
+ "<title>" + _("Redirecting to {0}", host) + "</title>\n" +
+ "<link rel=\"shortcut icon\" href=\"http://proxy.i2p/themes/console/images/favicon.ico\" >\n" +
+ "<link href=\"http://proxy.i2p/themes/console/default/console.css\" rel=\"stylesheet\" type=\"text/css\" >\n" +
+ "<meta http-equiv=\"Refresh\" content=\"1; url=" + url + "\">\n" +
+ "</head><body>\n" +
+ "<div class=logo>\n" +
+ "<a href=\"http://127.0.0.1:7657/\" title=\"" + _("Router Console") + "\"><img src=\"http://proxy.i2p/themes/console/images/i2plogo.png\" alt=\"I2P Router Console\" border=\"0\"></a><hr>\n" +
+ "<a href=\"http://127.0.0.1:7657/config\">" + _("Configuration") + "</a> <a href=\"http://127.0.0.1:7657/help.jsp\">" + _("Help") + "</a> <a href=\"http://127.0.0.1:7657/susidns/index\">" + _("Addressbook") + "</a>\n" +
+ "</div>" +
+ "<div class=warning id=warning>\n" +
+ "<h3>" +
+ (success ?
+ _("Saved {0} to the {1} addressbook, redirecting now.", host, book) :
+ _("Failed to save {0} to the {1} addressbook, redirecting now.", host, book)) +
+ "</h3>\n<p><a href=\"" + url + "\">" +
+ _("Click here if you are not redirected automatically.") +
+ "</a></p></div>").getBytes("UTF-8"));
+ I2PTunnelHTTPClient.writeFooter(out);
+ out.flush();
+ }
+
+ /**
+ * Decode %xx encoding
+ * @since 0.8.7
+ */
+ public static String decode(String s) {
+ if (!s.contains("%"))
+ return s;
+ StringBuilder buf = new StringBuilder(s.length());
+ for (int i = 0; i < s.length(); i++) {
+ char c = s.charAt(i);
+ if (c != '%') {
+ buf.append(c);
+ } else {
+ try {
+ buf.append((char) Integer.parseInt(s.substring(++i, (++i) + 1), 16));
+ } catch (IndexOutOfBoundsException ioobe) {
+ break;
+ } catch (NumberFormatException nfe) {
+ break;
+ }
+ }
+ }
+ return buf.toString();
+ }
+
+ private static final String BUNDLE_NAME = "net.i2p.i2ptunnel.web.messages";
+
+ /** lang in routerconsole.lang property, else current locale */
+ protected static String _(String key) {
+ return Translate.getString(key, I2PAppContext.getGlobalContext(), BUNDLE_NAME);
+ }
+
+ /** {0} */
+ protected static String _(String key, Object o) {
+ return Translate.getString(key, o, I2PAppContext.getGlobalContext(), BUNDLE_NAME);
+ }
+
+ /** {0} and {1} */
+ protected static String _(String key, Object o, Object o2) {
+ return Translate.getString(key, o, o2, I2PAppContext.getGlobalContext(), BUNDLE_NAME);
+ }
+
+}
diff --git a/apps/i2ptunnel/jsp/wizard.jsp b/apps/i2ptunnel/jsp/wizard.jsp
index ddb6556991c90efeda21f47053f09536b894b1c5..74afb65a28790f56d2a470484ad441af1ac27647 100644
--- a/apps/i2ptunnel/jsp/wizard.jsp
+++ b/apps/i2ptunnel/jsp/wizard.jsp
@@ -1,6 +1,10 @@
<%
// NOTE: Do the header carefully so there is no whitespace before the <?xml... line
+ // http://www.crazysquirrel.com/computing/general/form-encoding.jspx
+ if (request.getCharacterEncoding() == null)
+ request.setCharacterEncoding("UTF-8");
+
%><%@page pageEncoding="UTF-8"
%><%@page contentType="text/html" import="net.i2p.i2ptunnel.web.EditBean"
%><?xml version="1.0" encoding="UTF-8"?>
diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml
index e686e364a73c17db730bbcf1959f1bc4f5f3ca05..de9534274b35867cc1e869c5c6cb8c77a5884c5a 100644
--- a/apps/jetty/build.xml
+++ b/apps/jetty/build.xml
@@ -117,6 +117,7 @@
<property name="workspace.changes.tr" value="" />
<jar destfile="./jettylib/org.mortbay.jetty.jar" basedir="./build/obj" includes="**/*.class" update="true" >
<manifest>
+ <attribute name="Built-By" value="${build.built-by}" />
<attribute name="Build-Date" value="${build.timestamp}" />
<attribute name="Base-Revision" value="${workspace.version}" />
<attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
diff --git a/apps/ministreaming/java/build.xml b/apps/ministreaming/java/build.xml
index 235088fc312852a00a4acd178198fc3b7267932d..451ecf0f4c031b27c42a136706163cad968a5227 100644
--- a/apps/ministreaming/java/build.xml
+++ b/apps/ministreaming/java/build.xml
@@ -51,6 +51,7 @@
<jar destfile="./build/mstreaming.jar" basedir="./build/obj" includes="**/*.class" >
<manifest>
<attribute name="Implementation-Version" value="${full.version}" />
+ <attribute name="Built-By" value="${build.built-by}" />
<attribute name="Build-Date" value="${build.timestamp}" />
<attribute name="Base-Revision" value="${workspace.version}" />
<attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml
index 3dba335781c6f87708177aa15ce91c80d5017dba..714bd17db5b6fe4bccf9b5c858ffc822ad171344 100644
--- a/apps/routerconsole/java/build.xml
+++ b/apps/routerconsole/java/build.xml
@@ -92,6 +92,7 @@
<!-- DTG added in 0.8.4, not in the classpath for very old installs, before we changed wrapper.config to specify * -->
<attribute name="Class-Path" value="i2p.jar router.jar jrobin.jar desktopgui.jar" />
<attribute name="Implementation-Version" value="${full.version}" />
+ <attribute name="Built-By" value="${build.built-by}" />
<attribute name="Build-Date" value="${build.timestamp}" />
<attribute name="Base-Revision" value="${workspace.version}" />
<attribute name="Workspace-Changes" value="${workspace.changes.j.tr}" />
@@ -172,6 +173,7 @@
basedir="../jsp/" excludes="web.xml, *.css, **/*.java, *.jsp, *.jsi, web-fragment.xml, web-out.xml">
<manifest>
<attribute name="Implementation-Version" value="${full.version}" />
+ <attribute name="Built-By" value="${build.built-by}" />
<attribute name="Build-Date" value="${build.timestamp}" />
<attribute name="Base-Revision" value="${workspace.version}" />
<attribute name="Workspace-Changes" value="${workspace.changes.w.tr}" />
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java
index 7f59670bc1c1ca5e069f1dc2caeba60dce054eb6..f94f4b9c77287ae366901f13925e9d13c4193875 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java
@@ -52,7 +52,7 @@ public class ConfigClientsHelper extends HelperBase {
if ((mode == 0 && disabled) ||
(mode == 1 && (!disabled) && (!ssl)) ||
(mode == 2 && (!disabled) && ssl))
- return "checked=\"true\"";
+ return "checked=\"checked\"";
return "";
}
@@ -60,7 +60,7 @@ public class ConfigClientsHelper extends HelperBase {
public String getAuth() {
boolean enabled = _context.getBooleanProperty(PROP_AUTH);
if (enabled)
- return "checked=\"true\"";
+ return "checked=\"checked\"";
return "";
}
@@ -253,9 +253,9 @@ public class ConfigClientsHelper extends HelperBase {
}
buf.append("</td><td align=\"center\" width=\"10%\"><input type=\"checkbox\" class=\"optbox\" name=\"").append(index).append(".enabled\" value=\"true\" ");
if (enabled) {
- buf.append("checked=\"true\" ");
+ buf.append("checked=\"checked\" ");
if (ro)
- buf.append("disabled=\"true\" ");
+ buf.append("disabled=\"disabled\" ");
}
buf.append("></td><td align=\"center\" width=\"15%\">");
// The icons were way too much, so there's an X in each button class,
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHelper.java
index 6b86caeb226f3eb62c64f5ae9f7edb4f26cca807..ea8ec0aedca99061ede2590b182da01274633171 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHelper.java
@@ -80,7 +80,7 @@ public class ConfigLoggingHelper extends HelperBase {
String l = levels[i];
buf.append("<option value=\"").append(l).append('\"');
if (l.equals(cur))
- buf.append(" selected=\"true\"");
+ buf.append(" selected=\"selected\"");
buf.append('>').append(_(l)).append("</option>\n");
}
@@ -121,7 +121,7 @@ public class ConfigLoggingHelper extends HelperBase {
StringBuilder buf = new StringBuilder(65536);
buf.append("<select name=\"newlogclass\">\n" +
- "<option value=\"\" selected=\"true\">")
+ "<option value=\"\" selected=\"selected\">")
.append(_("Select a class to add"))
.append("</option>\n");
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java
index e9d3b152992bedb6af17eef8937bf65024edf6fd..b08fb3b019bbdb1d4a96118d58f7c89090027eed 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java
@@ -20,8 +20,8 @@ public class ConfigNetHelper extends HelperBase {
public final static String PROP_I2NP_NTCP_PORT = "i2np.ntcp.port";
public final static String PROP_I2NP_NTCP_AUTO_PORT = "i2np.ntcp.autoport";
public final static String PROP_I2NP_NTCP_AUTO_IP = "i2np.ntcp.autoip";
- private final static String CHECKED = " checked=\"true\" ";
- private final static String DISABLED = " disabled=\"true\" ";
+ private final static String CHECKED = " checked=\"checked\" ";
+ private final static String DISABLED = " disabled=\"disabled\" ";
public String getUdphostname() {
return _context.getProperty(UDPTransport.PROP_EXTERNAL_HOST, "");
@@ -250,7 +250,7 @@ public class ConfigNetHelper extends HelperBase {
}
buf.append("<option style=\"text-align: right;\" value=\"").append(val).append("\" ");
if (pct == val) {
- buf.append("selected=\"true\" ");
+ buf.append("selected=\"selected\" ");
found = true;
}
buf.append(">").append(val).append("%</option>\n");
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigReseedHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigReseedHelper.java
index 145bd49024b94c1995677126f6c305c4f4a2bcb5..5b5d747519629a0f7efe5dcba5b55476897832e3 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigReseedHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigReseedHelper.java
@@ -56,7 +56,7 @@ public class ConfigReseedHelper extends HelperBase {
if ((mode == 0 && (!disabled) && (!required)) ||
(mode == 1 && (!disabled) && required) ||
(mode == 2 && disabled))
- return "checked=\"true\"";
+ return "checked=\"checked\"";
return "";
}
@@ -82,7 +82,7 @@ public class ConfigReseedHelper extends HelperBase {
private String checked(String prop) {
boolean enabled = _context.getBooleanProperty(prop);
if (enabled)
- return "checked=\"true\"";
+ return "checked=\"checked\"";
return "";
}
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigStatsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigStatsHelper.java
index 254a20728d2ed733f65b2adf6545dbd5b8922b51..61d4969330f498b2607cb622c1deff980c04902f 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigStatsHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigStatsHelper.java
@@ -59,8 +59,16 @@ public class ConfigStatsHelper extends HelperBase {
_filters.add(tok.nextToken().trim());
}
- public ConfigStatsHelper() {}
-
+ /**
+ * Just hide for everybody unless already set.
+ * To enable set advanced config stat.logFilters=foo before starting...
+ * it has to be set at startup anyway for logging to be enabled at all
+ * @since 0.9
+ */
+ public boolean shouldShowLog() {
+ return !_filters.isEmpty();
+ }
+
public String getFilename() { return _context.statManager().getStatFile(); }
/**
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java
index 6df070bd34ba698505fb8810a30a91d75ce66bb0..14b18c7d706df5ef3a27013af393545942596765 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java
@@ -172,7 +172,7 @@ public class ConfigTunnelsHelper extends HelperBase {
if (!props.isEmpty()) {
buf.append("<tr><td align=\"right\" class=\"mediumtags\">" + _("Inbound options") + ":</td>\n" +
"<td colspan=\"2\" align=\"center\"><input name=\"").append(index);
- buf.append(".inboundOptions\" type=\"text\" size=\"32\" disabled=\"true\" " +
+ buf.append(".inboundOptions\" type=\"text\" size=\"32\" disabled=\"disabled\" " +
"value=\"");
for (Iterator iter = props.keySet().iterator(); iter.hasNext(); ) {
String prop = (String)iter.next();
@@ -185,7 +185,7 @@ public class ConfigTunnelsHelper extends HelperBase {
if (!props.isEmpty()) {
buf.append("<tr><td align=\"right\" class=\"mediumtags\">" + _("Outbound options") + ":</td>\n" +
"<td colspan=\"2\" align=\"center\"><input name=\"").append(index);
- buf.append(".outboundOptions\" type=\"text\" size=\"32\" disabled=\"true\" " +
+ buf.append(".outboundOptions\" type=\"text\" size=\"32\" disabled=\"disabled\" " +
"value=\"");
for (Iterator iter = props.keySet().iterator(); iter.hasNext(); ) {
String prop = (String)iter.next();
@@ -205,7 +205,7 @@ public class ConfigTunnelsHelper extends HelperBase {
for (int i = min; i <= max; i++) {
buf.append("<option value=\"").append(i).append("\" ");
if (i == now)
- buf.append("selected=\"true\" ");
+ buf.append("selected=\"selected\" ");
buf.append(">").append(ngettext(DUMMY1 + name, DUMMY2 + name + 's', i));
buf.append("</option>\n");
}
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java
index 7acae19630d5f3ddd811dd141039eedcef055170..f5f16aebd2af5bdfa6d777809bb8b006aa5f6364 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java
@@ -14,7 +14,7 @@ public class ConfigUIHelper extends HelperBase {
for (String theme : themes) {
buf.append("<input type=\"radio\" class=\"optbox\" name=\"theme\" ");
if (theme.equals(current))
- buf.append("checked=\"true\" ");
+ buf.append("checked=\"checked\" ");
buf.append("value=\"").append(theme).append("\">").append(_(theme)).append("<br>\n");
}
return buf.toString();
@@ -73,7 +73,7 @@ public class ConfigUIHelper extends HelperBase {
// we use "lang" so it is set automagically in CSSHelper
buf.append("<input type=\"radio\" class=\"optbox\" name=\"lang\" ");
if (langs[i].equals(current))
- buf.append("checked=\"true\" ");
+ buf.append("checked=\"checked\" ");
buf.append("value=\"").append(langs[i]).append("\">")
.append("<img height=\"11\" width=\"16\" alt=\"\" src=\"/flags.jsp?c=").append(flags[i]).append("\"> ")
.append(_(xlangs[i])).append("<br>\n");
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java
index 88aaa70b208c334130613e642837925104a29ef4..8ef110c396564c89989a09682f6b08e3249f5735 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java
@@ -75,7 +75,7 @@ public class ConfigUpdateHelper extends HelperBase {
public String getUpdateThroughProxy() {
String proxy = _context.getProperty(ConfigUpdateHandler.PROP_SHOULD_PROXY, ConfigUpdateHandler.DEFAULT_SHOULD_PROXY);
if (Boolean.valueOf(proxy).booleanValue())
- return "<input type=\"checkbox\" class=\"optbox\" value=\"true\" name=\"updateThroughProxy\" checked=\"true\" >";
+ return "<input type=\"checkbox\" class=\"optbox\" value=\"true\" name=\"updateThroughProxy\" checked=\"checked\" >";
else
return "<input type=\"checkbox\" class=\"optbox\" value=\"true\" name=\"updateThroughProxy\" >";
}
@@ -83,7 +83,7 @@ public class ConfigUpdateHelper extends HelperBase {
public String getUpdateUnsigned() {
String foo = _context.getProperty(ConfigUpdateHandler.PROP_UPDATE_UNSIGNED);
if (Boolean.valueOf(foo).booleanValue())
- return "<input type=\"checkbox\" class=\"optbox\" value=\"true\" name=\"updateUnsigned\" checked=\"true\" >";
+ return "<input type=\"checkbox\" class=\"optbox\" value=\"true\" name=\"updateUnsigned\" checked=\"checked\" >";
else
return "<input type=\"checkbox\" class=\"optbox\" value=\"true\" name=\"updateUnsigned\" >";
}
@@ -106,7 +106,7 @@ public class ConfigUpdateHelper extends HelperBase {
for (int i = 0; i < PERIODS.length; i++) {
buf.append("<option value=\"").append(PERIODS[i]);
if (PERIODS[i] == ms)
- buf.append("\" selected=\"true");
+ buf.append("\" selected=\"selected");
if (PERIODS[i] == -1)
buf.append("\">" + _("Never") + "</option>\n");
@@ -128,22 +128,22 @@ public class ConfigUpdateHelper extends HelperBase {
buf.append("<option value=\"notify\"");
if ("notify".equals(policy) || _dontInstall)
- buf.append(" selected=\"true\"");
+ buf.append(" selected=\"selected\"");
buf.append('>').append(_("Notify only")).append("</option>");
buf.append("<option value=\"download\"");
if (_dontInstall)
- buf.append(" disabled=\"true\"");
+ buf.append(" disabled=\"disabled\"");
else if ("download".equals(policy))
- buf.append(" selected=\"true\"");
+ buf.append(" selected=\"selected\"");
buf.append('>').append(_("Download and verify only")).append("</option>");
if (_context.hasWrapper()) {
buf.append("<option value=\"install\"");
if (_dontInstall)
- buf.append(" disabled=\"true\"");
+ buf.append(" disabled=\"disabled\"");
else if ("install".equals(policy))
- buf.append(" selected=\"true\"");
+ buf.append(" selected=\"selected\"");
buf.append('>').append(_("Download, verify, and restart")).append("</option>");
}
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/FileDumpHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/FileDumpHelper.java
index eea306aa209f174fdb77cf725fbfced0306f8085..7bb1e99d05f2efe61713b419dbd7ccedb9c7a43d 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/FileDumpHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/FileDumpHelper.java
@@ -18,6 +18,7 @@ import java.util.jar.Manifest;
import net.i2p.crypto.SHA256Generator;
import net.i2p.data.DataHelper;
+import net.i2p.util.FileUtil;
/**
* Dump info on jars and wars
@@ -29,7 +30,7 @@ public class FileDumpHelper extends HelperBase {
public String getFileSummary() {
StringBuilder buf = new StringBuilder(16*1024);
buf.append("<table><tr><th>File</th><th>Size</th><th>Date</th><th>SHA 256</th><th>Revision</th>" +
- "<th>JDK</th><th>Built</th><th>Mods</th></tr>");
+ "<th>JDK</th><th>Built</th><th>By</th><th>Mods</th></tr>");
// jars added in wrapper.config
URLClassLoader urlClassLoader = (URLClassLoader) ClassLoader.getSystemClassLoader();
@@ -95,7 +96,9 @@ public class FileDumpHelper extends HelperBase {
buf.append((new Date(mod)).toString());
else
buf.append("<font color=\"red\">Not found</font>");
- buf.append("</td><td>");
+ buf.append("</td><td align=\"center\">");
+ if (mod > 0 && !FileUtil.verifyZip(f))
+ buf.append("<font color=\"red\">CORRUPT</font><br>");
byte[] hash = sha256(f);
if (hash != null) {
byte[] hh = new byte[16];
@@ -132,13 +135,17 @@ public class FileDumpHelper extends HelperBase {
buf.append(s);
buf.append("</td><td>");
s = getAtt(att, "Build-Date");
+ if (s != null)
+ buf.append(s);
+ buf.append("</td><td align=\"center\">");
+ s = getAtt(att, "Built-By");
if (s != null)
buf.append(s);
buf.append("</td><td><font color=\"red\">");
s = getAtt(att, "Workspace-Changes");
if (s != null)
buf.append(s.replace(",", "<br>"));
- buf.append("</font></td>");
+ buf.append("</font></td></tr>\n");
}
private static byte[] sha256(File f) {
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java
index b6a4ad283778f94332fbbf27ae5aea1cec96e8ac..b5d54b4112712405309d4d6b23c077a251b63791 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java
@@ -20,6 +20,8 @@ public class GraphHelper extends FormHandler {
private int _height;
private int _refreshDelaySeconds;
private boolean _persistent;
+ private String _stat;
+ private int _end;
private static final String PROP_X = "routerconsole.graphX";
private static final String PROP_Y = "routerconsole.graphY";
@@ -32,6 +34,10 @@ public class GraphHelper extends FormHandler {
private static final int DEFAULT_PERIODS = 60;
static final int MAX_X = 2048;
static final int MAX_Y = 1024;
+ private static final int MIN_X = 200;
+ private static final int MIN_Y = 60;
+ private static final int MIN_C = 20;
+ private static final int MAX_C = SummaryListener.MAX_ROWS;
private static final int MIN_REFRESH = 15;
/** set the defaults after we have a context */
@@ -64,17 +70,45 @@ public class GraphHelper extends FormHandler {
public void storeWriter(Writer out) { _out = out; }
public void setPeriodCount(String str) {
- try { _periodCount = Integer.parseInt(str); } catch (NumberFormatException nfe) {}
+ setC(str);
}
- public void setShowEvents(boolean b) { _showEvents = b; }
+ /** @since 0.9 */
+ public void setE(String str) {
+ try {
+ _end = Math.max(0, Integer.parseInt(str));
+ } catch (NumberFormatException nfe) {}
+ }
+
+ /** @since 0.9 shorter parameter */
+ public void setC(String str) {
+ try {
+ _periodCount = Math.max(MIN_C, Math.min(Integer.parseInt(str), MAX_C));
+ } catch (NumberFormatException nfe) {}
+ }
+
+ public void setShowEvents(String b) { _showEvents = !"false".equals(b); }
public void setHeight(String str) {
- try { _height = Math.min(Integer.parseInt(str), MAX_Y); } catch (NumberFormatException nfe) {}
+ setH(str);
+ }
+
+ /** @since 0.9 shorter parameter */
+ public void setH(String str) {
+ try {
+ _height = Math.max(MIN_Y, Math.min(Integer.parseInt(str), MAX_Y));
+ } catch (NumberFormatException nfe) {}
}
public void setWidth(String str) {
- try { _width = Math.min(Integer.parseInt(str), MAX_X); } catch (NumberFormatException nfe) {}
+ setW(str);
+ }
+
+ /** @since 0.9 shorter parameter */
+ public void setW(String str) {
+ try {
+ _width = Math.max(MIN_X, Math.min(Integer.parseInt(str), MAX_X));
+ } catch (NumberFormatException nfe) {}
}
public void setRefreshDelay(String str) {
@@ -89,6 +123,14 @@ public class GraphHelper extends FormHandler {
/** @since 0.8.7 */
public void setPersistent(String foo) { _persistent = true; }
+
+ /**
+ * For single stat page
+ * @since 0.9
+ */
+ public void setStat(String stat) {
+ _stat = stat;
+ }
public String getImages() {
if (StatSummarizer.isDisabled())
@@ -109,11 +151,11 @@ public class GraphHelper extends FormHandler {
}
if (hasTx && hasRx && !_showEvents) {
- _out.write("<a href=\"viewstat.jsp?stat=bw.combined"
+ _out.write("<a href=\"viewstat?stat=bw.combined"
+ "&periodCount=" + (3 * _periodCount )
+ "&width=" + (3 * _width)
+ "&height=" + (3 * _height)
- + "\" target=\"_blank\">");
+ + "\">");
String title = _("Combined bandwidth graph");
_out.write("<img class=\"statimage\""
+ " src=\"viewstat.jsp?stat=bw.combined"
@@ -128,14 +170,14 @@ public class GraphHelper extends FormHandler {
Rate r = lsnr.getRate();
// e.g. "statname for 60m"
String title = _("{0} for {1}", r.getRateStat().getName(), DataHelper.formatDuration2(_periodCount * r.getPeriod()));
- _out.write("<a href=\"viewstat.jsp?stat="
+ _out.write("<a href=\"graph?stat="
+ r.getRateStat().getName()
- + "&showEvents=" + _showEvents
- + "&period=" + r.getPeriod()
- + "&periodCount=" + (3 * _periodCount)
- + "&width=" + (3 * _width)
- + "&height=" + (3 * _height)
- + "\" target=\"_blank\">");
+ + '.' + r.getPeriod()
+ + "&c=" + (3 * _periodCount)
+ + "&w=" + (3 * _width)
+ + "&h=" + (3 * _height)
+ + (_showEvents ? "&showEvents=1" : "")
+ + "\">");
_out.write("<img class=\"statimage\" border=\"0\""
+ " src=\"viewstat.jsp?stat="
+ r.getRateStat().getName()
@@ -156,6 +198,134 @@ public class GraphHelper extends FormHandler {
return "";
}
+ /**
+ * For single stat page
+ * @since 0.9
+ */
+ public String getSingleStat() {
+ try {
+ if (StatSummarizer.isDisabled())
+ return "";
+ if (_stat == null) {
+ _out.write("No stat");
+ return "";
+ }
+ List<Rate> rates = StatSummarizer.instance().parseSpecs(_stat);
+ if (rates.size() != 1) {
+ _out.write("Graphs not enabled for " + _stat);
+ return "";
+ }
+ Rate r = rates.get(0);
+ _out.write("<h3>");
+ _out.write(_("{0} for {1}", r.getRateStat().getName(), DataHelper.formatDuration2(_periodCount * r.getPeriod())));
+ if (_end > 0)
+ _out.write(' ' + _("ending {0} ago", DataHelper.formatDuration2(_end * r.getPeriod())));
+
+ _out.write("</h3><p><img class=\"statimage\" border=\"0\""
+ + " src=\"viewstat.jsp?stat="
+ + r.getRateStat().getName()
+ + "&showEvents=" + _showEvents
+ + "&period=" + r.getPeriod()
+ + "&periodCount=" + _periodCount
+ + "&end=" + _end
+ + "&width=" + _width
+ + "&height=" + _height
+ + "\"></p><p>\n");
+
+ if (_width < MAX_X && _height < MAX_Y) {
+ _out.write(link(_stat, _showEvents, _periodCount, _end, _width * 3 / 2, _height * 3 / 2));
+ _out.write(_("Larger"));
+ _out.write("</a> - ");
+ }
+
+ if (_width > MIN_X && _height > MIN_Y) {
+ _out.write(link(_stat, _showEvents, _periodCount, _end, _width * 2 / 3, _height * 2 / 3));
+ _out.write(_("Smaller"));
+ _out.write("</a> - ");
+ }
+
+ if (_height < MAX_Y) {
+ _out.write(link(_stat, _showEvents, _periodCount, _end, _width, _height * 3 / 2));
+ _out.write(_("Taller"));
+ _out.write("</a> - ");
+ }
+
+ if (_height > MIN_Y) {
+ _out.write(link(_stat, _showEvents, _periodCount, _end, _width, _height * 2 / 3));
+ _out.write(_("Shorter"));
+ _out.write("</a> - ");
+ }
+
+ if (_width < MAX_X) {
+ _out.write(link(_stat, _showEvents, _periodCount, _end, _width * 3 / 2, _height));
+ _out.write(_("Wider"));
+ _out.write("</a> - ");
+ }
+
+ if (_width > MIN_X) {
+ _out.write(link(_stat, _showEvents, _periodCount, _end, _width * 2 / 3, _height));
+ _out.write(_("Narrower"));
+ _out.write("</a>");
+ }
+
+ _out.write("<br>");
+ if (_periodCount < MAX_C) {
+ _out.write(link(_stat, _showEvents, _periodCount * 2, _end, _width, _height));
+ _out.write(_("Larger interval"));
+ _out.write("</a> - ");
+ }
+
+ if (_periodCount > MIN_C) {
+ _out.write(link(_stat, _showEvents, _periodCount / 2, _end, _width, _height));
+ _out.write(_("Smaller interval"));
+ _out.write("</a>");
+ }
+
+ _out.write("<br>");
+ if (_periodCount < MAX_C) {
+ _out.write(link(_stat, _showEvents, _periodCount, _end + _periodCount, _width, _height));
+ _out.write(_("Previous interval"));
+ _out.write("</a>");
+ }
+
+ if (_end > 0) {
+ int end = _end - _periodCount;
+ if (end <= 0)
+ end = 0;
+ if (_periodCount < MAX_C)
+ _out.write(" - ");
+ _out.write(link(_stat, _showEvents, _periodCount, end, _width, _height));
+ _out.write(_("Next interval"));
+ _out.write("</a> ");
+ }
+
+ _out.write("<br>");
+ _out.write(link(_stat, !_showEvents, _periodCount, _end, _width, _height));
+ _out.write(_showEvents ? _("Plot averages") : _("plot events"));
+ _out.write("</a>");
+
+ _out.write("</p><p><i>" + _("All times are UTC.") + "</i></p>\n");
+ } catch (IOException ioe) {
+ ioe.printStackTrace();
+ }
+ return "";
+ }
+
+ /** @since 0.9 */
+ private static String link(String stat, boolean showEvents,
+ int periodCount, int end,
+ int width, int height) {
+ return
+ "<a href=\"graph?stat="
+ + stat
+ + "&c=" + periodCount
+ + "&w=" + width
+ + "&h=" + height
+ + (end > 0 ? "&e=" + end : "")
+ + (showEvents ? "&showEvents=1" : "")
+ + "\">";
+ }
+
private static final int[] times = { 60, 2*60, 5*60, 10*60, 30*60, 60*60, -1 };
public String getForm() {
@@ -171,8 +341,8 @@ public class GraphHelper extends FormHandler {
"<input type=\"hidden\" name=\"action\" value=\"foo\">\n" +
"<input type=\"hidden\" name=\"nonce\" value=\"" + nonce + "\" >\n");
_out.write(_("Periods") + ": <input size=\"5\" style=\"text-align: right;\" type=\"text\" name=\"periodCount\" value=\"" + _periodCount + "\"><br>\n");
- _out.write(_("Plot averages") + ": <input type=\"radio\" class=\"optbox\" name=\"showEvents\" value=\"false\" " + (_showEvents ? "" : "checked=\"true\" ") + "> ");
- _out.write(_("or")+ " " +_("plot events") + ": <input type=\"radio\" class=\"optbox\" name=\"showEvents\" value=\"true\" "+ (_showEvents ? "checked=\"true\" " : "") + "><br>\n");
+ _out.write(_("Plot averages") + ": <input type=\"radio\" class=\"optbox\" name=\"showEvents\" value=\"false\" " + (_showEvents ? "" : "checked=\"checked\" ") + "> ");
+ _out.write(_("or")+ " " +_("plot events") + ": <input type=\"radio\" class=\"optbox\" name=\"showEvents\" value=\"true\" "+ (_showEvents ? "checked=\"checked\" " : "") + "><br>\n");
_out.write(_("Image sizes") + ": " + _("width") + ": <input size=\"4\" style=\"text-align: right;\" type=\"text\" name=\"width\" value=\"" + _width
+ "\"> " + _("pixels") + ", " + _("height") + ": <input size=\"4\" style=\"text-align: right;\" type=\"text\" name=\"height\" value=\"" + _height
+ "\"> " + _("pixels") + "<br>\n");
@@ -182,7 +352,7 @@ public class GraphHelper extends FormHandler {
_out.write(Integer.toString(times[i]));
_out.write("\"");
if (times[i] == _refreshDelaySeconds)
- _out.write(" selected=\"true\"");
+ _out.write(" selected=\"selected\"");
_out.write(">");
if (times[i] > 0)
_out.write(DataHelper.formatDuration2(times[i] * 1000));
@@ -195,7 +365,7 @@ public class GraphHelper extends FormHandler {
" <input type=\"checkbox\" class=\"optbox\" value=\"true\" name=\"persistent\"");
boolean persistent = _context.getBooleanPropertyDefaultTrue(SummaryListener.PROP_PERSISTENT);
if (persistent)
- _out.write(" checked=\"true\"");
+ _out.write(" checked=\"checked\"");
_out.write(">" +
"<hr><div class=\"formaction\"><input type=\"submit\" class=\"acceot\" value=\"" + _("Save settings and redraw graphs") + "\"></div></form>");
} catch (IOException ioe) {
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java
index 085ac317217dc75a9d7a30bfe8227114b6c107d5..ebdacbfd69f184b42f86628362a46a024ce45e61 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java
@@ -33,6 +33,7 @@ import net.i2p.data.RouterInfo;
import net.i2p.router.RouterContext;
import net.i2p.router.TunnelPoolSettings;
import net.i2p.router.networkdb.kademlia.HashDistance; // debug
+import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade;
import net.i2p.util.HexDump; // debug
import net.i2p.util.ObjectCounter;
import net.i2p.util.OrderedProperties;
@@ -105,7 +106,10 @@ public class NetDbRenderer {
StringBuilder buf = new StringBuilder(4*1024);
buf.append("<h2>" + _("Network Database Contents") + "</h2>\n");
buf.append("<a href=\"netdb\">" + _("View RouterInfo") + "</a>");
- buf.append("<h3>").append(_("LeaseSets")).append("</h3>\n");
+ buf.append("<h3>").append(_("LeaseSets"));
+ if (debug)
+ buf.append(" - Debug mode - Sorted by hash distance, closest first");
+ buf.append("</h3>\n");
Hash ourRKey;
Set<LeaseSet> leases;
DecimalFormat fmt;
@@ -120,15 +124,16 @@ public class NetDbRenderer {
}
leases.addAll(_context.netDb().getLeases());
int medianCount = 0;
+ int rapCount = 0;
BigInteger median = null;
int c = 0;
if (debug) {
// Find the center of the RAP leasesets
for (LeaseSet ls : leases) {
if (ls.getReceivedAsPublished())
- medianCount++;
+ rapCount++;
}
- medianCount /= 2;
+ medianCount = rapCount / 2;
}
long now = _context.clock().now();
for (LeaseSet ls : leases) {
@@ -167,9 +172,10 @@ public class NetDbRenderer {
if (c++ == medianCount)
median = dist;
}
- buf.append(" Dist: <b>").append(fmt.format(biLog2(dist))).append("</b>");
- buf.append(" RKey: ").append(ls.getRoutingKey().toBase64());
+ buf.append(" Dist: <b>").append(fmt.format(biLog2(dist))).append("</b><br>");
+ buf.append("Routing Key: ").append(ls.getRoutingKey().toBase64());
buf.append("<br>");
+ buf.append("Encryption Key: ").append(ls.getEncryptionKey().toBase64().substring(0, 20)).append("...<br>");
}
for (int i = 0; i < ls.getLeaseCount(); i++) {
buf.append(_("Lease")).append(' ').append(i + 1).append(": " + _("Gateway") + ' ');
@@ -181,18 +187,23 @@ public class NetDbRenderer {
buf.setLength(0);
}
if (debug) {
- buf.append("<p><b>Total Leasesets: " + leases.size());
- buf.append("</b></p><p><b>Published (RAP) Leasesets: " + _context.netDb().getKnownLeaseSets());
+ FloodfillNetworkDatabaseFacade netdb = (FloodfillNetworkDatabaseFacade)_context.netDb();
+ buf.append("<p><b>Total Leasesets: ").append(leases.size());
+ buf.append("</b></p><p><b>Published (RAP) Leasesets: ").append(netdb.getKnownLeaseSets());
//buf.append("</b></p><p><b>Mod Data: " + HexDump.dump(_context.routingKeyGenerator().getModData()));
+ int ff = _context.peerManager().getPeersByCapability(FloodfillNetworkDatabaseFacade.CAPABILITY_FLOODFILL).size();
+ buf.append("</b></p><p><b>Known Floodfills: ").append(ff);
+ buf.append("</b></p><p><b>Currently Floodfill? ");
+ buf.append(netdb.floodfillEnabled() ? "yes" : "no");
buf.append("</b></p><p><b>Network data (only valid if floodfill):");
//buf.append("</b></p><p><b>Center of Key Space (router hash): " + ourRKey.toBase64());
if (median != null) {
double log2 = biLog2(median);
- buf.append("</b></p><p><b>Median distance (bits): " + fmt.format(log2));
+ buf.append("</b></p><p><b>Median distance (bits): ").append(fmt.format(log2));
// 3 for 8 floodfills... -1 for median
int total = (int) Math.round(Math.pow(2, 3 + 256 - 1 - log2));
- buf.append("</b></p><p><b>Estimated total floodfills: " + total);
- buf.append("</b></p><p><b>Estimated network total leasesets: " + (total * leases.size() / 8));
+ buf.append("</b></p><p><b>Estimated total floodfills: ").append(total);
+ buf.append("</b></p><p><b>Estimated total leasesets: ").append(total * rapCount / 8);
}
buf.append("</b></p>");
}
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/StatSummarizer.java b/apps/routerconsole/java/src/net/i2p/router/web/StatSummarizer.java
index d7b0077a9c01a5eb1feea57c43461db07a2f8598..4d740e4b5b02dc0d6c2ff06289e18273a70bb281 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/StatSummarizer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/StatSummarizer.java
@@ -172,32 +172,37 @@ public class StatSummarizer implements Runnable {
public boolean renderPng(Rate rate, OutputStream out) throws IOException {
return renderPng(rate, out, GraphHelper.DEFAULT_X, GraphHelper.DEFAULT_Y,
- false, false, false, false, -1, true);
+ false, false, false, false, -1, 0, true);
}
/**
* This does the single data graphs.
* For the two-data bandwidth graph see renderRatePng().
* Synchronized to conserve memory.
+ *
+ * @param end number of periods before now
* @return success
*/
public boolean renderPng(Rate rate, OutputStream out, int width, int height, boolean hideLegend,
boolean hideGrid, boolean hideTitle, boolean showEvents, int periodCount,
- boolean showCredit) throws IOException {
+ int end, boolean showCredit) throws IOException {
try {
try {
_sem.acquire();
} catch (InterruptedException ie) {}
return locked_renderPng(rate, out, width, height, hideLegend, hideGrid, hideTitle, showEvents,
- periodCount, showCredit);
+ periodCount, end, showCredit);
} finally {
_sem.release();
}
}
+ /**
+ * @param end number of periods before now
+ */
private boolean locked_renderPng(Rate rate, OutputStream out, int width, int height, boolean hideLegend,
boolean hideGrid, boolean hideTitle, boolean showEvents, int periodCount,
- boolean showCredit) throws IOException {
+ int end, boolean showCredit) throws IOException {
if (width > GraphHelper.MAX_X)
width = GraphHelper.MAX_X;
else if (width <= 0)
@@ -206,9 +211,11 @@ public class StatSummarizer implements Runnable {
height = GraphHelper.MAX_Y;
else if (height <= 0)
height = GraphHelper.DEFAULT_Y;
+ if (end < 0)
+ end = 0;
for (SummaryListener lsnr : _listeners) {
if (lsnr.getRate().equals(rate)) {
- lsnr.renderPng(out, width, height, hideLegend, hideGrid, hideTitle, showEvents, periodCount, showCredit);
+ lsnr.renderPng(out, width, height, hideLegend, hideGrid, hideTitle, showEvents, periodCount, end, showCredit);
return true;
}
}
@@ -368,7 +375,7 @@ public class StatSummarizer implements Runnable {
* @param specs statName.period,statName.period,statName.period
* @return list of Rate objects
*/
- private List<Rate> parseSpecs(String specs) {
+ List<Rate> parseSpecs(String specs) {
StringTokenizer tok = new StringTokenizer(specs, ",");
List<Rate> rv = new ArrayList();
while (tok.hasMoreTokens()) {
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryListener.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryListener.java
index 1ea872a88066c813a39f7185b50f005f02da26d9..39290a04224836d38d1b87682effe531314b0129 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryListener.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryListener.java
@@ -55,7 +55,7 @@ class SummaryListener implements RateSummaryListener {
static final int PERIODS = 60 * 24; // 1440
private static final int MIN_ROWS = PERIODS;
- private static final int MAX_ROWS = 91 * MIN_ROWS;
+ static final int MAX_ROWS = 91 * MIN_ROWS;
private static final long THREE_MONTHS = 91l * 24 * 60 * 60 * 1000;
public SummaryListener(Rate r) {
@@ -191,10 +191,15 @@ class SummaryListener implements RateSummaryListener {
_db = null;
}
- public void renderPng(OutputStream out, int width, int height, boolean hideLegend, boolean hideGrid, boolean hideTitle, boolean showEvents, int periodCount, boolean showCredit) throws IOException {
+ /**
+ * @param end number of periods before now
+ */
+ public void renderPng(OutputStream out, int width, int height, boolean hideLegend, boolean hideGrid,
+ boolean hideTitle, boolean showEvents, int periodCount,
+ int end, boolean showCredit) throws IOException {
if (_renderer == null || _db == null)
throw new IOException("No RRD, check logs for previous errors");
- _renderer.render(out, width, height, hideLegend, hideGrid, hideTitle, showEvents, periodCount, showCredit);
+ _renderer.render(out, width, height, hideLegend, hideGrid, hideTitle, showEvents, periodCount, end, showCredit);
}
public void renderPng(OutputStream out) throws IOException {
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java
index 02b4e51d3843bd63e27c373c77c4c3a490a9d45f..35845f7c7c8c9b063b9ed46508e46a03ac20abf5 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java
@@ -81,13 +81,21 @@ class SummaryRenderer {
}
public void render(OutputStream out) throws IOException { render(out, GraphHelper.DEFAULT_X, GraphHelper.DEFAULT_Y,
- false, false, false, false, -1, false); }
+ false, false, false, false, -1, 0, false); }
- public void render(OutputStream out, int width, int height, boolean hideLegend, boolean hideGrid, boolean hideTitle, boolean showEvents, int periodCount, boolean showCredit) throws IOException {
+ /**
+ * @param endp number of periods before now
+ */
+ public void render(OutputStream out, int width, int height, boolean hideLegend, boolean hideGrid,
+ boolean hideTitle, boolean showEvents, int periodCount,
+ int endp, boolean showCredit) throws IOException {
long end = _listener.now() - 75*1000;
+ long period = _listener.getRate().getPeriod();
+ if (endp > 0)
+ end -= period * endp;
if (periodCount <= 0 || periodCount > _listener.getRows())
periodCount = _listener.getRows();
- long start = end - _listener.getRate().getPeriod()*periodCount;
+ long start = end - (period * periodCount);
//long begin = System.currentTimeMillis();
try {
RrdGraphDef def = new RrdGraphDef();
@@ -103,9 +111,9 @@ class SummaryRenderer {
String p;
// we want the formatting and translation of formatDuration2(), except not zh, and not the
if (IS_WIN && "zh".equals(Messages.getLanguage(_context)))
- p = DataHelper.formatDuration(_listener.getRate().getPeriod());
+ p = DataHelper.formatDuration(period);
else
- p = DataHelper.formatDuration2(_listener.getRate().getPeriod()).replace(" ", " ");
+ p = DataHelper.formatDuration2(period).replace(" ", " ");
if (showEvents)
title = name + ' ' + _("events in {0}", p);
else
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java
index 73efe19de47fe39e5c29e6e1b2c1f3c390ac1653..fdc670f53490d977e393925ab926221dad0519cd 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java
@@ -134,6 +134,7 @@ public class TunnelRenderer {
out.write("<div class=\"statusnotes\"><b>" + _("Inactive participating tunnels") + ": " + inactive + "</b></div>\n");
out.write("<div class=\"statusnotes\"><b>" + _("Lifetime bandwidth usage") + ": " + DataHelper.formatSize2(processed*1024) + "B</b></div>\n");
//renderPeers(out);
+ out.write("</div>");
}
private static class TunnelComparator implements Comparator<HopConfig> {
@@ -222,7 +223,7 @@ public class TunnelRenderer {
}
}
if (live <= 0)
- out.write("<div class=\"statusnotes\"><center><b>" + _("No tunnels; waiting for the grace period to end.") + "</center></b></div>\n");
+ out.write("<div class=\"statusnotes\"><center><b>" + _("No tunnels; waiting for the grace period to end.") + "</b></center></div>\n");
out.write("<div class=\"statusnotes\"><center><b>" + _("Lifetime bandwidth usage") + ": " +
DataHelper.formatSize2(processedIn*1024) + "B " + _("in") + ", " +
DataHelper.formatSize2(processedOut*1024) + "B " + _("out") + "</b></center></div>");
diff --git a/apps/routerconsole/jsp/configreseed.jsp b/apps/routerconsole/jsp/configreseed.jsp
index 648a14ee953e7678e0d56d5c3a86c07b2bd92d99..2a08d1015fc78be61524aeffea2b785929c8ab30 100644
--- a/apps/routerconsole/jsp/configreseed.jsp
+++ b/apps/routerconsole/jsp/configreseed.jsp
@@ -41,7 +41,7 @@
<input type="radio" class="optbox" name="mode" value="2" <%=reseedHelper.modeChecked(2) %> >
<b><%=intl._("Use non-SSL only")%></b></td></tr>
<tr><td class="mediumtags" align="right"><b><%=intl._("Reseed URLs")%>:</b></td>
-<td><textarea name="reseedURL" wrap="off" spellcheck="false"><jsp:getProperty name="reseedHelper" property="reseedURL" /></textarea></td></tr>
+<td><textarea wrap="off" name="reseedURL" cols="60" rows="7" spellcheck="false"><jsp:getProperty name="reseedHelper" property="reseedURL" /></textarea></td></tr>
<tr><td class="mediumtags" align="right"><b><%=intl._("Enable HTTP Proxy?")%></b></td>
<td><input type="checkbox" class="optbox" name="enable" value="true" <jsp:getProperty name="reseedHelper" property="enable" /> ></td></tr>
diff --git a/apps/routerconsole/jsp/configstats.jsp b/apps/routerconsole/jsp/configstats.jsp
index 7e548a11361c6323e5e15112855c8e03dd36fe13..f284badae45030608674f402edeecbca4e54c168 100644
--- a/apps/routerconsole/jsp/configstats.jsp
+++ b/apps/routerconsole/jsp/configstats.jsp
@@ -76,10 +76,21 @@ function toggleAll(category)
<h3><%=intl._("Configure I2P Stat Collection")%></h3>
<p><%=intl._("Enable full stats?")%>
<input type="checkbox" class="optbox" name="isFull" value="true" <%
- if (statshelper.getIsFull()) { %>checked="true" <% } %> >
+ if (statshelper.getIsFull()) { %>checked="checked" <% } %> >
(<%=intl._("change requires restart to take effect")%>)<br>
- <%=intl._("Stat file")%>: <input type="text" name="filename" value="<%=statshelper.getFilename()%>" ><br>
-<%=intl._("Filter")%>: (<a href="javascript:void(null);" onclick="toggleAll('*')"><%=intl._("toggle all")%></a>)<br></p>
+<%
+
+ // stats.log for devs only and grows without bounds, not recommended
+ boolean shouldShowLog = statshelper.shouldShowLog();
+ if (shouldShowLog) {
+
+%><%=intl._("Stat file")%>: <input type="text" name="filename" value="<%=statshelper.getFilename()%>" ><br>
+Warning - Log with care, stat file grows without limit.<br>
+<%
+
+ } // shouldShowLog
+
+%><%=intl._("Filter")%>: (<a href="javascript:void(null);" onclick="toggleAll('*')"><%=intl._("toggle all")%></a>)<br></p>
<div class="wideload">
<table>
<% while (statshelper.hasMoreStats()) {
@@ -90,27 +101,51 @@ function toggleAll(category)
(<a href="javascript:void(null);" onclick="toggleAll('<%=statshelper.getCurrentGroupName()%>')"><%=intl._("toggle all")%></a>)
</td></tr>
<tr class="tablefooter">
- <td align="center"><b><%=intl._("Log")%></b></td>
- <td align="center"><b><%=intl._("Graph")%></b></td>
+<%
+
+ if (shouldShowLog) {
+
+%> <td align="center"><b><%=intl._("Log")%></b></td>
+<%
+
+ } // shouldShowLog
+
+%> <td align="center"><b><%=intl._("Graph")%></b></td>
<td></td></tr>
<%
} // end iterating over required groups for the current stat %>
- <tr><td align="center">
+ <tr>
+<%
+
+ if (shouldShowLog) {
+
+%> <td align="center">
<a name="<%=statshelper.getCurrentStatName()%>"></a>
<input type="checkbox" class="optbox <%=statshelper.getCurrentGroupName()%>" name="statList" value="<%=statshelper.getCurrentStatName()%>" <%
- if (statshelper.getCurrentIsLogged()) { %>checked="true" <% } %> ></td>
- <td align="center">
+ if (statshelper.getCurrentIsLogged()) { %>checked="checked" <% } %> ></td>
+<%
+
+ } // shouldShowLog
+
+%> <td align="center">
<% if (statshelper.getCurrentCanBeGraphed()) { %>
<input type="checkbox" class="optbox <%=statshelper.getCurrentGroupName()%>" name="graphList" value="<%=statshelper.getCurrentGraphName()%>" <%
- if (statshelper.getCurrentIsGraphed()) { %>checked="true" <% } %> ><% } %></td>
+ if (statshelper.getCurrentIsGraphed()) { %>checked="checked" <% } %> ><% } %></td>
<td align="left"><b><%=statshelper.getCurrentStatName()%>:</b><br>
<%=statshelper.getCurrentStatDescription()%></td></tr><%
- } // end iterating over all stats %>
- <tr><td colspan="3"></td></tr>
+ } // end iterating over all stats
+
+ if (shouldShowLog) {
+
+%> <tr><td colspan="3"></td></tr>
<tr><td align="center"><input type="checkbox" class="optbox" name="explicitFilter" ></td>
<td colspan="2"><%=intl._("Advanced filter")%>:
<input type="text" name="explicitFilterValue" value="<%=statshelper.getExplicitFilter()%>" size="40" ></td></tr>
- <tr class="tablefooter"><td colspan="3" align="right">
+<%
+
+ } // shouldShowLog
+
+%> <tr class="tablefooter"><td colspan="3" align="right">
<input type="reset" class="cancel" value="<%=intl._("Cancel")%>" >
<input type="submit" name="shouldsave" class="accept" value="<%=intl._("Save changes")%>" >
</td></tr>
diff --git a/apps/routerconsole/jsp/configupdate.jsp b/apps/routerconsole/jsp/configupdate.jsp
index c3066ade634da3c58e851ccca958709539aa5084..465f9b412e370617c2aefda6147b3d9a491675f1 100644
--- a/apps/routerconsole/jsp/configupdate.jsp
+++ b/apps/routerconsole/jsp/configupdate.jsp
@@ -56,9 +56,9 @@
<td><input type="text" size="10" name="proxyPort" value="<jsp:getProperty name="updatehelper" property="proxyPort" />" /></td></tr>
<% if (updatehelper.canInstall()) { %>
<tr><td class= "mediumtags" align="right"><b><%=intl._("Update URLs")%>:</b></td>
- <td><textarea name="updateURL" wrap="off" spellcheck="false"><jsp:getProperty name="updatehelper" property="updateURL" /></textarea></td>
+ <td><textarea cols="60" rows="6" name="updateURL" wrap="off" spellcheck="false"><jsp:getProperty name="updatehelper" property="updateURL" /></textarea></td>
</tr><tr><td class= "mediumtags" align="right"><b><%=intl._("Trusted keys")%>:</b></td>
- <td><textarea name="trustedKeys" wrap="off" spellcheck="false"><jsp:getProperty name="updatehelper" property="trustedKeys" /></textarea></td>
+ <td><textarea cols="60" rows="6" name="trustedKeys" wrap="off" spellcheck="false"><jsp:getProperty name="updatehelper" property="trustedKeys" /></textarea></td>
</tr><tr><td class= "mediumtags" align="right"><b><%=intl._("Update with unsigned development builds?")%></b></td>
<td><jsp:getProperty name="updatehelper" property="updateUnsigned" /></td>
</tr><tr><td class= "mediumtags" align="right"><b><%=intl._("Unsigned Build URL")%>:</b></td>
diff --git a/apps/routerconsole/jsp/graph.jsp b/apps/routerconsole/jsp/graph.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..6147fd96d0fb75325a45ce6d208bd751c1b80a27
--- /dev/null
+++ b/apps/routerconsole/jsp/graph.jsp
@@ -0,0 +1,22 @@
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html><head>
+<%@include file="css.jsi" %>
+<%=intl.title("graphs")%>
+ <jsp:useBean class="net.i2p.router.web.GraphHelper" id="graphHelper" scope="request" />
+ <jsp:setProperty name="graphHelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
+<% /* GraphHelper sets the defaults in setContextId, so setting the properties must be after the context */ %>
+ <jsp:setProperty name="graphHelper" property="*" />
+<%
+ graphHelper.storeWriter(out);
+%>
+</head><body>
+<%@include file="summary.jsi" %>
+<h1><%=intl._("I2P Performance Graphs")%></h1>
+<div class="main" id="main">
+ <div class="graphspanel">
+ <div class="widepanel">
+ <jsp:getProperty name="graphHelper" property="singleStat" />
+</div></div></div></body></html>
diff --git a/apps/routerconsole/jsp/graphs.jsp b/apps/routerconsole/jsp/graphs.jsp
index e54133250a7233399a9c3e696fae2a2daf3f3324..24dd94185df4c43f7996ec3077f4361fe8e2f9bf 100644
--- a/apps/routerconsole/jsp/graphs.jsp
+++ b/apps/routerconsole/jsp/graphs.jsp
@@ -6,7 +6,6 @@
<%@include file="css.jsi" %>
<%=intl.title("graphs")%>
<jsp:useBean class="net.i2p.router.web.GraphHelper" id="graphHelper" scope="request" />
- <% graphHelper.storeMethod(request.getMethod()); %>
<jsp:setProperty name="graphHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
<% /* GraphHelper sets the defaults in setContextId, so setting the properties must be after the context */ %>
<jsp:setProperty name="graphHelper" property="*" />
diff --git a/apps/routerconsole/jsp/js/ajax.js b/apps/routerconsole/jsp/js/ajax.js
new file mode 100644
index 0000000000000000000000000000000000000000..dab3164a098fd00dfcc3653fa9e4af40a5001dc8
--- /dev/null
+++ b/apps/routerconsole/jsp/js/ajax.js
@@ -0,0 +1,33 @@
+function ajax(url, target, refresh) {
+ // native XMLHttpRequest object
+ if (window.XMLHttpRequest) {
+ req = new XMLHttpRequest();
+ req.onreadystatechange = function() {ajaxDone(url, target, refresh);};
+ req.open("GET", url, true);
+ req.send(null);
+ // IE/Windows ActiveX version
+ } else if (window.ActiveXObject) {
+ req = new ActiveXObject("Microsoft.XMLDOM");
+ if (req) {
+ req.onreadystatechange = function() {ajaxDone(target);};
+ req.open("GET", url, true);
+ req.send(null);
+ }
+ }
+}
+
+function ajaxDone(url, target, refresh) {
+ // only if req is "loaded"
+ if (req.readyState == 4) {
+ // only if "OK"
+ if (req.status == 200) {
+ results = req.responseText;
+ document.getElementById(target).innerHTML = results;
+ document.getElementById("lowersection").style.display="block";
+ } else {
+ document.getElementById(target).innerHTML="<b>Router is down</b>";
+ document.getElementById("lowersection").style.display="none";
+ }
+ setTimeout(function() {ajax(url, target, refresh);}, refresh);
+ }
+}
diff --git a/apps/routerconsole/jsp/viewstat.jsp b/apps/routerconsole/jsp/viewstat.jsp
index ef5f1140fec0bc2c2c51baf6e70efac0f66644d3..af7b2944cd2fcc542b932135928bdf9e5c447352 100644
--- a/apps/routerconsole/jsp/viewstat.jsp
+++ b/apps/routerconsole/jsp/viewstat.jsp
@@ -47,12 +47,15 @@ if ( !rendered && ((rs != null) || fakeBw) ) {
int width = -1;
int height = -1;
int periodCount = -1;
+ int end = 0;
String str = request.getParameter("width");
if (str != null) try { width = Integer.parseInt(str); } catch (NumberFormatException nfe) {}
str = request.getParameter("height");
if (str != null) try { height = Integer.parseInt(str); } catch (NumberFormatException nfe) {}
str = request.getParameter("periodCount");
if (str != null) try { periodCount = Integer.parseInt(str); } catch (NumberFormatException nfe) {}
+ str = request.getParameter("end");
+ if (str != null) try { end = Integer.parseInt(str); } catch (NumberFormatException nfe) {}
boolean hideLegend = Boolean.valueOf(""+request.getParameter("hideLegend")).booleanValue();
boolean hideGrid = Boolean.valueOf(""+request.getParameter("hideGrid")).booleanValue();
boolean hideTitle = Boolean.valueOf(""+request.getParameter("hideTitle")).booleanValue();
@@ -63,7 +66,7 @@ if ( !rendered && ((rs != null) || fakeBw) ) {
if (fakeBw)
rendered = net.i2p.router.web.StatSummarizer.instance().renderRatePng(cout, width, height, hideLegend, hideGrid, hideTitle, showEvents, periodCount, showCredit);
else
- rendered = net.i2p.router.web.StatSummarizer.instance().renderPng(rate, cout, width, height, hideLegend, hideGrid, hideTitle, showEvents, periodCount, showCredit);
+ rendered = net.i2p.router.web.StatSummarizer.instance().renderPng(rate, cout, width, height, hideLegend, hideGrid, hideTitle, showEvents, periodCount, end, showCredit);
}
if (rendered)
cout.close();
diff --git a/apps/sam/java/build.xml b/apps/sam/java/build.xml
index 849fbd55d74830eb90573e1f601af9c1b4bf79d5..076c2e4533bc301576880ff5c39824a11f55aecc 100644
--- a/apps/sam/java/build.xml
+++ b/apps/sam/java/build.xml
@@ -72,6 +72,7 @@
<attribute name="Main-Class" value="net.i2p.sam.SAMBridge" />
<attribute name="Class-Path" value="i2p.jar mstreaming.jar streaming.jar" />
<attribute name="Implementation-Version" value="${full.version}" />
+ <attribute name="Built-By" value="${build.built-by}" />
<attribute name="Build-Date" value="${build.timestamp}" />
<attribute name="Base-Revision" value="${workspace.version}" />
<attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
@@ -87,6 +88,7 @@
<attribute name="Main-Class" value="net.i2p.sam.SAMBridge" />
<attribute name="Class-Path" value="i2p.jar mstreaming.jar streaming.jar" />
<attribute name="Implementation-Version" value="${full.version}" />
+ <attribute name="Built-By" value="${build.built-by}" />
<attribute name="Build-Date" value="${build.timestamp}" />
<attribute name="Base-Revision" value="${workspace.version}" />
<attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
diff --git a/apps/streaming/java/build.xml b/apps/streaming/java/build.xml
index 5f278f307c67183780e29bb28cb3294c0721d6df..971ae21cf2df0b3e0db0a7f024478fdd79d83583 100644
--- a/apps/streaming/java/build.xml
+++ b/apps/streaming/java/build.xml
@@ -64,6 +64,7 @@
<jar destfile="./build/streaming.jar" basedir="./build/obj" includes="**/*.class" >
<manifest>
<attribute name="Implementation-Version" value="${full.version}" />
+ <attribute name="Built-By" value="${build.built-by}" />
<attribute name="Build-Date" value="${build.timestamp}" />
<attribute name="Base-Revision" value="${workspace.version}" />
<attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionManager.java b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionManager.java
index f50a4b5cc8115ab55e0e8acc7d69369406f4f3f5..6e8811a2fea1fa79f73be5f5b4694359f306125a 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionManager.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionManager.java
@@ -161,8 +161,7 @@ class ConnectionManager {
// active++;
//}
if (locked_tooManyStreams()) {
- if (_log.shouldLog(Log.WARN))
- _log.warn("Refusing connection since we have exceeded our max of "
+ _log.logAlways(Log.WARN, "Refusing connection since we have exceeded our max of "
+ _maxConcurrentStreams + " connections");
reject = true;
} else {
@@ -233,8 +232,7 @@ class ConnectionManager {
while (true) {
long remaining = expiration - _context.clock().now();
if (remaining <= 0) {
- if (_log.shouldLog(Log.WARN))
- _log.warn("Refusing to connect since we have exceeded our max of "
+ _log.logAlways(Log.WARN, "Refusing to connect since we have exceeded our max of "
+ _maxConcurrentStreams + " connections");
_numWaiting--;
return null;
@@ -243,8 +241,7 @@ class ConnectionManager {
if (locked_tooManyStreams()) {
// allow a full buffer of pending/waiting streams
if (_numWaiting > _maxConcurrentStreams) {
- if (_log.shouldLog(Log.WARN))
- _log.warn("Refusing connection since we have exceeded our max of "
+ _log.logAlways(Log.WARN, "Refusing connection since we have exceeded our max of "
+ _maxConcurrentStreams + " and there are " + _numWaiting
+ " waiting already");
_numWaiting--;
diff --git a/apps/susidns/src/build.xml b/apps/susidns/src/build.xml
index 3fff55a34c9fce7f4e652c65027842ddd79d6a28..49a1629c35ec8869e0d3057844ed56679be79066 100644
--- a/apps/susidns/src/build.xml
+++ b/apps/susidns/src/build.xml
@@ -98,6 +98,7 @@
</fileset>
<manifest>
<attribute name="Implementation-Version" value="${full.version}" />
+ <attribute name="Built-By" value="${build.built-by}" />
<attribute name="Build-Date" value="${build.timestamp}" />
<attribute name="Base-Revision" value="${workspace.version}" />
<attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
diff --git a/apps/susidns/src/java/src/i2p/susi/dns/AddressBean.java b/apps/susidns/src/java/src/i2p/susi/dns/AddressBean.java
index 6f34af3e5b51a889705017d228cd3b1112712ea1..9c1c85863194cf9bf0163df6bdff55a0f0b6038d 100644
--- a/apps/susidns/src/java/src/i2p/susi/dns/AddressBean.java
+++ b/apps/susidns/src/java/src/i2p/susi/dns/AddressBean.java
@@ -170,6 +170,15 @@ public class AddressBean
return Base32.encode(hash) + ".b32.i2p";
}
+ /** @since 0.9 */
+ public String getB64()
+ {
+ byte[] dest = Base64.decode(destination);
+ if (dest == null)
+ return "";
+ return I2PAppContext.getGlobalContext().sha().calculateHash(dest).toBase64();
+ }
+
/** @since 0.8.7 */
public void setProperties(Properties p) {
props = p;
diff --git a/apps/susidns/src/jsp/addressbook.jsp b/apps/susidns/src/jsp/addressbook.jsp
index 4736a4dc01c0bf78f99b4879cbd32a508e5cb14c..e0a5de3148438bc87452858ae7ddb6e078c4610d 100644
--- a/apps/susidns/src/jsp/addressbook.jsp
+++ b/apps/susidns/src/jsp/addressbook.jsp
@@ -42,7 +42,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>${book.book} <%=intl._("address book")%> - susidns</title>
<link rel="stylesheet" type="text/css" href="css.css">
</head>
@@ -158,7 +158,7 @@ ${book.loadBookMessages}
</td><td class="names">
<span class="addrhlpr"><a href="details?h=${addr.name}" title="<%=intl._("More information on this entry")%>"><%=intl._("details")%></a></span>
</td>
-<td class="destinations"><textarea rows="1" style="height: 3em;" cols="40" wrap="off" readonly="readonly" name="dest_${addr.name}" >${addr.destination}</textarea></td>
+<td class="destinations"><textarea rows="1" style="height:3em;" wrap="off" cols="40" readonly="readonly" name="dest_${addr.name}" >${addr.destination}</textarea></td>
</tr>
</c:forEach>
</table>
@@ -190,7 +190,7 @@ ${book.loadBookMessages}
<table><tr><td>
<b><%=intl._("Host Name")%></b></td><td><input type="text" name="hostname" value="${book.hostname}" size="54">
</td></tr><tr><td>
-<b><%=intl._("Destination")%></b></td><td><textarea name="destination" rows="1" style="height: 3em;" cols="70" wrap="off" spellcheck="false">${book.destination}</textarea>
+<b><%=intl._("Destination")%></b></td><td><textarea name="destination" rows="1" style="height:3em" wrap="off" cols="70" spellcheck="false">${book.destination}</textarea>
</td></tr></table>
<p class="buttons">
<input class="cancel" type="reset" value="<%=intl._("Cancel")%>" >
diff --git a/apps/susidns/src/jsp/config.jsp b/apps/susidns/src/jsp/config.jsp
index 23cce5adadc4900af64b849084b49ce547f69427..a94e693e5420f5ff1199154014dd75161cc9872a 100644
--- a/apps/susidns/src/jsp/config.jsp
+++ b/apps/susidns/src/jsp/config.jsp
@@ -38,7 +38,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title><%=intl._("configuration")%> - susidns</title>
<link rel="stylesheet" type="text/css" href="css.css">
</head>
diff --git a/apps/susidns/src/jsp/details.jsp b/apps/susidns/src/jsp/details.jsp
index f9769ecac13f3b655cf730edcbed1a6de7b87552..49a4b7b6340050fec85a0573b82a838195e843f3 100644
--- a/apps/susidns/src/jsp/details.jsp
+++ b/apps/susidns/src/jsp/details.jsp
@@ -36,7 +36,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>${book.book} <%=intl._("addressbook")%> - susidns</title>
<link rel="stylesheet" type="text/css" href="css.css">
</head>
@@ -94,6 +94,9 @@
<td><%=intl._("Base 32 Address")%></td>
<td><a href="http://<%=b32%>/"><%=b32%></a></td>
</tr><tr class="list${book.trClass}">
+<td><%=intl._("Base 64 Hash")%></td>
+<td><%=addr.getB64()%></td>
+</tr><tr class="list${book.trClass}">
<td><%=intl._("Address Helper")%></td>
<td><a href="http://<%=addr.getName()%>/?i2paddresshelper=<%=addr.getDestination()%>"><%=intl._("link")%></a></td>
</tr><tr class="list${book.trClass}">
@@ -119,7 +122,7 @@
<td><%=addr.getNotes()%></td>
</tr><tr class="list${book.trClass}">
<td><%=intl._("Destination")%></td>
-<td class="destinations"><textarea rows="1" style="height: 3em;" cols="70" wrap="off" readonly="readonly" ><%=addr.getDestination()%></textarea></td>
+<td class="destinations"><textarea rows="1" style="height:3em;" wrap="off" cols="70" readonly="readonly" ><%=addr.getDestination()%></textarea></td>
</tr></table>
</div>
<div id="buttons">
diff --git a/apps/susidns/src/jsp/subscriptions.jsp b/apps/susidns/src/jsp/subscriptions.jsp
index 8d1c6c24894a4fad5920c93a631687e5e5f8bf7c..c01e2ee08e9e194d060bb4a6b03f08093569a6f3 100644
--- a/apps/susidns/src/jsp/subscriptions.jsp
+++ b/apps/susidns/src/jsp/subscriptions.jsp
@@ -38,7 +38,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title><%=intl._("subscriptions")%> - susidns</title>
<link rel="stylesheet" type="text/css" href="css.css">
</head>
diff --git a/apps/susimail/build.xml b/apps/susimail/build.xml
index 3368283d115e8b65a72f790f99e4c982d7f4b75d..3e22444d892e06b92255376f76d105ec05d696a5 100644
--- a/apps/susimail/build.xml
+++ b/apps/susimail/build.xml
@@ -46,6 +46,7 @@
basedir="src/" excludes="WEB-INF/web.xml LICENSE src/**/*">
<manifest>
<attribute name="Implementation-Version" value="${full.version}" />
+ <attribute name="Built-By" value="${build.built-by}" />
<attribute name="Build-Date" value="${build.timestamp}" />
<attribute name="Base-Revision" value="${workspace.version}" />
<attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
diff --git a/apps/systray/java/build.xml b/apps/systray/java/build.xml
index 5baf4ab6224a5b7183af97e6a43053b9b3e78180..eeec392303a9f3da648a15c98cd0d166953bdee9 100644
--- a/apps/systray/java/build.xml
+++ b/apps/systray/java/build.xml
@@ -45,6 +45,7 @@
<attribute name="Main-Class" value="net.i2p.apps.systray.SysTray" />
<attribute name="Class-Path" value="systray4j.jar" />
<attribute name="Implementation-Version" value="${full.version}" />
+ <attribute name="Built-By" value="${build.built-by}" />
<attribute name="Build-Date" value="${build.timestamp}" />
<attribute name="Base-Revision" value="${workspace.version}" />
<attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
diff --git a/build.properties b/build.properties
index f3ead757658b05a21cdbe376cf30d28353927db9..ab2fa1b9916c9f85378fdaad6506dbcd6b6e4b60 100644
--- a/build.properties
+++ b/build.properties
@@ -16,3 +16,5 @@ wrapperdocs.url=http://wrapper.tanukisoftware.com/jdoc/
# these are only for unit test javadocs
i2pdocs.url=http://docs.i2p-projekt.de/javadoc/
junitdocs.url=http://junit.org/apidocs/
+# This will go in the jar manifests
+build.built-by=unknown
diff --git a/build.xml b/build.xml
index a0ffe8ab5486b11d18cf48d9a27f9a3372408e4f..150db9b8594a824d6af01c6cef84ca0409931594 100644
--- a/build.xml
+++ b/build.xml
@@ -166,6 +166,7 @@
<zipfileset src="apps/jrobin/jrobin-1.5.9.1.jar"
excludes="org/jrobin/cmd/ org/jrobin/convertor/ org/jrobin/inspector/" />
<manifest>
+ <attribute name="Built-By" value="${build.built-by}" />
<attribute name="Build-Date" value="${build.timestamp}" />
<attribute name="Base-Revision" value="${workspace.version}" />
</manifest>
@@ -206,6 +207,7 @@
<copy file="apps/jetty/jettylib/javax.servlet.jar" todir="build/" />
</target>
+ <!-- this makes an empty build/launchi2p.jar and the build/i2p.exe for the no-wrapper windows startup, if possible -->
<target name="buildexe">
<condition property="noExe">
<os arch="x86_64" />
@@ -234,11 +236,13 @@
classname="net.sf.launch4j.ant.Launch4jTask"
classpath="${basedir}/installer/lib/launch4j/launch4j.jar:${basedir}/installer/lib/launch4j/lib/xstream.jar" />
+ <!-- this makes an empty build/launchi2p.jar and the build/i2p.exe for the no-wrapper windows startup -->
<target name="doBuildEXE" depends="buildProperties" unless="noExe">
<jar destfile="./build/launchi2p.jar">
<manifest>
<attribute name="Main-Class" value="net.i2p.router.RouterLaunch" />
<attribute name="Class-Path" value="lib/i2p.jar lib/router.jar lib/jbigi.jar lib/BOB.jar lib/sam.jar lib/mstreaming.jar lib/streaming.jar lib/routerconsole.jar lib/i2ptunnel.jar lib/org.mortbay.jetty.jar lib/javax.servlet.jar lib/jasper-compiler.jar lib/jasper-runtime.jar lib/commons-logging.jar lib/commons-el.jar lib/wrapper.jar lib/systray.jar lib/systray4j.jar lib/desktopgui.jar" />
+ <attribute name="Built-By" value="${build.built-by}" />
<attribute name="Build-Date" value="${build.timestamp}" />
<attribute name="Base-Revision" value="${workspace.version}" />
</manifest>
@@ -289,6 +293,7 @@
<jar destfile="build/jbigi.jar" whenmanifestonly="fail" >
<fileset dir="installer/lib/jbigi" includes="*.so *.dll *.jnilib" />
<manifest>
+ <attribute name="Built-By" value="${build.built-by}" />
<attribute name="Build-Date" value="${build.timestamp}" />
<attribute name="Base-Revision" value="${workspace.version}" />
<attribute name="Workspace-Changes" value="${workspace.changes.jbigi.tr}" />
@@ -302,6 +307,7 @@
<jar destfile="build/jbigi.jar" whenmanifestonly="fail" >
<fileset dir="installer/lib/jbigi" includes="*.so *.jnilib" />
<manifest>
+ <attribute name="Built-By" value="${build.built-by}" />
<attribute name="Build-Date" value="${build.timestamp}" />
<attribute name="Base-Revision" value="${workspace.version}" />
<attribute name="Workspace-Changes" value="${workspace.changes.jbigi.tr}" />
@@ -316,6 +322,7 @@
<jar destfile="build/jbigi.jar" whenmanifestonly="fail" >
<fileset dir="installer/lib/jbigi" includes="*freebsd*.so" />
<manifest>
+ <attribute name="Built-By" value="${build.built-by}" />
<attribute name="Build-Date" value="${build.timestamp}" />
<attribute name="Base-Revision" value="${workspace.version}" />
<attribute name="Workspace-Changes" value="${workspace.changes.jbigi.tr}" />
@@ -329,6 +336,7 @@
<jar destfile="build/jbigi.jar" whenmanifestonly="fail" >
<fileset dir="installer/lib/jbigi" includes="*linux*.so" />
<manifest>
+ <attribute name="Built-By" value="${build.built-by}" />
<attribute name="Build-Date" value="${build.timestamp}" />
<attribute name="Base-Revision" value="${workspace.version}" />
<attribute name="Workspace-Changes" value="${workspace.changes.jbigi.tr}" />
@@ -342,6 +350,7 @@
<jar destfile="build/jbigi.jar" whenmanifestonly="fail" >
<fileset dir="installer/lib/jbigi" includes="*linux-arm*.so,*linux-ppc*.so" />
<manifest>
+ <attribute name="Built-By" value="${build.built-by}" />
<attribute name="Build-Date" value="${build.timestamp}" />
<attribute name="Base-Revision" value="${workspace.version}" />
<attribute name="Workspace-Changes" value="${workspace.changes.jbigi.tr}" />
@@ -355,6 +364,7 @@
<jar destfile="build/jbigi.jar" whenmanifestonly="fail" >
<fileset dir="installer/lib/jbigi" includes="*.jnilib" />
<manifest>
+ <attribute name="Built-By" value="${build.built-by}" />
<attribute name="Build-Date" value="${build.timestamp}" />
<attribute name="Base-Revision" value="${workspace.version}" />
<attribute name="Workspace-Changes" value="${workspace.changes.jbigi.tr}" />
@@ -368,6 +378,7 @@
<jar destfile="build/jbigi.jar" whenmanifestonly="fail" >
<fileset dir="installer/lib/jbigi" includes="*windows*.dll" />
<manifest>
+ <attribute name="Built-By" value="${build.built-by}" />
<attribute name="Build-Date" value="${build.timestamp}" />
<attribute name="Base-Revision" value="${workspace.version}" />
<attribute name="Workspace-Changes" value="${workspace.changes.jbigi.tr}" />
@@ -544,6 +555,7 @@
</target>
<target name="verifyReleaseBuildNumbers" depends="getReleaseNumber, getBuildNumber" >
+ <echo message="SDK: ${java.vendor} ${java.version} (${java.runtime.name} ${java.runtime.version})" />
<fail message="Bad release number: ${release.number}" >
<condition>
<or>
@@ -572,7 +584,6 @@
<delete dir="./build" />
<delete file="installer/lib/izpack/patches.jar" failonerror="false" quiet="true" />
<delete file="i2pinstall.exe" failonerror="false" quiet="true" />
- <delete file="i2p.exe" failonerror="false" quiet="true" />
<delete file="syndie-standalone.zip" failonerror="false" quiet="true" />
<delete>
<fileset dir="." includes="i2pinstall*jar i2pinstall*bz2" />
@@ -754,7 +765,7 @@
</target>
<target name="preppkg-windows" depends="preppkg-base, buildexe">
- <copy file="i2p.exe" todir="pkg-temp/" failonerror="false" />
+ <copy file="build/i2p.exe" todir="pkg-temp/" failonerror="false" />
<copy file="apps/systray/java/lib/systray4j.dll" todir="pkg-temp/lib" />
<copy file="apps/systray/java/resources/iggy.ico" todir="pkg-temp/icons" />
<copy file="apps/systray/java/resources/iggy.xpm" todir="pkg-temp/icons" />
@@ -1016,7 +1027,9 @@
<copy file="build/i2psnark.jar" todir="pkg-temp/lib" />
<!-- include systray changes in 0.7.5 -->
<copy file="build/systray.jar" todir="pkg-temp/lib/" />
+ <!-- removed from updater in 0.9
<copy file="build/desktopgui.jar" todir="pkg-temp/lib/" />
+ -->
<copy file="build/susimail.war" todir="pkg-temp/webapps/" />
<copy file="build/susidns.war" todir="pkg-temp/webapps/" />
<!-- as of 0.7.12; someday, we can remove these from the updater -->
@@ -1116,6 +1129,7 @@
<jar destfile="./pkg-temp/installer/copy.jar" basedir="./core/java/build/obj" includes="net/i2p/util/Copy.class net/i2p/util/FileUtil.class">
<manifest>
<attribute name="Main-Class" value="net.i2p.util.Copy" />
+ <attribute name="Built-By" value="${build.built-by}" />
<attribute name="Build-Date" value="${build.timestamp}" />
<attribute name="Base-Revision" value="${workspace.version}" />
<attribute name="Workspace-Changes" value="${workspace.changes.util.tr}" />
@@ -1124,6 +1138,7 @@
<jar destfile="./pkg-temp/installer/delete.jar" basedir="./core/java/build/obj" includes="net/i2p/util/Delete.class net/i2p/util/FileUtil.class">
<manifest>
<attribute name="Main-Class" value="net.i2p.util.Delete" />
+ <attribute name="Built-By" value="${build.built-by}" />
<attribute name="Build-Date" value="${build.timestamp}" />
<attribute name="Base-Revision" value="${workspace.version}" />
<attribute name="Workspace-Changes" value="${workspace.changes.util.tr}" />
@@ -1132,6 +1147,7 @@
<jar destfile="./pkg-temp/installer/exec.jar" basedir="./core/java/build/obj" includes="net/i2p/util/Exec.class">
<manifest>
<attribute name="Main-Class" value="net.i2p.util.Exec" />
+ <attribute name="Built-By" value="${build.built-by}" />
<attribute name="Build-Date" value="${build.timestamp}" />
<attribute name="Base-Revision" value="${workspace.version}" />
<attribute name="Workspace-Changes" value="${workspace.changes.util.tr}" />
@@ -1169,43 +1185,31 @@
<ant target="doInstallerEXE" />
</target>
+ <!-- this makes i2pinstall.exe from install.jar -->
<target name="doInstallerEXE" unless="noExe">
<!-- now the installer exe -->
<launch4j configFile="./installer/i2pinstaller.xml" />
- <launch4j configFile="./installer/i2pstandalone.xml" />
<!-- thazzit -->
</target>
<!-- Custom installers -->
- <target name="installer-nowindows" depends="clean, preppkg-nowindows, getReleaseNumber, getBuildNumber, buildProperties, util-list-changes, izpack-patches" >
- <mkdir dir="pkg-temp/installer" />
- <!-- set if unset -->
- <property name="workspace.changes.util.tr" value="" />
- <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${i2p.build.number}${build.extra}.jar" installerType="standard" basedir="${basedir}" />
+ <target name="installer-nowindows" depends="clean, preppkg-nowindows, izpack-patches" >
+ <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${full.version}.jar" installerType="standard" basedir="${basedir}" />
</target>
- <target name="installer-freebsd" depends="clean, preppkg-freebsd-only, getReleaseNumber, getBuildNumber, buildProperties, util-list-changes, izpack-patches" >
- <mkdir dir="pkg-temp/installer" />
- <!-- set if unset -->
- <property name="workspace.changes.util.tr" value="" />
- <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${i2p.build.number}${build.extra}_freebsd-only.jar" installerType="standard" basedir="${basedir}" />
+ <target name="installer-freebsd" depends="clean, preppkg-freebsd-only, izpack-patches" >
+ <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${full.version}_freebsd-only.jar" installerType="standard" basedir="${basedir}" />
</target>
- <target name="installer-linux" depends="clean, preppkg-linux-only, getReleaseNumber, getBuildNumber, buildProperties, util-list-changes, izpack-patches" >
- <mkdir dir="pkg-temp/installer" />
- <!-- set if unset -->
- <property name="workspace.changes.util.tr" value="" />
- <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${i2p.build.number}${build.extra}_linux-only.jar" installerType="standard" basedir="${basedir}" />
+ <target name="installer-linux" depends="clean, preppkg-linux-only, izpack-patches" >
+ <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${full.version}_linux-only.jar" installerType="standard" basedir="${basedir}" />
</target>
- <target name="installer-osx" depends="clean, checkForIzpack2App, preppkg-osx-only, getReleaseNumber, getBuildNumber, buildProperties, util-list-changes, izpack-patches">
- <mkdir dir="pkg-temp/installer" />
+ <target name="installer-osx" depends="clean, checkForIzpack2App, preppkg-osx-only, izpack-patches">
<mkdir dir="pkg-temp/osx" />
- <!-- set if unset -->
- <property name="workspace.changes.util.tr" value="" />
- <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${i2p.build.number}${build.extra}_osx-only.jar" installerType="standard" basedir="${basedir}" />
+ <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${full.version}_osx-only.jar" installerType="standard" basedir="${basedir}" />
<ant target="installer2app" />
<delete dir="pkg-temp/osx" />
</target>
@@ -1218,34 +1222,32 @@
<mkdir dir="pkg-temp/osx" />
<exec executable="python" failonerror="true">
<arg value="${user.home}/IzPack/utils/wrappers/izpack2app/izpack2app.py" />
- <arg value="${basedir}/i2pinstall_${release.number}-${i2p.build.number}${build.extra}_osx-only.jar" />
- <arg value="${basedir}/pkg-temp/osx/i2p-${release.number}-${i2p.build.number}${build.extra}_osx-install.app" />
+ <arg value="${basedir}/i2pinstall_${full.version}_osx-only.jar" />
+ <arg value="${basedir}/pkg-temp/osx/i2p-${full.version}_osx-install.app" />
</exec>
<exec executable="chmod" failonerror="true" osfamily="unix">
<arg value="755" />
- <arg value="${basedir}/pkg-temp/osx/i2p-${release.number}-${i2p.build.number}${build.extra}_osx-install.app/Contents/MacOS/JavaApplicationStub" />
+ <arg value="${basedir}/pkg-temp/osx/i2p-${full.version}_osx-install.app/Contents/MacOS/JavaApplicationStub" />
</exec>
<exec executable="tar" osfamily="unix" failonerror="true">
<arg value="--owner=root" />
<arg value="--group=root" />
<arg value="-cjvf" />
- <arg value="${basedir}/i2pinstall_${release.number}-${i2p.build.number}${build.extra}_osx.tar.bz2" />
+ <arg value="${basedir}/i2pinstall_${full.version}_osx.tar.bz2" />
<arg value="-C" />
<arg value="${basedir}/pkg-temp/osx" />
- <arg value="i2p-${release.number}-${i2p.build.number}${build.extra}_osx-install.app" />
+ <arg value="i2p-${full.version}_osx-install.app" />
</exec>
</target>
- <!-- Yes, even though this makes an installer for Windows, we still need to depend on preppkg-unix (because the installer attempts to delete these files
- and will fail if they don't exist. Thankfully these files are so very small there's not much harm in including them.
- -->
- <target name="installer-windows" depends="clean, doBuildEXE, preppkg-windows-only, preppkg-unix, getReleaseNumber, getBuildNumber, buildProperties, util-list-changes, izpack-patches" >
+ <target name="installer-windows" depends="clean, preppkg-windows-only, util-list-changes, izpack-patches" >
<mkdir dir="pkg-temp/installer" />
<!-- set if unset -->
<property name="workspace.changes.util.tr" value="" />
<jar destfile="./pkg-temp/installer/copy.jar" basedir="./core/java/build/obj" includes="net/i2p/util/Copy.class net/i2p/util/FileUtil.class">
<manifest>
<attribute name="Main-Class" value="net.i2p.util.Copy" />
+ <attribute name="Built-By" value="${build.built-by}" />
<attribute name="Build-Date" value="${build.timestamp}" />
<attribute name="Base-Revision" value="${workspace.version}" />
<attribute name="Workspace-Changes" value="${workspace.changes.util.tr}" />
@@ -1254,6 +1256,7 @@
<jar destfile="./pkg-temp/installer/delete.jar" basedir="./core/java/build/obj" includes="net/i2p/util/Delete.class net/i2p/util/FileUtil.class">
<manifest>
<attribute name="Main-Class" value="net.i2p.util.Delete" />
+ <attribute name="Built-By" value="${build.built-by}" />
<attribute name="Build-Date" value="${build.timestamp}" />
<attribute name="Base-Revision" value="${workspace.version}" />
<attribute name="Workspace-Changes" value="${workspace.changes.util.tr}" />
@@ -1262,13 +1265,16 @@
<jar destfile="./pkg-temp/installer/exec.jar" basedir="./core/java/build/obj" includes="net/i2p/util/Exec.class">
<manifest>
<attribute name="Main-Class" value="net.i2p.util.Exec" />
+ <attribute name="Built-By" value="${build.built-by}" />
<attribute name="Build-Date" value="${build.timestamp}" />
<attribute name="Base-Revision" value="${workspace.version}" />
<attribute name="Workspace-Changes" value="${workspace.changes.util.tr}" />
</manifest>
</jar>
- <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${i2p.build.number}${build.extra}_windows-only.jar" installerType="standard" basedir="${basedir}" />
- <delete dir="pkg-temp/win" />
+ <izpack input="${basedir}/installer/install.xml" output="${basedir}/install.jar" installerType="standard" basedir="${basedir}" />
+ <ant target="installerexe" />
+ <delete file="${basedir}/install.jar" />
+ <move file="${basedir}/i2pinstall.exe" tofile="${basedir}/i2pinstall_${full.version}_windows-only.exe" />
</target>
<target name="installer-all" depends="installer-freebsd, installer-linux, installer-osx, installer-windows, installer" >
@@ -1383,8 +1389,9 @@
<echo message="New version number is ${release.number}" />
<copy file="i2pupdate.zip" tofile="i2pupdate_${release.number}.zip" />
<copy file="i2pinstall.exe" tofile="i2pinstall_${release.number}.exe" />
- <delete file="i2pupdate.sud" failonerror="false" />
- <delete file="i2pupdate.su2" failonerror="false" />
+ <delete file="i2pupdate.sud" />
+ <delete file="i2pupdate.su2" />
+ <!-- make this a lot easier by putting release.privkey=/path/to/privkey in override.properties -->
<input message="Enter private signing key file:" addproperty="release.privkey" />
<fail message="You must enter a path." >
<condition>
@@ -1494,6 +1501,17 @@
<arg value="-b" />
<arg value="i2pupdate_${release.number}.zip" />
</exec>
+ <exec executable="chmod" failonerror="true">
+ <arg value="444" />
+ <arg value="i2pinstall_${release.number}.exe" />
+ <arg value="i2psource_${release.number}.tar.bz2" />
+ <arg value="i2pupdate_${release.number}.zip" />
+ <arg value="i2pupdate.su2" />
+ <arg value="i2pupdate.sud" />
+ <arg value="i2pinstall_${release.number}.exe.sig" />
+ <arg value="i2psource_${release.number}.tar.bz2.sig" />
+ <arg value="i2pupdate_${release.number}.zip.sig" />
+ </exec>
<echo message="File sizes:" />
<exec executable="ls" failonerror="true">
<arg value="-l" />
diff --git a/core/java/build.xml b/core/java/build.xml
index c3eaf5c0780dd3d9f59692af034f100916ccf2c5..dad75fc9b5561fc002a172c3bcb650acc5b0eb37 100644
--- a/core/java/build.xml
+++ b/core/java/build.xml
@@ -59,6 +59,7 @@
<jar destfile="./build/i2p.jar" basedir="./build/obj" includes="**/*.class" >
<manifest>
<attribute name="Implementation-Version" value="${full.version}" />
+ <attribute name="Built-By" value="${build.built-by}" />
<attribute name="Build-Date" value="${build.timestamp}" />
<attribute name="Base-Revision" value="${workspace.version}" />
<attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
diff --git a/core/java/src/net/i2p/client/RequestLeaseSetMessageHandler.java b/core/java/src/net/i2p/client/RequestLeaseSetMessageHandler.java
index 663c01b7bb3c204641f98c601f45f5747818ba32..6bacb95f2276093374d50631928b2e7f7a9da5f8 100644
--- a/core/java/src/net/i2p/client/RequestLeaseSetMessageHandler.java
+++ b/core/java/src/net/i2p/client/RequestLeaseSetMessageHandler.java
@@ -34,7 +34,7 @@ import net.i2p.util.Log;
* @author jrandom
*/
class RequestLeaseSetMessageHandler extends HandlerImpl {
- private final Map _existingLeaseSets;
+ private final Map<Destination, LeaseInfo> _existingLeaseSets;
public RequestLeaseSetMessageHandler(I2PAppContext context) {
super(context, RequestLeaseSetMessage.MESSAGE_TYPE);
@@ -59,7 +59,7 @@ class RequestLeaseSetMessageHandler extends HandlerImpl {
leaseSet.setDestination(session.getMyDestination());
// reuse the old keys for the client
- LeaseInfo li = (LeaseInfo) _existingLeaseSets.get(session.getMyDestination());
+ LeaseInfo li = _existingLeaseSets.get(session.getMyDestination());
if (li == null) {
li = new LeaseInfo(session.getMyDestination());
_existingLeaseSets.put(session.getMyDestination(), li);
@@ -98,11 +98,11 @@ class RequestLeaseSetMessageHandler extends HandlerImpl {
}
private static class LeaseInfo {
- private PublicKey _pubKey;
- private PrivateKey _privKey;
- private SigningPublicKey _signingPubKey;
- private SigningPrivateKey _signingPrivKey;
- private Destination _dest;
+ private final PublicKey _pubKey;
+ private final PrivateKey _privKey;
+ private final SigningPublicKey _signingPubKey;
+ private final SigningPrivateKey _signingPrivKey;
+ private final Destination _dest;
public LeaseInfo(Destination dest) {
_dest = dest;
diff --git a/core/java/src/net/i2p/client/naming/BlockfileNamingService.java b/core/java/src/net/i2p/client/naming/BlockfileNamingService.java
index 6d0e1bb6f3bd636e435c1f330fc4ea1efe09f8a9..8172ee7fd2b88b713342f1da52742bac6d6fe57f 100644
--- a/core/java/src/net/i2p/client/naming/BlockfileNamingService.java
+++ b/core/java/src/net/i2p/client/naming/BlockfileNamingService.java
@@ -92,6 +92,7 @@ public class BlockfileNamingService extends DummyNamingService {
private final RAIFile _raf;
private final List<String> _lists;
private final List<InvalidEntry> _invalid;
+ private final Map<String, String> _negativeCache;
private volatile boolean _isClosed;
private final boolean _readOnly;
private boolean _needsUpgrade;
@@ -118,6 +119,9 @@ public class BlockfileNamingService extends DummyNamingService {
private static final String PROP_ADDED = "a";
private static final String PROP_SOURCE = "s";
+ private static final String DUMMY = "";
+ private static final int NEGATIVE_CACHE_SIZE = 32;
+
/**
* Opens the database at hostsdb.blockfile or creates a new
* one and imports entries from hosts.txt, userhosts.txt, and privatehosts.txt.
@@ -132,6 +136,7 @@ public class BlockfileNamingService extends DummyNamingService {
super(context);
_lists = new ArrayList();
_invalid = new ArrayList();
+ _negativeCache = new LHM(NEGATIVE_CACHE_SIZE);
BlockFile bf = null;
RAIFile raf = null;
boolean readOnly = false;
@@ -628,6 +633,10 @@ public class BlockfileNamingService extends DummyNamingService {
}
String key = hostname.toLowerCase(Locale.US);
+ synchronized(_negativeCache) {
+ if (_negativeCache.get(key) != null)
+ return null;
+ }
synchronized(_bf) {
if (_isClosed)
return null;
@@ -650,8 +659,13 @@ public class BlockfileNamingService extends DummyNamingService {
}
deleteInvalid();
}
- if (d != null)
+ if (d != null) {
putCache(hostname, d);
+ } else {
+ synchronized(_negativeCache) {
+ _negativeCache.put(key, DUMMY);
+ }
+ }
return d;
}
@@ -683,6 +697,9 @@ public class BlockfileNamingService extends DummyNamingService {
return false;
}
String key = hostname.toLowerCase(Locale.US);
+ synchronized(_negativeCache) {
+ _negativeCache.remove(key);
+ }
String listname = FALLBACK_LIST;
Properties props = new Properties();
props.setProperty(PROP_ADDED, Long.toString(_context.clock().now()));
@@ -1031,6 +1048,9 @@ public class BlockfileNamingService extends DummyNamingService {
}
_isClosed = true;
}
+ synchronized(_negativeCache) {
+ _negativeCache.clear();
+ }
clearCache();
}
diff --git a/core/java/src/net/i2p/client/naming/DummyNamingService.java b/core/java/src/net/i2p/client/naming/DummyNamingService.java
index 21f8a7c7cc1f0de892979ddd57431e84e6450198..63c6cf26484d67f9b94d1d5d1ae06da6a9651428 100644
--- a/core/java/src/net/i2p/client/naming/DummyNamingService.java
+++ b/core/java/src/net/i2p/client/naming/DummyNamingService.java
@@ -116,7 +116,7 @@ class DummyNamingService extends NamingService {
}
}
- private static class LHM<K, V> extends LinkedHashMap<K, V> {
+ protected static class LHM<K, V> extends LinkedHashMap<K, V> {
private final int _max;
public LHM(int max) {
diff --git a/core/java/src/net/i2p/crypto/TransientSessionKeyManager.java b/core/java/src/net/i2p/crypto/TransientSessionKeyManager.java
index e17802042b22a3a09e8e774d9dc0ee98ab411bc6..7959c68e9315d1a99976875bcf0d12c6170192f6 100644
--- a/core/java/src/net/i2p/crypto/TransientSessionKeyManager.java
+++ b/core/java/src/net/i2p/crypto/TransientSessionKeyManager.java
@@ -625,7 +625,7 @@ public class TransientSessionKeyManager extends SessionKeyManager {
OutboundSession sess = iter.next();
Set<TagSet> sets = new TreeSet(new TagSetComparator());
sets.addAll(sess.getTagSets());
- buf.append("<tr><td><b>Target key:</b> ").append(sess.getTarget().toBase64().substring(0, 64)).append("<br>" +
+ buf.append("<tr><td><b>Target public key:</b> ").append(sess.getTarget().toBase64().substring(0, 20)).append("...<br>" +
"<b>Established:</b> ").append(DataHelper.formatDuration(now - sess.getEstablishedDate())).append(" ago<br>" +
"<b>Last Used:</b> ").append(DataHelper.formatDuration(now - sess.getLastUsedDate())).append(" ago<br>" +
"<b>Session key:</b> ").append(sess.getCurrentKey().toBase64()).append("</td>" +
diff --git a/core/java/src/net/i2p/data/Base32.java b/core/java/src/net/i2p/data/Base32.java
index fd6f81a02de28a5958cce041c3b78b8abc639ccb..d3d438d62e777dbf3dff51aa1def5a15b9c6bcd7 100644
--- a/core/java/src/net/i2p/data/Base32.java
+++ b/core/java/src/net/i2p/data/Base32.java
@@ -29,7 +29,7 @@ import net.i2p.util.Log;
*/
public class Base32 {
- private final static Log _log = new Log(Base32.class);
+ //private final static Log _log = new Log(Base32.class);
/** The 32 valid Base32 values. */
private final static char[] ALPHABET = {'a', 'b', 'c', 'd',
@@ -248,12 +248,12 @@ public class Base32 {
outBuff[outBuffPosn] = next;
usedbits -= 3;
} else if (next != 0) {
- _log.warn("Extra data at the end: " + next + "(decimal)");
+ //_log.warn("Extra data at the end: " + next + "(decimal)");
return null;
}
}
} else {
- _log.warn("Bad Base32 input character at " + i + ": " + source[i] + "(decimal)");
+ //_log.warn("Bad Base32 input character at " + i + ": " + source[i] + "(decimal)");
return null;
}
}
diff --git a/core/java/src/net/i2p/data/Base64.java b/core/java/src/net/i2p/data/Base64.java
index 6f5fc34a57dd048497ee177d704714856b9496f7..9adb3e202e9e455851eaa0bd6e838df8b8e37ae4 100644
--- a/core/java/src/net/i2p/data/Base64.java
+++ b/core/java/src/net/i2p/data/Base64.java
@@ -41,7 +41,7 @@ import net.i2p.util.Log;
*/
public class Base64 {
- private final static Log _log = new Log(Base64.class);
+ //private final static Log _log = new Log(Base64.class);
/**
* @param source if null will return ""
@@ -750,7 +750,7 @@ public class Base64 {
} // end if: white space, equals sign or better
else {
- _log.warn("Bad Base64 input character at " + i + ": " + source[i] + "(decimal)");
+ //_log.warn("Bad Base64 input character at " + i + ": " + source[i] + "(decimal)");
return null;
} // end else:
} // each input character
diff --git a/core/java/src/net/i2p/data/DataHelper.java b/core/java/src/net/i2p/data/DataHelper.java
index d809926098896ce073233a1fd82186b6a1266bec..ad6ac6ea9d0b10c536fe365fecf4954aad25f900 100644
--- a/core/java/src/net/i2p/data/DataHelper.java
+++ b/core/java/src/net/i2p/data/DataHelper.java
@@ -1299,10 +1299,20 @@ public class DataHelper {
// rv.add(struct);
//}
ArrayList<DataStructure> rv = new ArrayList(dataStructures);
- Collections.sort(rv, new DataStructureComparator());
+ sortStructureList(rv);
return rv;
}
+ /**
+ * See above.
+ * DEPRECATED - Only used by RouterInfo.
+ *
+ * @since 0.9
+ */
+ static void sortStructureList(List<? extends DataStructure> dataStructures) {
+ Collections.sort(dataStructures, new DataStructureComparator());
+ }
+
/**
* See sortStructures() comments.
* @since 0.8.3
diff --git a/core/java/src/net/i2p/data/DataStructureImpl.java b/core/java/src/net/i2p/data/DataStructureImpl.java
index b4b43eb57ad2d835e4bde3abc12ce8d6914b5640..1ca043672ef2ae14f818bdc1921d113e0ae40b52 100644
--- a/core/java/src/net/i2p/data/DataStructureImpl.java
+++ b/core/java/src/net/i2p/data/DataStructureImpl.java
@@ -14,6 +14,7 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import net.i2p.I2PAppContext;
import net.i2p.crypto.SHA256Generator;
import net.i2p.util.Log;
@@ -23,7 +24,6 @@ import net.i2p.util.Log;
* @author jrandom
*/
public abstract class DataStructureImpl implements DataStructure {
- private final static Log _log = new Log(DataStructureImpl.class);
public String toBase64() {
byte data[] = toByteArray();
@@ -48,10 +48,12 @@ public abstract class DataStructureImpl implements DataStructure {
writeBytes(baos);
return baos.toByteArray();
} catch (IOException ioe) {
- _log.error("Error writing out the byte array", ioe);
+ Log log = I2PAppContext.getGlobalContext().logManager().getLog(getClass());
+ log.error("Error writing out the byte array", ioe);
return null;
} catch (DataFormatException dfe) {
- _log.error("Error writing out the byte array", dfe);
+ Log log = I2PAppContext.getGlobalContext().logManager().getLog(getClass());
+ log.error("Error writing out the byte array", dfe);
return null;
}
}
@@ -73,4 +75,4 @@ public abstract class DataStructureImpl implements DataStructure {
protected int read(InputStream in, byte target[]) throws IOException {
return DataHelper.read(in, target);
}
-}
\ No newline at end of file
+}
diff --git a/core/java/src/net/i2p/data/Lease.java b/core/java/src/net/i2p/data/Lease.java
index 283e2aa7c232e3462a4a4dbd170f5d9ce692030b..d6c97f1502f23402f64e0a755615d0b15dccaad4 100644
--- a/core/java/src/net/i2p/data/Lease.java
+++ b/core/java/src/net/i2p/data/Lease.java
@@ -26,8 +26,8 @@ public class Lease extends DataStructureImpl {
private Hash _gateway;
private TunnelId _tunnelId;
private Date _end;
- private int _numSuccess;
- private int _numFailure;
+ //private int _numSuccess;
+ //private int _numFailure;
public Lease() {
}
@@ -74,14 +74,18 @@ public class Lease extends DataStructureImpl {
*
* @deprecated unused
*/
+/****
public int getNumSuccess() {
return _numSuccess;
}
+****/
/** @deprecated unused */
+/****
public void setNumSuccess(int num) {
_numSuccess = num;
}
+****/
/**
* Transient attribute of the lease, used to note how many times messages sent
@@ -89,14 +93,18 @@ public class Lease extends DataStructureImpl {
*
* @deprecated unused
*/
+/****
public int getNumFailure() {
return _numFailure;
}
+****/
/** @deprecated unused */
+/****
public void setNumFailure(int num) {
_numFailure = num;
}
+****/
/** has this lease already expired? */
public boolean isExpired() {
diff --git a/core/java/src/net/i2p/data/LeaseSet.java b/core/java/src/net/i2p/data/LeaseSet.java
index e372f401cd32172ebbbccdda2ba5749f890b0c77..9fe9ebb3044da1a19b1d370dcfd91a37d1d18a0d 100644
--- a/core/java/src/net/i2p/data/LeaseSet.java
+++ b/core/java/src/net/i2p/data/LeaseSet.java
@@ -56,7 +56,6 @@ import net.i2p.util.RandomSource;
* @author jrandom
*/
public class LeaseSet extends DatabaseEntry {
- private final static Log _log = new Log(LeaseSet.class);
private Destination _destination;
private PublicKey _encryptionKey;
private SigningPublicKey _signingKey;
@@ -71,11 +70,26 @@ public class LeaseSet extends DatabaseEntry {
private boolean _decrypted;
private boolean _checked;
- /** This seems like plenty */
- public final static int MAX_LEASES = 6;
+ /**
+ * Unlimited before 0.6.3;
+ * 6 as of 0.6.3;
+ * Increased in version 0.9.
+ *
+ * Leasesets larger than 6 should be used with caution,
+ * as each lease adds 44 bytes, and routers older than version 0.9
+ * will not be able to connect as they will throw an exception in
+ * readBytes(). Also, the churn will be quite rapid, leading to
+ * frequent netdb stores and transmission on existing connections.
+ *
+ * However we increase it now in case some hugely popular eepsite arrives.
+ * Strategies elsewhere in the router to efficiently handle
+ * large leasesets are TBD.
+ */
+ public static final int MAX_LEASES = 16;
+ private static final int OLD_MAX_LEASES = 6;
public LeaseSet() {
- _leases = new ArrayList(MAX_LEASES);
+ _leases = new ArrayList(OLD_MAX_LEASES);
_firstExpiration = Long.MAX_VALUE;
}
@@ -354,14 +368,16 @@ public class LeaseSet extends DatabaseEntry {
* Must be called after all the leases are in place, but before sign().
*/
public void encrypt(SessionKey key) {
- if (_log.shouldLog(Log.WARN))
- _log.warn("encrypting lease: " + _destination.calculateHash());
+ //if (_log.shouldLog(Log.WARN))
+ // _log.warn("encrypting lease: " + _destination.calculateHash());
try {
encryp(key);
} catch (DataFormatException dfe) {
- _log.error("Error encrypting lease: " + _destination.calculateHash());
+ Log log = I2PAppContext.getGlobalContext().logManager().getLog(LeaseSet.class);
+ log.error("Error encrypting lease: " + _destination.calculateHash());
} catch (IOException ioe) {
- _log.error("Error encrypting lease: " + _destination.calculateHash());
+ Log log = I2PAppContext.getGlobalContext().logManager().getLog(LeaseSet.class);
+ log.error("Error encrypting lease: " + _destination.calculateHash());
}
}
@@ -420,8 +436,8 @@ public class LeaseSet extends DatabaseEntry {
* encrypted leaseset can be sent on to others (via writeBytes())
*/
private void decrypt(SessionKey key) throws DataFormatException, IOException {
- if (_log.shouldLog(Log.WARN))
- _log.warn("decrypting lease: " + _destination.calculateHash());
+ //if (_log.shouldLog(Log.WARN))
+ // _log.warn("decrypting lease: " + _destination.calculateHash());
int size = _leases.size();
if (size < 2)
throw new DataFormatException("Bad number of leases for decryption");
@@ -468,9 +484,11 @@ public class LeaseSet extends DatabaseEntry {
decrypt(key);
_decrypted = true;
} catch (DataFormatException dfe) {
- _log.error("Error decrypting lease: " + _destination.calculateHash() + dfe);
+ Log log = I2PAppContext.getGlobalContext().logManager().getLog(LeaseSet.class);
+ log.error("Error decrypting lease: " + _destination.calculateHash() + dfe);
} catch (IOException ioe) {
- _log.error("Error decrypting lease: " + _destination.calculateHash() + ioe);
+ Log log = I2PAppContext.getGlobalContext().logManager().getLog(LeaseSet.class);
+ log.error("Error decrypting lease: " + _destination.calculateHash() + ioe);
}
}
_checked = true;
diff --git a/core/java/src/net/i2p/data/Payload.java b/core/java/src/net/i2p/data/Payload.java
index bdaac7d4c50601bdba37df4cb5aa15e9c2c704d0..453fe80773eb66032932a0a88e1fefbde5ce125f 100644
--- a/core/java/src/net/i2p/data/Payload.java
+++ b/core/java/src/net/i2p/data/Payload.java
@@ -26,7 +26,7 @@ import net.i2p.util.Log;
* @author jrandom
*/
public class Payload extends DataStructureImpl {
- private final static Log _log = new Log(Payload.class);
+ //private final static Log _log = new Log(Payload.class);
private byte[] _encryptedData;
private byte[] _unencryptedData;
@@ -82,16 +82,16 @@ public class Payload extends DataStructureImpl {
_encryptedData = new byte[size];
int read = read(in, _encryptedData);
if (read != size) throw new DataFormatException("Incorrect number of bytes read in the payload structure");
- if (_log.shouldLog(Log.DEBUG))
- _log.debug("read payload: " + read + " bytes");
+ //if (_log.shouldLog(Log.DEBUG))
+ // _log.debug("read payload: " + read + " bytes");
}
public void writeBytes(OutputStream out) throws DataFormatException, IOException {
if (_encryptedData == null) throw new DataFormatException("Not yet encrypted. Please set the encrypted data");
DataHelper.writeLong(out, 4, _encryptedData.length);
out.write(_encryptedData);
- if (_log.shouldLog(Log.DEBUG))
- _log.debug("wrote payload: " + _encryptedData.length);
+ //if (_log.shouldLog(Log.DEBUG))
+ // _log.debug("wrote payload: " + _encryptedData.length);
}
/**
diff --git a/core/java/src/net/i2p/data/RouterInfo.java b/core/java/src/net/i2p/data/RouterInfo.java
index 6c34ad2023989aed04caff0b47d662e346296e0a..398b61e0c84c34d12b20d40b33692f9c6ebebbc0 100644
--- a/core/java/src/net/i2p/data/RouterInfo.java
+++ b/core/java/src/net/i2p/data/RouterInfo.java
@@ -13,6 +13,7 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
@@ -24,6 +25,7 @@ import java.util.Properties;
import java.util.Set;
import java.util.Vector;
+import net.i2p.I2PAppContext;
import net.i2p.crypto.SHA256Generator;
import net.i2p.util.Clock;
import net.i2p.util.Log;
@@ -43,10 +45,14 @@ import net.i2p.util.OrderedProperties;
* @author jrandom
*/
public class RouterInfo extends DatabaseEntry {
- private final static Log _log = new Log(RouterInfo.class);
private RouterIdentity _identity;
private volatile long _published;
- private final Set<RouterAddress> _addresses;
+ /**
+ * Addresses must be sorted by SHA256.
+ * When an RI is created, they are sorted in setAddresses().
+ * Save addresses in the order received so we need not resort.
+ */
+ private final List<RouterAddress> _addresses;
/** may be null to save memory, no longer final */
private Set<Hash> _peers;
private final Properties _options;
@@ -71,7 +77,7 @@ public class RouterInfo extends DatabaseEntry {
public static final String BW_CAPABILITY_CHARS = "KLMNO";
public RouterInfo() {
- _addresses = new HashSet(2);
+ _addresses = new ArrayList(2);
_options = new OrderedProperties();
}
@@ -156,21 +162,33 @@ public class RouterInfo extends DatabaseEntry {
*
* @return unmodifiable view, non-null
*/
- public Set<RouterAddress> getAddresses() {
- return Collections.unmodifiableSet(_addresses);
+ public Collection<RouterAddress> getAddresses() {
+ return Collections.unmodifiableCollection(_addresses);
}
/**
* Specify a set of RouterAddress structures at which this router
* can be contacted.
*
- * @throws IllegalStateException if RouterInfo is already signed
+ * Warning - Sorts the addresses here. Do not modify any address
+ * after calling this, as the sort order is based on the
+ * hash of the entire address structure.
+ *
+ * @param addresses may be null
+ * @throws IllegalStateException if RouterInfo is already signed or addresses previously set
*/
- public void setAddresses(Set<RouterAddress> addresses) {
- if (_signature != null)
+ public void setAddresses(Collection<RouterAddress> addresses) {
+ if (_signature != null || !_addresses.isEmpty())
throw new IllegalStateException();
- _addresses.clear();
- if (addresses != null) _addresses.addAll(addresses);
+ if (addresses != null) {
+ _addresses.addAll(addresses);
+ if (_addresses.size() > 1) {
+ // WARNING this sort algorithm cannot be changed, as it must be consistent
+ // network-wide. The signature is not checked at readin time, but only
+ // later, and the addresses are stored in a Set, not a List.
+ DataHelper.sortStructureList(_addresses);
+ }
+ }
}
/**
@@ -270,14 +288,7 @@ public class RouterInfo extends DatabaseEntry {
DataHelper.writeLong(out, 1, 0);
} else {
DataHelper.writeLong(out, 1, sz);
- Collection<RouterAddress> addresses = _addresses;
- if (sz > 1) {
- // WARNING this sort algorithm cannot be changed, as it must be consistent
- // network-wide. The signature is not checked at readin time, but only
- // later, and the addresses are stored in a Set, not a List.
- addresses = (Collection<RouterAddress>) DataHelper.sortStructures(addresses);
- }
- for (RouterAddress addr : addresses) {
+ for (RouterAddress addr : _addresses) {
addr.writeBytes(out);
}
}
@@ -458,16 +469,16 @@ public class RouterInfo extends DatabaseEntry {
_validated = true;
if (!_isValid) {
+ Log log = I2PAppContext.getGlobalContext().logManager().getLog(RouterInfo.class);
byte data[] = null;
try {
data = getBytes();
} catch (DataFormatException dfe) {
- _log.error("Error validating", dfe);
+ log.error("Error validating", dfe);
return;
}
- if (_log.shouldLog(Log.ERROR))
- _log.error("Invalid [" + SHA256Generator.getInstance().calculateHash(data).toBase64()
- + (_log.shouldLog(Log.WARN) ? ("]\n" + toString()) : ""),
+ log.error("Invalid [" + SHA256Generator.getInstance().calculateHash(data).toBase64()
+ + (log.shouldLog(Log.WARN) ? ("]\n" + toString()) : ""),
new Exception("Signature failed"));
}
}
diff --git a/core/java/src/net/i2p/util/Log.java b/core/java/src/net/i2p/util/Log.java
index 0a03e19b5efee99099d1d86fc2cd6caa5d5c32e4..538e3986b98e2faefb6bb1262623e42daaa2662c 100644
--- a/core/java/src/net/i2p/util/Log.java
+++ b/core/java/src/net/i2p/util/Log.java
@@ -16,7 +16,7 @@ import net.i2p.I2PAppContext;
/**
* Wrapper class for whatever logging system I2P uses. This class should be
* instantiated and kept as a variable for each class it is used by, ala:
- * <code>private final static Log _log = new Log(MyClassName.class);</code>
+ * <code>private final Log _log = context.logManager().getLog(MyClassName.class);</code>
*
* If there is anything in here that doesn't make sense, turn off your computer
* and go fly a kite.
diff --git a/core/java/src/net/i2p/util/SimpleTimer2.java b/core/java/src/net/i2p/util/SimpleTimer2.java
index ab568d64466823225a04bc66ad2e1d32d8eda7c1..8e2aee8a746407871e0f9f1d49a66b3e5bce25f8 100644
--- a/core/java/src/net/i2p/util/SimpleTimer2.java
+++ b/core/java/src/net/i2p/util/SimpleTimer2.java
@@ -31,7 +31,6 @@ public class SimpleTimer2 {
private static final int MIN_THREADS = 2;
private static final int MAX_THREADS = 4;
private final I2PAppContext _context;
- private static Log _log; // static so TimedEvent can use it
private final ScheduledThreadPoolExecutor _executor;
private final String _name;
private int _count;
@@ -40,7 +39,6 @@ public class SimpleTimer2 {
protected SimpleTimer2() { this("SimpleTimer2"); }
protected SimpleTimer2(String name) {
_context = I2PAppContext.getGlobalContext();
- _log = _context.logManager().getLog(SimpleTimer2.class);
_name = name;
_count = 0;
long maxMemory = Runtime.getRuntime().maxMemory();
@@ -79,8 +77,10 @@ public class SimpleTimer2 {
@Override
protected void afterExecute(Runnable r, Throwable t) {
super.afterExecute(r, t);
- if (t != null) // shoudn't happen, caught in RunnableEvent.run()
- _log.log(Log.CRIT, "wtf, event borked: " + r, t);
+ if (t != null) { // shoudn't happen, caught in RunnableEvent.run()
+ Log log = I2PAppContext.getGlobalContext().logManager().getLog(SimpleTimer2.class);
+ log.log(Log.CRIT, "wtf, event borked: " + r, t);
+ }
}
}
@@ -126,6 +126,7 @@ public class SimpleTimer2 {
*
*/
public static abstract class TimedEvent implements Runnable {
+ private final Log _log;
private SimpleTimer2 _pool;
private int _fuzz;
protected static final int DEFAULT_FUZZ = 3;
@@ -136,7 +137,9 @@ public class SimpleTimer2 {
public TimedEvent(SimpleTimer2 pool) {
_pool = pool;
_fuzz = DEFAULT_FUZZ;
+ _log = I2PAppContext.getGlobalContext().logManager().getLog(SimpleTimer2.class);
}
+
/** automatically schedules, don't use this one if you have other things to do first */
public TimedEvent(SimpleTimer2 pool, long timeoutMs) {
this(pool);
diff --git a/history.txt b/history.txt
index e3b1aae098cf2e07a74ff48f0fc753e05cd6c45a..c3290a434f70183e9e6df9bb40740953a7869c76 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,36 @@
+2012-03-02 zzz
+ * BlockfileNamingService: Add negative cache
+ * Build: Add built-by to jars; check for corrupt jars on debug page
+ * configstats.jsp: Hide log settings unless already enabled
+ * DataStructures:
+ - Remove static logs
+ - Sort addresses in RouterInfo at initialization only;
+ change from Set to List to save space
+ - Remove unused counters in Lease to save space
+ - Increase max leases to 16
+ * Graphs:
+ - New single graph page with easy resizing
+ - Support graphing of previous intervals
+ * i2pinstall.exe: Add icon
+ * i2psnark:
+ - Add tracker configuration form
+ - Remove custom tracker option from create form
+ - Add private torrent option
+ - More icons in buttons
+ - Use js for refresh
+ * I2PTunnelHTTPClient:
+ - Refactoring to use Java URI parser to better handle
+ escapes, IPv6 addresses, ports
+ - Rewrite i2paddresshelper scanning/removal
+ - Refactor out local server code
+ - Nicer address helper error page
+ * NetDB:
+ - Reenable verify of RI stores, disabled in 0.7.9,
+ checkin comments claim reenabled in 0.7.10 but didn't happen.
+ - Synchronize StoreJob.sendNext() to avoid dups
+ * netdb.jsp: Fix debug leaseset count again
+ * susidns: Add b64 hash to details page
+
* 2012-02-27 0.8.13 released
2012-02-22 kytv
diff --git a/installer/i2pinstaller.xml b/installer/i2pinstaller.xml
index fd46517beb743296c00506693a62cc2d3428dd70..4751a856501e5ede9073e4c491b07c7b371dceae 100644
--- a/installer/i2pinstaller.xml
+++ b/installer/i2pinstaller.xml
@@ -5,7 +5,7 @@
<errTitle>I2P Installer</errTitle>
<chdir>.</chdir>
<customProcName>false</customProcName>
- <!--<icon>SimpleApp.ico</icon>-->
+ <icon>resources/console.ico</icon>
<jre>
<minVersion>1.5.0</minVersion>
</jre>
diff --git a/installer/i2pstandalone.xml b/installer/i2pstandalone.xml
index 9a6f0a65955b863e9ea49c637853bdd96a232b97..60ba8163bbed6c4ba98ed7f0aba39755d5f68366 100644
--- a/installer/i2pstandalone.xml
+++ b/installer/i2pstandalone.xml
@@ -1,7 +1,7 @@
<launch4jConfig>
<headerType>0</headerType>
<jar>../build/launchi2p.jar</jar>
- <outfile>../i2p.exe</outfile>
+ <outfile>../build/i2p.exe</outfile>
<errTitle>I2P</errTitle>
<chdir>.</chdir>
<customProcName>false</customProcName>
diff --git a/installer/resources/proxy/ahelper-notfound-header.ht b/installer/resources/proxy/ahelper-notfound-header.ht
new file mode 100644
index 0000000000000000000000000000000000000000..0cdc36fb6d08600fc49759c0912ec36b1657f261
--- /dev/null
+++ b/installer/resources/proxy/ahelper-notfound-header.ht
@@ -0,0 +1,23 @@
+HTTP/1.1 409 Bad Helper
+Content-Type: text/html; charset=UTF-8
+Cache-control: no-cache
+Connection: close
+Proxy-Connection: close
+
+<html><head>
+<title>I2P Warning: Bad Address Helper</title>
+<link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico" >
+<link href="http://proxy.i2p/themes/console/default/console.css" rel="stylesheet" type="text/css" >
+</head>
+<body>
+<div class=logo>
+ <a href="http://127.0.0.1:7657/index.jsp" title="Router Console"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="I2P Router Console" border="0"></a><hr>
+ <a href="http://127.0.0.1:7657/config.jsp">Configuration</a> <a href="http://127.0.0.1:7657/help.jsp">Help</a> <a href="http://127.0.0.1:7657/susidns/">Addressbook</a>
+</div>
+<div class=warning id=warning>
+<h3>Warning: Bad Address Helper</h3>
+<p>
+The helper key you put for i2paddresshelper= is not resolvable.
+It seems to be garbage data, or a mistyped b32. Check your URL
+to try and fix the helper key to be a valid Base 32 hostname or Base 64 key.
+</p>
diff --git a/installer/resources/themes/snark/ubergine/snark.css b/installer/resources/themes/snark/ubergine/snark.css
index 01c1632e341d1a1a82d14e40d9c366229e8507a0..560a212209f1fe3ae0e015bf3618d6ef142c82f3 100644
--- a/installer/resources/themes/snark/ubergine/snark.css
+++ b/installer/resources/themes/snark/ubergine/snark.css
@@ -470,7 +470,7 @@ input {
border: 1px inset #000;
background: #212 url('/themes/snark/ubergine/images/graytile.png');
color: #f60;
- margin: 2px 0;
+ margin: 2px 4px;
}
input.r {
@@ -525,12 +525,50 @@ input[type=radio] {
vertical-align: bottom;
}
+input.default { width: 1px; height: 1px; visibility: hidden; }
+
input.accept {
background: #989 url('../../console/images/accept.png') no-repeat 2px center;
padding: 2px 3px 2px 20px !important;
min-height: 22px;
}
+input.add {
+ background: #989 url('../../console/images/add.png') no-repeat 2px center;
+ padding: 2px 3px 2px 20px !important;
+ min-height: 22px;
+}
+
+input.create {
+ background: #989 url('images/create.png') no-repeat 2px center;
+ padding: 2px 3px 2px 20px !important;
+ min-height: 22px;
+}
+
+input.cancel {
+ background: #989 url('../../console/images/cancel.png') no-repeat 2px center;
+ padding: 2px 3px 2px 20px !important;
+ min-height: 22px;
+}
+
+input.create {
+ background: #989 url('images/create.png') no-repeat 2px center;
+ padding: 2px 3px 2px 20px !important;
+ min-height: 22px;
+}
+
+input.delete {
+ background: #989 url('../../console/images/delete.png') no-repeat 2px center;
+ padding: 2px 3px 2px 20px !important;
+ min-height: 22px;
+}
+
+input.reload {
+ background: #989 url('../../console/images/arrow_refresh.png') no-repeat 2px center;
+ padding: 2px 3px 2px 20px !important;
+ min-height: 22px;
+}
+
select {
background: #333;
background: url('/themes/snark/ubergine/images/graytile.png') !important;
diff --git a/installer/resources/themes/snark/vanilla/snark.css b/installer/resources/themes/snark/vanilla/snark.css
index b0c0c1de5d432d00795b0d3b68141e7fe4269eea..efd061582de04be6360e211920bd57cfadbee5e6 100644
--- a/installer/resources/themes/snark/vanilla/snark.css
+++ b/installer/resources/themes/snark/vanilla/snark.css
@@ -493,7 +493,7 @@ input {
border: 1px inset #000;
background: #fff /*url('/themes/snark/ubergine/images/graytile.png')*/;
color: #000;
- margin: 2px 0;
+ margin: 2px 4px;
}
input.r {
@@ -549,12 +549,44 @@ input[type=radio] {
vertical-align: bottom;
}
+input.default { width: 1px; height: 1px; visibility: hidden; }
+
input.accept {
background: #f3efc7 url('../../console/images/accept.png') no-repeat 2px center;
padding: 2px 3px 2px 20px !important;
min-height: 22px;
}
+input.add {
+ background: #f3efc7 url('../../console/images/add.png') no-repeat 2px center;
+ padding: 2px 3px 2px 20px !important;
+ min-height: 22px;
+}
+
+input.cancel {
+ background: #f3efc7 url('../../console/images/cancel.png') no-repeat 2px center;
+ padding: 2px 3px 2px 20px !important;
+ min-height: 22px;
+}
+
+input.create {
+ background: #f3efc7 url('images/create.png') no-repeat 2px center;
+ padding: 2px 3px 2px 20px !important;
+ min-height: 22px;
+}
+
+input.delete {
+ background: #f3efc7 url('../../console/images/delete.png') no-repeat 2px center;
+ padding: 2px 3px 2px 20px !important;
+ min-height: 22px;
+}
+
+input.reload {
+ background: #f3efc7 url('../../console/images/arrow_refresh.png') no-repeat 2px center;
+ padding: 2px 3px 2px 20px !important;
+ min-height: 22px;
+}
+
select {
background: #fff;
/* background: url('/themes/snark/ubergine/images/graytile.png') !important;*/
diff --git a/router/java/build.xml b/router/java/build.xml
index e933086cf805521f2df9b380d6623be6d1c5a74d..990b3e4732c824c9c7593d9a7089f98a9b492595 100644
--- a/router/java/build.xml
+++ b/router/java/build.xml
@@ -73,6 +73,7 @@
<jar destfile="./build/router.jar" basedir="./build/obj" includes="**/*.class" >
<manifest>
<attribute name="Implementation-Version" value="${full.version}" />
+ <attribute name="Built-By" value="${build.built-by}" />
<attribute name="Build-Date" value="${build.timestamp}" />
<attribute name="Base-Revision" value="${workspace.version}" />
<attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
diff --git a/router/java/src/net/i2p/router/Blocklist.java b/router/java/src/net/i2p/router/Blocklist.java
index 153b14e7c928064182255abb0e51f209f9764946..10f9d51b3a6fe4695421c0446d7c7de63e02d9e6 100644
--- a/router/java/src/net/i2p/router/Blocklist.java
+++ b/router/java/src/net/i2p/router/Blocklist.java
@@ -479,15 +479,9 @@ public class Blocklist {
List<byte[]> rv = new ArrayList(1);
RouterInfo pinfo = _context.netDb().lookupRouterInfoLocally(peer);
if (pinfo == null) return rv;
- Set<RouterAddress> paddr = pinfo.getAddresses();
- if (paddr == null || paddr.isEmpty())
- return rv;
String oldphost = null;
- List<RouterAddress> pladdr = new ArrayList(paddr);
// for each peer address
- for (int j = 0; j < paddr.size(); j++) {
- RouterAddress pa = (RouterAddress) pladdr.get(j);
- if (pa == null) continue;
+ for (RouterAddress pa : pinfo.getAddresses()) {
String phost = pa.getOption("host");
if (phost == null) continue;
if (oldphost != null && oldphost.equals(phost)) continue;
@@ -787,7 +781,7 @@ public class Blocklist {
Set<Integer> singles = new TreeSet();
singles.addAll(_singleIPBlocklist);
if (!singles.isEmpty()) {
- out.write("<table><tr><th align=center colspan=2><b>");
+ out.write("<table><tr><th align=\"center\" colspan=\"2\"><b>");
out.write(_("IPs Banned Until Restart"));
out.write("</b></td></tr>");
// first 0 - 127
@@ -795,27 +789,27 @@ public class Blocklist {
int ip = ii.intValue();
if (ip < 0)
continue;
- out.write("<tr><td align=center width=50%>");
+ out.write("<tr><td align=\"center\" width=\"50%\">");
out.write(toStr(ip));
- out.write("</td><td width=50%> </td></tr>\n");
+ out.write("</td><td width=\"50%\"> </td></tr>\n");
}
// then 128 - 255
for (Integer ii : singles) {
int ip = ii.intValue();
if (ip >= 0)
break;
- out.write("<tr><td align=center width=50%>");
+ out.write("<tr><td align=\"center\" width=\"50%\">");
out.write(toStr(ip));
- out.write("</td><td width=50%> </td></tr>\n");
+ out.write("</td><td width=\"50%\"> </td></tr>\n");
}
out.write("</table>");
}
if (_blocklistSize > 0) {
- out.write("<table><tr><th align=center colspan=2><b>");
+ out.write("<table><tr><th align=\"center\" colspan=\"2\"><b>");
out.write(_("IPs Permanently Banned"));
- out.write("</b></th></tr><tr><td align=center width=50%><b>");
+ out.write("</b></th></tr><tr><td align=\"center\" width=\"50%\"><b>");
out.write(_("From"));
- out.write("</b></td><td align=center width=50%><b>");
+ out.write("</b></td><td align=\"center\" width=\"50%\"><b>");
out.write(_("To"));
out.write("</b></td></tr>");
int max = Math.min(_blocklistSize, MAX_DISPLAY);
@@ -825,7 +819,7 @@ public class Blocklist {
int from = getFrom(_blocklist[i]);
if (from < 0)
continue;
- out.write("<tr><td align=center width=50%>"); out.write(toStr(from)); out.write("</td><td align=center width=50%>");
+ out.write("<tr><td align=\"center\" width=\"50%\">"); out.write(toStr(from)); out.write("</td><td align=\"center\" width=\"50%\">");
int to = getTo(_blocklist[i]);
if (to != from) {
out.write(toStr(to)); out.write("</td></tr>\n");
@@ -838,7 +832,7 @@ public class Blocklist {
int from = getFrom(_blocklist[i]);
if (from >= 0)
break;
- out.write("<tr><td align=center width=50%>"); out.write(toStr(from)); out.write("</td><td align=center width=50%>");
+ out.write("<tr><td align=\"center\" width=\"50%\">"); out.write(toStr(from)); out.write("</td><td align=\"center\" width=\"50%\">");
int to = getTo(_blocklist[i]);
if (to != from) {
out.write(toStr(to)); out.write("</td></tr>\n");
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index a411b009986dc5f1f6384384ad98aeea42885422..87e5bffca0684477c0ba8daee48da05fbea99f44 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
- public final static long BUILD = 0;
+ public final static long BUILD = 1;
/** for example "-test" */
public final static String EXTRA = "";
diff --git a/router/java/src/net/i2p/router/StatisticsManager.java b/router/java/src/net/i2p/router/StatisticsManager.java
index 75dcd5ecd3f0f598085daf452b8adcb07f3e74a0..c943401257035920f4c9e78c1d42598d8073a6ad 100644
--- a/router/java/src/net/i2p/router/StatisticsManager.java
+++ b/router/java/src/net/i2p/router/StatisticsManager.java
@@ -85,7 +85,7 @@ public class StatisticsManager implements Service {
if (_context.getBooleanPropertyDefaultTrue(PROP_PUBLISH_RANKINGS)) {
long publishedUptime = _context.router().getUptime();
// Don't publish these for first hour
- if (publishedUptime > 62*60*1000)
+ if (publishedUptime > 62*60*1000 && CoreVersion.VERSION.equals("0.8.13"))
includeAverageThroughput(stats);
//includeRate("router.invalidMessageTime", stats, new long[] { 10*60*1000 });
//includeRate("router.duplicateMessageId", stats, new long[] { 24*60*60*1000 });
diff --git a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java
index a7a136d1ddc4865369551bb9b49bbab4a86fa983..8597c52b2b183da972d991ee76a838af90dc7cf3 100644
--- a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java
+++ b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java
@@ -239,13 +239,13 @@ class ClientConnectionRunner {
}
/**
- * Send a DisconnectMessage and log with level Log.CRIT.
+ * Send a DisconnectMessage and log with level Log.ERROR.
* This is always bad.
* See ClientMessageEventListener.handleCreateSession()
* for why we don't send a SessionStatusMessage when we do this.
*/
void disconnectClient(String reason) {
- disconnectClient(reason, Log.CRIT);
+ disconnectClient(reason, Log.ERROR);
}
/**
@@ -254,9 +254,10 @@ class ClientConnectionRunner {
*/
void disconnectClient(String reason, int logLevel) {
if (_log.shouldLog(logLevel))
- _log.log(logLevel, "Disconnecting the client ("
- + _config
- + ") : " + reason);
+ _log.log(logLevel, "Disconnecting the client - "
+ + reason
+ + " config: "
+ + _config);
DisconnectMessage msg = new DisconnectMessage();
msg.setReason(reason);
try {
diff --git a/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java b/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java
index 94e2c0cf357dba26e6cc4cf81a16e023ca8c0816..022326cb6d263b9e8be097bbc8ec1119cf31e819 100644
--- a/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java
+++ b/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java
@@ -36,7 +36,7 @@ import net.i2p.util.Log;
* @author jrandom
*/
public class ClientManagerFacadeImpl extends ClientManagerFacade implements InternalClientManager {
- private final static Log _log = new Log(ClientManagerFacadeImpl.class);
+ private final Log _log;
private ClientManager _manager;
private RouterContext _context;
/** note that this is different than the property the client side uses, i2cp.tcp.port */
@@ -48,7 +48,8 @@ public class ClientManagerFacadeImpl extends ClientManagerFacade implements Inte
public ClientManagerFacadeImpl(RouterContext context) {
_context = context;
- _log.debug("Client manager facade created");
+ _log = _context.logManager().getLog(ClientManagerFacadeImpl.class);
+ //_log.debug("Client manager facade created");
}
public void startup() {
diff --git a/router/java/src/net/i2p/router/client/RequestLeaseSetJob.java b/router/java/src/net/i2p/router/client/RequestLeaseSetJob.java
index 516a652d22b8b6381b5d94ec42c28193556649c1..1ac0b93d0400b7d071f853cd625ef4bd8d35b55c 100644
--- a/router/java/src/net/i2p/router/client/RequestLeaseSetJob.java
+++ b/router/java/src/net/i2p/router/client/RequestLeaseSetJob.java
@@ -27,13 +27,13 @@ import net.i2p.util.Log;
*
*/
class RequestLeaseSetJob extends JobImpl {
- private Log _log;
- private ClientConnectionRunner _runner;
- private LeaseSet _ls;
- private long _expiration;
- private Job _onCreate;
- private Job _onFail;
- private LeaseRequestState _requestState;
+ private final Log _log;
+ private final ClientConnectionRunner _runner;
+ private final LeaseSet _ls;
+ private final long _expiration;
+ private final Job _onCreate;
+ private final Job _onFail;
+ private final LeaseRequestState _requestState;
public RequestLeaseSetJob(RouterContext ctx, ClientConnectionRunner runner, LeaseSet set, long expiration, Job onCreate, Job onFail, LeaseRequestState state) {
super(ctx);
@@ -92,8 +92,8 @@ class RequestLeaseSetJob extends JobImpl {
*
*/
private class CheckLeaseRequestStatus extends JobImpl {
- private LeaseRequestState _req;
- private long _start;
+ private final LeaseRequestState _req;
+ private final long _start;
public CheckLeaseRequestStatus(RouterContext enclosingContext, LeaseRequestState state) {
super(enclosingContext);
@@ -114,9 +114,9 @@ class RequestLeaseSetJob extends JobImpl {
return;
} else {
RequestLeaseSetJob.CheckLeaseRequestStatus.this.getContext().statManager().addRateData("client.requestLeaseSetTimeout", 1, 0);
- if (_log.shouldLog(Log.CRIT)) {
+ if (_log.shouldLog(Log.ERROR)) {
long waited = System.currentTimeMillis() - _start;
- _log.log(Log.CRIT, "Failed to receive a leaseSet in the time allotted (" + waited + "): " + _req + " for "
+ _log.error("Failed to receive a leaseSet in the time allotted (" + waited + "): " + _req + " for "
+ _runner.getConfig().getDestination().calculateHash().toBase64());
}
_runner.disconnectClient("Took too long to request leaseSet");
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillStoreJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillStoreJob.java
index edc760c3d8c2709fe7fe43c2eb5db17178b8bba4..581566287dc96548dcb703864a327a4507ffdaa6 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillStoreJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillStoreJob.java
@@ -68,10 +68,7 @@ class FloodfillStoreJob extends StoreJob {
DatabaseEntry data = _state.getData();
boolean isRouterInfo = data.getType() == DatabaseEntry.KEY_TYPE_ROUTERINFO;
long published = data.getDate();
- if (isRouterInfo) {
- // Temporarily disable
- return;
- }
+
// we should always have exactly one successful entry
Hash sentTo = null;
try {
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillVerifyStoreJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillVerifyStoreJob.java
index 9fe6e2522109abcd9fefcc539b0f62188453a212..7b567d6126c1dc574daa5e7c69681c1550191770 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillVerifyStoreJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillVerifyStoreJob.java
@@ -216,7 +216,7 @@ public class FloodfillVerifyStoreJob extends JobImpl {
if (_log.shouldLog(Log.WARN))
_log.warn("Verify failed (older) for " + _key);
if (_log.shouldLog(Log.INFO))
- _log.info("Rcvd older lease: " + dsm.getEntry());
+ _log.info("Rcvd older data: " + dsm.getEntry());
} else if (_message instanceof DatabaseSearchReplyMessage) {
// assume 0 old, all new, 0 invalid, 0 dup
getContext().profileManager().dbLookupReply(_target, 0,
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java
index 9774f65bd80cbd95de7f869dfec9cd7804a6e27e..21c6a5ccd5f46a5e7b72bd5cbdd0669b3a058ae6 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java
@@ -8,12 +8,13 @@ package net.i2p.router.networkdb.kademlia;
*
*/
+import java.util.Collection;
import java.util.Date;
-import java.util.Set;
import net.i2p.data.DatabaseEntry;
import net.i2p.data.Hash;
import net.i2p.data.LeaseSet;
+import net.i2p.data.RouterAddress;
import net.i2p.data.RouterIdentity;
import net.i2p.data.RouterInfo;
import net.i2p.data.i2np.DatabaseStoreMessage;
@@ -145,9 +146,9 @@ public class HandleFloodfillDatabaseStoreMessageJob extends JobImpl {
_log.shouldLog(Log.WARN))
_log.warn("Blocklisting new peer " + key + ' ' + ri);
} else {
- Set oldAddr = prevNetDb.getAddresses();
- Set newAddr = ri.getAddresses();
- if (newAddr != null && (!newAddr.equals(oldAddr)) &&
+ Collection<RouterAddress> oldAddr = prevNetDb.getAddresses();
+ Collection<RouterAddress> newAddr = ri.getAddresses();
+ if ((!newAddr.equals(oldAddr)) &&
(!getContext().shitlist().isShitlistedForever(key)) &&
getContext().blocklist().isBlocklisted(key) &&
_log.shouldLog(Log.WARN))
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/LocalHash.java b/router/java/src/net/i2p/router/networkdb/kademlia/LocalHash.java
index ebf787ad09466b6ed755a638940fa0eb0f31d726..53a28019c86f2ccf7474ba936869f719173c43c6 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/LocalHash.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/LocalHash.java
@@ -27,7 +27,7 @@ import net.i2p.util.Log;
* @author moved from Hash.java by zzz
*/
class LocalHash extends Hash {
- private final static Log _log = new Log(LocalHash.class);
+ //private final static Log _log = new Log(LocalHash.class);
private /* FIXME final FIXME */ Map<Hash, byte[]> _xorCache;
private static final int MAX_CACHED_XOR = 1024;
@@ -86,6 +86,7 @@ class LocalHash extends Hash {
_xorCache.put(key, distance);
cached = _xorCache.size();
}
+ /****
if (_log.shouldLog(Log.DEBUG)) {
// explicit buffer, since the compiler can't guess how long it'll be
StringBuilder buf = new StringBuilder(128);
@@ -94,7 +95,9 @@ class LocalHash extends Hash {
buf.append(DataHelper.toHexString(key.getData()));
_log.debug(buf.toString(), new Exception());
}
+ ****/
} else {
+ /****
if (_log.shouldLog(Log.DEBUG)) {
// explicit buffer, since the compiler can't guess how long it'll be
StringBuilder buf = new StringBuilder(128);
@@ -103,6 +106,7 @@ class LocalHash extends Hash {
buf.append(DataHelper.toHexString(key.getData()));
_log.debug(buf.toString());
}
+ ****/
}
return distance;
}
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/MessageWrapper.java b/router/java/src/net/i2p/router/networkdb/kademlia/MessageWrapper.java
index b53269e52134eb2e38bd36461fdbbed29e40f338..d8550791642cf8215bf2fb2d06da55593a22be26 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/MessageWrapper.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/MessageWrapper.java
@@ -27,7 +27,7 @@ import net.i2p.util.Log;
*/
class MessageWrapper {
- private static final Log _log = RouterContext.getGlobalContext().logManager().getLog(MessageWrapper.class);
+ //private static final Log _log = RouterContext.getGlobalContext().logManager().getLog(MessageWrapper.class);
private static final int NETDB_TAGS_TO_DELIVER = 6;
private static final int NETDB_LOW_THRESHOLD = 3;
@@ -71,8 +71,8 @@ class MessageWrapper {
PublicKey sentTo = to.getIdentity().getPublicKey();
if (!sentTags.isEmpty())
tsh = skm.tagsDelivered(sentTo, sentKey, sentTags);
- if (_log.shouldLog(Log.DEBUG))
- _log.debug("Sent to: " + to.getIdentity().getHash() + " with key: " + sentKey + " and tags: " + sentTags.size());
+ //if (_log.shouldLog(Log.DEBUG))
+ // _log.debug("Sent to: " + to.getIdentity().getHash() + " with key: " + sentKey + " and tags: " + sentTags.size());
return new WrappedMessage(msg, skm, sentTo, sentKey, tsh);
}
@@ -103,8 +103,8 @@ class MessageWrapper {
void acked() {
if (this.tsh != null) {
this.skm.tagsAcked(this.sentTo, this.sessionKey, this.tsh);
- if (_log.shouldLog(Log.DEBUG))
- _log.debug("Tags acked for key: " + this.sessionKey);
+ //if (_log.shouldLog(Log.DEBUG))
+ // _log.debug("Tags acked for key: " + this.sessionKey);
}
}
@@ -112,8 +112,8 @@ class MessageWrapper {
void fail() {
if (this.tsh != null) {
this.skm.failTags(this.sentTo, this.sessionKey, this.tsh);
- if (_log.shouldLog(Log.DEBUG))
- _log.debug("Tags NOT acked for key: " + this.sessionKey);
+ //if (_log.shouldLog(Log.DEBUG))
+ // _log.debug("Tags NOT acked for key: " + this.sessionKey);
}
}
}
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java
index 4620e3cffa9b614a8054b54c735801fe4ace89c1..e86b9b680700e7c05eb2733e774eb1d919b24dce 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java
@@ -98,6 +98,8 @@ class StoreJob extends JobImpl {
/**
* send the key to the next batch of peers
+ *
+ * Synchronized to enforce parallelization limits and prevent dups
*/
private void sendNext() {
if (_state.completed()) {
@@ -130,8 +132,9 @@ class StoreJob extends JobImpl {
* the routing table, but making sure no more than PARALLELIZATION are outstanding
* at any time
*
+ * Caller should synchronize to enforce parallelization limits and prevent dups
*/
- private void continueSending() {
+ private synchronized void continueSending() {
if (_state.completed()) return;
int toCheck = getParallelization() - _state.getPending().size();
if (toCheck <= 0) {
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/StoreState.java b/router/java/src/net/i2p/router/networkdb/kademlia/StoreState.java
index 9666c09be520533526c44e46a9621b9b6dce8f37..876e2f4af8eaddeb7c64894bd1f4534e8f963f3d 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/StoreState.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/StoreState.java
@@ -14,15 +14,15 @@ import net.i2p.data.Hash;
import net.i2p.router.RouterContext;
/**
- *
+ * Tracks the state of a StoreJob
*/
class StoreState {
- private RouterContext _context;
- private Hash _key;
- private DatabaseEntry _data;
+ private final RouterContext _context;
+ private final Hash _key;
+ private final DatabaseEntry _data;
private final HashSet<Hash> _pendingPeers;
- private Map<Hash, Long> _pendingPeerTimes;
- private Map<Hash, MessageWrapper.WrappedMessage> _pendingMessages;
+ private final Map<Hash, Long> _pendingPeerTimes;
+ private final Map<Hash, MessageWrapper.WrappedMessage> _pendingMessages;
private final HashSet<Hash> _successfulPeers;
//private final HashSet<Hash> _successfulExploratoryPeers;
private final HashSet<Hash> _failedPeers;
diff --git a/router/java/src/net/i2p/router/networkdb/reseed/ReseedChecker.java b/router/java/src/net/i2p/router/networkdb/reseed/ReseedChecker.java
index 6bb816985da20e829434de112d4e815c3b47fc43..ea3e0408d37d01ea9ad21e0b9fbe8e4c34b20077 100644
--- a/router/java/src/net/i2p/router/networkdb/reseed/ReseedChecker.java
+++ b/router/java/src/net/i2p/router/networkdb/reseed/ReseedChecker.java
@@ -32,14 +32,16 @@ public class ReseedChecker {
File noReseedFileAlt1 = new File(new File(System.getProperty("user.home")), "noreseed.i2p");
File noReseedFileAlt2 = new File(context.getConfigDir(), ".i2pnoreseed");
File noReseedFileAlt3 = new File(context.getConfigDir(), "noreseed.i2p");
+ Log _log = context.logManager().getLog(ReseedChecker.class);
if (!noReseedFile.exists() && !noReseedFileAlt1.exists() && !noReseedFileAlt2.exists() && !noReseedFileAlt3.exists()) {
- Log _log = context.logManager().getLog(ReseedChecker.class);
if (count <= 1)
_log.logAlways(Log.INFO, "Downloading peer router information for a new I2P installation");
else
_log.logAlways(Log.WARN, "Very few known peers remaining - reseeding now");
Reseeder reseeder = new Reseeder(context);
reseeder.requestReseed();
+ } else {
+ _log.logAlways(Log.WARN, "Only " + count + " peers remaining but reseed disabled by config file");
}
}
}
diff --git a/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java b/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java
index 8b14d22a0f5a8ce73d096b5a318d46508f56ebe9..d8459166a5be84506e92fde941c20e68468cc84a 100644
--- a/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java
+++ b/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java
@@ -7,6 +7,7 @@ import java.net.UnknownHostException;
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -1258,7 +1259,7 @@ public class ProfileOrganizer {
RouterInfo pinfo = _context.netDb().lookupRouterInfoLocally(peer);
if (pinfo == null)
return rv;
- Set<RouterAddress> paddr = pinfo.getAddresses();
+ Collection<RouterAddress> paddr = pinfo.getAddresses();
if (paddr == null)
return rv;
for (RouterAddress pa : paddr) {
diff --git a/router/java/src/net/i2p/router/transport/TransportManager.java b/router/java/src/net/i2p/router/transport/TransportManager.java
index 8b6b29713d63307d6445fe041acc94b98a3a526e..d0a10f31b5b7f7183644476ce52c6798cc3bd7d1 100644
--- a/router/java/src/net/i2p/router/transport/TransportManager.java
+++ b/router/java/src/net/i2p/router/transport/TransportManager.java
@@ -518,9 +518,9 @@ public class TransportManager implements TransportEventListener {
buf.append("<h3>").append(_("Definitions")).append("</h3><div class=\"configure\">" +
"<p><b id=\"def.peer\">").append(_("Peer")).append("</b>: ").append(_("The remote peer, identified by router hash")).append("<br>\n" +
"<b id=\"def.dir\">").append(_("Dir")).append("</b>: " +
- "<img src=\"/themes/console/images/inbound.png\"> ").append(_("Inbound connection")).append("<br>\n" +
+ "<img alt=\"Inbound\" src=\"/themes/console/images/inbound.png\"> ").append(_("Inbound connection")).append("<br>\n" +
" " +
- "<img src=\"/themes/console/images/outbound.png\"> ").append(_("Outbound connection")).append("<br>\n" +
+ "<img alt=\"Outbound\" src=\"/themes/console/images/outbound.png\"> ").append(_("Outbound connection")).append("<br>\n" +
" " +
"<img src=\"/themes/console/images/inbound.png\" alt=\"V\" height=\"8\" width=\"12\"> ").append(_("They offered to introduce us (help other peers traverse our firewall)")).append("<br>\n" +
" " +
@@ -531,7 +531,7 @@ public class TransportManager implements TransportEventListener {
"<b id=\"def.skew\">").append(_("Skew")).append("</b>: ").append(_("The difference between the peer's clock and your own")).append("<br>\n" +
"<b id=\"def.cwnd\">CWND</b>: ").append(_("The congestion window, which is how many bytes can be sent without an acknowledgement")).append(" / <br>\n" +
" ").append(_("The number of sent messages awaiting acknowledgement")).append(" /<br>\n" +
- " ").append(_("The maximum number of concurrent messages to send")).append(" /<br>\n"+
+ " ").append(_("The maximum number of concurrent messages to send")).append(" /<br>\n"+
" ").append(_("The number of pending sends which exceed congestion window")).append("<br>\n" +
"<b id=\"def.ssthresh\">SST</b>: ").append(_("The slow start threshold")).append("<br>\n" +
"<b id=\"def.rtt\">RTT</b>: ").append(_("The round trip time in milliseconds")).append("<br>\n" +
diff --git a/router/java/src/net/i2p/router/transport/ntcp/NTCPAddress.java b/router/java/src/net/i2p/router/transport/ntcp/NTCPAddress.java
index acced89f433a2cbd9fbf5687ef5bba52d1021f5d..a51233ad631f53a104430cea2b9cfe7e512f9b71 100644
--- a/router/java/src/net/i2p/router/transport/ntcp/NTCPAddress.java
+++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPAddress.java
@@ -11,6 +11,7 @@ package net.i2p.router.transport.ntcp;
import java.net.InetAddress;
import java.util.Properties;
+import net.i2p.I2PAppContext;
import net.i2p.data.DataHelper;
import net.i2p.data.RouterAddress;
import net.i2p.router.transport.TransportImpl;
@@ -20,7 +21,6 @@ import net.i2p.util.Log;
* Wrap up an address
*/
public class NTCPAddress {
- private final static Log _log = new Log(NTCPAddress.class);
private int _port;
private String _host;
//private InetAddress _addr;
@@ -68,7 +68,8 @@ public class NTCPAddress {
try {
_port = Integer.parseInt(port.trim());
} catch (NumberFormatException nfe) {
- _log.error("Invalid port [" + port + "]", nfe);
+ Log log = I2PAppContext.getGlobalContext().logManager().getLog(NTCPAddress.class);
+ log.error("Invalid port [" + port + "]", nfe);
_port = -1;
}
} else {
@@ -119,8 +120,8 @@ public class NTCPAddress {
//}
return TransportImpl.isPubliclyRoutable(quad);
} catch (Throwable t) {
- if (_log.shouldLog(Log.WARN))
- _log.warn("Error checking routability", t);
+ //if (_log.shouldLog(Log.WARN))
+ // _log.warn("Error checking routability", t);
return false;
}
}
diff --git a/router/java/src/net/i2p/router/transport/udp/UDPPacket.java b/router/java/src/net/i2p/router/transport/udp/UDPPacket.java
index c45a29bdb1b0ed8c5eda33c5d648a8e713ddbb42..eb4c3e23c50d28d2aa029c8c2a968d0c2a6ece18 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPPacket.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPPacket.java
@@ -18,7 +18,6 @@ import net.i2p.util.Log;
*/
class UDPPacket {
private I2PAppContext _context;
- private static Log _log;
private final DatagramPacket _packet;
private volatile short _priority;
private volatile long _initializeTime;
@@ -48,7 +47,6 @@ class UDPPacket {
_packetCache = new LinkedBlockingQueue(CACHE_SIZE);
else
_packetCache = null;
- _log = I2PAppContext.getGlobalContext().logManager().getLog(UDPPacket.class);
}
/**
@@ -214,8 +212,8 @@ class UDPPacket {
eq = DataHelper.eq(hmac.getData(), 0, _data, _packet.getOffset(), MAC_SIZE);
*/
} else {
- if (_log.shouldLog(Log.WARN))
- _log.warn("Payload length is " + payloadLength);
+ //if (_log.shouldLog(Log.WARN))
+ // _log.warn("Payload length is " + payloadLength);
}
_afterValidate = _context.clock().now();
@@ -321,9 +319,10 @@ class UDPPacket {
private void verifyNotReleased() {
if (CACHE) return;
if (_released) {
- _log.log(Log.CRIT, "Already released. current stack trace is:", new Exception());
- _log.log(Log.CRIT, "Released by: ", _releasedBy);
- _log.log(Log.CRIT, "Acquired by: ", _acquiredBy);
+ Log log = I2PAppContext.getGlobalContext().logManager().getLog(UDPPacket.class);
+ log.log(Log.CRIT, "Already released. current stack trace is:", new Exception());
+ log.log(Log.CRIT, "Released by: ", _releasedBy);
+ log.log(Log.CRIT, "Acquired by: ", _acquiredBy);
}
}
}