0.9.19

Updates after review:
Remove meeh.i2p as update host (ticket #1515) Re-add 193.xxx https reseed Fix SocketManagerFactory property handling Restore UPnP locale fix lost in the merge i2ptunnel finals I2NP unique id fixes duplicate done() in ReseedChecker bigger langbox in CSS reformatting Javadocs
2015-04-12 13:32:49 +00:00 · 2015-04-11 19:34:34 +00:00 · 2015-04-09 12:06:26 +00:00 · 2015-04-09 11:59:17 +00:00 · 2015-04-09 11:51:55 +00:00 · 2015-04-05 17:36:30 +00:00
1995 changed files with 312618 additions and 263908 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,48 @@
+# Just to try and prevent some noob disasters.
+# Use git add -f foo.jar to ignore this ignore list
+
+# generated release files
+*.exe
+*.[gx]z
+*.bz2
+*.[rwjt]ar
+*.sig
+*.su[d23]
+*.deb
+*.zip
+*.torrent
+
+*~
+web-fragment.xml
+web-out.xml
+*.out
+
+# Temporary/build dirs
+build/
+pkg-temp/
+classes/
+dist/
+/installer/resources/locale/mo
+/tmp
+/apps/jetty/jettylib
+*_jsp.java
+*.class
+
+# Debian-related
+/debian/copyright
+/debian/changelog
+.pc/
+
+# Build property overrides
+/override.properties
+
+# Reporting
+*.fba
+sloccount.sc
+/reports/
+
+# Don't allow patches
+*.(diff|patch)
+
+# but allow debian/patches
+!/debian/patches/*.(patch|diff)
--- a/.mtn-ignore
+++ b/.mtn-ignore
@@ -1,5 +1,7 @@
 # Just to try and prevent some noob disasters.
 # Use mtn add --no-respect-ignore foo.jar to ignore this ignore list
+
+# Temporary/build files
 _jsp\.java$
 \.bz2$
 \.tar$
@@ -14,18 +16,35 @@ _jsp\.java$
 \.sig$
 \.sud$
 \.su2$
+.\su3$
 \.tar$
 \.war$
 .\deb$
 \.zip$
+\.torrent$
 ^\.
-^build
-^pkg-temp/
 ~$
+web-fragment.xml
+web-out.xml
+
+# Temporary/build dirs
+^build
+^pkg-temp
 /build
-/classes/
+/classes
+/dist
+^installer/resources/locale/mo
+/tmp
+^apps/jetty/jettylib
+
+# Debian-related
 ^debian/copyright
 ^debian/changelog
+^.pc/
+
+# Build property overrides
 override.properties
+
+# Reporting
 sloccount.sc
 ^reports/
--- a/.tx/config
+++ b/.tx/config
@@ -9,16 +9,45 @@ trans.es = apps/i2ptunnel/locale/messages_es.po
 trans.fr = apps/i2ptunnel/locale/messages_fr.po
 trans.hu = apps/i2ptunnel/locale/messages_hu.po
 trans.it = apps/i2ptunnel/locale/messages_it.po
+trans.ja = apps/i2ptunnel/locale/messages_ja.po
 trans.nb = apps/i2ptunnel/locale/messages_nb.po
 trans.nl = apps/i2ptunnel/locale/messages_nl.po
+trans.nn = apps/i2ptunnel/locale/messages_nn.po
 trans.pl = apps/i2ptunnel/locale/messages_pl.po
 trans.pt = apps/i2ptunnel/locale/messages_pt.po
-trans.ru = apps/i2ptunnel/locale/messages_ru.po
+trans.pt_BR = apps/i2ptunnel/locale/messages_pt_BR.po
+trans.ro = apps/i2ptunnel/locale/messages_ro.po
+trans.ru_RU = apps/i2ptunnel/locale/messages_ru.po
+trans.sk = apps/i2ptunnel/locale/messages_sk.po
 trans.sv_SE = apps/i2ptunnel/locale/messages_sv.po
 trans.uk_UA = apps/i2ptunnel/locale/messages_uk.po
 trans.vi = apps/i2ptunnel/locale/messages_vi.po
 trans.zh_CN = apps/i2ptunnel/locale/messages_zh.po

+[I2P.proxy]
+source_file = apps/i2ptunnel/locale-proxy/messages_en.po
+source_lang = en
+trans.ar = apps/i2ptunnel/locale-proxy/messages_ar.po
+trans.cs = apps/i2ptunnel/locale-proxy/messages_cs.po
+trans.de = apps/i2ptunnel/locale-proxy/messages_de.po
+trans.es = apps/i2ptunnel/locale-proxy/messages_es.po
+trans.fr = apps/i2ptunnel/locale-proxy/messages_fr.po
+trans.hu = apps/i2ptunnel/locale-proxy/messages_hu.po
+trans.id = apps/i2ptunnel/locale-proxy/messages_id.po
+trans.it = apps/i2ptunnel/locale-proxy/messages_it.po
+trans.nb = apps/i2ptunnel/locale-proxy/messages_nb.po
+trans.nl = apps/i2ptunnel/locale-proxy/messages_nl.po
+trans.pl = apps/i2ptunnel/locale-proxy/messages_pl.po
+trans.pt = apps/i2ptunnel/locale-proxy/messages_pt.po
+trans.pt_BR = apps/i2ptunnel/locale-proxy/messages_pt_BR.po
+trans.ro = apps/i2ptunnel/locale-proxy/messages_ro.po
+trans.ru_RU = apps/i2ptunnel/locale-proxy/messages_ru.po
+trans.sk = apps/i2ptunnel/locale-proxy/messages_sk.po
+trans.sv_SE = apps/i2ptunnel/locale-proxy/messages_sv.po
+trans.uk_UA = apps/i2ptunnel/locale-proxy/messages_uk.po
+trans.vi = apps/i2ptunnel/locale-proxy/messages_vi.po
+trans.zh_CN = apps/i2ptunnel/locale-proxy/messages_zh.po
+
 [I2P.routerconsole]
 source_file = apps/routerconsole/locale/messages_en.po
 source_lang = en
@@ -33,16 +62,79 @@ trans.fi = apps/routerconsole/locale/messages_fi.po
 trans.fr = apps/routerconsole/locale/messages_fr.po
 trans.hu = apps/routerconsole/locale/messages_hu.po
 trans.it = apps/routerconsole/locale/messages_it.po
+trans.ja = apps/routerconsole/locale/messages_ja.po
 trans.nb = apps/routerconsole/locale/messages_nb.po
 trans.nl = apps/routerconsole/locale/messages_nl.po
 trans.pl = apps/routerconsole/locale/messages_pl.po
 trans.pt = apps/routerconsole/locale/messages_pt.po
-trans.ru = apps/routerconsole/locale/messages_ru.po
+trans.pt_BR = apps/routerconsole/locale/messages_pt_BR.po
+trans.ro = apps/routerconsole/locale/messages_ro.po
+trans.ru_RU = apps/routerconsole/locale/messages_ru.po
 trans.sv_SE = apps/routerconsole/locale/messages_sv.po
+trans.tr_TR = apps/routerconsole/locale/messages_tr.po
 trans.uk_UA = apps/routerconsole/locale/messages_uk.po
 trans.vi = apps/routerconsole/locale/messages_vi.po
 trans.zh_CN = apps/routerconsole/locale/messages_zh.po

+[I2P.welcome]
+source_file = apps/routerconsole/locale-news/messages_en.po
+source_lang = en
+trans.ar = apps/routerconsole/locale-news/messages_ar.po
+trans.de = apps/routerconsole/locale-news/messages_de.po
+trans.es = apps/routerconsole/locale-news/messages_es.po
+trans.fi = apps/routerconsole/locale-news/messages_fi.po
+trans.fr = apps/routerconsole/locale-news/messages_fr.po
+trans.he = apps/routerconsole/locale-news/messages_he.po
+trans.id = apps/routerconsole/locale-news/messages_id.po
+trans.it = apps/routerconsole/locale-news/messages_it.po
+trans.ja = apps/routerconsole/locale-news/messages_ja.po
+trans.ko = apps/routerconsole/locale-news/messages_ko.po
+trans.mg = apps/routerconsole/locale-news/messages_mg.po
+trans.nb = apps/routerconsole/locale-news/messages_nb.po
+trans.nl = apps/routerconsole/locale-news/messages_nl.po
+trans.pl = apps/routerconsole/locale-news/messages_pl.po
+trans.pt = apps/routerconsole/locale-news/messages_pt.po
+trans.pt_BR = apps/routerconsole/locale-news/messages_pt_BR.po
+trans.ro = apps/routerconsole/locale-news/messages_ro.po
+trans.ru_RU = apps/routerconsole/locale-news/messages_ru.po
+trans.sk = apps/routerconsole/locale-news/messages_sk.po
+trans.sq = apps/routerconsole/locale-news/messages_sq.po
+trans.sv_SE = apps/routerconsole/locale-news/messages_sv.po
+trans.tr_TR = apps/routerconsole/locale-news/messages_tr.po
+trans.uk_UA = apps/routerconsole/locale-news/messages_uk.po
+trans.zh_CN = apps/routerconsole/locale-news/messages_zh.po
+
+[I2P.countries]
+type = PO
+source_file = apps/routerconsole/locale-countries/messages_en.po
+source_lang = en
+trans.ca = apps/routerconsole/locale-countries/messages_ca.po
+trans.da = apps/routerconsole/locale-countries/messages_da.po
+trans.de = apps/routerconsole/locale-countries/messages_de.po
+trans.el = apps/routerconsole/locale-countries/messages_el.po
+trans.es = apps/routerconsole/locale-countries/messages_es.po
+trans.et_EE = apps/routerconsole/locale-countries/messages_et.po
+trans.fi = apps/routerconsole/locale-countries/messages_fi.po
+trans.fr = apps/routerconsole/locale-countries/messages_fr.po
+trans.hu = apps/routerconsole/locale-countries/messages_hu.po
+trans.it = apps/routerconsole/locale-countries/messages_it.po
+trans.ja = apps/routerconsole/locale-countries/messages_ja.po
+trans.mg = apps/routerconsole/locale-countries/messages_mg.po
+trans.nb = apps/routerconsole/locale-countries/messages_nb.po
+trans.nl = apps/routerconsole/locale-countries/messages_nl.po
+trans.pl = apps/routerconsole/locale-countries/messages_pl.po
+trans.pt = apps/routerconsole/locale-countries/messages_pt.po
+trans.pt_BR = apps/routerconsole/locale-countries/messages_pt_BR.po
+trans.ro = apps/routerconsole/locale-countries/messages_ro.po
+trans.ru_RU = apps/routerconsole/locale-countries/messages_ru.po
+trans.sk = apps/routerconsole/locale-countries/messages_sk.po
+trans.sq = apps/routerconsole/locale-countries/messages_sq.po
+trans.sv_SE = apps/routerconsole/locale-countries/messages_sv.po
+trans.uk_UA = apps/routerconsole/locale-countries/messages_uk.po
+trans.tr_TR = apps/routerconsole/locale-countries/messages_tr.po
+trans.vi = apps/routerconsole/locale-countries/messages_vi.po
+trans.zh_CN = apps/routerconsole/locale-countries/messages_zh.po
+
 [I2P.i2psnark]
 source_file = apps/i2psnark/locale/messages_en.po
 source_lang = en
@@ -57,7 +149,10 @@ trans.nb = apps/i2psnark/locale/messages_nb.po
 trans.nl = apps/i2psnark/locale/messages_nl.po
 trans.pl = apps/i2psnark/locale/messages_pl.po
 trans.pt = apps/i2psnark/locale/messages_pt.po
-trans.ru = apps/i2psnark/locale/messages_ru.po
+trans.pt_BR = apps/i2psnark/locale/messages_pt_bR.po
+trans.ro = apps/i2psnark/locale/messages_ro.po
+trans.ru_RU = apps/i2psnark/locale/messages_ru.po
+trans.sk = apps/i2psnark/locale/messages_sk.po
 trans.sv_SE = apps/i2psnark/locale/messages_sv.po
 trans.vi = apps/i2psnark/locale/messages_vi.po
 trans.zh_CN = apps/i2psnark/locale/messages_zh.po
@@ -74,11 +169,15 @@ trans.es = apps/susidns/locale/messages_es.po
 trans.fr = apps/susidns/locale/messages_fr.po
 trans.hu = apps/susidns/locale/messages_hu.po
 trans.it = apps/susidns/locale/messages_it.po
+trans.ja = apps/susidns/locale/messages_ja.po
 trans.nl = apps/susidns/locale/messages_nl.po
 trans.pl = apps/susidns/locale/messages_pl.po
 trans.pt = apps/susidns/locale/messages_pt.po
-trans.ru = apps/susidns/locale/messages_ru.po
+trans.pt_BR = apps/susidns/locale/messages_pt_BR.po
+trans.ro = apps/susidns/locale/messages_ro.po
+trans.ru_RU = apps/susidns/locale/messages_ru.po
 trans.sv_SE = apps/susidns/locale/messages_sv.po
+trans.tr_TR = apps/susidns/locale/messages_tr.po
 trans.uk_UA = apps/susidns/locale/messages_uk.po
 trans.vi = apps/susidns/locale/messages_vi.po
 trans.zh_CN = apps/susidns/locale/messages_zh.po
@@ -95,11 +194,16 @@ trans.es = apps/desktopgui/locale/messages_es.po
 trans.fr = apps/desktopgui/locale/messages_fr.po
 trans.hu = apps/desktopgui/locale/messages_hu.po
 trans.it = apps/desktopgui/locale/messages_it.po
+trans.ja = apps/desktopgui/locale/messages_ja.po
 trans.nl = apps/desktopgui/locale/messages_nl.po
 trans.pl = apps/desktopgui/locale/messages_pl.po
-trans.ru = apps/desktopgui/locale/messages_ru.po
+trans.pt_BR = apps/desktopgui/locale/messages_pt_BR.po
+trans.ro = apps/desktopgui/locale/messages_ro.po
+trans.ru_RU = apps/desktopgui/locale/messages_ru.po
+trans.sk = apps/desktopgui/locale/messages_sk.po
 trans.sv_SE = apps/desktopgui/locale/messages_sv.po
 trans.uk_UA = apps/desktopgui/locale/messages_uk.po
+trans.tr_TR = apps/desktopgui/locale/messages_tr.po
 trans.vi = apps/desktopgui/locale/messages_vi.po
 trans.zh_CN = apps/desktopgui/locale/messages_zh.po

@@ -107,15 +211,24 @@ trans.zh_CN = apps/desktopgui/locale/messages_zh.po
 source_file = apps/susimail/locale/messages_en.po
 source_lang = en
 trans.cs = apps/susimail/locale/messages_cs.po
+trans.da = apps/susimail/locale/messages_da.po
 trans.de = apps/susimail/locale/messages_de.po
 trans.es = apps/susimail/locale/messages_es.po
+trans.fi = apps/susimail/locale/messages_fi.po
 trans.fr = apps/susimail/locale/messages_fr.po
 trans.hu = apps/susimail/locale/messages_hu.po
+trans.id = apps/susimail/locale/messages_id.po
 trans.it = apps/susimail/locale/messages_it.po
+trans.ja = apps/susimail/locale/messages_ja.po
+trans.mg = apps/susimail/locale/messages_mg.po
 trans.nl = apps/susimail/locale/messages_nl.po
-trans.ru = apps/susimail/locale/messages_ru.po
-trans.sv_SE = apps/susimail/locale/messages_sv.po
 trans.pl = apps/susimail/locale/messages_pl.po
+trans.pt = apps/susimail/locale/messages_pt.po
+trans.pt_BR = apps/susimail/locale/messages_pt_BR.po
+trans.ro = apps/susimail/locale/messages_ro.po
+trans.ru_RU = apps/susimail/locale/messages_ru.po
+trans.sq = apps/susimail/locale/messages_sq.po
+trans.sv_SE = apps/susimail/locale/messages_sv.po
 trans.uk_UA = apps/susimail/locale/messages_uk.po
 trans.vi = apps/susimail/locale/messages_vi.po
 trans.zh_CN = apps/susimail/locale/messages_zh.po
@@ -127,21 +240,96 @@ trans.cs = debian/po/cs.po
 trans.de = debian/po/de.po
 trans.el = debian/po/el.po
 trans.es = debian/po/es.po
+trans.fi = debian/po/fi.po
 trans.fr = debian/po/fr.po
+trans.id = debian/po/id.po
 trans.it = debian/po/it.po
 trans.hu = debian/po/hu.po
+trans.ja = debian/po/ja.po
+trans.ko = debian/po/ko.po
+trans.nl = debian/po/nl.po
 trans.pl = debian/po/pl.po
-trans.ru = debian/po/ru.po
+trans.pt = debian/po/pt.po
+trans.pt_BR = debian/po/pt_BR.po
+trans.ro = debian/po/ro.po
+trans.ru_RU = debian/po/ru.po
+trans.sk = debian/po/sk.po
+trans.sq = debian/po/sq.po
 trans.sv_SE = debian/po/sv.po
 trans.uk_UA = debian/po/uk.po
+trans.tr_TR = debian/po/tr.po
+trans.zh_CN = debian/po/zh.po

 [I2P.i2prouter-script]
-source_file = installer/resources/locale/messages_en.po
+source_file = installer/resources/locale/po/messages_en.po
 source_lang = en
+;; currently fails check
+;;trans.ca = installer/resources/locale/po/messages_ca.po
 trans.de = installer/resources/locale/po/messages_de.po
+trans.es = installer/resources/locale/po/messages_es.po
 trans.fr = installer/resources/locale/po/messages_fr.po
+trans.id = installer/resources/locale/po/messages_id.po
 trans.it = installer/resources/locale/po/messages_it.po
+trans.pl = installer/resources/locale/po/messages_pl.po
+trans.ja = installer/resources/locale/po/messages_ja.po
+;; currently fails check
+;;trans.ko = installer/resources/locale/po/messages_ko.po
+trans.nl = installer/resources/locale/po/messages_nl.po
+trans.pl = installer/resources/locale/po/messages_pl.po
+trans.pt = installer/resources/locale/po/messages_pt.po
+trans.pt_BR = installer/resources/locale/po/messages_pt_BR.po
+trans.ro = installer/resources/locale/po/messages_ro.po
+trans.ru_RU = installer/resources/locale/po/messages_ru.po
+trans.sk = installer/resources/locale/po/messages_sk.po
+trans.sv_SE = installer/resources/locale/po/messages_sv.po
+trans.tr_TR = installer/resources/locale/po/messages_tr.po
+;; currently fails check
+;;trans.uk_UA = installer/resources/locale/po/messages_uk.po
+trans.zh_CN = installer/resources/locale/po/messages_zh.po
+
+[I2P.getopt]
+source_file = core/java/src/gnu/getopt/MessagesBundle.properties
+source_lang = en
+type = PROPERTIES
+trans.cs = core/java/src/gnu/getopt/MessagesBundle_cs.properties
+trans.de = core/java/src/gnu/getopt/MessagesBundle_de.properties
+trans.es = core/java/src/gnu/getopt/MessagesBundle_es.properties
+trans.fr = core/java/src/gnu/getopt/MessagesBundle_fr.properties
+trans.hu = core/java/src/gnu/getopt/MessagesBundle_hu.properties
+trans.id = core/java/src/gnu/getopt/MessagesBundle_id.properties
+trans.it = core/java/src/gnu/getopt/MessagesBundle_it.properties
+trans.ja = core/java/src/gnu/getopt/MessagesBundle_ja.properties
+trans.ko = core/java/src/gnu/getopt/MessagesBundle_ko.properties
+trans.nl = core/java/src/gnu/getopt/MessagesBundle_nl.properties
+trans.nb = core/java/src/gnu/getopt/MessagesBundle_nb.properties
+trans.pl = core/java/src/gnu/getopt/MessagesBundle_pl.properties
+;; currently corrupt, non-UTF-8
+;;trans.pt = core/java/src/gnu/getopt/MessagesBundle_pt.properties
+;; currently corrupt, non-UTF-8
+;;trans.pt_BR = core/java/src/gnu/getopt/MessagesBundle_pt_BR.properties
+trans.ro = core/java/src/gnu/getopt/MessagesBundle_ro.properties
+trans.ru_RU = core/java/src/gnu/getopt/MessagesBundle_ru.properties
+trans.sk = core/java/src/gnu/getopt/MessagesBundle_sk.properties
+;; currently corrupt, non-UTF-8
+;;trans.sq = core/java/src/gnu/getopt/MessagesBundle_sq.properties
+trans.uk_UA = core/java/src/gnu/getopt/MessagesBundle_uk.properties
+trans.zh_CN = core/java/src/gnu/getopt/MessagesBundle_zh.properties
+
+[I2P.streaming]
+source_file = apps/ministreaming/locale/messages_en.po
+source_lang = en
+trans.de = apps/ministreaming/locale/messages_de.po
+trans.es = apps/ministreaming/locale/messages_es.po
+trans.fr = apps/ministreaming/locale/messages_fr.po
+trans.id = apps/ministreaming/locale/messages_id.po
+trans.it = apps/ministreaming/locale/messages_it.po
+trans.nb = apps/ministreaming/locale/messages_nb.po
+trans.pl = apps/ministreaming/locale/messages_pl.po
+trans.ro = apps/ministreaming/locale/messages_ro.po
+trans.ru_RU = apps/ministreaming/locale/messages_ru.po
+trans.uk_UA = apps/ministreaming/locale/messages_uk.po
+trans.zh_CN = apps/ministreaming/locale/messages_zh.po

 [main]
-host = http://www.transifex.net
+host = https://www.transifex.com

--- a/INSTALL-headless.txt
+++ b/INSTALL-headless.txt
@@ -12,7 +12,7 @@ you may use:
 to configure the router.

 If you're having trouble, swing by http://forum.i2p/, check the
-website at http://www.i2p2.de/, or get on irc://irc.freenode.net/#i2p
+website at https://geti2p.net/, or get on irc://irc.freenode.net/#i2p

 I2P will create and store files and configuration data in the user directory
 ~/.i2p/ on Linux and %APPDATA%\I2P\ on Windows. This directory is created
@@ -39,7 +39,10 @@ To uninstall I2P:
   rm -rf $I2PInstallDir ~/.i2p

 Supported JVMs:
-  Windows: Latest available from http://java.com/download (1.5+ supported)
-  Linux:   Latest available from http://java.com/download (1.5+ supported)
-  FreeBSD: 1.5-compatible (NIO required)
-  Other operating systems and JVMs: See http://trac.i2p2.de/wiki/java
+  All platforms: Java 1.6 or higher required; 1.7 or higher recommended
+  Windows: OpenJDK or Oracle from http://java.com/download
+  Linux:   OpenJDK or Oracle from http://java.com/download
+  FreeBSD: OpenJDK or Oracle from http://java.com/download
+  Raspberry Pi: Oracle 8 Early Access https://jdk8.java.net/download.html
+  PowerPC: IBM SDK 7 http://www.ibm.com/developerworks/java/jdk/linux/download.html
+  Other operating systems and JVMs: See https://trac.i2p2.de/wiki/java or https://geti2p.net/download
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -2,7 +2,7 @@ I2P source installation instructions

 Prerequisites to build from source:
 	Java SDK (preferably Oracle/Sun or OpenJDK) 1.6.0 or higher
-          Non-linux operating systems and JVMs: See http://trac.i2p2.de/wiki/java
+          Non-linux operating systems and JVMs: See https://trac.i2p2.de/wiki/java
 	Apache Ant 1.7.0 or higher
 	The xgettext, msgfmt, and msgmerge tools installed
 	from the GNU gettext package http://www.gnu.org/software/gettext/
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -36,7 +36,7 @@ Public domain except as listed below:
   Copyright (c) 2003, TheCrypto
   See licenses/LICENSE-ElGamalDSA.txt

-   SHA256 and HMAC-SHA256:
+   SHA256 and HMAC:
   Copyright (c) 2000 - 2004 The Legion Of The Bouncy Castle
   See licenses/LICENSE-SHA256.txt

@@ -76,6 +76,11 @@ Public domain except as listed below:
   Copyright 2012  Hiroshi Nakamura <nahi@ruby-lang.org>
   See licenses/LICENSE-Apache2.0.txt

+   Getopt:
+   Copyright (c) 1998 by Aaron M. Renn (arenn@urbanophile.com)
+   See licenses/LICENSE-LGPLv2.1.txt
+
+
 Router (router.jar):
 Public domain except as listed below:
   UPnP.java:
@@ -132,7 +137,7 @@ Installer:



-Java Service Wrapper Community Edition 32-bit 3.5.13:
+Java Service Wrapper Community Edition 32-bit 3.5.25:
   Copyright (C) 1999-2011 Tanuki Software, Ltd. All Rights Reserved.
   See licenses/LICENSE-Wrapper.txt

@@ -177,10 +182,11 @@ Applications:
   By welterde.
   See licenses/LICENSE-GPLv2.txt

-   Jetty 6.1.26:
-   Copyright 1995-2009 Mort Bay Consulting Pty Ltd
-   See licenses/LICENSE-Jetty.txt
+   Jetty 8.1.16.v20140903:
+   See licenses/ABOUT-Jetty.html
+   See licenses/NOTICE-Jetty.html
   See licenses/LICENSE-Apache2.0.txt
+   See licenses/LICENSE-ECLIPSE-1.0.html
   See licenses/NOTICE-Commons-Logging.txt

   JRobin 1.5.9.1:
@@ -206,7 +212,7 @@ Applications:
       FatCow icons: See licenses/LICENSE-FatCowIcons.txt

       GeoIP Data:
-       Copyright (c) 2008 MaxMind, Inc.  All Rights Reserved.
+       This product includes GeoLite data created by MaxMind, available from http://www.maxmind.com/
       See licenses/LICENSE-GeoIP.txt

   Router Console and I2PSnark themes:
@@ -242,8 +248,8 @@ Applications:
      Bundles systray4j-2.4.1:
      See licenses/LICENSE-LGPLv2.1.txt

-   Tomcat 6.0.36:
-   Copyright 1999-2012 The Apache Software Foundation
+   Tomcat 6.0.43:
+   Copyright 1999-2014 The Apache Software Foundation
   See licenses/LICENSE-Apache2.0.txt
   See licenses/NOTICE-Tomcat.txt

--- a/README.txt
+++ b/README.txt
@@ -1,6 +1,6 @@
 Prerequisites to build from source:
 	Java SDK (preferably Oracle/Sun or OpenJDK) 1.6.0 or higher
-          Non-linux operating systems and JVMs: See http://trac.i2p2.de/wiki/java
+          Non-linux operating systems and JVMs: See https://trac.i2p2.de/wiki/java
 	Apache Ant 1.7.0 or higher
 	The xgettext, msgfmt, and msgmerge tools installed
 	  from the GNU gettext package http://www.gnu.org/software/gettext/
@@ -15,20 +15,20 @@ To build:
 		ant installer-osx

 	Run 'ant' with no arguments to see other build options.
-	See INSTALL.txt or http://www.i2p2.de/download.html for installation instructions.
+	See INSTALL.txt or https://geti2p.net/download for installation instructions.

 Documentation:
-	http://www.i2p2.de/how
+	https://geti2p.net/how
 	API: run 'ant javadoc' then start at build/javadoc/index.html

 Latest release:
-	http://www.i2p2.de/download.html
+	https://geti2p.net/download

 To get development branch from source control:
-	http://www.i2p2.de/newdevelopers.html
+	https://geti2p.net/newdevelopers

 FAQ:
-	http://www.i2p2.de/faq.html
+	https://geti2p.net/faq

 Need help?
 	IRC irc.freenode.net #i2p
--- a/Slackware/README
+++ b/Slackware/README
@@ -1,30 +1,70 @@
-ou will need atleast monotone > = 0.41 to get the most recent build source
-and connect it to an already running i2p router.
+Getting the sources
+===================

-OR:
+Monotone
+--------

-You may download the actual "stable" source from
-http://code.google.com/p/i2p/downloads/list
+The bleeding-edge source code is available both within and outside of I2P. The
+I2P project uses Monotone to maintain the codebase.

-You will need to follwing tools to build the i2p and i2p-base packages:
+Information on retrieving the source with monotone is available within I2P at
+http://i2p-projekt.i2p/monotone and from the internet at https://geti2p.net/monotone.

-bash >= 3.1.017
-requiredbuilder >= 0.16.3 ( http://www.stabellini.net/requiredbuilder.html )
-jre >= 6u11
-jdk >= 6u11
-apache-ant >= 1.7.1
-perl >= 5.10.0
-python >= 2.5.2
+Monotone 1.0 Slackbuilds are available at http://slackbuilds.org/.

-Reccomended:
-monotone >= 0.41 ( http://pkgs.dr.ea.ms )
+Git
+---

-See also:
+Git is also an option to retrieve the I2P source code. That said, the I2P
+Monotone servers are *the* authoritative source.

-i2p/readme.txt
+Public Git repositories hosting the I2P source and managed by I2P project team members include

-AND
+- https://github.com/i2p/i2p.i2p
+- http://git.repo.i2p/w/i2p.i2p.git (mirrored from Github)
+- http://sourceforge.net/p/i2p/code/

-i2p-base/readme.txt

-for information and handy tips.
+Tarball
+-------
+
+The latest stable release is always available from the I2P homepage at
+https://geti2p.net/get/.
+
+
+This SlackBuild
+===============
+
+Requirements
+-------------
+
+The following are needed to build the i2p package:
+
+* jre >= 6
+* jdk >= 6
+* gettext
+* apache-ant >= 1.7.1
+
+If you don't care about bundling the translations, the gettext requirement can
+be avoided by adding -Drequire.gettext=false to the ant lines in
+i2p/i2p.SlackBuild
+
+A JRE >= v6 is the only requirement to run I2P.
+
+Building
+--------
+
+As the root user, run either $I2PSRC/Slackware/i2p/i2p.SlackBuild or `ant slackpkg` to create a package
+in $I2PSRC/Slackware/i2p which can be installed using the Slackware packaging tools.
+
+See also
+========
+
+Please also take a look at
+
+* i2p/README
+* eepget(1)
+* i2prouter(1)
+* http://i2p-projekt.i2p / https://geti2p.net
+
+for additional information and tips.
--- a/Slackware/i2p-base/build.xml
+++ b/Slackware/i2p-base/build.xml
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project basedir="." default="slackpkg">
-    <target name="slackpkg">
-        <echo message="Building Slackware package." />
-        <exec executable="./i2p-base.SlackBuild">
-        </exec>
-    </target>
-</project>
--- a/Slackware/i2p-base/doinst.sh
+++ b/Slackware/i2p-base/doinst.sh
@@ -1,157 +0,0 @@
-#!/bin/sh
-#
-#
-# Now in the future we only need to look for '#I2P' and '#/I2P' 
-# for modifications to rc.local and rc.local_shutdown. 
-# I was a moron for not doing it this way in the first place :-) -- Sponge
-#
-#
-
-touch /etc/rc.d/rc.local
-touch /etc/rc.d/rc.local_shutdown
-
-echo
-echo -n "Check 1: /etc/rc.d/rc.local "
-I2PRCA=`grep -c /etc/rc.d/rc.local -e '/etc/rc.d/rc.i2p'`
-
-if [ $I2PRCA -eq 0 ] ; then
-	echo '#I2P' >> /etc/rc.d/rc.local
-	echo '( cd /tmp ; rm -Rf i2p-*.tmp )' >> /etc/rc.d/rc.local
-	echo "if [ -x /etc/rc.d/rc.i2p ] ; then" >> /etc/rc.d/rc.local
-	echo "        sh /etc/rc.d/rc.i2p start" >> /etc/rc.d/rc.local
-	echo "fi" >> /etc/rc.d/rc.local
-	echo '#/I2P' >> /etc/rc.d/rc.local
-	echo "modified."
-else
-	echo -n "looks OK so far,"
-	# Fix old installs, or where people have modified.
-
-	echo -n " Check 1A: "
-	I2PRCC=`grep -c /etc/rc.d/rc.local -e 'i2p-\*\.tmp'`
-
-	if [ $I2PRCC -eq 0 ] ; then
-		DATA=$(cat /etc/rc.d/rc.local | sed -re 's/if \[ -x \/etc\/rc\.d\/rc\.i2p \] ; then/#I2P\n\( cd \/tmp ; rm -Rf i2p-*.tmp \)\nif \[ -x \/etc\/rc.d\/rc.i2p \] ; then/')
-		echo "${DATA}" > /etc/rc.d/rc.local
-		echo -n "additional modifications applied,"
-	else
-		echo -n "looks OK so far,"
-	fi
-
-	echo -n " Check 1B: "
-	I2PRCE=`grep -c /etc/rc.d/rc.local -e 'i2p-\*\.tmp'`
-	if [ $I2PRCE -eq 0 ] ; then
-		DATATOP=$(cat /etc/rc.d/rc.local | sed -n '0,/i2p-\*\.tmp/p' | sed '$d' )
-		DATABOT=$(cat /etc/rc.d/rc.local | sed -n '/i2p-\*\.tmp/,$p' | sed -n '/^fi/,$p' | sed "1d")
-		echo "${DATATOP}" > /etc/rc.d/rc.local
-		echo '#I2P' >> /etc/rc.d/rc.local
-		echo '( cd /tmp ; rm -Rf i2p-*.tmp )' >> /etc/rc.d/rc.local
-		echo "if [ -x /etc/rc.d/rc.i2p ] ; then" >> /etc/rc.d/rc.local
-		echo "        sh /etc/rc.d/rc.i2p start" >> /etc/rc.d/rc.local
-		echo "fi" >> /etc/rc.d/rc.local
-		echo '#/I2P' >> /etc/rc.d/rc.local
-		echo "${DATABOT}" >> /etc/rc.d/rc.local
-		
-		echo -n "additional modifications applied,"
-	else
-		echo -n "looks ok so far,"
-	fi
-	echo -n " Check 1C: "
-	I2PRCF=`grep -c /etc/rc.d/rc.local -e '#/I2P'`
-	if [ $I2PRCF -eq 0 ] ; then
-		DATATOP=$(cat /etc/rc.d/rc.local | sed -n '0,/^#I2P/p' | sed '$d' )
-		DATABOT=$(cat /etc/rc.d/rc.local | sed -n '/^#I2P/,$p' | sed -n '/^fi/,$p' | sed "1d")
-		echo "${DATATOP}" > /etc/rc.d/rc.local
-		echo '#I2P' >> /etc/rc.d/rc.local
-		echo '( cd /tmp ; rm -Rf i2p-*.tmp )' >> /etc/rc.d/rc.local
-		echo "if [ -x /etc/rc.d/rc.i2p ] ; then" >> /etc/rc.d/rc.local
-		echo "        sh /etc/rc.d/rc.i2p start" >> /etc/rc.d/rc.local
-		echo "fi" >> /etc/rc.d/rc.local
-		echo '#/I2P' >> /etc/rc.d/rc.local
-		echo "${DATABOT}" >> /etc/rc.d/rc.local
-
-		echo -n "additional modifications applied,"
-	else
-		echo -n "looks ok so far,"
-	fi
-	echo " Done."
-fi
-
-echo -n "Check 2: /etc/rc.d/rc.local_shutdown "
-I2PRCB=`grep -c /etc/rc.d/rc.local_shutdown -e '/etc/rc.d/rc.i2p'`
-if [ $I2PRCB -eq 0 ] ; then
-	echo "#I2P" >> /etc/rc.d/rc.local_shutdown
-	echo "if [ -x /etc/rc.d/rc.i2p ] ; then" >> /etc/rc.d/rc.local_shutdown
-	echo "        sh /etc/rc.d/rc.i2p stop" >> /etc/rc.d/rc.local_shutdown
-	echo "fi" >> /etc/rc.d/rc.local_shutdown
-	echo "#/I2P" >> /etc/rc.d/rc.local_shutdown
-	echo "modified."
-else
-	echo -n "looks OK so far,"
-	# Fix old installs
-
-	echo -n " Check 1A: "
-	I2PRCG=`grep -c /etc/rc.d/rc.local_shutdown -e '#I2P'`
-	if [ $I2PRCG -eq 0 ] ; then
-		DATATOP=$(cat /etc/rc.d/rc.local_shutdown | sed -n '0,/^if \[ -x \/etc\/rc\.d\/rc\.i2p \] ; then/p' | sed '$d' )
-		DATABOT=$(cat /etc/rc.d/rc.local_shutdown | sed -n '/^if \[ -x \/etc\/rc\.d\/rc\.i2p \] ; then/,$p' | sed -n '/^fi/,$p' | sed "1d")
-		echo "${DATATOP}" > /etc/rc.d/rc.local_shutdown
-		echo '#I2P' >> /etc/rc.d/rc.local_shutdown
-		echo "if [ -x /etc/rc.d/rc.i2p ] ; then" >> /etc/rc.d/rc.local_shutdown
-		echo "        sh /etc/rc.d/rc.i2p stop" >> /etc/rc.d/rc.local_shutdown
-		echo "fi" >> /etc/rc.d/rc.local_shutdown
-		echo "#/I2P" >> /etc/rc.d/rc.local_shutdown
-		echo "${DATABOT}" >> /etc/rc.d/rc.local_shutdown
-		echo -n "additional modifications applied,"
-	else
-		echo -n "looks OK so far,"
-	fi
-	echo -n " Check 1B: "
-	I2PRCH=`grep -c /etc/rc.d/rc.local_shutdown -e '#/I2P'`
-	if [ $I2PRCH -eq 0 ] ; then
-		DATATOP=$(cat /etc/rc.d/rc.local_shutdown | sed -n '0,/^#I2P/p' | sed '$d' )
-		DATABOT=$(cat /etc/rc.d/rc.local_shutdown | sed -n '/^#I2P/,$p' | sed -n '/^fi/,$p' | sed "1d")
-		echo "${DATATOP}" > /etc/rc.d/rc.local_shutdown
-		echo '#I2P' >> /etc/rc.d/rc.local_shutdown
-		echo "if [ -x /etc/rc.d/rc.i2p ] ; then" >> /etc/rc.d/rc.local_shutdown
-		echo "        sh /etc/rc.d/rc.i2p stop" >> /etc/rc.d/rc.local_shutdown
-		echo "fi" >> /etc/rc.d/rc.local_shutdown
-		echo "#/I2P" >> /etc/rc.d/rc.local_shutdown
-		echo "${DATABOT}" >> /etc/rc.d/rc.local_shutdown
-		echo -n "additional modifications applied,"
-	else
-		echo -n "looks OK so far,"
-	fi
-	echo " Done."
-fi
-
-if [ -f /etc/rc.d/rc.i2p ] ; then
-	if [ -x /etc/rc.d/rc.i2p ] ; then
-		chmod +x /etc/rc.d/rc.i2p.new
-	fi
-	# Hopefully get admin's attention.
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -e "\007" ; sleep 0.3
-	echo "It apears that you already have /etc/rc.d/rc.i2p"
-	echo "You should replace it with /etc/rc.d/rc.i2p.new as soon as possible"
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -e "\007" ; sleep 0.3
-else
-	mv /etc/rc.d/rc.i2p.new /etc/rc.d/rc.i2p
-	echo
-	echo "Installation finished. The i2p start/stop script has been"
-	echo "installed in /etc/rc.d . You should chmod +x"
-	echo '/etc/rc.d/rc.i2p to start it on boot.'
-	echo
-fi
-
-exit
--- a/Slackware/i2p-base/i2p-base.SlackBuild
+++ b/Slackware/i2p-base/i2p-base.SlackBuild
@@ -1,57 +0,0 @@
-#!/bin/sh
-#
-# Heavily based on the Slackware 12.2 SlackBuild
-# Slackware build script for I2P
-#
-# PLEASE READ THIS:
-# How to start I2P:
-# After installpkg command, doinst.sh will execute a post-installation script
-# needed by I2P. After that you have to chmod +x /etc/rc.d/rc.i2p and start
-# I2P service with /etc/rc.d/rc.i2p start.
-#
-# Now tell your browser to user this proxy: localhost on port 4444 and open
-# this page: http://localhost:7657/index.jsp
-#
-# Here you can configure I2P, watch network status and navigate anonimously.
-# It's suggested to subscribe to various dns host, like i2host.i2p
-# For any additional information, visit i2host.i2p and forum.i2p
-#
-
-CWD=$(pwd)
-TMP=/tmp
-PKG=/$TMP/package-base-i2p
-NAME=i2p-base
-VERSION=0.0.4
-BUILD=1sponge
-ARCH=noarch
-INSTALL_DIR=opt
-
-# Less than slackware 13?
-SLKPLT=$(cat /etc/slackware-version | sed -re "s/(Slackware )([0-9]*)(.*)/\2/")
-if [ $SLKPLT -lt 13 ] ; then
-	EXT=tgz
-else
-	EXT=txz
-fi
-
-rm -rf $PKG
-mkdir -p $PKG
-cd $PKG
-chown -R root:root .
-
-mkdir -p $PKG/etc/rc.d
-mkdir -p $PKG/install
-sed "s|directory|/$INSTALL_DIR/i2p/i2prouter|g" "$CWD/rc.i2p_def" > $PKG/etc/rc.d/rc.i2p.new
-chmod 644 $PKG/etc/rc.d/rc.i2p.new
-cat "$CWD/doinst.sh" > $PKG/install/doinst.sh
-cat "$CWD/slack-desc" > $PKG/install/slack-desc
-
-cd $PKG
-#
-# Not really that important to exec this 
-# as there aren't any deps we don't know.
-#
-# requiredbuilder -v -y -s $CWD $PKG
-#
-cat "$CWD/slack-required" > $PKG/install/slack-required
-makepkg -l y -c n $CWD/${NAME}-$VERSION-$ARCH-$BUILD.$EXT
--- a/Slackware/i2p-base/rc.i2p_def
+++ b/Slackware/i2p-base/rc.i2p_def
@@ -1,68 +0,0 @@
-#!/bin/sh
-# Start/stop i2p service.
-
-i2p_start() {
- # Check if router is up first!
- /bin/su - -c "/bin/bash -l -c '( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\" ; directory status )'" > /dev/null
- if [ $? -eq 0 ] ; then {
-  # I2p is already running, so tell the user.
-  echo "I2P is already running..."
-  i2p_status
- } 
- else
- {
-  # Just in-case there are leftover junk in /tmp...
-  rm -Rf `grep /tmp/hsperfdata_root/* -le i2p` /tmp/i2p-*.tmp /tmp/router.ping
-  # Now that all junk is cleaned up, start.
-  /bin/su - -c "/bin/bash -l -c '( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\" ; directory start )'"
- }
- fi
-}
-
-i2p_stop() {
- /bin/su - -c "/bin/bash -l -c '( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\" ; directory stop )'"
- rm -Rf `grep /tmp/hsperfdata_root/* -le i2p` /tmp/i2p-*.tmp /tmp/router.ping
-}
-
-i2p_restart() {
- # We want a FULL cycle here, not the wrappers idea of this!
- i2p_stop
- i2p_start
-}
-
-i2p_status() {
- /bin/su - -c "/bin/bash -l -c '( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\" ; directory status )'"
-}
-
-i2p_console() {
- /bin/su - -c "/bin/bash -l -c '( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\" ; directory console )'"
-}
-
-i2p_dump() {
- /bin/su - -c "/bin/bash -l -c '( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\" ; directory dump )'"
-}
-
-case "$1" in
-'start')
-  i2p_start
-  ;;
-'stop')
-  i2p_stop
-  ;;
-'restart')
-  i2p_restart
-  ;;
-'status')
-  i2p_status
-  ;;
-'console')
-  i2p_console
-  ;;
-'dump')
-  i2p_dump
-  ;;
-*)
-  echo "usage $0 start|stop|restart|status|console|dump"
-  ;;
-esac
-
--- a/Slackware/i2p-base/readme.txt
+++ b/Slackware/i2p-base/readme.txt
@@ -1,10 +0,0 @@
-An rc file called rc.i2p has been placed into the /etc/rc.d directory.
-If you want to change installation dir, change the variable INSTALL_DIR
-on base-i2p.SlackBuild and rebuild the package. You also will need to do the
-same for the i2p package.
-
-The install script will insert everything needed into /etc/rc.d/rc.local and
-into /etc/rc.d/rc.local_shutdown automatically.
-
-If you want to start I2P at boot you have to chmod +x /etc/rc.d/rc.i2p
-
--- a/Slackware/i2p-base/slack-desc
+++ b/Slackware/i2p-base/slack-desc
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-base-i2p: base-i2p (I2P anonymizing network base config files)
-base-i2p:
-base-i2p: I2P is an anonymizing network, offering a simple layer that
-base-i2p: identity-sensitive applications can use to securely communicate. All
-base-i2p: data is wrapped with several layers of encryption, and the network is
-base-i2p: both distributed and dynamic, with no trusted parties.
-base-i2p: Many applications are available that interface with I2P, including 
-base-i2p: mail, peer-peer file sharing, IRC chat, and others.
-base-i2p:
-base-i2p: This package provides the startup files.
-base-i2p:
--- a/Slackware/i2p-base/slack-required
+++ b/Slackware/i2p-base/slack-required
@@ -1 +0,0 @@
-bash >= 3.1.017
--- a/Slackware/i2p/README
+++ b/Slackware/i2p/README
@@ -0,0 +1,89 @@
+The I2P package will be installed to /opt/i2p.
+
+To install to another location, set the variable INSTALL_DIR in i2p.SlackBuild
+and rebuild the package.
+
+
+Installing and Upgrading:
+=========================
+
+I2P has an auto-update function but generally speaking packages are managed by
+packaging systems. Changing a package's files outside of the package system can
+cause problems. To upgrade when there's a new I2P release, retrieve the new
+source, re-run the SlackBuild, then use upgradepkg to update.
+
+To ignore all this and upgrade "in-network", simply change the permissions of the installation
+directory (/opt/i2p by default). Something like the following would suffice:
+
+    chown -R USERNAME /opt/i2p
+
+
+Starting and using I2P
+======================
+
+Using the initscript
+--------------------
+
+To start I2P at boot, set the executable bit on /etc/rc.d/rc.i2p, add this
+script to rc.local*, and set the variable "RUN_AS_USER" in /etc/rc.d/rc.i2p.
+
+Optionally, create a new user/group with limited rights to run I2P.
+
+Something like the following would work to start I2P at system boot, running under the
+"i2p" account:
+
+     echo '[ -x /etc/rc.d/rc.i2p ] && /etc/rc.d/rc.i2p start' >> /etc/rc.d/rc.local
+     echo '[ -x /etc/rc.d/rc.i2p ] && /etc/rc.d/rc.i2p stop' >> /etc/.rc.d/rc.local_shutdown
+     sed -i .bak 's/^.*\(RUN_AS_USER\)=.*/\1=i2p/' /etc/rc.d/rc.i2p
+     chmod 755 /etc/rc.d/rc.i2p
+
+Unless running as a user named "i2psvc", I2P's config directory defaults to
+$HOME/.i2p. In the case of the "i2psvc" user, the default config directory is
+/var/lib/i2p/i2p-config.
+
+It should not need to be said that using the "root" account is not recommended.
+
+When running using the initscript, I2P will write its logs to /var/log/i2p.
+
+Starting I2P "on-demand"
+------------------------
+
+As with a normal installation, I2P can be started with "i2prouter start". The
+i2prouter and eepget scripts hve been installed to /usr/bin so they'll be
+accessible in the default system PATH.
+
+When running using the i2prouter script, I2P will write its logs to $HOME/.i2p.
+
+
+Configuring your browser
+------------------------
+
+In order to access eepSites (I2P-internal web sites) your web browser needs to
+be configured. Set the HTTP Proxy to 127.0.0.1 and port 4444. For more information, see
+https://geti2p.net/en/about/browser-config
+
+The I2P router console is reachable at http://127.0.0.1:7657.
+
+
+Addressbook subscriptions
+-------------------------
+
+Please see the FAQs at http://i2p-projekt.i2p/faq or https://geti2p.net/faq for information about
+the various addressbook services.
+
+
+Chatting on IRC
+---------------
+
+I2P comes preconfigured with a tunnel pointing to the I2P-only IRC network,
+Irc2P.  Signing on is easy, just connect to 127.0.0.1 on port 6668. Do not
+configure a proxy in your IRC client.
+
+
+Additional information
+======================
+
+Within I2P: http://i2p-projekt.i2p/, http://forum.i2p/, http://zzz.i2p/, http://trac.i2p2.i2p/
+On the Internet:  https://geti2p.net/, https://trac.i2p2.de
+Manpages: i2prouter(1), eepget(1)
+
--- a/Slackware/i2p/build.xml
+++ b/Slackware/i2p/build.xml
@@ -2,7 +2,7 @@
 <project basedir="." default="slackpkg">
    <target name="slackpkg">
        <echo message="Building Slackware package." />
-        <exec executable="./i2p.SlackBuild">
-        </exec>
+        <chmod file="./i2p.Slackbuild" perm="755" />
+        <exec executable="./i2p.SlackBuild" failifexecutionfails="true" />
    </target>
 </project>
--- a/Slackware/i2p/doinst.sh
+++ b/Slackware/i2p/doinst.sh
@@ -1,72 +1,60 @@
 #!/bin/sh

+# Abort on error or unset variables
+set -e
+set -u
+
+# This is changed by i2p.SlackBuild
 INST_DIR=directory
+PKGNAME="%pkg"

-( cd install
+config() {
+    NEW="$1"
+    OLD="$(dirname $NEW)/$(basename $NEW .new)"
+    if [ ! -r $NEW ]; then
+        # If we get here there's a flaw in the packaging. We'll just return so that
+        # we don't emit a spurious error for the user. (It's not the user's problem).
+        return
+    fi

-echo
-for i in *.config ; {
-	if [ -f $INST_DIR/$i ] ; then
-		echo "Please check ${INST_DIR}${i}, as there is a new version."
-		cp $i $INST_DIR/$i.new
-	else
-		cp $i $INST_DIR/$i
-	fi
+    # If this file doesn't exist yet, drop the .new extension.
+    if [ ! -r $OLD ]; then
+        mv $NEW $OLD
+        return
+    elif [ "$(md5sum $OLD | cut -d' ' -f1)" = "$(md5sum $NEW | cut -d' ' -f1)" ]; then
+        # If there are no differences in the files, remove the file with the .new extension.
+        rm $NEW
+        return
+    fi
+    # Alert the admin if they differ, but let's not be terribly obnoxious about it.
+    echo "WARNING: The files $OLD and $NEW differ." >&2
 }

-)
+# Unlike previous versions of the package, we install i2prouter and eepget to /usr/bin
+# to make them available within the system PATH.

-( cd $INST_DIR
-	if [ -f blocklist.txt ] ; then
-		echo "Please check ${INST_DIR}blocklist.txt, as there is a new version."
-	else
-		mv blocklist.txt.new blocklist.txt
-	fi
-)
+# Users might still want to /opt/i2p/i2prouter or /opt/i2p/eepget so we'll create symlinks
+# in the installation directory.
+ln -sf /usr/bin/eepget $INST_DIR
+ln -sf /usr/bin/i2prouter $INST_DIR
+(cd /usr/doc/$PKGNAME; ln -sf $INST_DIR/history.txt changelog)

-( cd $INST_DIR/eepsite
-	if [ -f jetty.xml ] ; then
-		echo "Please check ${INST_DIR}/eepsite, as there are new files."
-	else
-		find $PKG/$INSTALL_DIR/i2p -name "*.xml.new" -exec sh -c 'mv "$0" "${0/.new}"' {} \;
-	fi
-)
-
-( cd $INST_DIR/eepsite/docroot
-	if [ -f index.html ] ; then
-		rm index.html.new
-	else
-		mv index.html.new index.html
-	fi
-	if [ -f favicon.ico ] ; then
-		rm favicon.ico.new
-	else
-		mv favicon.ico.new favicon.ico
-	fi
-)
-
-echo
-echo "FINISHING I2P INSTALLATION. PLEASE WAIT."
-
-cd $INST_DIR
-
-
-
-OS_ARCH=`uname -m`
-X86_64=`echo "$OS_ARCH" | grep x86_64`
-if [ "X$X86_64" = "X" ]; then
-        wrapperpath="./lib/wrapper/linux"
+if $(uname -m | grep -q '64'); then
+    (cd $INST_DIR; ln -sf i2psvc-linux-x86-64 i2psvc)
 else
-        wrapperpath="./lib/wrapper/linux64"
+    (cd $INST_DIR; ln -sf i2psvc-linux-x86-32 i2psvc)
 fi
-cp $wrapperpath/libwrapper.so ./lib/
-cp $wrapperpath/wrapper.jar ./lib/
-cp $wrapperpath/i2psvc .
-rm -rf ./lib/wrapper
-chmod 744 ./i2psvc

-echo
-echo "Installation finished."
-echo
+config /etc/rc.d/rc.i2p.new
+config $INST_DIR/wrapper.config.new

-exit
+if [ -e /var/log/packages/i2p-base* ]; then
+    echo "Warning: This package supercedes the 'i2p-base' package." >&2
+    echo
+    echo "You may want to 'removepkg i2p-base'" >&2
+    echo "and check the contents of /etc/rc.d/rc.local*" >&2
+    echo "for correctness" >&2
+fi
+
+# Remove extraneous 'sh' from sponge's set-up
+sed -i 's|sh /etc/rc\.d/rc\.i2p|/etc/rc.d/rc.i2p|g' /etc/rc.d/rc.local*
--- a/Slackware/i2p/i2p.SlackBuild
+++ b/Slackware/i2p/i2p.SlackBuild
@@ -3,135 +3,124 @@
 # Heavily based on the Slackware 12.2 SlackBuild
 # Slackware build script for I2P
 #
-# PLEASE READ THIS:
-# Probably you will never have to update I2P packages with upgradepkg,
-# just because I2P has an auto-update function.
-# Really you should not ever use any "upgrade" method.
-#
-# The correct way to upgrade is to: 
-# 1: install the upgrade
-# 2: remove the old package
-#
-# It is a terrible shame that upgradepkg doesn't do this, infact, 
-# it would actually be the correct way for *any* package!
+# Packages are generally prohibited from being updated outside
+# of the package manager; this I2P SlackBuild is no different.
 #
+# If you'd like to use the I2P "in-network" updates anyway, you'll need to
+# grant the user that I2P will run as write permission to the installation directory
+# (/opt/i2p by default).
 #
+# For safety's sake, a user's I2P config files will *never* be overwritten by any upgrade method.
+# In the future this SlackBuild may alert when a default config file is updated.
+##

-BUILD=1sponge
+# Make sure makepkg and friends can be found
+PATH=$PATH:/sbin
+
+# abort on error and unset variables (same as set -e and set -u, respectively)
+set -o errexit
+set -o nounset
+
+if [ $(id -ur) -ne 0 ]; then
+    echo "ERROR: SlackBuilds require root access." >&2
+    exit 1
+fi
+
+BUILD=1kytv
 # INSTALL_DIR is referenced from /, don't prefix it with a '/'
 INSTALL_DIR=opt
 NAME=i2p
 ARCH=noarch

-# Less than slackware 13?
-SLKPLT=$(cat /etc/slackware-version | sed -re "s/(Slackware )([0-9]*)(.*)/\2/")
-if [ $SLKPLT -lt 13 ] ; then
-	EXT=tgz
-else
-	EXT=txz
-fi
-
-
-#
-# This mess is here due to the totally moronic way i2p does versioning.
-# We correct it here.
-#
-ROUTER=$(echo -ne "_")$(cat ../../router/java/src/net/i2p/router/RouterVersion.java | grep -e "public final static long BUILD" | cut -f2 -d"=" | cut -f1 -d";" | sed -re "s/ //g")
-if [ "$ROUTER" == "_" ] ;  then
-	ROUTER="_0"
-fi
-
-#
-# That was the easy one, now for the tough one.
-#
-
-CORE=$(cat ../../core/java/src/net/i2p/CoreVersion.java | grep -e "public final static String VERSION" | cut -f2 -d'"' | sed -re "s/ //g")
-CORE1=$(echo -n $CORE.x.x | sed -re "s/(.*)\.(.*)\.(.*)\.(.*)/\1/")
-CORE2=$(echo -n $CORE.x | sed -re "s/(.*)\.(.*)\.(.*)\.(.*)/\1/")
-
-if [ "$CORE.x.x" == "$CORE1" ] ; then
-	CORE=$(echo -ne $CORE".0.0")
-fi
-if [ "$CORE.x" == "$CORE2" ] ; then
-	CORE=$(echo -ne $CORE".0")
-fi
-
-VERSION=$(echo $CORE$ROUTER)
-#
-# Whew!
-# OK, let's build i2p
-#
-
-CWD=$(pwd)
+CWD=$(readlink -m $(dirname $0))
+I2PSRC=$(readlink -m $CWD/../../)
 TMP=/tmp
-
 PKG=$TMP/package-i2p
-rm -rf $PKG
-mkdir -p $PKG

-cd $CWD/../../
+if [ -e "/etc/slackware-version" ]; then
+    # Older than Slackware 13?
+    SLACKVER=$(sed -e "s/Slackware\s\+\([0-9]\+\)\.\?\([0-9]\+\)\?/\1/" /etc/slackware-version)
+    if [ $SLACKVER -lt 13 ] ; then
+        EXT=tgz
+    else
+        EXT=txz
+    fi
+else
+    echo "ERROR: This script is only intended for use on Slackware systems.">&2
+    exit 1
+fi

+# Extract version strings
+I2PBUILD=$(sed -e '/^.\+long\s\+BUILD/!d' -e 's/^.\+long\s\+BUILD\s\+=\s\+\([0-9]\+\);/\1/' $I2PSRC/router/java/src/net/i2p/router/RouterVersion.java)
+# Thanks to user "ihavei2p" for the second awk statement
+# If the version is x.y, it'll be set to x.y.0. Otherwise the version string will be unchanged
+CORE=$(awk -F'"' '/static\s+String\s+VERSION/{print $2}' $I2PSRC/core/java/src/net/i2p/CoreVersion.java | \
+        awk -F. '{ if (NF > 3) { print; exit } else if ($3 == "") { $3=0; print $1"."$2"."$3 } else print }')
+VERSION="${CORE}_${I2PBUILD}"
+
+[ -d $PKG ] && rm -rf $PKG
+mkdir -p $PKG/$INSTALL_DIR $PKG/install
+
+cd "$I2PSRC"
 ant distclean
-#ant dist
-ant tarball
+ant jbigi-linux-x86-only preppkg-unix

-tar xjvf i2p.tar.bz2 -C $TMP
+chown -R root:root $I2PSRC/pkg-temp
+cp -a $I2PSRC/pkg-temp $PKG/$INSTALL_DIR/i2p

-cd $TMP/i2p
-chown -R root:root .
-
-mkdir -p $PKG/$INSTALL_DIR/
-cp -a ../i2p $PKG/$INSTALL_DIR/
-
-mkdir -p $PKG/install
-
-#############################################################################
-# Preconfigureation to make package smaller, and...
-# we keep as much as reasonable in the installation directory.
-# This makes the install map fairly well to the standard installation.
-# It also makes it easier to find the log and pid files!
-#############################################################################
+# $INSTALL_DIR is used by this SlackBuild.
+# [%$]INSTALL_PATH , [%$]SYSTEM_java_io_tmpdir, and [%$]USER_HOME have the correct paths set
+# by the IzPack installer.
 cd $PKG/$INSTALL_DIR/i2p
+for file in wrapper.config eepget i2prouter runplain.sh; do
+    sed -i "s|[%$]INSTALL_PATH|/$INSTALL_DIR/i2p|g;s|[$%]SYSTEM_java_io_tmpdir|$TMP|g;s/[%$]USER_HOME/\$HOME/g" $file
+done
+mv wrapper.config wrapper.config.new

-# wrapper.config $INSTALL_PATH and $SYSTEM_java_io_tmpdir
-sed "s|\$INSTALL_PATH|/$INSTALL_DIR/i2p|g" wrapper.config > a
-sed "s|\$SYSTEM_java_io_tmpdir|/$INSTALL_DIR/i2p|g" a > wrapper.config
-# eepget %INSTALL_PATH
-sed "s|\$INSTALL_PATH|/$INSTALL_DIR/i2p|g" eepget > a
-rm eepget
-mv a eepget
-# runplain.sh %INSTALL_PATH and %SYSTEM_java_io_tmpdir
-sed "s|%INSTALL_PATH|/$INSTALL_DIR/i2p|g" runplain.sh > a
-sed "s|%SYSTEM_java_io_tmpdir|/$INSTALL_DIR/i2p|g" a > runplain.sh
-# i2prouter %INSTALL_PATH and %SYSTEM_java_io_tmpdir
-sed "s|%INSTALL_PATH|/$INSTALL_DIR/i2p|g" i2prouter > a
-rm i2prouter
-mv a i2prouter
-sed "s|%SYSTEM_java_io_tmpdir|/$INSTALL_DIR/i2p|g" i2prouter > a
-sed "s|#ALLOW_ROOT=true|ALLOW_ROOT=true|g" a > i2prouter
+install -d $PKG/usr/bin
+install -d $PKG/usr/doc/$NAME-$VERSION
+install -d $PKG/etc/rc.d
+mv licenses LICENSE.txt -t $PKG/usr/doc/$NAME-$VERSION

-chmod 744 ./i2prouter
-chmod 744 ./osid
-chmod 744 ./runplain.sh
-chmod 744 ./eepget
-chmod 744 ./scripts/i2pbench.sh
-chmod 744 ./scripts/i2ptest.sh
-rm -Rf ./lib/*.dll ./*.bat ./*.exe ./installer ./icons ./a postinstall.sh
+# runplain.sh will live in the installation directory. eepget and i2prouter will go to /usr/bin
+# with symlinks in INST_DIR (created in doinst.sh)
+install -m755 i2prouter $PKG/usr/bin
+install -m755 eepget $PKG/usr/bin
+chmod 755  ./runplain.sh

-mv $PKG/$INSTALL_DIR/i2p/*.config $PKG/install
-mv $PKG/$INSTALL_DIR/i2p/blocklist.txt $PKG/$INSTALL_DIR/i2p/blocklist.txt.new
-find $PKG/$INSTALL_DIR/i2p -name "*.xml" -exec mv {} {}.new \;
-mv $PKG/$INSTALL_DIR/i2p/eepsite/docroot/index.html $PKG/$INSTALL_DIR/i2p/eepsite/docroot/index.html.new
-mv $PKG/$INSTALL_DIR/i2p/eepsite/docroot/favicon.ico $PKG/$INSTALL_DIR/i2p/eepsite/docroot/favicon.ico.new
-sed "s|directory|/$INSTALL_DIR/i2p/|g" $CWD/doinst.sh > $PKG/install/doinst.sh
-cat $CWD/slack-desc > $PKG/install/slack-desc
+if [ $INSTALL_DIR != 'opt' ]; then
+    sed "s|\(The I2P package\)\s\+will be\s\+\(installed to\).+|\1 has been \2 $INSTALL_DIR/i2p|g" $CWD/README > $PKG/usr/doc/$NAME-$VERSION/README
+else
+    sed "s|will be installed|has been installed|" $CWD/README > $PKG/usr/doc/$NAME-$VERSION/README
+fi
+
+install -d $PKG/usr/man/man1
+gzip -9 man/*.1
+install -m644 man/*.1.gz $PKG/usr/man/man1
+rm -rf ./man
+
+# We install all x86 wrapper binaries.
+# The i2prouter script will try to determine the OS (linux), the bits (32 VS 64) and should be able
+# to figure out the correct wrapper binary to use.
+
+# However: In case the i2prouter script's detection fails, "$INST_DIR/i2psvc" will point to
+# what 'we' think the correct binary is.
+#
+# A good reason for installing all binaries: in case the user, for whatever reason, switches from an
+# x64 JRE to an x86 JRE, I2P should continue to work without needing to be reinstalled.
+install -m755 $I2PSRC/installer/lib/wrapper/linux/i2psvc ./i2psvc-linux-x86-32
+install -m644 $I2PSRC/installer/lib/wrapper/linux/libwrapper.so ./lib/libwrapper-linux-x86-32.so
+install -m755 $I2PSRC/installer/lib/wrapper/linux64/i2psvc ./i2psvc-linux-x86-64
+install -m644 $I2PSRC/installer/lib/wrapper/linux64/libwrapper.so ./lib/libwrapper-linux-x86-64.so
+install -m644 $I2PSRC/installer/lib/wrapper/all/wrapper.jar ./lib/wrapper.jar
+install -m644 $I2PSRC/build/jbigi.jar $PKG/$INSTALL_DIR/i2p/lib/jbigi.jar
+
+rm -f ./postinstall.sh ./osid ./INSTALL-*.txt
+sed "s|directory|/$INSTALL_DIR/i2p|" $CWD/doinst.sh > $PKG/install/doinst.sh
+sed -i "s|%pkg|$NAME-$VERSION|" $PKG/install/doinst.sh
+sed "s|%INST_DIR|/$INSTALL_DIR/i2p|" $CWD/rc.i2p> $PKG/etc/rc.d/rc.i2p.new
+cp $CWD/slack-desc $PKG/install/slack-desc

 cd $PKG
-#
-# requiredbuilder messes up REALLY bad, and thinks java is perl?!
-# It also did not catch the shell requirements! BOOOOOOOOOOO! HISSSSSSSS!
-#
-# requiredbuilder -v -y -s $CWD $PKG
-#
-cat $CWD/slack-required > $PKG/install/slack-required
+cp $CWD/slack-required $PKG/install/slack-required
 makepkg -l y -c n $CWD/${NAME}-$VERSION-$ARCH-$BUILD.$EXT
--- a/Slackware/i2p/rc.i2p
+++ b/Slackware/i2p/rc.i2p
@@ -0,0 +1,185 @@
+#!/bin/sh
+
+# Abort on errors
+set -e
+
+##
+# This *must* be configured. Set this to the user that will run I2P.
+# Note: If you don't want I2P to start automatically at boot,
+# use "i2prouter start" as a non-root user to start I2P.
+#RUN_AS_USER=
+##
+
+##
+# Set the locale as desired.
+# Note: this is not the same as the language shown in the I2P router console.
+# This affects the locale used in wrapper.log. For best results, use a
+# unicode enabled locale. This is especially important for foreign language torrents.
+#
+# If not set the user's configured locale will be used.
+#RCLOCALE=
+##
+
+#####################################################
+# Nothing below this point should need to be edited #
+#####################################################
+# %INST_DIR is set by i2p.SlackBuild
+INSTALL_DIR="%INST_DIR"
+# Make sure the package is installed and that the wrapper can be found
+[ -d $INSTALL_DIR ] && [ -x $INSTALL_DIR/i2psvc ] || (echo "The I2P package is not installed" >&2 ; exit 1)
+
+if [ -z $RUN_AS_USER ]; then
+    echo "ERROR: RUN_AS_USER not configured in $0" >&2
+    exit 1
+fi
+
+if [ $(id -ur) -ne 0 ]; then
+    echo 'ERROR: You must be root to start this service.' >&2
+    echo
+    exit 1
+fi
+
+if [ -z $RCLOCALE ]; then
+    if [ ! $(locale -a |grep -q "en_US\.utf8") ]; then
+        RCLOCALE="en_US.utf8"
+    fi
+fi
+
+# Abort this script if any referenced variables haven't been set
+set -u
+
+if $(uname -m |grep -q '64'); then
+    BITS='64'
+else
+    BITS=''
+fi
+
+PATH="$PATH:/usr/lib$BITS/java/bin:/usr/lib$BITS/java/jre/bin"
+RUN=/var/run/i2p
+PIDFILE="$RUN/i2p.pid"
+WRAPPER_CONF="$INSTALL_DIR/wrapper.config"
+WRAPPERLOG=/var/log/i2p/wrapper.log
+I2PTEMP="/tmp/i2p-daemon"
+DESC="The I2P daemon"
+JAVABINARY=$(awk -F'=' '/^ *wrapper\.java\.command/{print $2}' "$WRAPPER_CONF")
+
+if [ ! $(which $JAVABINARY 2>/dev/null) ]; then
+    for rc in /etc/profile.d/*jdk*.sh /etc/profile.d/*java*.sh; do
+        [ -r $rc ] && . $rc
+    done
+    if [ ! $(which $JAVABINARY 2>/dev/null) ]; then
+        echo "ERROR: Cannot find java. Please set the path to java in $WRAPPER_CONF" >&2
+        exit 1
+    fi
+fi
+
+JAVA=$(which $JAVABINARY 2>/dev/null)
+
+I2P_ARGS="$WRAPPER_CONF \
+ wrapper.java.additional.1=-DloggerFilenameOverride=/var/log/i2p/log-router-@.txt \
+ wrapper.java.additional.10=-Dwrapper.logfile=$WRAPPERLOG \
+ wrapper.java.additional.11=-Di2p.dir.pid=$RUN \
+ wrapper.java.additional.12=-Di2p.dir.temp=$I2PTEMP \
+ wrapper.java.command=$JAVA \
+ wrapper.logfile=$WRAPPERLOG \
+ wrapper.pidfile=$PIDFILE \
+ wrapper.daemonize=TRUE"
+
+LC_ALL=$RCLOCALE
+LANG=$RCLOCALE
+export LC_ALL LANG
+
+is_running() {
+    if [ -r $PIDFILE ]; then
+        PID="$(cat ${PIDFILE})" 2>/dev/null 2>&1
+        if ! kill -0 $PID >/dev/null 2>&1; then
+            rm "$PIDFILE"
+            return 1
+        else
+            return 0
+        fi
+    else
+        return 1
+    fi
+}
+
+start() {
+    if is_running; then
+        echo "ERROR: $DESC is already running." >&2
+    fi
+
+    for DIR in $RUN $I2PTEMP; do
+        test -d $DIR && rm -rf $DIR
+        mkdir -p $DIR
+        chown -R $RUN_AS_USER $DIR
+    done
+    [ -d /var/log/i2p ] || mkdir /var/log/i2p
+    chown -R $RUN_AS_USER /var/log/i2p
+
+    echo -n "Starting $DESC..."
+    TZ=UTC su $RUN_AS_USER -c "$INSTALL_DIR/i2psvc $I2P_ARGS"
+    is_running
+    echo "[pid: $PID]"
+}
+
+stop(){
+    if is_running; then
+        echo -n "Stopping $DESC [pid: $PID] (this could take a while)."
+        kill "$PID" >/dev/null 2>&1
+        while kill -0 "$PID" > /dev/null 2>&1; do
+            echo -n .
+            sleep 1
+        done
+        rm -rf "$RUN" "$I2PTEMP"
+        echo done.
+        return 0
+    else
+        echo "$DESC is not running." >&2
+        return 1
+    fi
+}
+
+
+# Unset +u to allow the 'usage' text to be displayed
+set +u
+case "$1" in
+    start)
+        start
+        ;;
+    status)
+        if is_running; then
+            echo "$DESC is running [pid: $PID]" >&2
+        else
+            echo "$DESC is not running." >&2
+        fi
+        ;;
+    stop)
+        stop
+        ;;
+    graceful)
+        if is_running; then
+            kill -HUP $PID
+            echo "Graceful shutdown of $DESC initiated." >&2
+            echo "This may take up to 11 minutes." >&2
+        fi
+        ;;
+    dump)
+        if is_running; then
+            kill -3 $PID
+            echo "Threads dumped to $WRAPPERLOG" >&2
+        else
+            echo "$DESC is not running." >&2
+        fi
+        ;;
+    restart)
+        if is_running; then
+            stop
+            start
+        else
+            echo "$DESC is not running." >&2
+        fi
+        ;;
+    *)
+        echo "usage: $0 start|stop|status|restart|graceful|dump"
+        ;;
+esac
--- a/Slackware/i2p/readme.txt
+++ b/Slackware/i2p/readme.txt
@@ -1,47 +0,0 @@
-Building:
-The i2p package will be installed in /opt/i2p 
-
-If you want to change installation dir, change the variable INSTALL_DIR
-on i2p.SlackBuild and rebuild the package. You will also need to do the same
-in the base-i2p package.
-
-Installation and Upgrade:
-Probably you will never have to update i2p packages. However if you do,
-be sure to installpkg first, then removepkg or custom config files can
-be lost with upgradepkg. I2P has an auto-update function. However using
-installpkg then removepkg lowers the demand on the I2P network as a 
-whole, and is by far faster.
-
-After installpkg command, doinst.sh will execute a postinstallation script
-needed by I2P.  Be sure to also install the base-i2p package.
-
-Optional:
-
-chmod +x /etc/rc.d/rc.i2p only if you want it to start on boot and stop on
-shutdown.
-
-How to start I2P:
-
-Start I2P service with-
-sh /etc/rc.d/rc.i2p start
-
-Now tell your browser to user this proxy: localhost on port 4444 and open
-this page: http://localhost:7657/index.jsp
-Here you can configure I2P, watch network status and navigate anonimously.
-It's suggested to subscribe to various addressbook hosts so that you can
-get to the many available eepsites and other service on I2P. These are not
-set up by default for security reasons. 
-
-Please see the faqs on http://www.i2p2.i2p/ or http://www.i2p2.de/ on how
-to subscribe to the various addressbook services.
-
-To stop I2P:
- /etc/rc.d/rc.i2p stop
-
-
-For any additional information:
-
-Within I2P- http://www.i2p2.i2p/, http://forum.i2p/, http://zzz.i2p
-
-Internet (not reccomended!) - http://www.i2p2.de/, http://forum.i2p2.de/
-
--- a/Slackware/i2p/slack-desc
+++ b/Slackware/i2p/slack-desc
@@ -6,7 +6,7 @@
 # leave one space after the ':'.

   |-----handy-ruler----------------------------------------------------------|
-i2p: i2p (an anonymizing network)
+i2p: I2P (an anonymizing network)
 i2p:
 i2p: I2P is an anonymizing network, offering a simple layer that
 i2p: identity-sensitive applications can use to securely communicate. All
@@ -14,6 +14,6 @@ i2p: data is wrapped with several layers of encryption, and the network is
 i2p: both distributed and dynamic, with no trusted parties.
 i2p: Many applications are available that interface with I2P, including 
 i2p: mail, peer-peer file sharing, IRC chat, and others.
-i2p: WARNING: To upgrade installpkg FIRST _THEN_ removepkg.
-i2p: For more information, see:  http://www.i2p2.de/
+i2p: 
+i2p: For more information, see:  https://geti2p.net/
 i2p:
--- a/Slackware/i2p/slack-required
+++ b/Slackware/i2p/slack-required
@@ -1,4 +1 @@
-jre >= 5
-i2p-base >= 0.0.1
-bash >= 3.1.017
-
+jre >= 6
--- a/apps/BOB/.classpath
+++ b/apps/BOB/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/i2p_sdk"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ministreaming"/>
+	<classpathentry kind="output" path="build"/>
+</classpath>
--- a/installer/lib/.project
+++ b/installer/lib/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>lib</name>
+	<name>BOB</name>
 	<comment></comment>
 	<projects>
 	</projects>
--- a/apps/BOB/src/net/i2p/BOB/BOB.java
+++ b/apps/BOB/src/net/i2p/BOB/BOB.java
@@ -15,6 +15,8 @@
 */
 package net.i2p.BOB;

+import static net.i2p.app.ClientAppState.*;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -25,12 +27,17 @@ import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketTimeoutException;
+import java.net.URL;
+import java.util.Arrays;
 import java.util.Properties;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;

 import net.i2p.I2PAppContext;
+import net.i2p.app.*;
 import net.i2p.client.I2PClient;
-import net.i2p.util.Log;
+import net.i2p.util.I2PAppThread;
 import net.i2p.util.SimpleScheduler;
 import net.i2p.util.SimpleTimer2;

@@ -105,57 +112,78 @@ import net.i2p.util.SimpleTimer2;
 *
 * @author sponge
 */
-public class BOB {
+public class BOB implements Runnable, ClientApp {

 	public final static String PROP_CONFIG_LOCATION = "BOB.config";
 	public final static String PROP_BOB_PORT = "BOB.port";
 	public final static String PROP_BOB_HOST = "BOB.host";
 	public final static String PROP_CFG_VER = "BOB.CFG.VER";
-	private static NamedDB database;
-	private static Properties props = new Properties();
-	private static AtomicBoolean spin = new AtomicBoolean(true);
+
+	/** unused when started via the ClientApp interface */
+	private static BOB _bob;
+
+	private final NamedDB database;
+	private final Properties props = new Properties();
+	private final AtomicBoolean spin = new AtomicBoolean(true);
 	private static final String P_RUNNING = "RUNNING";
 	private static final String P_STARTING = "STARTING";
 	private static final String P_STOPPING = "STOPPING";
-	private static AtomicBoolean lock = new AtomicBoolean(false);
+	private final AtomicBoolean lock = new AtomicBoolean(false);
 	// no longer used.
 	// private static int maxConnections = 0;

-	/**
-	 * Log a warning
-	 *
-	 * @param arg
-	 */
-	public static void info(String arg) {
-		System.out.println("INFO:" + arg);
-		(new Log(BOB.class)).info(arg);
-	}
+	private final Logger _log;
+	private final ClientAppManager _mgr;
+	private final String[] _args;
+	private volatile ClientAppState _state = UNINITIALIZED;

-	/**
-	 * Log a warning
-	 *
-	 * @param arg
-	 */
-	public static void warn(String arg) {
-		System.out.println("WARNING:" + arg);
-		(new Log(BOB.class)).warn(arg);
-	}
-
-	/**
-	 * Log an error
-	 *
-	 * @param arg
-	 */
-	public static void error(String arg) {
-		System.out.println("ERROR: " + arg);
-		(new Log(BOB.class)).error(arg);
-	}
+	private volatile ServerSocket listener;
+	private volatile Thread _runner;

 	/**
 	 * Stop BOB gracefully
+	 * @deprecated unused
 	 */
-	public static void stop() {
-		spin.set(false);
+	public synchronized static void stop() {
+		if (_bob != null)
+			_bob.shutdown(null);
+	}
+
+	/**
+	 *  For ClientApp interface.
+	 *  Does NOT open the listener socket or start threads; caller must call startup()
+	 *
+	 *  @param mgr may be null
+	 *  @param args non-null
+	 *  @throws Exception on bad args
+	 *  @since 0.9.10
+	 */
+	public BOB(I2PAppContext context, ClientAppManager mgr, String[] args) {
+		// If we were run from command line, log to stdout
+		boolean logToStdout = false;
+		URL classResource = BOB.class.getResource("BOB.class");
+		if (classResource != null) {
+		    String classPath = classResource.toString();
+		    if (classPath.startsWith("jar")) {
+		        String manifestPath = classPath.substring(0, classPath.lastIndexOf("!") + 1) +
+		                "/META-INF/MANIFEST.MF";
+		        try {
+		            Manifest manifest = new Manifest(new URL(manifestPath).openStream());
+		            Attributes attrs = manifest.getMainAttributes();
+		            String mainClass = attrs.getValue("Main-Class");
+		            if ("net.i2p.BOB.Main".equals(mainClass))
+		                logToStdout = true;
+		        } catch (IOException ioe) {}
+		    }
+		}
+
+		_log = new Logger(context.logManager().getLog(BOB.class), logToStdout);
+
+		_mgr = mgr;
+		_args = args;
+		_state = INITIALIZED;
+		database = new NamedDB();
+		loadConfig();
 	}

 	/**
@@ -163,9 +191,23 @@ public class BOB {
 	 *
 	 * @param args
 	 */
-	public static void main(String[] args) {
-		database = new NamedDB();
-		ServerSocket listener = null;
+	public synchronized static void main(String[] args) {
+		try {
+			_bob = new BOB(I2PAppContext.getGlobalContext(), null, args);
+			_bob.startup();
+		} catch (RuntimeException e) {
+			e.printStackTrace();
+			throw e;
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw new RuntimeException(e);
+		}
+	}
+
+	/**
+	 * @since 0.9.10
+	 */
+	private void loadConfig() {
 		int i = 0;
 		boolean save = false;
 		// Set up all defaults to be passed forward to other threads.
@@ -176,116 +218,144 @@ public class BOB {
 		SimpleTimer2 Y2 = SimpleTimer2.getInstance();
 		i = Y1.hashCode();
 		i = Y2.hashCode();
-		Log _log = new Log(BOB.class);
-		try {
-			{
-				File cfg = new File(configLocation);
-				if (!cfg.isAbsolute()) {
-					cfg = new File(I2PAppContext.getGlobalContext().getConfigDir(), configLocation);
-				}
-				try {
-					FileInputStream fi = new FileInputStream(cfg);
-					props.load(fi);
-					fi.close();
-				} catch (FileNotFoundException fnfe) {
-					warn("Unable to load up the BOB config file " + cfg.getAbsolutePath() + ", Using defaults.");
-					warn(fnfe.toString());
-					save = true;
-				} catch (IOException ioe) {
-					warn("IOException on BOB config file " + cfg.getAbsolutePath() + ", using defaults.");
-					warn(ioe.toString());
-				}
+		{
+			File cfg = new File(configLocation);
+			if (!cfg.isAbsolute()) {
+				cfg = new File(I2PAppContext.getGlobalContext().getConfigDir(), configLocation);
 			}
-			// Global router and client API configurations that are missing are set to defaults here.
-			if (!props.containsKey(I2PClient.PROP_TCP_HOST)) {
-				props.setProperty(I2PClient.PROP_TCP_HOST, "localhost");
-				save = true;
-			}
-			if (!props.containsKey(I2PClient.PROP_TCP_PORT)) {
-				props.setProperty(I2PClient.PROP_TCP_PORT, "7654");
-				save = true;
-			}
-			if (!props.containsKey(PROP_BOB_PORT)) {
-				props.setProperty(PROP_BOB_PORT, "2827"); // 0xB0B
-				save = true;
-			}
-			if (!props.containsKey("inbound.length")) {
-				props.setProperty("inbound.length", "1");
-				save = true;
-			}
-			if (!props.containsKey("outbound.length")) {
-				props.setProperty("outbound.length", "1");
-				save = true;
-			}
-			if (!props.containsKey("inbound.lengthVariance")) {
-				props.setProperty("inbound.lengthVariance", "0");
-				save = true;
-			}
-			if (!props.containsKey("outbound.lengthVariance")) {
-				props.setProperty("outbound.lengthVariance", "0");
-				save = true;
-			}
-			if (!props.containsKey(PROP_BOB_HOST)) {
-				props.setProperty(PROP_BOB_HOST, "localhost");
-				save = true;
-			}
-			// PROP_RELIABILITY_NONE, PROP_RELIABILITY_BEST_EFFORT, PROP_RELIABILITY_GUARANTEED
-			if (!props.containsKey(PROP_CFG_VER)) {
-				props.setProperty(I2PClient.PROP_RELIABILITY, I2PClient.PROP_RELIABILITY_NONE);
-				props.setProperty(PROP_CFG_VER,"1");
-				save = true;
-			}
-			if (save) {
-				File cfg = new File(configLocation);
-				if (!cfg.isAbsolute()) {
-					cfg = new File(I2PAppContext.getGlobalContext().getConfigDir(), configLocation);
-				}
-				try {
-					warn("Writing new defaults file " + cfg.getAbsolutePath());
-					FileOutputStream fo = new FileOutputStream(cfg);
-					props.store(fo, cfg.getAbsolutePath());
-					fo.close();
-				} catch (IOException ioe) {
-					error("IOException on BOB config file " + cfg.getAbsolutePath() + ", " + ioe);
-				}
-			}
-
-			i = 0;
-			boolean g = false;
-			spin.set(true);
+			FileInputStream fi = null;
 			try {
-				info("BOB is now running.");
-				listener = new ServerSocket(Integer.parseInt(props.getProperty(PROP_BOB_PORT)), 10, InetAddress.getByName(props.getProperty(PROP_BOB_HOST)));
-				Socket server = null;
-				listener.setSoTimeout(500); // .5 sec
-				
-				while (spin.get()) {
-					//DoCMDS connection;
-
-					try {
-						server = listener.accept();
-						server.setKeepAlive(true);
-						g = true;
-					} catch (ConnectException ce) {
-						g = false;
-					} catch (SocketTimeoutException ste) {
-						g = false;
-					}
-
-					if (g) {
-						DoCMDS conn_c = new DoCMDS(spin, lock, server, props, database, _log);
-						Thread t = new Thread(conn_c);
-						t.setName("BOB.DoCMDS " + i);
-						t.start();
-						i++;
-					}
-				}
+				fi = new FileInputStream(cfg);
+				props.load(fi);
+			} catch (FileNotFoundException fnfe) {
+				_log.warn("Unable to load up the BOB config file " + cfg.getAbsolutePath() + ", Using defaults.", fnfe);
+				save = true;
 			} catch (IOException ioe) {
-				error("IOException on socket listen: " + ioe);
-				ioe.printStackTrace();
+				_log.warn("IOException on BOB config file " + cfg.getAbsolutePath() + ", using defaults.", ioe);
+			} finally {
+				if (fi != null) try { fi.close(); } catch (IOException ioe) {}
 			}
+		}
+		// Global router and client API configurations that are missing are set to defaults here.
+		if (!props.containsKey(I2PClient.PROP_TCP_HOST)) {
+			props.setProperty(I2PClient.PROP_TCP_HOST, "localhost");
+			save = true;
+		}
+		if (!props.containsKey(I2PClient.PROP_TCP_PORT)) {
+			props.setProperty(I2PClient.PROP_TCP_PORT, "7654");
+			save = true;
+		}
+		if (!props.containsKey(PROP_BOB_PORT)) {
+			props.setProperty(PROP_BOB_PORT, "2827"); // 0xB0B
+			save = true;
+		}
+		if (!props.containsKey("inbound.length")) {
+			props.setProperty("inbound.length", "1");
+			save = true;
+		}
+		if (!props.containsKey("outbound.length")) {
+			props.setProperty("outbound.length", "1");
+			save = true;
+		}
+		if (!props.containsKey("inbound.lengthVariance")) {
+			props.setProperty("inbound.lengthVariance", "0");
+			save = true;
+		}
+		if (!props.containsKey("outbound.lengthVariance")) {
+			props.setProperty("outbound.lengthVariance", "0");
+			save = true;
+		}
+		if (!props.containsKey(PROP_BOB_HOST)) {
+			props.setProperty(PROP_BOB_HOST, "localhost");
+			save = true;
+		}
+		// PROP_RELIABILITY_NONE, PROP_RELIABILITY_BEST_EFFORT, PROP_RELIABILITY_GUARANTEED
+		if (!props.containsKey(PROP_CFG_VER)) {
+			props.setProperty(I2PClient.PROP_RELIABILITY, I2PClient.PROP_RELIABILITY_NONE);
+			props.setProperty(PROP_CFG_VER,"1");
+			save = true;
+		}
+		if (save) {
+			File cfg = new File(configLocation);
+			if (!cfg.isAbsolute()) {
+				cfg = new File(I2PAppContext.getGlobalContext().getConfigDir(), configLocation);
+			}
+			FileOutputStream fo = null;
+			try {
+				_log.warn("Writing new defaults file " + cfg.getAbsolutePath());
+				fo = new FileOutputStream(cfg);
+				props.store(fo, cfg.getAbsolutePath());
+			} catch (IOException ioe) {
+				_log.error("IOException on BOB config file " + cfg.getAbsolutePath(), ioe);
+			} finally {
+				if (fo != null) try { fo.close(); } catch (IOException ioe) {}
+			}
+		}
+	}
+
+	/**
+	 * @since 0.9.10
+	 */
+	private void startListener() throws IOException {
+		listener = new ServerSocket(Integer.parseInt(props.getProperty(PROP_BOB_PORT)), 10, InetAddress.getByName(props.getProperty(PROP_BOB_HOST)));
+		listener.setSoTimeout(500); // .5 sec
+	}
+
+	/**
+	 * @since 0.9.10
+	 */
+	private void startThread() {
+		I2PAppThread t = new I2PAppThread(this, "BOBListener");
+		t.start();
+		_runner = t;
+	}
+
+	/**
+	 * @since 0.9.10
+	 */
+	public void run() {
+		if (listener == null) return;
+		changeState(RUNNING);
+		_log.info("BOB is now running.");
+		if (_mgr != null)
+			_mgr.register(this);
+
+		int i = 0;
+		boolean g = false;
+		spin.set(true);
+		try {
+			Socket server = null;
+
+			while (spin.get()) {
+				//DoCMDS connection;
+
+				try {
+					server = listener.accept();
+					server.setKeepAlive(true);
+					g = true;
+				} catch (ConnectException ce) {
+					g = false;
+				} catch (SocketTimeoutException ste) {
+					g = false;
+				}
+
+				if (g) {
+					DoCMDS conn_c = new DoCMDS(spin, lock, server, props, database, _log);
+					Thread t = new Thread(conn_c);
+					t.setName("BOB.DoCMDS " + i);
+					t.start();
+					i++;
+				}
+			}
+			changeState(STOPPING);
+		} catch (Exception e) {
+			if (spin.get())
+				_log.error("Unexpected error while listening for connections", e);
+			else
+				e = null;
+			changeState(STOPPING, e);
 		} finally {
-			info("BOB is now shutting down...");
+			_log.info("BOB is now shutting down...");
 			// Clean up everything.
 			try {
 				listener.close();
@@ -308,7 +378,7 @@ public class BOB {
 					database.releaseReadLock();
 					database.getWriteLock();
 					nickinfo.getWriteLock();
-					nickinfo.add(P_STOPPING, new Boolean(true));
+					nickinfo.add(P_STOPPING, Boolean.valueOf(true));
 					nickinfo.releaseWriteLock();
 					database.releaseWriteLock();
 				} else {
@@ -316,8 +386,8 @@ public class BOB {
 					database.releaseReadLock();
 				}
 			}
-			info("BOB is now stopped.");
-
+			changeState(STOPPED);
+			_log.info("BOB is now stopped.");
 		}
 	}

@@ -369,4 +439,86 @@ public class BOB {
 			waitjoin(groups[i], level + 1, groups[i].getName());
 		}
 	}
+
+	////// begin ClientApp interface
+
+	/**
+	 * @since 0.9.10
+	 */
+	@Override
+	public void startup() throws IOException {
+		if (_state != INITIALIZED)
+			return;
+		changeState(STARTING);
+		try {
+			startListener();
+		} catch (IOException e) {
+			_log.error("Error starting BOB on"
+					+ props.getProperty(PROP_BOB_HOST)
+					+ ":" + props.getProperty(PROP_BOB_PORT), e);
+			changeState(START_FAILED, e);
+			throw e;
+		}
+		startThread();
+	}
+
+	/**
+	 * @since 0.9.10
+	 */
+	@Override
+	public void shutdown(String[] args) {
+		if (_state != RUNNING)
+			return;
+		changeState(STOPPING);
+		spin.set(false);
+		if (_runner != null)
+			_runner.interrupt();
+		else
+			changeState(STOPPED);
+	}
+
+	/**
+	 * @since 0.9.10
+	 */
+	@Override
+	public ClientAppState getState() {
+		return _state;
+	}
+
+	/**
+	 * @since 0.9.10
+	 */
+	@Override
+	public String getName() {
+		return "BOB";
+	}
+
+	/**
+	 * @since 0.9.10
+	 */
+	@Override
+	public String getDisplayName() {
+		return "BOB " + Arrays.toString(_args);
+	}
+
+	////// end ClientApp interface
+	////// begin ClientApp helpers
+
+	/**
+	 *  @since 0.9.10
+	 */
+	private void changeState(ClientAppState state) {
+		changeState(state, null);
+	}
+
+	/**
+	 *  @since 0.9.10
+	 */
+	private synchronized void changeState(ClientAppState state, Exception e) {
+		_state = state;
+		if (_mgr != null)
+			_mgr.notify(this, state, null, e);
+	}
+
+	////// end ClientApp helpers
 }
--- a/apps/BOB/src/net/i2p/BOB/DoCMDS.java
+++ b/apps/BOB/src/net/i2p/BOB/DoCMDS.java
@@ -31,7 +31,6 @@ import net.i2p.client.I2PClientFactory;
 //import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
 //import net.i2p.i2ptunnel.I2PTunnel;
-import net.i2p.util.Log;
 // needed only for debugging.
 // import java.util.logging.Level;
 // import java.util.logging.Logger;
@@ -56,7 +55,7 @@ public class DoCMDS implements Runnable {
 	private ByteArrayOutputStream prikey;
 	private boolean dk,  ns,  ip,  op;
 	private NamedDB nickinfo;
-	private Log _log;
+	private Logger _log;
 	private AtomicBoolean LIVE;
 	private AtomicBoolean lock;
 	/* database strings */
@@ -164,7 +163,7 @@ public class DoCMDS implements Runnable {
 	 * @param database
 	 * @param _log
 	 */
-	DoCMDS(AtomicBoolean LIVE, AtomicBoolean lock, Socket server, Properties props, NamedDB database, Log _log) {
+	DoCMDS(AtomicBoolean LIVE, AtomicBoolean lock, Socket server, Properties props, NamedDB database, Logger _log) {
 		this.lock = lock;
 		this.LIVE = LIVE;
 		this.server = server;
@@ -388,7 +387,7 @@ public class DoCMDS implements Runnable {
 	 * Does the base64 information look OK
 	 *
 	 * @param data
-	 * @return
+	 * @return OK
 	 */
 	private boolean is64ok(String data) {
 		try {
@@ -606,7 +605,7 @@ public class DoCMDS implements Runnable {
 														break die;
 													}
 												} catch (I2PException ipe) {
-													BOB.error("Error generating keys" + ipe);
+													_log.error("Error generating keys", ipe);
 													out.println("ERROR generating keys");
 												}

@@ -665,7 +664,7 @@ public class DoCMDS implements Runnable {
 													break die;
 												}
 												try {
-													nickinfo.add(P_QUIET, new Boolean(Boolean.parseBoolean(Arg) == true));
+													nickinfo.add(P_QUIET, Boolean.valueOf(Arg));
 												} catch (Exception ex) {
 													try {
 														wunlock();
@@ -817,10 +816,10 @@ public class DoCMDS implements Runnable {
 										try {
 											database.add(Arg, nickinfo);
 											nickinfo.add(P_NICKNAME, Arg);
-											nickinfo.add(P_STARTING, new Boolean(false));
-											nickinfo.add(P_RUNNING, new Boolean(false));
-											nickinfo.add(P_STOPPING, new Boolean(false));
-											nickinfo.add(P_QUIET, new Boolean(false));
+											nickinfo.add(P_STARTING, Boolean.valueOf(false));
+											nickinfo.add(P_RUNNING, Boolean.valueOf(false));
+											nickinfo.add(P_STOPPING, Boolean.valueOf(false));
+											nickinfo.add(P_QUIET, Boolean.valueOf(false));
 											nickinfo.add(P_INHOST, "localhost");
 											nickinfo.add(P_OUTHOST, "localhost");
 											Properties Q = new Properties();
@@ -989,7 +988,7 @@ public class DoCMDS implements Runnable {
 													prt = Integer.parseInt(Arg);
 													if (prt > 1 && prt < 65536) {
 														try {
-															nickinfo.add(P_INPORT, new Integer(prt));
+															nickinfo.add(P_INPORT, Integer.valueOf(prt));
 														} catch (Exception ex) {
 															try {
 																wunlock();
@@ -1076,7 +1075,7 @@ public class DoCMDS implements Runnable {
 													prt = Integer.parseInt(Arg);
 													if (prt > 1 && prt < 65536) {
 														try {
-															nickinfo.add(P_OUTPORT, new Integer(prt));
+															nickinfo.add(P_OUTPORT, Integer.valueOf(prt));
 														} catch (Exception ex) {
 															try {
 																wunlock();
@@ -1355,7 +1354,7 @@ public class DoCMDS implements Runnable {
 													break die;
 												}

-												nickinfo.add(P_STOPPING, new Boolean(true));
+												nickinfo.add(P_STOPPING, Boolean.valueOf(true));
 												try {
 													wunlock();

--- a/apps/BOB/src/net/i2p/BOB/I2Plistener.java
+++ b/apps/BOB/src/net/i2p/BOB/I2Plistener.java
@@ -22,7 +22,6 @@ import net.i2p.I2PException;
 import net.i2p.client.streaming.I2PServerSocket;
 import net.i2p.client.streaming.I2PSocket;
 import net.i2p.client.streaming.I2PSocketManager;
-import net.i2p.util.Log;

 /**
 * Listen on I2P and connect to TCP
@@ -32,7 +31,7 @@ import net.i2p.util.Log;
 public class I2Plistener implements Runnable {

 	private NamedDB info,  database;
-	private Log _log;
+	private Logger _log;
 	public I2PSocketManager socketManager;
 	public I2PServerSocket serverSocket;
 	private AtomicBoolean lives;
@@ -45,7 +44,7 @@ public class I2Plistener implements Runnable {
 	 * @param database
 	 * @param _log
 	 */
-	I2Plistener(I2PServerSocket SS, I2PSocketManager S, NamedDB info, NamedDB database, Log _log, AtomicBoolean lives) {
+	I2Plistener(I2PServerSocket SS, I2PSocketManager S, NamedDB info, NamedDB database, Logger _log, AtomicBoolean lives) {
 		this.database = database;
 		this.info = info;
 		this._log = _log;
--- a/apps/BOB/src/net/i2p/BOB/Lifted.java
+++ b/apps/BOB/src/net/i2p/BOB/Lifted.java
@@ -15,7 +15,7 @@
 */
 package net.i2p.BOB;

-import java.util.Enumeration;
+import java.util.Map;
 import java.util.Properties;

 /**
@@ -39,10 +39,8 @@ public class Lifted {
 	 *
 	 **/
 	public static void copyProperties(Properties src_prop, Properties dest_prop) {
-		for (Enumeration propertyNames = src_prop.propertyNames();
-			propertyNames.hasMoreElements();) {
-			Object key = propertyNames.nextElement();
-			dest_prop.put(key, src_prop.get(key));
+		for (Map.Entry<Object, Object> e : src_prop.entrySet()) {
+			dest_prop.put((String)e.getKey(), (String)e.getValue());
 		}
 	}
 }
--- a/apps/BOB/src/net/i2p/BOB/Logger.java
+++ b/apps/BOB/src/net/i2p/BOB/Logger.java
@@ -0,0 +1,44 @@
+package net.i2p.BOB;
+
+import net.i2p.util.Log;
+
+public class Logger {
+	public Log log;
+	private boolean logToStdout;
+
+	public Logger(Log log, boolean logToStdout) {
+		this.log = log;
+		this.logToStdout = logToStdout;
+	}
+
+	public void info(String msg) {
+		if (logToStdout)
+			System.out.println("INFO: " + msg);
+		if (log.shouldLog(Log.INFO))
+			log.info(msg);
+	}
+
+	public void warn(String msg) {
+		warn(msg, null);
+	}
+
+	public void warn(String msg, Throwable e) {
+		if (logToStdout) {
+			System.out.println("WARNING: " + msg);
+			if (e != null)
+				e.printStackTrace();
+		}
+		if (log.shouldLog(Log.WARN))
+			log.warn(msg, e);
+	}
+
+	public void error(String msg, Throwable e) {
+		if (logToStdout) {
+			System.out.println("ERROR: " + msg);
+			if (e != null)
+				e.printStackTrace();
+		}
+		if (log.shouldLog(Log.ERROR))
+			log.error(msg, e);
+	}
+}
--- a/apps/BOB/src/net/i2p/BOB/MUXlisten.java
+++ b/apps/BOB/src/net/i2p/BOB/MUXlisten.java
@@ -22,6 +22,7 @@ import java.net.ServerSocket;
 import java.util.Properties;
 import java.util.concurrent.atomic.AtomicBoolean;
 import net.i2p.I2PException;
+import net.i2p.client.I2PClient;
 import net.i2p.client.streaming.I2PServerSocket;
 import net.i2p.client.streaming.I2PSocketManager;
 import net.i2p.client.streaming.I2PSocketManagerFactory;
@@ -36,7 +37,7 @@ import net.i2p.util.Log;
 public class MUXlisten implements Runnable {

 	private NamedDB database,  info;
-	private Log _log;
+	private Logger _log;
 	private I2PSocketManager socketManager;
 	private ByteArrayInputStream prikey;
 	private ThreadGroup tg;
@@ -57,7 +58,7 @@ public class MUXlisten implements Runnable {
 	 * @throws net.i2p.I2PException
 	 * @throws java.io.IOException
 	 */
-	MUXlisten(AtomicBoolean lock, NamedDB database, NamedDB info, Log _log) throws I2PException, IOException, RuntimeException {
+	MUXlisten(AtomicBoolean lock, NamedDB database, NamedDB info, Logger _log) throws I2PException, IOException, RuntimeException {
 		try {
 			int port = 0;
 			InetAddress host = null;
@@ -70,7 +71,7 @@ public class MUXlisten implements Runnable {

 			this.database.getWriteLock();
 			this.info.getWriteLock();
-			this.info.add("STARTING", new Boolean(true));
+			this.info.add("STARTING", Boolean.valueOf(true));
 			this.info.releaseWriteLock();
 			this.database.releaseWriteLock();
 			this.database.getReadLock();
@@ -96,15 +97,25 @@ public class MUXlisten implements Runnable {
 			this.database.releaseReadLock();
 			this.info.releaseReadLock();

+			String i2cpHost = Q.getProperty(I2PClient.PROP_TCP_HOST, "127.0.0.1");
+			int i2cpPort = 7654;
+			String i2cpPortStr = Q.getProperty(I2PClient.PROP_TCP_PORT, "7654");
+			try {
+				i2cpPort = Integer.parseInt(i2cpPortStr);
+			} catch (NumberFormatException nfe) {
+				throw new IllegalArgumentException("Invalid I2CP port specified [" + i2cpPortStr + "]");
+			}
+
 			if (this.come_in) {
 				this.listener = new ServerSocket(port, backlog, host);
 			}
-			socketManager = I2PSocketManagerFactory.createManager(prikey, Q);
+			socketManager = I2PSocketManagerFactory.createManager(
+					prikey, i2cpHost, i2cpPort, Q);
 		} catch (IOException e) {
 			// Something went bad.
 			this.database.getWriteLock();
 			this.info.getWriteLock();
-			this.info.add("STARTING", new Boolean(false));
+			this.info.add("STARTING", Boolean.valueOf(false));
 			this.info.releaseWriteLock();
 			this.database.releaseWriteLock();
 			throw new IOException(e.toString());
@@ -112,7 +123,7 @@ public class MUXlisten implements Runnable {
 			// Something went bad.
 			this.database.getWriteLock();
 			this.info.getWriteLock();
-			this.info.add("STARTING", new Boolean(false));
+			this.info.add("STARTING", Boolean.valueOf(false));
 			this.info.releaseWriteLock();
 			this.database.releaseWriteLock();
 			throw new RuntimeException(e);
@@ -120,7 +131,7 @@ public class MUXlisten implements Runnable {
 			// Something else went bad.
 			this.database.getWriteLock();
 			this.info.getWriteLock();
-			this.info.add("STARTING", new Boolean(false));
+			this.info.add("STARTING", Boolean.valueOf(false));
 			this.info.releaseWriteLock();
 			this.database.releaseWriteLock();
 			e.printStackTrace();
@@ -160,7 +171,7 @@ public class MUXlisten implements Runnable {
 			try {
 				wlock();
 				try {
-					info.add("RUNNING", new Boolean(true));
+					info.add("RUNNING", Boolean.valueOf(true));
 				} catch (Exception e) {
 					lock.set(false);
 					wunlock();
@@ -204,7 +215,7 @@ public class MUXlisten implements Runnable {
 						try {
 							wlock();
 							try {
-								info.add("STARTING", new Boolean(false));
+								info.add("STARTING", Boolean.valueOf(false));
 							} catch (Exception e) {
 								wunlock();
 								break quit;
@@ -258,9 +269,9 @@ public class MUXlisten implements Runnable {
 			try {
 				wlock();
 				try {
-					info.add("STARTING", new Boolean(false));
-					info.add("STOPPING", new Boolean(true));
-					info.add("RUNNING", new Boolean(false));
+					info.add("STARTING", Boolean.valueOf(false));
+					info.add("STOPPING", Boolean.valueOf(true));
+					info.add("RUNNING", Boolean.valueOf(false));
 				} catch (Exception e) {
 					lock.set(false);
 					wunlock();
@@ -309,9 +320,9 @@ public class MUXlisten implements Runnable {
 			try {
 				wlock();
 				try {
-					info.add("STARTING", new Boolean(false));
-					info.add("STOPPING", new Boolean(false));
-					info.add("RUNNING", new Boolean(false));
+					info.add("STARTING", Boolean.valueOf(false));
+					info.add("STOPPING", Boolean.valueOf(false));
+					info.add("RUNNING", Boolean.valueOf(false));
 				} catch (Exception e) {
 					lock.set(false);
 					wunlock();
--- a/apps/BOB/src/net/i2p/BOB/NamedDB.java
+++ b/apps/BOB/src/net/i2p/BOB/NamedDB.java
@@ -23,7 +23,7 @@ package net.i2p.BOB;
 public class NamedDB {

 	private volatile Object[][] data;
-	private volatile int index,  writersWaiting,  readers;
+	private int index,  writersWaiting,  readers;

 	/**
 	 * make initial NULL object
@@ -31,7 +31,6 @@ public class NamedDB {
 	 */
 	public NamedDB() {
 		this.data = new Object[1][2];
-		this.index = this.writersWaiting = this.readers = 0;
 	}

 	synchronized public void getReadLock() {
--- a/apps/BOB/src/net/i2p/BOB/TCPio.java
+++ b/apps/BOB/src/net/i2p/BOB/TCPio.java
@@ -116,7 +116,6 @@ public class TCPio implements Runnable {
 				Aout.close();
 			} catch (IOException ex) {
 			}
-			return;
 		}
 	}
 }
--- a/apps/BOB/src/net/i2p/BOB/TCPlistener.java
+++ b/apps/BOB/src/net/i2p/BOB/TCPlistener.java
@@ -22,7 +22,6 @@ import java.net.SocketTimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import net.i2p.client.streaming.I2PServerSocket;
 import net.i2p.client.streaming.I2PSocketManager;
-import net.i2p.util.Log;

 /**
 * Listen on TCP port and connect to I2P
@@ -32,7 +31,7 @@ import net.i2p.util.Log;
 public class TCPlistener implements Runnable {

 	private NamedDB info,  database;
-	private Log _log;
+	private Logger _log;
 	public I2PSocketManager socketManager;
 	public I2PServerSocket serverSocket;
 	private ServerSocket listener;
@@ -45,7 +44,7 @@ public class TCPlistener implements Runnable {
 	 * @param database
 	 * @param _log
 	 */
-	TCPlistener(ServerSocket listener, I2PSocketManager S, NamedDB info, NamedDB database, Log _log, AtomicBoolean lives) {
+	TCPlistener(ServerSocket listener, I2PSocketManager S, NamedDB info, NamedDB database, Logger _log, AtomicBoolean lives) {
 		this.database = database;
 		this.info = info;
 		this._log = _log;
--- a/apps/BOB/src/net/i2p/BOB/TCPtoI2P.java
+++ b/apps/BOB/src/net/i2p/BOB/TCPtoI2P.java
@@ -70,12 +70,10 @@ public class TCPtoI2P implements Runnable {
 	 * @throws IOException
 	 */
 	private static String lnRead(InputStream in) throws IOException {
-		String S;
+		StringBuilder builder = new StringBuilder();
 		int b;
 		char c;

-		S = new String();
-
 		while (true) {
 			b = in.read();
 			if (b == 13) {
@@ -87,9 +85,9 @@ public class TCPtoI2P implements Runnable {
 				break;
 			}
 			c = (char) (b & 0x7f); // We only care about ASCII
-			S = new String(S + c);
+			builder.append(c);
 		}
-		return S;
+		return builder.toString();
 	}

 	/**
@@ -101,7 +99,7 @@ public class TCPtoI2P implements Runnable {
 	 */
 	private void Emsg(String e, OutputStream out) throws IOException {
 		// Debugging		System.out.println("ERROR TCPtoI2P: " + e);
-		out.write("ERROR ".concat(e).getBytes());
+		out.write("ERROR ".concat(e).getBytes("UTF-8"));
 		out.write(13);
 		out.write(10);
 		out.flush();
--- a/apps/BOB/src/net/i2p/BOB/UDPIOthread.java
+++ b/apps/BOB/src/net/i2p/BOB/UDPIOthread.java
@@ -106,8 +106,10 @@ public class UDPIOthread implements I2PSessionListener, Runnable {
 		//		_log.debug("Message available: id = " + msgId + " size = " + size);
 		try {
 			byte msg[] = session.receiveMessage(msgId);
-			out.write(msg);
-			out.flush();
+			if (msg != null) {
+				out.write(msg);
+				out.flush();
+			}
 		} catch (I2PSessionException ise) {
 			up = false;
 		} catch (IOException ioe) {
--- a/apps/addressbook/.classpath
+++ b/apps/addressbook/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="java/src"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/i2p_sdk"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="/jetty/jettylib/javax.servlet.jar"/>
+	<classpathentry kind="output" path="build"/>
+</classpath>
--- a/apps/addressbook/.project
+++ b/apps/addressbook/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>addressbook</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
--- a/apps/addressbook/build.xml
+++ b/apps/addressbook/build.xml
@@ -7,6 +7,7 @@
 	<property name="jar" value="addressbook.jar"/>
 	<property name="war" value="addressbook.war"/>
 	<property name="javac.compilerargs" value="" />
+	<property name="javac.version" value="1.6" />
 	
 	<target name="init">
 		<mkdir dir="${build}"/>
@@ -24,6 +25,18 @@
            <typefound name="depend" />
        </condition>
        <target name="depend" if="depend.available">
+            <depend
+                cache="../../build"
+                srcdir="${src}"
+                destdir="${build}" >
+                <!-- Depend on classes instead of jars where available -->
+                <classpath>
+                    <pathelement location="../../core/java/build/obj" />
+                </classpath>
+            </depend>
+        </target>
+
+        <target name="dependServlet" if="depend.available">
            <depend
                cache="../../build"
                srcdir="${src}"
@@ -37,9 +50,22 @@
        </target>

 	<target name="compile" depends="init, depend">
-		<javac debug="true" deprecation="on" source="1.5" target="1.5" 
+            <javac debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
                       includeAntRuntime="false"
-                       srcdir="${src}" destdir="${build}">
+                       srcdir="${src}" destdir="${build}"
+                       excludes="net/i2p/addressbook/Servlet.java">
+            <compilerarg line="${javac.compilerargs}" />
+            <classpath>
+                <pathelement location="../../core/java/build/i2p.jar" />
+            </classpath>
+		</javac>
+	</target>
+
+	<target name="compileServlet" depends="init, dependServlet, compile">
+            <javac debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
+                       includeAntRuntime="false"
+                       srcdir="${src}" destdir="${build}"
+                       includes="net/i2p/addressbook/Servlet.java">
            <compilerarg line="${javac.compilerargs}" />
            <classpath>
                <pathelement location="../../core/java/build/i2p.jar" />
@@ -48,11 +74,11 @@
 		</javac>
 	</target>

-        <!-- unused for now, as we oddly ship addressbook as a .war -->
+        <!-- unused for now (except for Android), as we oddly ship addressbook as a .war -->
 	<target name="jar" depends="compile, changes">
-		<jar basedir="${build}" destfile="${dist}/${jar}">
 		<!-- set if unset -->
 		<property name="workspace.changes" value="" />
+		<jar basedir="${build}" destfile="${dist}/${jar}">
 			<manifest>
 				<attribute name="Main-Class" value="addressbook.Daemon"/>
 				<attribute name="Implementation-Version" value="${full.version}" />
@@ -64,7 +90,7 @@
 		</jar>
 	</target>
 	
-	<target name="war" depends="compile, changes, warUpToDate" unless="war.uptodate">
+	<target name="war" depends="compileServlet, changes, warUpToDate" unless="war.uptodate">
 		<mkdir dir="${dist}/tmp"/>
 		<mkdir dir="${dist}/tmp/WEB-INF"/>
 		<mkdir dir="${dist}/tmp/WEB-INF/classes"/>
--- a/apps/addressbook/java/src/net/i2p/addressbook/AddressBook.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/AddressBook.java
@@ -120,11 +120,11 @@ class AddressBook {
                subscription.setLastFetched(I2PAppContext.getGlobalContext().clock().now());
                subf = tmp;
            } else {
-                a = Collections.EMPTY_MAP;
+                a = Collections.emptyMap();
                tmp.delete();
            }
        } catch (IOException ioe) {
-            a = Collections.EMPTY_MAP;
+            a = Collections.emptyMap();
        }
        this.addresses = a;
        this.subFile = subf;
@@ -148,7 +148,7 @@ class AddressBook {
        try {
            a = ConfigParser.parse(file);
        } catch (IOException exp) {
-            a = new HashMap();
+            a = new HashMap<String, String>();
        }
        this.addresses = a;
        this.subFile = null;
@@ -260,7 +260,7 @@ class AddressBook {
     *            An AddressBook to merge with.
     * @param overwrite True to overwrite
     * @param log
-     *            The log to write messages about new addresses or conflicts to.
+     *            The log to write messages about new addresses or conflicts to. May be null.
     *
     * @throws IllegalStateException if this was created with the Subscription constructor.
     */
--- a/apps/addressbook/java/src/net/i2p/addressbook/ConfigIterator.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/ConfigIterator.java
@@ -138,7 +138,8 @@ class ConfigIterator implements Iterator<Map.Entry<String, String>> {
        public boolean equals(Object o) {
            if (!(o instanceof Map.Entry))
                return false;
-            Map.Entry e = (Map.Entry) o;
+            @SuppressWarnings("unchecked")
+            Map.Entry<Object, Object> e = (Map.Entry<Object, Object>) o;
            return key.equals(e.getKey()) && value.equals(e.getValue());
        }
    }
--- a/apps/addressbook/java/src/net/i2p/addressbook/ConfigParser.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/ConfigParser.java
@@ -64,10 +64,11 @@ class ConfigParser {
        if (inputLine.startsWith(";")) {
            return "";
        }
-        if (inputLine.split("#").length > 0) {
-            return inputLine.split("#")[0];
+        int hash = inputLine.indexOf('#');
+        if (hash >= 0) {
+            return inputLine.substring(0, hash);
        } else {
-            return "";
+            return inputLine;
        }
    }

@@ -87,11 +88,11 @@ class ConfigParser {
     *  
     */
    public static Map<String, String>  parse(BufferedReader input) throws IOException {
-        Map<String, String>  result = new HashMap();
+        Map<String, String>  result = new HashMap<String, String>();
        String inputLine;
        inputLine = input.readLine();
        while (inputLine != null) {
-            inputLine = ConfigParser.stripComments(inputLine);
+            inputLine = stripComments(inputLine);
            String[] splitLine = inputLine.split("=");
            if (splitLine.length == 2) {
                result.put(splitLine[0].trim().toLowerCase(Locale.US), splitLine[1].trim());
@@ -116,7 +117,7 @@ class ConfigParser {
        FileInputStream fileStream = new FileInputStream(file);
        BufferedReader input = new BufferedReader(new InputStreamReader(
                fileStream));
-        Map<String, String>  rv = ConfigParser.parse(input);
+        Map<String, String>  rv = parse(input);
        try {
            fileStream.close();
        } catch (IOException ioe) {}
@@ -136,7 +137,7 @@ class ConfigParser {
    public static Map<String, String>  parse(String string) throws IOException {
        StringReader stringReader = new StringReader(string);
        BufferedReader input = new BufferedReader(stringReader);
-        return ConfigParser.parse(input);
+        return parse(input);
    }
    
    /**
@@ -153,7 +154,7 @@ class ConfigParser {
    public static Map<String, String>  parse(File file, Map<String, String>  map) {
        Map<String, String>  result;
        try {
-            result = ConfigParser.parse(file);
+            result = parse(file);
            for (Map.Entry<String, String> entry : map.entrySet()) {
                if (!result.containsKey(entry.getKey()))
                    result.put(entry.getKey(), entry.getValue());
@@ -161,7 +162,7 @@ class ConfigParser {
        } catch (IOException exp) {
            result = map;
            try {
-                ConfigParser.write(result, file);
+                write(result, file);
            } catch (IOException exp2) {
            }
        }
@@ -179,10 +180,10 @@ class ConfigParser {
     */
    public static List<String> parseSubscriptions(BufferedReader input)
            throws IOException {
-        List<String> result = new LinkedList();
+        List<String> result = new LinkedList<String>();
        String inputLine = input.readLine();
        while (inputLine != null) {
-            inputLine = ConfigParser.stripComments(inputLine).trim();
+            inputLine = stripComments(inputLine).trim();
            if (inputLine.length() > 0) {
                result.add(inputLine);
            }
@@ -205,7 +206,7 @@ class ConfigParser {
        FileInputStream fileStream = new FileInputStream(file);
        BufferedReader input = new BufferedReader(new InputStreamReader(
                fileStream));
-        List<String> rv = ConfigParser.parseSubscriptions(input);
+        List<String> rv = parseSubscriptions(input);
        try {
            fileStream.close();
        } catch (IOException ioe) {}
@@ -224,7 +225,7 @@ class ConfigParser {
    public static List<String> parseSubscriptions(String string) throws IOException {
        StringReader stringReader = new StringReader(string);
        BufferedReader input = new BufferedReader(stringReader);
-        return ConfigParser.parseSubscriptions(input);
+        return parseSubscriptions(input);
    }
    
    /**
@@ -234,18 +235,30 @@ class ConfigParser {
     * 
     * @param file
     *            A File to attempt to parse.
-     * @param list list of files to parse
+     * @param list The default subscriptions to be saved and returned if the file cannot be read
     * @return A List consisting of one element for each line in file, or if
     *         file cannot be read, list.
     */
    public static List<String> parseSubscriptions(File file, List<String> list) {
        List<String> result;
        try {
-            result = ConfigParser.parseSubscriptions(file);
+            result = parseSubscriptions(file);
+            // Fix up files that contain the old default
+            // which was changed in 0.9.11
+            if (result.remove(Daemon.OLD_DEFAULT_SUB)) {
+                for (String sub : list) {
+                    if (!result.contains(sub))
+                        result.add(sub);
+                }
+                try {
+                    writeSubscriptions(result, file);
+                    // TODO log
+                } catch (IOException ioe) {}
+            }
        } catch (IOException exp) {
            result = list;
            try {
-                ConfigParser.writeSubscriptions(result, file);
+                writeSubscriptions(result, file);
            } catch (IOException exp2) {
            }
        }
@@ -289,8 +302,7 @@ class ConfigParser {
        boolean success = false;
        if (!isWindows) {
            File tmp = SecureFile.createTempFile("temp-", ".tmp", file.getAbsoluteFile().getParentFile());
-            ConfigParser
-                .write(map, new BufferedWriter(new OutputStreamWriter(new SecureFileOutputStream(tmp), "UTF-8")));
+            write(map, new BufferedWriter(new OutputStreamWriter(new SecureFileOutputStream(tmp), "UTF-8")));
            success = tmp.renameTo(file);
            if (!success) {
                tmp.delete();
@@ -299,8 +311,7 @@ class ConfigParser {
        }
        if (!success) {
            // hmm, that didn't work, try it the old way
-            ConfigParser
-                .write(map, new BufferedWriter(new OutputStreamWriter(new SecureFileOutputStream(file), "UTF-8")));
+            write(map, new BufferedWriter(new OutputStreamWriter(new SecureFileOutputStream(file), "UTF-8")));
        }
    }

@@ -337,7 +348,7 @@ class ConfigParser {
     */
    public static void writeSubscriptions(List<String> list, File file)
            throws IOException {
-        ConfigParser.writeSubscriptions(list, new BufferedWriter(
+        writeSubscriptions(list, new BufferedWriter(
                new OutputStreamWriter(new SecureFileOutputStream(file), "UTF-8")));
    }

--- a/apps/addressbook/java/src/net/i2p/addressbook/Daemon.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/Daemon.java
@@ -37,6 +37,7 @@ import net.i2p.client.naming.SingleFileNamingService;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
 import net.i2p.util.SecureDirectory;
+import net.i2p.util.SystemVersion;

 /**
 * Main class of addressbook.  Performs updates, and runs the main loop.
@@ -47,8 +48,11 @@ import net.i2p.util.SecureDirectory;
 public class Daemon {
    public static final String VERSION = "2.0.4";
    private static final Daemon _instance = new Daemon();
-    private boolean _running;
+    private volatile boolean _running;
    private static final boolean DEBUG = false;
+    private static final String DEFAULT_SUB = "http://i2p-projekt.i2p/hosts.txt";
+    /** @since 0.9.12 */
+    static final String OLD_DEFAULT_SUB = "http://www.i2p2.i2p/hosts.txt";
    
    /**
     * Update the router and published address books using remote data from the
@@ -168,7 +172,7 @@ public class Daemon {
                                if (publishedNS == null)
                                    publishedNS = new SingleFileNamingService(I2PAppContext.getGlobalContext(), published.getAbsolutePath());
                                success = publishedNS.putIfAbsent(key, dest);
-                                if (!success) {
+                                if (log != null && !success) {
                                    try {
                                        log.append("Save to published address book " + published.getCanonicalPath() + " failed for new key " + key);
                                    } catch (IOException ioe) {}
@@ -250,14 +254,14 @@ public class Daemon {
        }
        delay *= 60 * 60 * 1000;
        
-        List<String> defaultSubs = new LinkedList();
+        List<String> defaultSubs = new LinkedList<String>();
        // defaultSubs.add("http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/i2p/hosts.txt");
-        defaultSubs.add("http://www.i2p2.i2p/hosts.txt");
+        defaultSubs.add(DEFAULT_SUB);
        
        SubscriptionList subscriptions = new SubscriptionList(subscriptionFile,
                etagsFile, lastModifiedFile, lastFetchedFile, delay, defaultSubs, settings
                .get("proxy_host"), Integer.parseInt(settings.get("proxy_port")));
-        Log log = new Log(logFile);
+        Log log = SystemVersion.isAndroid() ? null : new Log(logFile);

        // If false, add hosts via naming service; if true, write hosts.txt file directly
        // Default false
@@ -330,7 +334,7 @@ public class Daemon {
            homeFile = new SecureDirectory(System.getProperty("user.dir"));
        }
        
-        Map<String, String> defaultSettings = new HashMap();
+        Map<String, String> defaultSettings = new HashMap<String, String>();
        defaultSettings.put("proxy_host", "127.0.0.1");
        defaultSettings.put("proxy_port", "4444");
        defaultSettings.put("master_addressbook", "../userhosts.txt");
--- a/apps/addressbook/java/src/net/i2p/addressbook/Servlet.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/Servlet.java
@@ -41,7 +41,9 @@ import javax.servlet.http.HttpServletResponse;
 *
 */
 public class Servlet extends HttpServlet {
-    private DaemonThread thread;
+
+    private static final long serialVersionUID = 1L;
+    private transient DaemonThread thread;
    //private String nonce;
    //private static final String PROP_NONCE = "addressbook.nonce";

--- a/apps/addressbook/java/src/net/i2p/addressbook/SubscriptionIterator.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/SubscriptionIterator.java
@@ -81,7 +81,7 @@ class SubscriptionIterator implements Iterator<AddressBook> {
            //                   DataHelper.formatDuration(I2PAppContext.getGlobalContext().clock().now() - sub.getLastFetched()) +
            //                   " ago but the minimum delay is " +
            //                   DataHelper.formatDuration(this.delay));
-            return new AddressBook(Collections.EMPTY_MAP);
+            return new AddressBook(Collections.<String, String> emptyMap());
        }
    }

--- a/apps/addressbook/java/src/net/i2p/addressbook/SubscriptionList.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/SubscriptionList.java
@@ -69,7 +69,7 @@ class SubscriptionList {
    public SubscriptionList(File locationsFile, File etagsFile,
            File lastModifiedFile, File lastFetchedFile, long delay, List<String> defaultSubs, String proxyHost, 
            int proxyPort) {
-        this.subscriptions = new LinkedList();
+        this.subscriptions = new LinkedList<Subscription>();
        this.etagsFile = etagsFile;
        this.lastModifiedFile = lastModifiedFile;
        this.lastFetchedFile = lastFetchedFile;
@@ -84,17 +84,17 @@ class SubscriptionList {
        try {
            etags = ConfigParser.parse(etagsFile);
        } catch (IOException exp) {
-            etags = new HashMap();
+            etags = new HashMap<String, String>();
        }
        try {
            lastModified = ConfigParser.parse(lastModifiedFile);
        } catch (IOException exp) {
-            lastModified = new HashMap();
+            lastModified = new HashMap<String, String>();
        }
        try {
            lastFetched = ConfigParser.parse(lastFetchedFile);
        } catch (IOException exp) {
-            lastFetched = new HashMap();
+            lastFetched = new HashMap<String, String>();
        }
        for (String location : locations) {
            this.subscriptions.add(new Subscription(location, etags.get(location),
@@ -121,9 +121,9 @@ class SubscriptionList {
     * won't be read back correctly; the '=' should be escaped.
     */
    public void write() {
-        Map<String, String> etags = new HashMap();
-        Map<String, String>  lastModified = new HashMap();
-        Map<String, String>  lastFetched = new HashMap();
+        Map<String, String> etags = new HashMap<String, String>();
+        Map<String, String>  lastModified = new HashMap<String, String>();
+        Map<String, String>  lastFetched = new HashMap<String, String>();
        for (Subscription sub : this.subscriptions) {
            if (sub.getEtag() != null) {
                etags.put(sub.getLocation(), sub.getEtag());
--- a/apps/addressbook/java/src/net/i2p/addressbook/package.html
+++ b/apps/addressbook/java/src/net/i2p/addressbook/package.html
@@ -0,0 +1,11 @@
+<html>
+<body>
+<p>
+The addressbook application, which fetches hosts.txt files from subscription URLS via
+HTTP and adds new hosts to the local database.
+While implemented as a webapp, this application contains no user interface.
+May also be packaged as a jar, as is done for Android.
+The webapp named 'addressbook' in the console is actually SusiDNS.
+</p>
+</body>
+</html>
--- a/apps/addressbook/web.xml
+++ b/apps/addressbook/web.xml
@@ -4,6 +4,15 @@
    "http://java.sun.com/j2ee/dtds/web-app_2.2.dtd">

 <web-app>
+    <filter>
+        <filter-name>XSSFilter</filter-name>
+        <filter-class>net.i2p.servlet.filters.XSSFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>XSSFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
 	<servlet>
 		<servlet-name>addressbook</servlet-name>
 		<servlet-class>net.i2p.addressbook.Servlet</servlet-class>
--- a/apps/apparmor/home.i2p.i2prouter
+++ b/apps/apparmor/home.i2p.i2prouter
@@ -0,0 +1,108 @@
+# Last Modified: Mon, 16 Feb 2015
+# vim:syntax=apparmor et ts=8 sw=4
+
+#include <tunables/global>
+
+$INSTALL_PATH/{i2prouter,runplain.sh} flags=(complain) {
+  #include <abstractions/base>
+  #include <abstractions/fonts>
+  #include <abstractions/nameservice>
+  #include <abstractions/ssl_certs>
+
+  capability sys_ptrace,
+  network inet stream,
+  network inet6 stream,
+
+  $INSTALL_PATH/                                          r,
+  $INSTALL_PATH/{i2psvc,wrapper}                          rmix,
+  owner $INSTALL_PATH/**                                  rwklm,
+
+  # Needed for Java
+  @{PROC}                                                 r,
+  @{PROC}/[0-9]*/net/if_inet6                             r,
+  @{PROC}/[0-9]*/net/ipv6_route                           r,
+  @{PROC}/[0-9]*/status                                   r,
+  @{PROC}/[0-9]*/stat                                     r,
+  @{PROC}/[0-9]*/cmdline                                  r,
+  @{PROC}/1/comm                                          r,
+  @{PROC}/uptime                                          r,
+  @{PROC}/sys/kernel/pid_max                              r,
+  /sys/devices/system/cpu/                                r,
+  /sys/devices/system/cpu/**                              r,
+  /dev/random                                             r,
+  /dev/urandom                                            r,
+
+
+  /etc/ssl/certs/java/**                                  r,
+  /etc/timezone                                           r,
+  /usr/share/javazi/**                                    r,
+
+  # Debian
+  /etc/java-{6,7,8}-openjdk/**                            r,
+  /usr/lib/jvm/default-java/jre/bin/java                  rix,
+
+  # Debian, Ubuntu, openSUSE
+  /usr/lib{,32,64}/jvm/java-*-openjdk-*/jre/bin/java      rix,
+  /usr/lib{,32,64}/jvm/java-*-openjdk-*/jre/bin/keytool   rix,
+
+  # Raspbian
+  /usr/lib/jvm/jdk-*-oracle-*/jre/bin/java                rix,
+  /usr/lib/jvm/jdk-*-oracle-*/jre/bin/keytool             rix,
+
+
+  # Fonts are needed for I2P's graphs
+  /etc/fonts/**                                           r,
+  /usr/share/fontconfig/                                  r,
+  /usr/share/fontconfig/**                                r,
+  /usr/share/fonts/                                       r,
+  /usr/share/fonts/**                                     r,
+  /usr/share/fonts/truetype/                              r,
+  /usr/share/fonts/truetype/**                            r,
+  /usr/share/java/java-atk-wrapper.jar                    r,
+  /var/cache/fontconfig/                                  r,
+  /var/cache/fontconfig/**                                r,
+
+  # Used by some plugins
+  /usr/share/java/eclipse-ecj-*.jar                       r,
+
+  /{,var/}tmp/                                            rwm,
+  owner /{,var/}tmp/**                                    rwklm,
+
+  /{,usr/}bin/{,b,d}ash                                   rix,
+  /{,usr/}bin/cat                                         rix,
+  /{,usr/}bin/cut                                         rix,
+  /{,usr/}bin/dirname                                     rix,
+  /{,usr/}bin/expr                                        rix,
+  /{,usr/}bin/{,g,m}awk                                   rix,
+  /{,usr/}bin/grep                                        rix,
+  /{,usr/}bin/id                                          rix,
+  /{,usr/}bin/ldd                                         rix,
+  /{,usr/}bin/ls                                          rix,
+  /{,usr/}bin/mkdir                                       rix,
+  /{,usr/}bin/nohup                                       rix,
+  /{,usr/}bin/ps                                          rix,
+  /{,usr/}bin/rm                                          rix,
+  /{,usr/}bin/sed                                         rix,
+  /{,usr/}bin/sleep                                       rix,
+  /{,usr/}bin/tail                                        rix,
+  /{,usr/}bin/tr                                          rix,
+  /{,usr/}bin/uname                                       rix,
+  /{,usr/}bin/which                                       rix,
+
+  @{HOME}/.java/fonts/**                                  r,
+  owner  @{HOME}/.i2p/                                    rw,
+  owner  @{HOME}/.i2p/**                                  rwk,
+
+  # Prevent spamming the logs
+  deny owner @{HOME}/.java/                               wk,
+  deny @{HOME}/.fontconfig/                               wk,
+  deny @{HOME}/.java/fonts/**                             w,
+  deny /dev/tty                                           rw,
+  deny /dev/pts/[0-9]*                                    rw,
+  deny @{PROC}/[0-9]*/fd/                                 r,
+  deny /usr/local/share/fonts/                            r,
+  deny /var/cache/fontconfig/                             wk,
+  # Used by some versions of the Tanuki wrapper but never used by I2P
+  deny /usr/share/java/hamcrest*.jar                      r,
+  deny /usr/share/java/junit*.jar                         r,
+}
--- a/apps/desktopgui/.classpath
+++ b/apps/desktopgui/.classpath
@@ -3,7 +3,7 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/i2p_router"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/i2p_sdk"/>
-	<classpathentry kind="lib" path="/lib/wrapper/all/wrapper.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/installer"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>
--- a/apps/desktopgui/build.xml
+++ b/apps/desktopgui/build.xml
@@ -7,12 +7,13 @@
 	<property name="jar" value="desktopgui.jar"/>
 	<property name="resources" value="resources"/>
    <property name="javadoc" value="javadoc"/>
+	<property name="javac.compilerargs" value=""/>
+	<property name="javac.version" value="1.6" />
+	<property name="require.gettext" value="true" />

    <condition property="no.bundle">
        <isfalse value="${require.gettext}" />
    </condition>
-	<property name="javac.compilerargs" value=""/>
-	<property name="require.gettext" value="true" />

 	<target name="init">
 	<mkdir dir="${build}"/>
@@ -27,7 +28,7 @@
 	</target>

 	<target name="compile" depends="init">
-		<javac debug="true" deprecation="on" source="1.5" target="1.5" 
+            <javac debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
                       includeAntRuntime="false"
                       srcdir="${src}" destdir="${build}">
            <compilerarg line="${javac.compilerargs}" />
@@ -44,6 +45,7 @@

 	<target name="bundle" unless="no.bundle">
        <exec executable="sh" osfamily="unix" failifexecutionfails="true" failonerror="${require.gettext}" >
+            <env key="JAVA_HOME" value="${java.home}" />
            <arg value="./bundle-messages.sh" />
        </exec>
        <exec executable="sh" osfamily="mac" failifexecutionfails="true" failonerror="${require.gettext}" >
--- a/apps/desktopgui/bundle-messages.sh
+++ b/apps/desktopgui/bundle-messages.sh
@@ -16,6 +16,10 @@ TMPFILE=build/javafiles.txt
 export TZ=UTC
 RC=0

+if ! $(which javac > /dev/null 2>&1); then
+    export JAVAC=${JAVA_HOME}/../bin/javac
+fi
+
 if [ "$1" = "-p" ]
 then
 	POUPDATE=1
--- a/apps/desktopgui/locale/messages_ar.po
+++ b/apps/desktopgui/locale/messages_ar.po
@@ -11,6 +11,7 @@ msgstr ""
 "POT-Creation-Date: 2011-02-20 11:53+0000\n"
 "PO-Revision-Date: 2011-02-26 19:46-0000\n"
 "Last-Translator: hamada <hamada@mail.i2p>\n"
+"Language: ar\n"
 "Language-Team: duck <duck@mail.i2p>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
--- a/apps/desktopgui/locale/messages_de.po
+++ b/apps/desktopgui/locale/messages_de.po
@@ -3,19 +3,19 @@
 # This file is distributed under the same license as the desktopgui package.
 # To contribute translations, see http://www.i2p2.de/newdevelopers
 # foo <foo@bar>, 2009.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
-"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2011-03-03 18:29+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-09 18:07+0000\n"
 "PO-Revision-Date: 2011-03-22 15:49+0000\n"
 "Last-Translator: blabla <blabla@trash-mail.com>\n"
 "Language-Team: German <>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"

 #: src/net/i2p/desktopgui/ExternalTrayManager.java:23
@@ -46,10 +46,10 @@ msgstr "I2P neustarten"
 msgid "Stop I2P"
 msgstr "I2P beenden"

-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:43
 msgid "Tray icon configuration"
 msgstr "Systemleistensymbol konfigurieren"

-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:46
 msgid "Should tray icon be enabled?"
 msgstr "Systemleistensymbol aktivieren?"
--- a/apps/desktopgui/locale/messages_en.po
+++ b/apps/desktopgui/locale/messages_en.po
@@ -8,11 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P desktopgui\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 18:29+0000\n"
+"POT-Creation-Date: 2014-01-09 19:27+0000\n"
 "PO-Revision-Date: 2010-06-15 14:09+0100\n"
 "Last-Translator: duck <duck@mail.i2p>\n"
 "Language-Team: duck <duck@mail.i2p>\n"
-"Language: \n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -46,10 +46,10 @@ msgstr ""
 msgid "Stop I2P"
 msgstr ""

-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:43
 msgid "Tray icon configuration"
 msgstr ""

-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:46
 msgid "Should tray icon be enabled?"
 msgstr ""
--- a/apps/desktopgui/locale/messages_fr.po
+++ b/apps/desktopgui/locale/messages_fr.po
@@ -2,21 +2,26 @@
 # Copyright (C) 2009 The I2P Project
 # This file is distributed under the same license as the desktopgui package.
 # To contribute translations, see http://www.i2p2.de/newdevelopers
-# foo <foo@bar>, 2009.
 #
+# Translators:
+# blabla <blabla@trash-mail.com>, 2011
+# ducki2p <ducki2p@gmail.com>, 2011
+# foo <foo@bar>, 2009
+# Boxoa590, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: I2P desktopgui\n"
+"Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 18:29+0000\n"
-"PO-Revision-Date: 2011-03-30 21:58+0100\n"
-"Last-Translator: magma <magma@mail.i2p>\n"
-"Language-Team: duck <duck@mail.i2p>\n"
-"Language: \n"
+"POT-Creation-Date: 2014-01-09 19:14+0000\n"
+"PO-Revision-Date: 2013-06-08 04:50+0000\n"
+"Last-Translator: Boxoa590\n"
+"Language-Team: French (http://www.transifex.com/projects/p/I2P/language/"
+"fr/)\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"

 #: src/net/i2p/desktopgui/ExternalTrayManager.java:23
 msgid "Start I2P"
@@ -24,7 +29,7 @@ msgstr "Démarrer I2P"

 #: src/net/i2p/desktopgui/ExternalTrayManager.java:38
 msgid "I2P is starting!"
-msgstr "I2P démarre!"
+msgstr "I2P démarre !"

 #: src/net/i2p/desktopgui/ExternalTrayManager.java:38
 msgid "Starting"
@@ -32,7 +37,7 @@ msgstr "Démarrage"

 #: src/net/i2p/desktopgui/InternalTrayManager.java:26
 msgid "Launch I2P Browser"
-msgstr "Lancer le navigateur"
+msgstr "Lancer le navigateur I2P"

 #: src/net/i2p/desktopgui/InternalTrayManager.java:50
 msgid "Configure desktopgui"
@@ -46,11 +51,10 @@ msgstr "Redémarrer I2P"
 msgid "Stop I2P"
 msgstr "Arrêter I2P"

-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:43
 msgid "Tray icon configuration"
 msgstr "Configuration de l'icône de notification"

-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:46
 msgid "Should tray icon be enabled?"
-msgstr "Activer l'icône de notification"
-
+msgstr "Activer l'icône de notification ?"
--- a/apps/desktopgui/locale/messages_ja.po
+++ b/apps/desktopgui/locale/messages_ja.po
@@ -0,0 +1,56 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+# plazmism <gomidori@live.jp>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-03 18:29+0000\n"
+"PO-Revision-Date: 2013-11-26 10:38+0000\n"
+"Last-Translator: plazmism <gomidori@live.jp>\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/I2P/language/ja/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+msgid "Start I2P"
+msgstr "I2P を開始"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "I2P is starting!"
+msgstr "I2P 起動中！"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "Starting"
+msgstr "起動中"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+msgid "Launch I2P Browser"
+msgstr "I2P ブラウザを起動"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:50
+msgid "Configure desktopgui"
+msgstr "desktopgui を設定"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+msgid "Restart I2P"
+msgstr "I2P を再起動"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+msgid "Stop I2P"
+msgstr "I2P を停止"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+msgid "Tray icon configuration"
+msgstr "トレイアイコン設定"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+msgid "Should tray icon be enabled?"
+msgstr "トレイアイコンを有効にしますか？"
--- a/apps/desktopgui/locale/messages_pl.po
+++ b/apps/desktopgui/locale/messages_pl.po
@@ -3,20 +3,22 @@
 # This file is distributed under the same license as the desktopgui package.
 # To contribute translations, see http://www.i2p2.de/newdevelopers
 # 
-#   <b790979@klzlk.com>, 2011.
+# Translators:
+# PolishAnon <b790979@klzlk.com>, 2011
+# polacco <polacco@i2pmail.org>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
-"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2011-03-03 18:29+0000\n"
-"PO-Revision-Date: 2011-05-25 18:36+0000\n"
-"Last-Translator: PolishAnon <b790979@klzlk.com>\n"
-"Language-Team: Polish (http://www.transifex.net/projects/p/I2P/team/pl/)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-09 19:27+0000\n"
+"PO-Revision-Date: 2015-02-17 20:54+0000\n"
+"Last-Translator: polacco <polacco@i2pmail.org>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/I2P/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"

 #: src/net/i2p/desktopgui/ExternalTrayManager.java:23
 msgid "Start I2P"
@@ -32,7 +34,7 @@ msgstr "Uruchamianie"

 #: src/net/i2p/desktopgui/InternalTrayManager.java:26
 msgid "Launch I2P Browser"
-msgstr "Uruchom Przeglądarke I2P"
+msgstr "Uruchom przeglądarkę I2P"

 #: src/net/i2p/desktopgui/InternalTrayManager.java:50
 msgid "Configure desktopgui"
@@ -46,12 +48,10 @@ msgstr "Zrestartuj I2P"
 msgid "Stop I2P"
 msgstr "Zatrzymaj I2P"

-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:43
 msgid "Tray icon configuration"
 msgstr "Konfiguracja ikony zasobnika"

-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:46
 msgid "Should tray icon be enabled?"
 msgstr "Czy ikona zasobnika powinna być aktywna?"
-
-
--- a/apps/desktopgui/locale/messages_pt_BR.po
+++ b/apps/desktopgui/locale/messages_pt_BR.po
@@ -0,0 +1,57 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+# testsubject67 <deborinha97@hotmail.com>, 2014
+# blueboy, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-09 19:27+0000\n"
+"PO-Revision-Date: 2014-07-05 17:40+0000\n"
+"Last-Translator: testsubject67 <deborinha97@hotmail.com>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/I2P/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+msgid "Start I2P"
+msgstr "Conectar-se à I2P"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "I2P is starting!"
+msgstr "Conectando-se a I2P!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "Starting"
+msgstr "Conectando"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+msgid "Launch I2P Browser"
+msgstr "Lançar o navegador I2P "
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:50
+msgid "Configure desktopgui"
+msgstr "Configurar desktopgui"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+msgid "Restart I2P"
+msgstr "Reinicializar o roteador I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+msgid "Stop I2P"
+msgstr "Interromper o roteador I2P"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:43
+msgid "Tray icon configuration"
+msgstr "Configuração de ícone de bandeja"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:46
+msgid "Should tray icon be enabled?"
+msgstr "Ativar ícone de bandeja?"
--- a/apps/desktopgui/locale/messages_ro.po
+++ b/apps/desktopgui/locale/messages_ro.po
@@ -0,0 +1,57 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-09 19:03+0000\n"
+"PO-Revision-Date: 2013-11-11 11:31+0000\n"
+"Last-Translator: polearnik <polearnik@mail.ru>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/I2P/language/"
+"ro/)\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
+"2:1));\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+msgid "Start I2P"
+msgstr "Start I2P"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "I2P is starting!"
+msgstr "I2P se pornește!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "Starting"
+msgstr "Începere"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+msgid "Launch I2P Browser"
+msgstr "Lansare I2P Browser"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:50
+msgid "Configure desktopgui"
+msgstr "Configurarea desktopgui"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+msgid "Restart I2P"
+msgstr "Restart I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+msgid "Stop I2P"
+msgstr "Stop I2P"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:43
+msgid "Tray icon configuration"
+msgstr "Configurare pictogramei din bara de sistem"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:46
+msgid "Should tray icon be enabled?"
+msgstr "Ar trebui să fie activata pictograma din bara de sistem?"
--- a/apps/desktopgui/locale/messages_ru.po
+++ b/apps/desktopgui/locale/messages_ru.po
@@ -2,21 +2,24 @@
 # Copyright (C) 2009 The I2P Project
 # This file is distributed under the same license as the desktopgui package.
 # To contribute translations, see http://www.i2p2.de/newdevelopers
-# foo <foo@bar>, 2009.
-#
+# 
+# Translators:
+# ducki2p <ducki2p@gmail.com>, 2011
+# foo <foo@bar>, 2009
+# Роман Азаренко <transifex@basicxp.ru>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: I2P desktopgui\n"
+"Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-19 17:26+0000\n"
-"PO-Revision-Date: 2011-02-23 10:23+0500\n"
-"Last-Translator: Hidden Z <hiddenz@mail.i2p>\n"
-"Language-Team: duck <duck@mail.i2p>\n"
-"Language: \n"
+"POT-Creation-Date: 2011-03-03 18:29+0000\n"
+"PO-Revision-Date: 2013-12-04 11:46+0000\n"
+"Last-Translator: Bergitte <alvina_alexandrova@mail.ru>\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/I2P/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Language: ru_RU\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"

 #: src/net/i2p/desktopgui/ExternalTrayManager.java:23
 msgid "Start I2P"
@@ -32,7 +35,7 @@ msgstr "Запускается"

 #: src/net/i2p/desktopgui/InternalTrayManager.java:26
 msgid "Launch I2P Browser"
-msgstr "Запустить I2P браузер"
+msgstr "Запустить браузер I2P"

 #: src/net/i2p/desktopgui/InternalTrayManager.java:50
 msgid "Configure desktopgui"
@@ -48,9 +51,8 @@ msgstr "Остановить I2P"

 #: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
 msgid "Tray icon configuration"
-msgstr "Настройка иконки в трее"
+msgstr "Конфигурация значка в области уведомлений"

 #: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
 msgid "Should tray icon be enabled?"
-msgstr "Отображать ли иконку в трее?"
-
+msgstr "Отображать ли значок в области уведомлений?"
--- a/apps/desktopgui/locale/messages_sk.po
+++ b/apps/desktopgui/locale/messages_sk.po
@@ -0,0 +1,57 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+# Krantišek <jaksrn@gmail.com>, 2014
+# Svistwarrior273 <romanbeno273@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-09 19:27+0000\n"
+"PO-Revision-Date: 2014-04-20 09:56+0000\n"
+"Last-Translator: Svistwarrior273 <romanbeno273@gmail.com>\n"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/I2P/language/sk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+msgid "Start I2P"
+msgstr "Spustiť I2P"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "I2P is starting!"
+msgstr "I2P sa spúšťa!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "Starting"
+msgstr "Spúšťa sa"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+msgid "Launch I2P Browser"
+msgstr "Spustiť I2P prehliadač"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:50
+msgid "Configure desktopgui"
+msgstr "Nakonfigurovať desktopgui"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+msgid "Restart I2P"
+msgstr "Reštartovať I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+msgid "Stop I2P"
+msgstr "Zastaviť I2P"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:43
+msgid "Tray icon configuration"
+msgstr "Konfigurácia ikony v lište"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:46
+msgid "Should tray icon be enabled?"
+msgstr "Mala by byť ikona v lište povolená?"
--- a/apps/desktopgui/locale/messages_tr.po
+++ b/apps/desktopgui/locale/messages_tr.po
@@ -0,0 +1,56 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+# Kaya Zeren <kayazeren@gmail.com>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
+"POT-Creation-Date: 2011-03-03 18:29+0000\n"
+"PO-Revision-Date: 2013-04-26 06:07+0000\n"
+"Last-Translator: Kaya Zeren <kayazeren@gmail.com>\n"
+"Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/I2P/language/tr_TR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr_TR\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+msgid "Start I2P"
+msgstr "I2P başlasın"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "I2P is starting!"
+msgstr "I2P başlatılıyor!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "Starting"
+msgstr "Başlatılıyor"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+msgid "Launch I2P Browser"
+msgstr "I2P Tarayıcısını Açın"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:50
+msgid "Configure desktopgui"
+msgstr "Masaüstü Arayüzünü Ayarlayın"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+msgid "Restart I2P"
+msgstr "I2P Yeniden Başlasın"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+msgid "Stop I2P"
+msgstr "I2P Durdurulsun"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+msgid "Tray icon configuration"
+msgstr "Sistem tepsisi simgesi ayarı"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+msgid "Should tray icon be enabled?"
+msgstr "Sistem tepsisi simgesi kullanılsın"
--- a/apps/desktopgui/locale/messages_uk.po
+++ b/apps/desktopgui/locale/messages_uk.po
@@ -3,20 +3,23 @@
 # This file is distributed under the same license as the desktopgui package.
 # To contribute translations, see http://www.i2p2.de/newdevelopers
 # 
-#   <gribua@gmail.com>, 2011.
+# Translators:
+# Denis Blank <gribua@gmail.com>, 2011
+# LinuxChata, 2014
+# madjong <madjong@i2pmail.org>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
-"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
-"POT-Creation-Date: 2011-03-03 18:29+0000\n"
-"PO-Revision-Date: 2011-06-19 14:01+0000\n"
-"Last-Translator: Pharmasolin <gribua@gmail.com>\n"
-"Language-Team: Ukrainian (Ukraine) (http://www.transifex.net/projects/p/I2P/team/uk_UA/)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-09 19:27+0000\n"
+"PO-Revision-Date: 2014-12-17 17:00+0000\n"
+"Last-Translator: madjong <madjong@i2pmail.org>\n"
+"Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/projects/p/I2P/language/uk_UA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: uk_UA\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"

 #: src/net/i2p/desktopgui/ExternalTrayManager.java:23
 msgid "Start I2P"
@@ -46,12 +49,10 @@ msgstr "Перезапустити I2P"
 msgid "Stop I2P"
 msgstr "Зупинити I2P"

-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:43
 msgid "Tray icon configuration"
-msgstr "Настройка трей-іконки"
+msgstr "Налаштування трей-іконки"

-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:46
 msgid "Should tray icon be enabled?"
-msgstr "Чм повинна трей-іконка бути включена?"
-
-
+msgstr "Чи повинна трей-іконка бути включена?"
--- a/apps/desktopgui/src/net/i2p/desktopgui/Main.java
+++ b/apps/desktopgui/src/net/i2p/desktopgui/Main.java
@@ -7,9 +7,6 @@ package net.i2p.desktopgui;
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
-import java.awt.GraphicsEnvironment;
-
-import net.i2p.I2PAppContext;
 import net.i2p.desktopgui.router.RouterManager;
 import net.i2p.desktopgui.util.*;
 import net.i2p.util.Log;
--- a/apps/desktopgui/src/net/i2p/desktopgui/TrayManager.java
+++ b/apps/desktopgui/src/net/i2p/desktopgui/TrayManager.java
@@ -1,28 +1,15 @@
 package net.i2p.desktopgui;

 import java.awt.AWTException;
-import java.awt.Desktop;
 import java.awt.Image;
-import java.awt.MenuItem;
 import java.awt.PopupMenu;
 import java.awt.SystemTray;
 import java.awt.Toolkit;
 import java.awt.TrayIcon;
-import java.awt.Desktop.Action;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.net.URL;

-import javax.swing.SwingWorker;
-
 import net.i2p.desktopgui.i18n.DesktopguiTranslator;
 import net.i2p.desktopgui.router.RouterManager;
-import net.i2p.desktopgui.util.BrowseException;
-import net.i2p.desktopgui.util.ConfigurationManager;
-import net.i2p.desktopgui.util.I2PDesktop;
 import net.i2p.util.Log;

 /**
--- a/apps/desktopgui/src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java
+++ b/apps/desktopgui/src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java
@@ -32,7 +32,6 @@ public class DesktopguiConfigurationFrame extends javax.swing.JFrame {
     * WARNING: Do NOT modify this code. The content of this method is
     * always regenerated by the Form Editor.
     */
-    @SuppressWarnings("unchecked")
    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
    private void initComponents() {

@@ -115,7 +114,7 @@ public class DesktopguiConfigurationFrame extends javax.swing.JFrame {
            System.out.println("Enabling desktopgui");
        }
        try {
-            RouterManager.getRouterContext().setProperty(property, value);
+            RouterManager.getRouterContext().router().saveConfig(property, value);
        } catch (Exception ex) {
            Logger.getLogger(DesktopguiConfigurationFrame.class.getName()).log(Level.SEVERE, null, ex);
        }
--- a/apps/desktopgui/src/net/i2p/desktopgui/router/RouterManager.java
+++ b/apps/desktopgui/src/net/i2p/desktopgui/router/RouterManager.java
@@ -5,8 +5,6 @@ import java.io.IOException;
 import org.tanukisoftware.wrapper.WrapperManager;

 import net.i2p.I2PAppContext;
-import net.i2p.desktopgui.i18n.DesktopguiTranslator;
-import net.i2p.desktopgui.util.ConfigurationManager;
 import net.i2p.router.Router;
 import net.i2p.router.RouterContext;
 import net.i2p.util.Log;
--- a/apps/desktopgui/src/net/i2p/desktopgui/util/ConfigurationManager.java
+++ b/apps/desktopgui/src/net/i2p/desktopgui/util/ConfigurationManager.java
@@ -78,7 +78,7 @@ public class ConfigurationManager {
 	 * @return The value of a configuration: true if found, defaultValue if not found.
 	 */
 	public boolean getBooleanConfiguration(String arg, boolean defaultValue) {
-		Boolean value = ((Boolean) booleanConfigurations.get("startWithI2P"));
+		Boolean value = booleanConfigurations.get("startWithI2P");
 		System.out.println(value);
 		if(value != null) {
 			return value;
--- a/apps/desktopgui/src/net/i2p/desktopgui/util/I2PDesktop.java
+++ b/apps/desktopgui/src/net/i2p/desktopgui/util/I2PDesktop.java
@@ -1,13 +1,8 @@
 package net.i2p.desktopgui.util;

 import java.awt.Desktop;
-import java.awt.TrayIcon;
 import java.awt.Desktop.Action;
-import java.io.IOException;
 import java.net.URI;
-import java.net.URISyntaxException;
-
-import net.i2p.desktopgui.router.RouterManager;
 import net.i2p.util.Log;

 public class I2PDesktop {
--- a/apps/i2psnark/.classpath
+++ b/apps/i2psnark/.classpath
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="java/src"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/i2p_sdk"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ministreaming"/>
-	<classpathentry kind="lib" path="/jetty/jettylib/javax.servlet.jar"/>
-	<classpathentry kind="lib" path="/jetty/jettylib/jetty-util.jar"/>
-	<classpathentry kind="lib" path="/jetty/jettylib/org.mortbay.jetty.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/i2p_sdk"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jetty"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ministreaming"/>
 	<classpathentry kind="output" path="java/build/obj"/>
 </classpath>
--- a/apps/i2psnark/java/build.xml
+++ b/apps/i2psnark/java/build.xml
@@ -17,28 +17,28 @@
            <classpath>
                <pathelement location="../../../core/java/build/obj" />
                <pathelement location="../../ministreaming/java/build/obj" />
-                <pathelement location="../../jetty/jettylib/org.mortbay.jetty.jar" />
                <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
-                <pathelement location="../../jetty/jettylib/jetty-util.jar" />
            </classpath>
        </depend>
    </target>

+    <property name="javac.compilerargs" value="" />
+    <property name="javac.version" value="1.6" />
+    <property name="require.gettext" value="true" />
+
    <condition property="no.bundle">
        <isfalse value="${require.gettext}" />
    </condition>
-    <property name="javac.compilerargs" value="" />
-    <property name="require.gettext" value="true" />

    <target name="compile" depends="depend">
        <mkdir dir="./build" />
        <mkdir dir="./build/obj" />
        <javac 
            srcdir="./src" 
-            debug="true" deprecation="on" source="1.5" target="1.5" 
+            debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
            destdir="./build/obj" 
            includeAntRuntime="false"
-            classpath="../../../core/java/build/i2p.jar:../../jetty/jettylib/org.mortbay.jetty.jar:../../jetty/jettylib/javax.servlet.jar:../../jetty/jettylib/jetty-util.jar:../../ministreaming/java/build/mstreaming.jar" >
+            classpath="../../../core/java/build/i2p.jar:../../jetty/jettylib/javax.servlet.jar:../../ministreaming/java/build/mstreaming.jar" >
            <compilerarg line="${javac.compilerargs}" />
        </javac>
    </target>
@@ -60,7 +60,7 @@
    <target name="jar" depends="builddep, compile, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
        <!-- set if unset -->
        <property name="workspace.changes.tr" value="" />
-        <jar destfile="./build/i2psnark.jar" basedir="./build/obj" includes="**/*.class" excludes="**/I2PSnarkServlet*.class **/FetchAndAdd*.class **/messages_*.class">
+        <jar destfile="./build/i2psnark.jar" basedir="./build/obj" includes="**/*.class" excludes="**/web/* **/messages_*.class">
            <manifest>
                <attribute name="Main-Class" value="org.klomp.snark.Snark" />
                <attribute name="Class-Path" value="i2p.jar mstreaming.jar streaming.jar" />
@@ -75,7 +75,7 @@
    
    <target name="jarUpToDate">
        <uptodate property="jar.uptodate" targetfile="build/i2psnark.jar" >
-            <srcfiles dir= "build/obj" includes="**/*.class" excludes="**/I2PSnarkServlet*.class **/FetchAndAdd*.class **/messages_*.class" />
+            <srcfiles dir= "build/obj" includes="**/*.class" excludes="**/web/* **/messages_*.class" />
        </uptodate>
        <condition property="shouldListChanges" >
            <and>
@@ -100,13 +100,15 @@
    <target name="war" depends="jar, bundle, warUpToDate, listChangedFiles" unless="war.uptodate" > 
        <!-- set if unset -->
        <property name="workspace.changes.tr" value="" />
-        <copy todir="build/icons/.icons" >
-            <fileset dir="../icons/" />
+        <copy todir="build/resources/.resources" >
+            <fileset dir="../resources/" />
        </copy>
+        <!-- mime.properties must be in with the classes -->
+        <copy file="../mime.properties" todir="build/obj/org/klomp/snark/web" />
        <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/" />
+          <classes dir="./build/obj" includes="**/web/*" />
+            <fileset dir="build/resources/" />
            <manifest>
                <attribute name="Implementation-Version" value="${full.version}" />
                <attribute name="Built-By" value="${build.built-by}" />
@@ -119,7 +121,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 ../resources/**/* ../web.xml" />
        </uptodate>
    </target>
    
@@ -127,6 +129,7 @@
        <!-- Update the messages_*.po files.
             We need to supply the bat file for windows, and then change the fail property to true -->
        <exec executable="sh" osfamily="unix" failifexecutionfails="true" failonerror="${require.gettext}" >
+            <env key="JAVA_HOME" value="${java.home}" />
            <arg value="./bundle-messages.sh" />
        </exec>
        <exec executable="sh" osfamily="mac" failifexecutionfails="true" failonerror="${require.gettext}" >
@@ -172,7 +175,6 @@
        <copy file="../../jetty/jettylib/commons-logging.jar" tofile="./dist/lib/commons-logging.jar" />
        <copy file="../../jetty/jettylib/javax.servlet.jar" tofile="./dist/lib/javax.servlet.jar" />
        <copy file="../../jetty/jettylib/org.mortbay.jetty.jar" tofile="./dist/lib/org.mortbay.jetty.jar" />
-        <copy file="../../jetty/jettylib/jasper-compiler.jar" tofile="./dist/lib/jasper-compiler.jar" />
        <copy file="../../jetty/jettylib/jasper-runtime.jar" tofile="./dist/lib/jasper-runtime.jar" />
        <copy file="../../ministreaming/java/build/mstreaming.jar" tofile="./dist/lib/mstreaming.jar" />
        <copy file="../../streaming/java/build/streaming.jar" tofile="./dist/lib/streaming.jar" />
--- a/apps/i2psnark/java/bundle-messages.sh
+++ b/apps/i2psnark/java/bundle-messages.sh
@@ -15,6 +15,10 @@ TMPFILE=build/javafiles.txt
 export TZ=UTC
 RC=0

+if ! $(which javac > /dev/null 2>&1); then
+    export JAVAC=${JAVA_HOME}/../bin/javac
+fi
+
 if [ "$1" = "-p" ]
 then
 	POUPDATE=1
--- a/apps/i2psnark/java/src/net/i2p/kademlia/XORComparator.java
+++ b/apps/i2psnark/java/src/net/i2p/kademlia/XORComparator.java
@@ -1,28 +0,0 @@
-package net.i2p.kademlia;
-
-import java.util.Comparator;
-
-import net.i2p.data.DataHelper;
-import net.i2p.data.SimpleDataStructure;
-
-/**
- * Help sort Hashes in relation to a base key using the XOR metric
- *
- * @since 0.9.2
- */
-class XORComparator<T extends SimpleDataStructure> implements Comparator<T> {
-    private final byte[] _base;
-
-    /**
-     * @param target key to compare distances with
-     */
-    public XORComparator(T target) {
-        _base = target.getData();
-    }
-
-    public int compare(T lhs, T rhs) {
-        byte lhsDelta[] = DataHelper.xor(lhs.getData(), _base);
-        byte rhsDelta[] = DataHelper.xor(rhs.getData(), _base);
-        return DataHelper.compareTo(lhsDelta, rhsDelta);
-    }
-}
--- a/apps/i2psnark/java/src/org/klomp/snark/BWLimits.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/BWLimits.java
@@ -4,7 +4,6 @@
 */
 package org.klomp.snark;

-import java.util.Arrays;
 import java.util.Properties;

 import net.i2p.client.I2PSessionException;
@@ -37,7 +36,9 @@ class BWLimits {
        return rv;
    }

+/****
    public static void main(String args[]) {
        System.out.println(Arrays.toString(getBWLimits("127.0.0.1", 7654)));
    }
+****/
 }
--- a/apps/i2psnark/java/src/org/klomp/snark/CompleteListener.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/CompleteListener.java
@@ -54,7 +54,15 @@ public interface CompleteListener {
     */
    public void gotPiece(Snark snark);

-    // not really listeners but the easiest way to get back to an optional SnarkManager
+    /** not really listeners but the easiest way to get back to an optional SnarkManager */
    public long getSavedTorrentTime(Snark snark);
    public BitField getSavedTorrentBitField(Snark snark);
+    /**
+     * @since 0.9.15
+     */
+    public boolean getSavedPreserveNamesSetting(Snark snark);
+    /**
+     * @since 0.9.15
+     */
+    public long getSavedUploaded(Snark snark);
 }
--- a/apps/i2psnark/java/src/org/klomp/snark/ConnectionAcceptor.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/ConnectionAcceptor.java
@@ -33,79 +33,106 @@ import net.i2p.data.Hash;
 import net.i2p.util.I2PAppThread;
 import net.i2p.util.Log;
 import net.i2p.util.ObjectCounter;
-import net.i2p.util.SimpleScheduler;
-import net.i2p.util.SimpleTimer;
+import net.i2p.util.SimpleTimer2;

 /**
- * Accepts connections on a TCP port and routes them to sub-acceptors.
+ * Accepts connections on a I2PServerSocket and routes them to PeerAcceptors.
 */
-public class ConnectionAcceptor implements Runnable
+class ConnectionAcceptor implements Runnable
 {
  private final Log _log = I2PAppContext.getGlobalContext().logManager().getLog(ConnectionAcceptor.class);
-  private I2PServerSocket serverSocket;
-  private PeerAcceptor peeracceptor;
+  private final PeerAcceptor peeracceptor;
  private Thread thread;
  private final I2PSnarkUtil _util;
-  private final ObjectCounter<Hash> _badCounter = new ObjectCounter();
+  private final ObjectCounter<Hash> _badCounter = new ObjectCounter<Hash>();
+  private final SimpleTimer2.TimedEvent _cleaner;

-  private boolean stop;
-  private boolean socketChanged;
+  private volatile boolean stop;

-  private static final int MAX_BAD = 2;
+  // protocol errors before blacklisting.
+  private static final int MAX_BAD = 1;
  private static final long BAD_CLEAN_INTERVAL = 30*60*1000;

-  public ConnectionAcceptor(I2PSnarkUtil util) { _util = util; }
+  /**
+   *  Multitorrent. Caller MUST call startAccepting()
+   */
+  public ConnectionAcceptor(I2PSnarkUtil util, PeerCoordinatorSet set) {
+      _util = util;
+      _cleaner = new Cleaner();
+      peeracceptor = new PeerAcceptor(set);
+  }
  
-  public synchronized void startAccepting(PeerCoordinatorSet set, I2PServerSocket socket) {
-    if (serverSocket != socket) {
-      if ( (peeracceptor == null) || (peeracceptor.coordinators != set) )
-        peeracceptor = new PeerAcceptor(set);
-      serverSocket = socket;
+  /**
+   *  May be called even when already running. May be called to start up again after halt().
+   */
+  public synchronized void startAccepting() {
      stop = false;
-      socketChanged = true;
+      if (_log.shouldLog(Log.WARN))
+          _log.warn("ConnectionAcceptor startAccepting new thread? " + (thread == null));
      if (thread == null) {
          thread = new I2PAppThread(this, "I2PSnark acceptor");
          thread.setDaemon(true);
          thread.start();
-          _util.getContext().simpleScheduler().addPeriodicEvent(new Cleaner(), BAD_CLEAN_INTERVAL);
+          _cleaner.reschedule(BAD_CLEAN_INTERVAL, false);
      }
-    }
  }
  
-  public ConnectionAcceptor(I2PSnarkUtil util, I2PServerSocket serverSocket,
+  /**
+   *  Unused (single torrent).
+   *  Do NOT call startAccepting().
+   */
+  public ConnectionAcceptor(I2PSnarkUtil util,
                            PeerAcceptor peeracceptor)
  {
-    this.serverSocket = serverSocket;
    this.peeracceptor = peeracceptor;
    _util = util;
    
    thread = new I2PAppThread(this, "I2PSnark acceptor");
    thread.setDaemon(true);
    thread.start();
-    _util.getContext().simpleScheduler().addPeriodicEvent(new Cleaner(), BAD_CLEAN_INTERVAL);
+    _cleaner = new Cleaner();
  }

-  public void halt()
+  /**
+   *  May be restarted later with startAccepting().
+   */
+  public synchronized void halt()
  {
    if (stop) return;
    stop = true;
+    locked_halt();
+    Thread t = thread;
+    if (t != null) {
+      t.interrupt();
+      thread = null;
+    }
+  }

-    I2PServerSocket ss = serverSocket;
-    if (ss != null)
+
+  /**
+   *  Caller must synch
+   *  @since 0.9.9
+   */
+  private void locked_halt()
+  {
+    I2PServerSocket ss = _util.getServerSocket();
+    if (ss != null) {
      try
        {
          ss.close();
        }
      catch(I2PException ioe) { }
-
-    Thread t = thread;
-    if (t != null)
-      t.interrupt();
+    }
+    _badCounter.clear();
+    _cleaner.cancel();
  }
  
-  public void restart() {
-      serverSocket = _util.getServerSocket();
-      socketChanged = true;
+  /**
+   *  Effectively unused, would only be called if we changed
+   *  I2CP host/port, which is hidden in the gui if in router context
+   *  FIXME this only works if already running
+   */
+  public synchronized void restart() {
      Thread t = thread;
      if (t != null)
          t.interrupt();
@@ -113,21 +140,32 @@ public class ConnectionAcceptor implements Runnable

  public int getPort()
  {
-    return 6881; // serverSocket.getLocalPort();
+    return TrackerClient.PORT; // serverSocket.getLocalPort();
  }

  public void run()
+  {
+      try {
+          run2();
+      } finally {
+          synchronized(this) {
+              thread = null;
+          }
+      }
+  }
+
+  private void run2()
  {
    while(!stop)
      {
-        if (socketChanged) {
-            // ok, already updated
-            socketChanged = false;
-        }
+        I2PServerSocket serverSocket = _util.getServerSocket();
        while ( (serverSocket == null) && (!stop)) {
+            if (!(_util.isConnecting() || _util.connected())) {
+                stop = true;
+                break;
+            }
+            try { Thread.sleep(10*1000); } catch (InterruptedException ie) {}
            serverSocket = _util.getServerSocket();
-            if (serverSocket == null)
-                try { Thread.sleep(10*1000); } catch (InterruptedException ie) {}
        }
        if(stop)
            break;
@@ -135,24 +173,26 @@ public class ConnectionAcceptor implements Runnable
          {
            I2PSocket socket = serverSocket.accept();
            if (socket == null) {
-                if (socketChanged) {
                    continue;
-                } else {
-                    I2PServerSocket ss = _util.getServerSocket();
-                    if (ss != serverSocket) {
-                        serverSocket = ss;
-                        socketChanged = true;
-                    }
-                }
            } else {
                if (socket.getPeerDestination().equals(_util.getMyDestination())) {
                    _log.error("Incoming connection from myself");
                    try { socket.close(); } catch (IOException ioe) {}
                    continue;
                }
-                if (_badCounter.count(socket.getPeerDestination().calculateHash()) >= MAX_BAD) {
+                Hash h = socket.getPeerDestination().calculateHash();
+                if (socket.getLocalPort() == 80) {
+                     _badCounter.increment(h);
                    if (_log.shouldLog(Log.WARN))
-                        _log.warn("Rejecting connection from " + socket.getPeerDestination().calculateHash() + " after " + MAX_BAD + " failures");
+                        _log.error("Dropping incoming HTTP from " + h);
+                    try { socket.close(); } catch (IOException ioe) {}
+                    continue;
+                }
+                int bad = _badCounter.count(h);
+                if (bad >= MAX_BAD) {
+                    if (_log.shouldLog(Log.WARN))
+                        _log.warn("Rejecting connection from " + h +
+                                  " after " + bad + " failures, max is " + MAX_BAD);
                    try { socket.close(); } catch (IOException ioe) {}
                    continue;
                }
@@ -162,26 +202,34 @@ public class ConnectionAcceptor implements Runnable
          }
        catch (I2PException ioe)
          {
-            if (!socketChanged) {
-                _log.error("Error while accepting", ioe);
-                stop = true;
+            int level = stop ? Log.WARN : Log.ERROR;
+            if (_log.shouldLog(level))
+                _log.log(level, "Error while accepting", ioe);
+            synchronized(this) {
+                if (!stop) {
+                    locked_halt();
+                    thread = null;
+                    stop = true;
+                }
            }
          }
        catch (IOException ioe)
          {
-            _log.error("Error while accepting", ioe);
-            stop = true;
+            int level = stop ? Log.WARN : Log.ERROR;
+            if (_log.shouldLog(level))
+                _log.log(level, "Error while accepting", ioe);
+            synchronized(this) {
+                if (!stop) {
+                    locked_halt();
+                    thread = null;
+                    stop = true;
+                }
+            }
          }
        // catch oom?
      }
-
-    try
-      {
-        if (serverSocket != null)
-          serverSocket.close();
-      }
-    catch (I2PException ignored) { }
-    
+      if (_log.shouldLog(Log.WARN))
+          _log.warn("ConnectionAcceptor closed");
  }
  
  private class Handler implements Runnable {
@@ -214,7 +262,17 @@ public class ConnectionAcceptor implements Runnable
  }

    /** @since 0.9.1 */    
-    private class Cleaner implements SimpleTimer.TimedEvent {
-        public void timeReached() { _badCounter.clear(); }
+    private class Cleaner extends SimpleTimer2.TimedEvent {
+
+        public Cleaner() {
+            super(_util.getContext().simpleTimer2());
+        }
+
+        public void timeReached() {
+            if (stop)
+                return;
+            _badCounter.clear();
+            schedule(BAD_CLEAN_INTERVAL);
+        }
    }
 }
--- a/apps/i2psnark/java/src/org/klomp/snark/CoordinatorListener.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/CoordinatorListener.java
@@ -37,8 +37,20 @@ interface CoordinatorListener
   */
  void gotMetaInfo(PeerCoordinator coordinator, MetaInfo metainfo);

+  /**
+   * Is this number of uploaders over the per-torrent limit?
+   */
  public boolean overUploadLimit(int uploaders);
+
+  /**
+   * Are we currently over the upstream bandwidth limit?
+   */
  public boolean overUpBWLimit();
+
+  /**
+   * Is the total (in Bps) over the upstream bandwidth limit?
+   */
  public boolean overUpBWLimit(long total);
+
  public void addMessage(String message);
 }
--- a/apps/i2psnark/java/src/org/klomp/snark/ExtensionHandler.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/ExtensionHandler.java
@@ -31,7 +31,7 @@ abstract class ExtensionHandler {
    public static final int ID_DHT = 3;
    /** not using the option bit since the compact format is different */
    public static final String TYPE_DHT = "i2p_dht";
-    /** Pieces * SHA1 Hash length, + 25% extra for file names, benconding overhead, etc */
+    /** Pieces * SHA1 Hash length, + 25% extra for file names, bencoding overhead, etc */
    private static final int MAX_METADATA_SIZE = Storage.MAX_PIECES * 20 * 5 / 4;
    private static final int PARALLEL_REQUESTS = 3;

@@ -43,8 +43,8 @@ abstract class ExtensionHandler {
   *  @return bencoded outgoing handshake message
   */
    public static byte[] getHandshake(int metasize, boolean pexAndMetadata, boolean dht) {
-        Map<String, Object> handshake = new HashMap();
-        Map<String, Integer> m = new HashMap();
+        Map<String, Object> handshake = new HashMap<String, Object>();
+        Map<String, Integer> m = new HashMap<String, Integer>();
        if (pexAndMetadata) {
            m.put(TYPE_METADATA, Integer.valueOf(ID_METADATA));
            m.put(TYPE_PEX, Integer.valueOf(ID_PEX));
@@ -56,7 +56,7 @@ abstract class ExtensionHandler {
        }
        // 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("p", Integer.valueOf(TrackerClient.PORT));
        handshake.put("v", "I2PSnark");
        handshake.put("reqq", Integer.valueOf(5));
        return BEncoder.bencode(handshake);
@@ -110,7 +110,8 @@ abstract class ExtensionHandler {
                // drop if we need metainfo and we haven't found anybody yet
                synchronized(state) {
                    if (!state.isInitialized()) {
-                        log.debug("Dropping peer, we need metadata! " + peer);
+                        if (log.shouldLog(Log.DEBUG))
+                            log.debug("Dropping peer, we need metadata! " + peer);
                        peer.disconnect();
                    }
                }
@@ -124,7 +125,8 @@ abstract class ExtensionHandler {
                // drop if we need metainfo and we haven't found anybody yet
                synchronized(state) {
                    if (!state.isInitialized()) {
-                        log.debug("Dropping peer, we need metadata! " + peer);
+                        if (log.shouldLog(Log.DEBUG))
+                            log.debug("Dropping peer, we need metadata! " + peer);
                        peer.disconnect();
                    }
                }
@@ -274,7 +276,7 @@ abstract class ExtensionHandler {

    /** REQUEST and REJECT are the same except for message type */
    private static void sendMessage(Peer peer, int type, int piece) {
-        Map<String, Object> map = new HashMap();
+        Map<String, Object> map = new HashMap<String, Object>();
        map.put("msg_type", Integer.valueOf(type));
        map.put("piece", Integer.valueOf(piece));
        byte[] payload = BEncoder.bencode(map);
@@ -289,7 +291,7 @@ abstract class ExtensionHandler {
    }

    private static void sendPiece(Peer peer, int piece, byte[] data) {
-        Map<String, Object> map = new HashMap();
+        Map<String, Object> map = new HashMap<String, Object>();
        map.put("msg_type", Integer.valueOf(TYPE_DATA));
        map.put("piece", Integer.valueOf(piece));
        map.put("total_size", Integer.valueOf(data.length));
@@ -332,7 +334,7 @@ abstract class ExtensionHandler {
            if (ids.length < HASH_LENGTH)
                return;
            int len = Math.min(ids.length, (I2PSnarkUtil.MAX_CONNECTIONS - 1) * HASH_LENGTH);
-            List<PeerID> peers = new ArrayList(len / HASH_LENGTH);
+            List<PeerID> peers = new ArrayList<PeerID>(len / HASH_LENGTH);
            for (int off = 0; off < len; off += HASH_LENGTH) {
                byte[] hash = new byte[HASH_LENGTH];
                System.arraycopy(ids, off, hash, 0, HASH_LENGTH);
@@ -380,7 +382,7 @@ abstract class ExtensionHandler {
    public static void sendPEX(Peer peer, List<Peer> pList) {
        if (pList.isEmpty())
            return;
-        Map<String, Object> map = new HashMap();
+        Map<String, Object> map = new HashMap<String, Object>();
        byte[] peers = new byte[HASH_LENGTH * pList.size()];
        int off = 0;
        for (Peer p : pList) {
@@ -404,7 +406,7 @@ abstract class ExtensionHandler {
     *  @since DHT
     */
    public static void sendDHT(Peer peer, int qport, int rport) {
-        Map<String, Object> map = new HashMap();
+        Map<String, Object> map = new HashMap<String, Object>();
        map.put("port", Integer.valueOf(qport));
        map.put("rport", Integer.valueOf(rport));
        byte[] payload = BEncoder.bencode(map);
--- a/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java
@@ -3,15 +3,14 @@ package org.klomp.snark;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
-import java.util.StringTokenizer;

 import net.i2p.I2PAppContext;
 import net.i2p.I2PException;
@@ -33,7 +32,6 @@ import net.i2p.util.FileUtil;
 import net.i2p.util.Log;
 import net.i2p.util.SecureDirectory;
 import net.i2p.util.SecureFile;
-import net.i2p.util.SimpleScheduler;
 import net.i2p.util.SimpleTimer;
 import net.i2p.util.Translate;

@@ -49,6 +47,7 @@ import org.klomp.snark.dht.KRPC;
 public class I2PSnarkUtil {
    private final I2PAppContext _context;
    private final Log _log;
+    private final String _baseName;
    
    private boolean _shouldProxy;
    private String _proxyHost;
@@ -75,32 +74,39 @@ public class I2PSnarkUtil {
    private static final int EEPGET_CONNECT_TIMEOUT_SHORT = 5*1000;
    public static final int DEFAULT_STARTUP_DELAY = 3;
    public static final boolean DEFAULT_USE_OPENTRACKERS = true;
-    public static final String DEFAULT_OPENTRACKERS = "http://tracker.welterde.i2p/a";
-    public static final int DEFAULT_MAX_UP_BW = 8;  //KBps
    public static final int MAX_CONNECTIONS = 16; // per torrent
    public static final String PROP_MAX_BW = "i2cp.outboundBytesPerSecond";
    public static final boolean DEFAULT_USE_DHT = true;
+    public static final String EEPGET_USER_AGENT = "I2PSnark";

    public I2PSnarkUtil(I2PAppContext ctx) {
+        this(ctx, "i2psnark");
+    }
+
+    /**
+     *  @param baseName generally "i2psnark"
+     *  @since Jetty 7
+     */
+    public I2PSnarkUtil(I2PAppContext ctx, String baseName) {
        _context = ctx;
        _log = _context.logManager().getLog(Snark.class);
-        _opts = new HashMap();
+        _baseName = baseName;
+        _opts = new HashMap<String, String>();
        //setProxy("127.0.0.1", 4444);
        setI2CPConfig("127.0.0.1", 7654, null);
-        _banlist = new ConcurrentHashSet();
+        _banlist = new ConcurrentHashSet<Hash>();
        _maxUploaders = Snark.MAX_TOTAL_UPLOADERS;
-        _maxUpBW = DEFAULT_MAX_UP_BW;
+        _maxUpBW = SnarkManager.DEFAULT_MAX_UP_BW;
        _maxConnections = MAX_CONNECTIONS;
        _startupDelay = DEFAULT_STARTUP_DELAY;
        _shouldUseOT = DEFAULT_USE_OPENTRACKERS;
-        // FIXME split if default has more than one
-        _openTrackers = Collections.singletonList(DEFAULT_OPENTRACKERS);
+        _openTrackers = Collections.emptyList();
        _shouldUseDHT = DEFAULT_USE_DHT;
        // This is used for both announce replies and .torrent file downloads,
        // so it must be available even if not connected to I2CP.
        // so much for multiple instances
-        _tmpDir = new SecureDirectory(ctx.getTempDir(), "i2psnark");
-        FileUtil.rmdir(_tmpDir, false);
+        _tmpDir = new SecureDirectory(ctx.getTempDir(), baseName + '-' + ctx.random().nextInt());
+        //FileUtil.rmdir(_tmpDir, false);
        _tmpDir.mkdirs();
    }
    
@@ -148,7 +154,7 @@ public class I2PSnarkUtil {
    }
    
    /**
-     *  This updates the session options and tells the router
+     *  This updates ALL the session options (not just the bw) and tells the router
     *  @param limit KBps
     */
    public void setMaxUpBW(int limit) {
@@ -210,15 +216,13 @@ public class I2PSnarkUtil {
                _log.debug("Connecting to I2P", new Exception("I did it"));
            Properties opts = _context.getProperties();
            if (_opts != null) {
-                for (Iterator iter = _opts.keySet().iterator(); iter.hasNext(); ) {
-                    String key = (String)iter.next();
-                    opts.setProperty(key, _opts.get(key).toString());
-                }
+                for (Map.Entry<String, String> entry : _opts.entrySet() )
+                    opts.setProperty(entry.getKey(), entry.getValue());
            }
            if (opts.getProperty("inbound.nickname") == null)
-                opts.setProperty("inbound.nickname", "I2PSnark");
+                opts.setProperty("inbound.nickname", _baseName.replace("i2psnark", "I2PSnark"));
            if (opts.getProperty("outbound.nickname") == null)
-                opts.setProperty("outbound.nickname", "I2PSnark");
+                opts.setProperty("outbound.nickname", _baseName.replace("i2psnark", "I2PSnark"));
            if (opts.getProperty("outbound.priority") == null)
                opts.setProperty("outbound.priority", "-10");
            // Dont do this for now, it is set in I2PSocketEepGet for announces,
@@ -249,11 +253,13 @@ public class I2PSnarkUtil {
                opts.setProperty("i2p.streaming.enforceProtocol", "true");
            if (opts.getProperty("i2p.streaming.disableRejectLogging") == null)
                opts.setProperty("i2p.streaming.disableRejectLogging", "true");
+            if (opts.getProperty("i2p.streaming.answerPings") == null)
+                opts.setProperty("i2p.streaming.answerPings", "false");
            _manager = I2PSocketManagerFactory.createManager(_i2cpHost, _i2cpPort, opts);
            _connecting = false;
        }
        if (_shouldUseDHT && _manager != null && _dht == null)
-            _dht = new KRPC(_context, _manager.getSession());
+            _dht = new KRPC(_context, _baseName, _manager.getSession());
        return (_manager != null);
    }
    
@@ -314,6 +320,8 @@ public class I2PSnarkUtil {
        if (_banlist.contains(dest))
            throw new IOException("Not trying to contact " + dest.toBase64() + ", as they are banlisted");
        try {
+            // TODO opts.setPort(xxx); connect(addr, opts)
+            // DHT moved above 6881 in 0.9.9
            I2PSocket rv = _manager.connect(addr);
            if (rv != null)
                _banlist.remove(dest);
@@ -321,7 +329,9 @@ public class I2PSnarkUtil {
        } catch (I2PException ie) {
            _banlist.add(dest);
            _context.simpleScheduler().addEvent(new Unbanlist(dest), 10*60*1000);
-            throw new IOException("Unable to reach the peer " + peer + ": " + ie.getMessage());
+            IOException ioe = new IOException("Unable to reach the peer " + peer);
+            ioe.initCause(ie);
+            throw ioe;
        }
    }
    
@@ -384,6 +394,7 @@ public class I2PSnarkUtil {
            }
        }
        EepGet get = new I2PSocketEepGet(_context, _manager, retries, out.getAbsolutePath(), fetchURL);
+        get.addHeader("User-Agent", EEPGET_USER_AGENT);
        if (get.fetch(timeout)) {
            if (_log.shouldLog(Log.DEBUG))
                _log.debug("Fetch successful [" + url + "]: size=" + out.length());
@@ -425,6 +436,7 @@ public class I2PSnarkUtil {
        }
        ByteArrayOutputStream out = new ByteArrayOutputStream(initialSize);
        EepGet get = new I2PSocketEepGet(_context, _manager, retries, -1, maxSize, null, out, fetchURL);
+        get.addHeader("User-Agent", EEPGET_USER_AGENT);
        if (get.fetch(timeout)) {
            if (_log.shouldLog(Log.DEBUG))
                _log.debug("Fetch successful [" + url + "]: size=" + out.size());
@@ -503,7 +515,7 @@ public class I2PSnarkUtil {
                            if (_log.shouldLog(Log.INFO))
                                _log.info("Using existing session for lookup of " + ip);
                            try {
-                                return sess.lookupDest(h);
+                                return sess.lookupDest(h, 15*1000);
                            } catch (I2PSessionException ise) {
                            }
                        }
@@ -553,22 +565,37 @@ public class I2PSnarkUtil {
        return rv;
    }
    
-    /** @param ot non-null */
+    /** @param ot non-null list of announce URLs */
    public void setOpenTrackers(List<String> ot) { 
        _openTrackers = ot;
    }

-    /** List of open trackers to use as backups
+    /** List of open tracker announce URLs to use as backups
     *  @return non-null, possibly unmodifiable, empty if disabled
     */
    public List<String> getOpenTrackers() { 
        if (!shouldUseOpenTrackers())
-            return Collections.EMPTY_LIST;
+            return Collections.emptyList();
        return _openTrackers;
    }

    /**
-     *  List of open trackers to use as backups even if disabled
+     *  Is this announce URL probably for an open tracker?
+     *
+     *  @since 0.9.17
+     */
+    public boolean isKnownOpenTracker(String url) { 
+        try {
+           URL u = new URL(url);
+           String host = u.getHost();
+           return host != null && SnarkManager.KNOWN_OPENTRACKERS.contains(host);
+        } catch (MalformedURLException mue) {
+           return false;
+        }
+    }
+
+    /**
+     *  List of open tracker announce URLs to use as backups even if disabled
     *  @return non-null
     *  @since 0.9.4
     */
@@ -588,7 +615,7 @@ public class I2PSnarkUtil {
    public synchronized void setUseDHT(boolean yes) {
        _shouldUseDHT = yes;
        if (yes && _manager != null && _dht == null) {
-            _dht = new KRPC(_context, _manager.getSession());
+            _dht = new KRPC(_context, _baseName, _manager.getSession());
        } else if (!yes && _dht != null) {
            _dht.stop();
            _dht = null;
--- a/apps/i2psnark/java/src/org/klomp/snark/IdleChecker.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/IdleChecker.java
@@ -0,0 +1,181 @@
+/*
+ * Released into the public domain 
+ * with no warranty of any kind, either expressed or implied.  
+ */
+package org.klomp.snark;
+
+import java.util.Map;
+import java.util.Properties;
+
+import net.i2p.client.I2PSession;
+import net.i2p.client.streaming.I2PSocketManager;
+import net.i2p.util.Log;
+import net.i2p.util.SimpleTimer2;
+
+/**
+ *  Periodically check for idle condition based on connected peers,
+ *  and reduce/restore tunnel count as necessary.
+ *  We can't use the I2CP idle detector because it's based on traffic,
+ *  so DHT and announces would keep it non-idle.
+ *
+ *  @since 0.9.7
+ */
+class IdleChecker extends SimpleTimer2.TimedEvent {
+
+    private final SnarkManager _mgr;
+    private final I2PSnarkUtil _util;
+    private final PeerCoordinatorSet _pcs;
+    private final Log _log;
+    private int _consec;
+    private int _consecNotRunning;
+    private boolean _isIdle;
+    private String _lastIn = "3";
+    private String _lastOut = "3";
+    private final Object _lock = new Object();
+
+    private static final long CHECK_TIME = 63*1000;
+    private static final int MAX_CONSEC_IDLE = 4;
+    private static final int MAX_CONSEC_NOT_RUNNING = 20;
+
+    /**
+     *  Caller must schedule
+     */
+    public IdleChecker(SnarkManager mgr, PeerCoordinatorSet pcs) {
+        super(mgr.util().getContext().simpleTimer2());
+        _util = mgr.util();
+        _log = _util.getContext().logManager().getLog(IdleChecker.class);
+        _mgr = mgr;
+        _pcs = pcs;
+    }
+
+    public void timeReached() {
+        synchronized (_lock) {
+            locked_timeReached();
+        }
+    }
+
+    private void locked_timeReached() {
+        if (_util.connected()) {
+            boolean torrentRunning = false;
+            int peerCount = 0;
+            for (PeerCoordinator pc : _pcs) {
+                if (!pc.halted()) {
+                    torrentRunning = true;
+                    peerCount += pc.getPeers();
+                }
+            }
+
+            if (torrentRunning) {
+                _consecNotRunning = 0;
+            } else {
+                if (_consecNotRunning++ >= MAX_CONSEC_NOT_RUNNING) {
+                    if (_log.shouldLog(Log.WARN))
+                        _log.warn("Closing tunnels on idle");
+                    _util.disconnect();
+                    _mgr.addMessage(_util.getString("No more torrents running.") + ' ' +
+                                    _util.getString("I2P tunnel closed."));
+                    schedule(3 * CHECK_TIME);
+                    return;
+                }
+            }
+
+            if (peerCount > 0) {
+                restoreTunnels(peerCount);
+            } else {
+                if (!_isIdle) {
+                    if (_consec++ >= MAX_CONSEC_IDLE)
+                        reduceTunnels();
+                    else
+                        restoreTunnels(1);  // pretend we have one peer for now
+                }
+            }
+        } else {
+            _isIdle = false;
+            _consec = 0;
+            _consecNotRunning = 0;
+            _lastIn = "3";
+            _lastOut = "3";
+        }
+        schedule(CHECK_TIME);
+    }
+
+    /**
+     *  Reduce to 1 in / 1 out tunnel
+     */
+    private void reduceTunnels() {
+        _isIdle = true;
+        if (_log.shouldLog(Log.INFO))
+            _log.info("Reducing tunnels on idle");
+        setTunnels("1", "1", "0", "0");
+    }
+    
+    /**
+     *  Restore or adjust tunnel count based on current peer count
+     *  @param peerCount greater than zero
+     */
+    private void restoreTunnels(int peerCount) {
+        if (_isIdle && _log.shouldLog(Log.INFO))
+            _log.info("Restoring tunnels on activity");
+        _isIdle = false;
+        Map<String, String> opts = _util.getI2CPOptions();
+        String i = opts.get("inbound.quantity");
+        if (i == null)
+            i = "3";
+        String o = opts.get("outbound.quantity");
+        if (o == null)
+            o = "3";
+        String ib = opts.get("inbound.backupQuantity");
+        if (ib == null)
+            ib = "0";
+        String ob= opts.get("outbound.backupQuantity");
+        if (ob == null)
+            ob = "0";
+        // we don't need more tunnels than we have peers, reduce if so
+        // reduce to max(peerCount / 2, 2)
+        int in, out;
+        try {
+            in = Integer.parseInt(i);
+        } catch (NumberFormatException nfe) {
+            in = 3;
+        }
+        try {
+            out = Integer.parseInt(o);
+        } catch (NumberFormatException nfe) {
+            out = 3;
+        }
+        int target = Math.max(peerCount / 2, 2);
+        if (target < in && in > 2) {
+            in = target;
+            i = Integer.toString(in);
+        }
+        if (target < out && out > 2) {
+            out = target;
+            o = Integer.toString(out);
+        }
+        if (!(_lastIn.equals(i) && _lastOut.equals(o)))
+            setTunnels(i, o, ib, ob);
+    }
+    
+    /**
+     *  Set in / out / in backup / out backup tunnel counts
+     */
+    private void setTunnels(String i, String o, String ib, String ob) {
+        _consec = 0;
+        I2PSocketManager mgr = _util.getSocketManager();
+        if (mgr != null) {
+            I2PSession sess = mgr.getSession();
+            if (sess != null) {
+                if (_log.shouldLog(Log.INFO))
+                    _log.info("New tunnel settings " + i + " / " + o + " / " + ib + " / " + ob);
+                Properties newProps = new Properties();
+                newProps.setProperty("inbound.quantity", i);
+                newProps.setProperty("outbound.quantity", o);
+                newProps.setProperty("inbound.backupQuantity", ib);
+                newProps.setProperty("outbound.backupQuantity", ob);
+                sess.updateOptions(newProps);
+                _lastIn = i;
+                _lastOut = o;
+            }
+        }
+    }
+}
--- a/apps/i2psnark/java/src/org/klomp/snark/MagnetState.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/MagnetState.java
@@ -6,7 +6,6 @@ import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;

-import net.i2p.I2PAppContext;
 import net.i2p.data.DataHelper;
 import net.i2p.util.RandomSource;

@@ -188,9 +187,9 @@ class MagnetState {
     *  @return true if this was the last piece
     *  @throws NPE, IllegalArgumentException, IOException, ...
     */
-    public MetaInfo buildMetaInfo() throws Exception {
+    private MetaInfo buildMetaInfo() throws Exception {
        // top map has nothing in it but the info map (no announce)
-        Map<String, BEValue> map = new HashMap();
+        Map<String, BEValue> map = new HashMap<String, BEValue>();
        InputStream is = new ByteArrayInputStream(metainfoBytes);
        BDecoder dec = new BDecoder(is);
        BEValue bev = dec.bdecodeMap();
--- a/apps/i2psnark/java/src/org/klomp/snark/MagnetURI.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/MagnetURI.java
@@ -42,7 +42,7 @@ public class MagnetURI {
            name = util.getString("Magnet") + ' ' + ihash;
            String dn = getParam("dn", url);
            if (dn != null)
-                name += " (" + Storage.filterName(dn) + ')';
+                name += " (" + dn + ')';
        } else if (url.startsWith(MAGGOT)) {
            // maggot://0691e40aae02e552cfcb57af1dca56214680c0c5:0b557bbdf8718e95d352fbe994dec3a383e2ede7
            ihash = url.substring(MAGGOT.length()).trim();
@@ -82,7 +82,7 @@ public class MagnetURI {
    }

    /**
-     *  @return pretty name or null
+     *  @return pretty name or null, NOT HTML escaped
     */
    public String getName() {
        return _name;
@@ -133,7 +133,7 @@ public class MagnetURI {
        }
        if (idx < 0 || idx > uri.length())
            return null;
-        List<String> rv = new ArrayList();
+        List<String> rv = new ArrayList<String>();
        while (true) {
            String p = uri.substring(idx);
            uri = p;
@@ -175,18 +175,25 @@ public class MagnetURI {
    }

    /**
-     *  Decode %xx encoding, convert to UTF-8 if necessary
-     *  Copied from i2ptunnel LocalHTTPServer
+     *  Decode %xx encoding, convert to UTF-8 if necessary.
+     *  Copied from i2ptunnel LocalHTTPServer.
+     *  Also converts '+' to ' ' so the dn parameter comes out right
+     *  These are coming in via a application/x-www-form-urlencoded form so
+     *  the pluses are in there...
+     *  hopefully any real + is encoded as %2B.
+     *
     *  @since 0.9.1
     */
    private static String decode(String s) {
-        if (!s.contains("%"))
+        if (!(s.contains("%") || s.contains("+")))
            return s;
        StringBuilder buf = new StringBuilder(s.length());
        boolean utf8 = false;
        for (int i = 0; i < s.length(); i++) {
            char c = s.charAt(i);
-            if (c != '%') {
+            if (c == '+') {
+                buf.append(' ');
+            } else if (c != '%') {
                buf.append(c);
            } else {
                try {
--- a/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java
@@ -62,6 +62,9 @@ public class MetaInfo
  private final long length;
  private final boolean privateTorrent;
  private final List<List<String>> announce_list;
+  private final String comment;
+  private final String created_by;
+  private final long creation_date;
  private Map<String, BEValue> infoMap;

  /**
@@ -87,6 +90,9 @@ public class MetaInfo
    this.length = length;
    this.privateTorrent = privateTorrent;
    this.announce_list = announce_list;
+    this.comment = null;
+    this.created_by = null;
+    this.creation_date = I2PAppContext.getGlobalContext().clock().now();

    // TODO if we add a parameter for other keys
    //if (other != null) {
@@ -150,11 +156,11 @@ public class MetaInfo
    if (val == null) {
        this.announce_list = null;
    } else {
-        this.announce_list = new ArrayList();
+        this.announce_list = new ArrayList<List<String>>();
        List<BEValue> bl1 = val.getList();
        for (BEValue bev : bl1) {
            List<BEValue> bl2 = bev.getList();
-            List<String> sl2 = new ArrayList();           
+            List<String> sl2 = new ArrayList<String>();           
            for (BEValue bev2 : bl2) {
                sl2.add(bev2.getString());
            }
@@ -162,6 +168,32 @@ public class MetaInfo
        }
    }

+    // misc. optional  top-level stuff
+    val = m.get("comment");
+    String st = null;
+    if (val != null) {
+        try {
+            st = val.getString();
+        } catch (InvalidBEncodingException ibee) {}
+    }
+    this.comment = st;
+    val = m.get("created by");
+    st = null;
+    if (val != null) {
+        try {
+            st = val.getString();
+        } catch (InvalidBEncodingException ibee) {}
+    }
+    this.created_by = st;
+    val = m.get("creation date");
+    long time = 0;
+    if (val != null) {
+        try {
+            time = val.getLong() * 1000;
+        } catch (InvalidBEncodingException ibee) {}
+    }
+    this.creation_date = time;
+
    val = m.get("info");
    if (val == null)
        throw new InvalidBEncodingException("Missing info map");
@@ -184,7 +216,18 @@ public class MetaInfo

    // BEP 27
    val = info.get("private");
-    privateTorrent = val != null && val.getString().equals("1");
+    if (val != null) {
+        Object o = val.getValue();
+        // Is it supposed to be a number or a string?
+        // i2psnark does it as a string. BEP 27 doesn't say.
+        // Transmission does numbers. So does libtorrent.
+        // We handle both as of 0.9.9.
+        // We switch to storing as number as of 0.9.14.
+        privateTorrent = "1".equals(o) ||
+                         ((o instanceof Number) && ((Number) o).intValue() == 1);
+    } else {
+        privateTorrent = false;
+    }

    val = info.get("piece length");
    if (val == null)
@@ -218,9 +261,9 @@ public class MetaInfo
        if (size == 0)
          throw new InvalidBEncodingException("zero size files list");

-        List<List<String>> m_files = new ArrayList(size);
-        List<List<String>> m_files_utf8 = new ArrayList(size);
-        List<Long> m_lengths = new ArrayList(size);
+        List<List<String>> m_files = new ArrayList<List<String>>(size);
+        List<List<String>> m_files_utf8 = new ArrayList<List<String>>(size);
+        List<Long> m_lengths = new ArrayList<Long>(size);
        long l = 0;
        for (int i = 0; i < list.size(); i++)
          {
@@ -246,7 +289,7 @@ public class MetaInfo
            if (path_length == 0)
              throw new InvalidBEncodingException("zero size file path list");

-            List<String> file = new ArrayList(path_length);
+            List<String> file = new ArrayList<String>(path_length);
            Iterator<BEValue> it = path_list.iterator();
            while (it.hasNext()) {
                String s = it.next().getString();
@@ -269,7 +312,7 @@ public class MetaInfo
                path_list = val.getList();
                path_length = path_list.size();
                if (path_length > 0) {
-                    file = new ArrayList(path_length);
+                    file = new ArrayList<String>(path_length);
                    it = path_list.iterator();
                    while (it.hasNext())
                        file.add(it.next().getString());
@@ -381,6 +424,33 @@ public class MetaInfo
    return lengths;
  }

+  /**
+   * The comment string or null.
+   * Not available for locally-created torrents.
+   * @since 0.9.7
+   */
+  public String getComment() {
+      return this.comment;
+  }
+
+  /**
+   * The created-by string or null.
+   * Not available for locally-created torrents.
+   * @since 0.9.7
+   */
+  public String getCreatedBy() {
+      return this.created_by;
+  }
+
+  /**
+   * The creation date (ms) or zero.
+   * As of 0.9.19, available for locally-created torrents.
+   * @since 0.9.7
+   */
+  public long getCreationDate() {
+      return this.creation_date;
+  }
+
  /**
   * Returns the number of pieces.
   */
@@ -447,9 +517,10 @@ public class MetaInfo

    sha1.update(bs, off, length);
    byte[] hash = sha1.digest();
-    for (int i = 0; i < 20; i++)
+    for (int i = 0; i < 20; i++) {
      if (hash[i] != piece_hashes[20 * piece + i])
        return false;
+    }
    return true;
  }
  
@@ -458,7 +529,6 @@ public class MetaInfo
   *  @since 0.9.1
   */
  boolean checkPiece(PartialPiece pp) {
-    MessageDigest sha1 = SHA1.getInstance();
    int piece = pp.getPiece();
    byte[] hash;
    try {
@@ -470,9 +540,10 @@ public class MetaInfo
        _log.warn("Error checking", ioe);
        return false;
    }
-    for (int i = 0; i < 20; i++)
+    for (int i = 0; i < 20; i++) {
      if (hash[i] != piece_hashes[20 * piece + i])
        return false;
+    }
    return true;
  }

@@ -501,12 +572,17 @@ public class MetaInfo
   * Creates a copy of this MetaInfo that shares everything except the
   * announce URL.
   * Drops any announce-list.
+   * Preserves infohash and info map, including any non-standard fields.
+   * @param announce may be null
   */
-  public MetaInfo reannounce(String announce)
+  public MetaInfo reannounce(String announce) throws InvalidBEncodingException
  {
-    return new MetaInfo(announce, name, name_utf8, files,
-                        lengths, piece_length,
-                        piece_hashes, length, privateTorrent, null);
+        Map<String, BEValue> m = new HashMap<String, BEValue>();
+        if (announce != null)
+            m.put("announce", new BEValue(DataHelper.getUTF8(announce)));
+        Map<String, BEValue> info = createInfoMap();
+        m.put("info", new BEValue(info));
+        return new MetaInfo(m);
  }

  /**
@@ -514,12 +590,20 @@ public class MetaInfo
   */
  public synchronized byte[] getTorrentData()
  {
-        Map m = new HashMap();
+        Map<String, Object> m = new HashMap<String, Object>();
        if (announce != null)
            m.put("announce", announce);
        if (announce_list != null)
            m.put("announce-list", announce_list);
-        Map info = createInfoMap();
+        // misc. optional  top-level stuff
+        if (comment != null)
+            m.put("comment", comment);
+        if (created_by != null)
+            m.put("created by", created_by);
+        if (creation_date != 0)
+            m.put("creation date", creation_date / 1000);
+
+        Map<String, BEValue> info = createInfoMap();
        m.put("info", info);
        // don't save this locally, we should only do this once
        return BEncoder.bencode(m);
@@ -539,32 +623,48 @@ public class MetaInfo
    // or else we will lose any non-standard keys and corrupt the infohash.
    if (infoMap != null)
        return Collections.unmodifiableMap(infoMap);
+    // we should only get here if serving a magnet on a torrent we created
+    if (_log.shouldLog(Log.WARN))
+        _log.warn("Creating new infomap", new Exception());
    // otherwise we must create it
-    Map info = new HashMap();
-    info.put("name", name);
+    Map<String, BEValue> info = new HashMap<String, BEValue>();
+    info.put("name", new BEValue(DataHelper.getUTF8(name)));
    if (name_utf8 != null)
-        info.put("name.utf-8", name_utf8);
+        info.put("name.utf-8", new BEValue(DataHelper.getUTF8(name_utf8)));
    // BEP 27
    if (privateTorrent)
-        info.put("private", "1");
+        // switched to number in 0.9.14
+        //info.put("private", new BEValue(DataHelper.getUTF8("1")));
+        info.put("private", new BEValue(Integer.valueOf(1)));

-    info.put("piece length", Integer.valueOf(piece_length));
-    info.put("pieces", piece_hashes);
+    info.put("piece length", new BEValue(Integer.valueOf(piece_length)));
+    info.put("pieces", new BEValue(piece_hashes));
    if (files == null)
-      info.put("length", Long.valueOf(length));
+      info.put("length", new BEValue(Long.valueOf(length)));
    else
      {
-        List l = new ArrayList();
+        List<BEValue> l = new ArrayList<BEValue>();
        for (int i = 0; i < files.size(); i++)
          {
-            Map file = new HashMap();
-            file.put("path", files.get(i));
-            if ( (files_utf8 != null) && (files_utf8.size() > i) )
-                file.put("path.utf-8", files_utf8.get(i));
-            file.put("length", lengths.get(i));
-            l.add(file);
+            Map<String, BEValue> file = new HashMap<String, BEValue>();
+            List<String> fi = files.get(i);
+            List<BEValue> befiles = new ArrayList<BEValue>(fi.size());
+            for (int j = 0; j < fi.size(); j++) {
+                befiles.add(new BEValue(DataHelper.getUTF8(fi.get(j))));
+            }
+            file.put("path", new BEValue(befiles));
+            if ( (files_utf8 != null) && (files_utf8.size() > i) ) {
+                List<String> fiu = files_utf8.get(i);
+                List<BEValue> beufiles = new ArrayList<BEValue>(fiu.size());
+                for (int j = 0; j < fiu.size(); j++) {
+                    beufiles.add(new BEValue(DataHelper.getUTF8(fiu.get(j))));
+                }
+                file.put("path.utf-8", new BEValue(beufiles));
+            }
+            file.put("length", new BEValue(lengths.get(i)));
+            l.add(new BEValue(file));
          }
-        info.put("files", l);
+        info.put("files", new BEValue(l));
      }

    // TODO if we add the ability for other keys in the first constructor
--- a/apps/i2psnark/java/src/org/klomp/snark/PartialPiece.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/PartialPiece.java
@@ -31,7 +31,7 @@ import net.i2p.util.SecureFile;
 *
 * @since 0.8.2
 */
-class PartialPiece implements Comparable {
+class PartialPiece implements Comparable<PartialPiece> {

    // we store the piece so we can use it in compareTo()
    private final Piece piece;
@@ -295,8 +295,7 @@ class PartialPiece implements Comparable {
     *  then rarest first,
     *  then highest downloaded first
     */
-    public int compareTo(Object o) throws ClassCastException {
-        PartialPiece opp = (PartialPiece)o;
+    public int compareTo(PartialPiece opp) {
        int d = this.piece.compareTo(opp.piece);
        if (d != 0)
            return d;
--- a/apps/i2psnark/java/src/org/klomp/snark/Peer.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/Peer.java
@@ -28,6 +28,8 @@ import java.io.OutputStream;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;

 import net.i2p.I2PAppContext;
 import net.i2p.client.streaming.I2PSocket;
@@ -37,7 +39,7 @@ import net.i2p.util.Log;

 import org.klomp.snark.bencode.BEValue;

-public class Peer implements Comparable
+public class Peer implements Comparable<Peer>
 {
  private final Log _log = I2PAppContext.getGlobalContext().logManager().getLog(Peer.class);
  // Identifying property, the peer id of the other side.
@@ -55,8 +57,8 @@ public class Peer implements Comparable
  private DataOutputStream dout;

  /** running counters */
-  private long downloaded;
-  private long uploaded;
+  private final AtomicLong downloaded = new AtomicLong();
+  private final AtomicLong uploaded = new AtomicLong();

  // Keeps state for in/out connections.  Non-null when the handshake
  // was successful, the connection setup and runs
@@ -68,8 +70,10 @@ public class Peer implements Comparable
  private I2PSocket sock;
  
  private boolean deregister = true;
-  private static long __id;
-  private long _id;
+  private static final AtomicLong __id = new AtomicLong();
+  private final long _id;
+  private final AtomicBoolean _disconnected = new AtomicBoolean();
+
  final static long CHECK_PERIOD = PeerCoordinator.CHECK_PERIOD; // 40 seconds
  final static int RATE_DEPTH = PeerCoordinator.RATE_DEPTH; // make following arrays RATE_DEPTH long
  private long uploaded_old[] = {-1,-1,-1};
@@ -98,7 +102,7 @@ public class Peer implements Comparable
    this.my_id = my_id;
    this.infohash = infohash;
    this.metainfo = metainfo;
-    _id = ++__id;
+    _id = __id.incrementAndGet();
    //_log.debug("Creating a new peer with " + peerID.toString(), new Exception("creating"));
  }

@@ -123,7 +127,7 @@ public class Peer implements Comparable

    byte[] id  = handshake(in, out);
    this.peerID = new PeerID(id, sock.getPeerDestination());
-    _id = ++__id;
+    _id = __id.incrementAndGet();
    if (_log.shouldLog(Log.DEBUG))
        _log.debug("Creating a new peer " + peerID.toString(), new Exception("creating " + _id));
  }
@@ -190,9 +194,8 @@ public class Peer implements Comparable
   * Compares the PeerIDs.
   * @deprecated unused?
   */
-  public int compareTo(Object o)
+  public int compareTo(Peer p)
  {
-    Peer p = (Peer)o;
    int rv = peerID.compareTo(p.peerID);
    if (rv == 0) {
        if (_id > p._id) return 1;
@@ -359,7 +362,7 @@ public class Peer implements Comparable
    String bittorrentProtocol = new String(bs, "UTF-8");
    if (!"BitTorrent protocol".equals(bittorrentProtocol))
      throw new IOException("Handshake failure, expected "
-                            + "'Bittorrent protocol', got '"
+                            + "'BitTorrent protocol', got '"
                            + bittorrentProtocol + "'");
    
    // Handshake read - options
@@ -457,6 +460,8 @@ public class Peer implements Comparable

  void disconnect()
  {
+    if (!_disconnected.compareAndSet(false, true))
+        return;
    PeerState s = state;
    if (s != null)
      {
@@ -476,9 +481,11 @@ public class Peer implements Comparable
        PeerConnectionIn in = s.in;
        if (in != null)
          in.disconnect();
-        PeerConnectionOut out = s.out;
-        if (out != null)
-          out.disconnect();
+        // this is blocking in streaming, so do this after closing the socket
+        // so it won't really block
+        //PeerConnectionOut out = s.out;
+        //if (out != null)
+        //  out.disconnect();
        PeerListener pl = s.listener;
        if (pl != null)
          pl.disconnected(this);
@@ -492,6 +499,13 @@ public class Peer implements Comparable
            _log.warn("Error disconnecting " + toString(), ioe);
        }
    }
+    if (s != null) {
+        // this is blocking in streaming, so do this after closing the socket
+        // so it won't really block
+        PeerConnectionOut out = s.out;
+        if (out != null)
+          out.disconnect();
+    }
  }

  /**
@@ -604,7 +618,7 @@ public class Peer implements Comparable
   * @since 0.8.4
   */
  public void downloaded(int size) {
-      downloaded += size;
+      downloaded.addAndGet(size);
  }

  /**
@@ -612,7 +626,7 @@ public class Peer implements Comparable
   * @since 0.8.4
   */
  public void uploaded(int size) {
-      uploaded += size;
+      uploaded.addAndGet(size);
  }

  /**
@@ -621,7 +635,7 @@ public class Peer implements Comparable
   */
  public long getDownloaded()
  {
-      return downloaded;
+      return downloaded.get();
  }

  /**
@@ -630,7 +644,7 @@ public class Peer implements Comparable
   */
  public long getUploaded()
  {
-      return uploaded;
+      return uploaded.get();
  }

  /**
@@ -638,8 +652,8 @@ public class Peer implements Comparable
   */
  public void resetCounters()
  {
-      downloaded = 0;
-      uploaded = 0;
+      downloaded.set(0);
+      uploaded.set(0);
  }
  
  public long getInactiveTime() {
--- a/apps/i2psnark/java/src/org/klomp/snark/PeerAcceptor.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/PeerAcceptor.java
@@ -26,8 +26,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.SequenceInputStream;
-import java.util.Iterator;
-
 import net.i2p.I2PAppContext;
 import net.i2p.client.streaming.I2PSocket;
 import net.i2p.data.Base64;
@@ -40,7 +38,7 @@ import net.i2p.util.Log;
 * protocol connection. The PeerAcceptor will then create a new peer
 * if the PeerCoordinator wants more peers.
 */
-public class PeerAcceptor
+class PeerAcceptor
 {
  private final Log _log = I2PAppContext.getGlobalContext().logManager().getLog(PeerAcceptor.class);
  private final PeerCoordinator coordinator;
@@ -170,8 +168,7 @@ public class PeerAcceptor
        if (b != PROTO[i])
            throw new IOException("Bad protocol 0x" + Integer.toHexString(b) + " at byte " + i);
    }
-    if (in.skip(8) != 8)
-        throw new IOException("EOF before hash");
+    DataHelper.skip(in, 8);
    byte buf[] = new byte[20];
    int read = DataHelper.read(in, buf);
    if (read != buf.length)
--- a/apps/i2psnark/java/src/org/klomp/snark/PeerCheckerTask.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/PeerCheckerTask.java
@@ -24,7 +24,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;

-import net.i2p.I2PAppContext;
 import net.i2p.data.DataHelper;
 import net.i2p.util.Log;

@@ -73,9 +72,11 @@ class PeerCheckerTask implements Runnable

        // Keep track of peers we remove now,
        // we will add them back to the end of the list.
-        List<Peer> removed = new ArrayList();
+        List<Peer> removed = new ArrayList<Peer>();
        int uploadLimit = coordinator.allowedUploaders();
        boolean overBWLimit = coordinator.overUpBWLimit();
+        if (_log.shouldLog(Log.DEBUG))
+            _log.debug("peers: " + peerList.size() + " limit: " + uploadLimit + " overBW? " + overBWLimit);
        DHT dht = _util.getDHT();
        for (Peer peer : peerList) {

@@ -222,7 +223,8 @@ class PeerCheckerTask implements Runnable
                peer.keepAlive();
            // announce them to local tracker (TrackerClient does this too)
            if (dht != null && (_runCount % 5) == 0) {
-                dht.announce(coordinator.getInfoHash(), peer.getPeerID().getDestHash());
+                dht.announce(coordinator.getInfoHash(), peer.getPeerID().getDestHash(),
+                             peer.isCompleted());
            }
          }

@@ -271,7 +273,7 @@ class PeerCheckerTask implements Runnable

        // announce ourselves to local tracker (TrackerClient does this too)
        if (dht != null && (_runCount % 16) == 0) {
-            dht.announce(coordinator.getInfoHash());
+            dht.announce(coordinator.getInfoHash(), coordinator.completed());
        }
  }
 }
--- a/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionIn.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionIn.java
@@ -65,7 +65,7 @@ class PeerConnectionIn implements Runnable
        try {
            din.close();
        } catch (IOException ioe) {
-            _log.warn("Error closing the stream from " + peer, ioe);
+            //_log.warn("Error closing the stream from " + peer, ioe);
        }
    }
  }
--- a/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionOut.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionOut.java
@@ -25,6 +25,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;

 import net.i2p.I2PAppContext;
 import net.i2p.util.I2PAppThread;
@@ -42,10 +43,10 @@ class PeerConnectionOut implements Runnable
  private boolean quit;

  // Contains Messages.
-  private final List<Message> sendQueue = new ArrayList();
+  private final List<Message> sendQueue = new ArrayList<Message>();
  
-  private static long __id = 0;
-  private long _id;
+  private static final AtomicLong __id = new AtomicLong();
+  private final long _id;
  
  long lastSent;

@@ -53,10 +54,9 @@ class PeerConnectionOut implements Runnable
  {
    this.peer = peer;
    this.dout = dout;
-    _id = ++__id;
+    _id = __id.incrementAndGet();

    lastSent = System.currentTimeMillis();
-    quit = false;
  }
  
  public void startup() {
@@ -66,7 +66,7 @@ class PeerConnectionOut implements Runnable

  /**
   * Continuesly monitors for more outgoing messages that have to be send.
-   * Stops if quit is true of an IOException occurs.
+   * Stops if quit is true or an IOException occurs.
   */
  public void run()
  {
@@ -116,10 +116,10 @@ class PeerConnectionOut implements Runnable
                    // And remove piece messages if we are choking.
                    
                    // this should get fixed for starvation
-                    Iterator it = sendQueue.iterator();
+                    Iterator<Message> it = sendQueue.iterator();
                    while (m == null && it.hasNext())
                      {
-                        Message nm = (Message)it.next();
+                        Message nm = it.next();
                        if (nm.type == Message.PIECE)
                          {
                            if (state.choking) {
@@ -135,7 +135,7 @@ class PeerConnectionOut implements Runnable
                            nm = null;
                          }
                          
-                        if (m == null && nm != null)
+                        if (nm != null)
                          {
                            m = nm;
                            //SimpleTimer.getInstance().removeEvent(nm.expireEvent);
@@ -215,13 +215,13 @@ class PeerConnectionOut implements Runnable
            thread.interrupt();
        
        sendQueue.clear();
-        sendQueue.notify();
+        sendQueue.notifyAll();
      }
    if (dout != null) {
        try {
            dout.close();
        } catch (IOException ioe) {
-            _log.warn("Error closing the stream to " + peer, ioe);
+            //_log.warn("Error closing the stream to " + peer, ioe);
        }
    }
  }
@@ -274,10 +274,10 @@ class PeerConnectionOut implements Runnable
    boolean removed = false;
    synchronized(sendQueue)
      {
-        Iterator it = sendQueue.iterator();
+        Iterator<Message> it = sendQueue.iterator();
        while (it.hasNext())
          {
-            Message m = (Message)it.next();
+            Message m = it.next();
            if (m.type == type)
              {
                it.remove();
@@ -360,13 +360,13 @@ class PeerConnectionOut implements Runnable

  /** reransmit requests not received in 7m */
  private static final int REQ_TIMEOUT = (2 * SEND_TIMEOUT) + (60 * 1000);
-  void retransmitRequests(List requests)
+  void retransmitRequests(List<Request> requests)
  {
    long now = System.currentTimeMillis();
-    Iterator it = requests.iterator();
+    Iterator<Request> it = requests.iterator();
    while (it.hasNext())
      {
-        Request req = (Request)it.next();
+        Request req = it.next();
        if(now > req.sendTime + REQ_TIMEOUT) {
          if (_log.shouldLog(Log.DEBUG))
              _log.debug("Retransmit request " + req + " to peer " + peer);
@@ -375,12 +375,12 @@ class PeerConnectionOut implements Runnable
      }
  }

-  void sendRequests(List requests)
+  void sendRequests(List<Request> requests)
  {
-    Iterator it = requests.iterator();
+    Iterator<Request> it = requests.iterator();
    while (it.hasNext())
      {
-        Request req = (Request)it.next();
+        Request req = it.next();
        sendRequest(req);
      }
  }
@@ -391,10 +391,10 @@ class PeerConnectionOut implements Runnable
    // (multiple choke/unchokes received cause duplicate requests in the queue)
    synchronized(sendQueue)
      {
-        Iterator it = sendQueue.iterator();
+        Iterator<Message> it = sendQueue.iterator();
        while (it.hasNext())
          {
-            Message m = (Message)it.next();
+            Message m = it.next();
            if (m.type == Message.REQUEST && m.piece == req.getPiece() &&
                m.begin == req.off && m.length == req.len)
              {
@@ -419,10 +419,10 @@ class PeerConnectionOut implements Runnable
    int total = 0;
    synchronized(sendQueue)
      {
-        Iterator it = sendQueue.iterator();
+        Iterator<Message> it = sendQueue.iterator();
        while (it.hasNext())
          {
-            Message m = (Message)it.next();
+            Message m = it.next();
            if (m.type == Message.PIECE)
                total += m.length;
          }
@@ -489,10 +489,10 @@ class PeerConnectionOut implements Runnable
    // See if it is still in our send queue
    synchronized(sendQueue)
      {
-        Iterator it = sendQueue.iterator();
+        Iterator<Message> it = sendQueue.iterator();
        while (it.hasNext())
          {
-            Message m = (Message)it.next();
+            Message m = it.next();
            if (m.type == Message.REQUEST
                && m.piece == req.getPiece()
                && m.begin == req.off
@@ -530,10 +530,10 @@ class PeerConnectionOut implements Runnable
  {
    synchronized (sendQueue)
      {
-        Iterator it = sendQueue.iterator();
+        Iterator<Message> it = sendQueue.iterator();
        while (it.hasNext())
          {
-            Message m = (Message)it.next();
+            Message m = it.next();
            if (m.type == Message.PIECE
                && m.piece == piece
                && m.begin == begin
--- a/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java
@@ -25,14 +25,14 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Deque;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.Queue;
 import java.util.Random;
 import java.util.Set;
-import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.LinkedBlockingDeque;

 import net.i2p.I2PAppContext;
 import net.i2p.data.ByteArray;
@@ -52,7 +52,7 @@ import org.klomp.snark.dht.DHT;
 */
 class PeerCoordinator implements PeerListener
 {
-  private final Log _log = I2PAppContext.getGlobalContext().logManager().getLog(PeerCoordinator.class);
+  private final Log _log;

  /**
   * External use by PeerMonitorTask only.
@@ -98,7 +98,7 @@ class PeerCoordinator implements PeerListener
   * This is a Queue, not a Set, because PeerCheckerTask keeps things in order for choking/unchoking.
   * External use by PeerMonitorTask only.
   */
-  final Queue<Peer> peers;
+  final Deque<Peer> peers;

  /**
   * Peers we heard about via PEX
@@ -144,6 +144,7 @@ class PeerCoordinator implements PeerListener
  {
    _util = util;
    _random = util.getContext().random();
+    _log = util.getContext().logManager().getLog(PeerCoordinator.class);
    this.id = id;
    this.infohash = infohash;
    this.metainfo = metainfo;
@@ -151,12 +152,12 @@ class PeerCoordinator implements PeerListener
    this.listener = listener;
    this.snark = torrent;

-    wantedPieces = new ArrayList();
+    wantedPieces = new ArrayList<Piece>();
    setWantedPieces();
-    partialPieces = new ArrayList(getMaxConnections() + 1);
-    peers = new LinkedBlockingQueue();
+    partialPieces = new ArrayList<PartialPiece>(getMaxConnections() + 1);
+    peers = new LinkedBlockingDeque<Peer>();
    magnetState = new MagnetState(infohash, metainfo);
-    pexPeers = new ConcurrentHashSet();
+    pexPeers = new ConcurrentHashSet<PeerID>();

    // Install a timer to check the uploaders.
    // Randomize the first start time so multiple tasks are spread out,
@@ -218,7 +219,7 @@ class PeerCoordinator implements PeerListener
  /** for web page detailed stats */
  public List<Peer> peerList()
  {
-        return new ArrayList(peers);
+        return new ArrayList<Peer>(peers);
  }

  public byte[] getID()
@@ -281,6 +282,14 @@ class PeerCoordinator implements PeerListener
    return uploaded;
  }

+  /**
+   *  Sets the initial total of uploaded bytes of all peers (from a saved status)
+   *  @since 0.9.15
+   */
+  public void setUploaded(long up) {
+      uploaded = up;
+  }
+
  /**
   * Returns the total number of downloaded bytes of all peers.
   */
@@ -376,10 +385,10 @@ class PeerCoordinator implements PeerListener
   */
  public boolean needOutboundPeers() {
        //return wantedBytes != 0 && needPeers();
-        // minus one to make it a little easier for new peers to get in on large swarms
+        // minus two to make it a little easier for new peers to get in on large swarms
        return wantedBytes != 0 &&
               !halted &&
-               peers.size() < getMaxConnections() - 1 &&
+               peers.size() < getMaxConnections() - 2 &&
               (storage == null || !storage.isChecking());
  }
  
@@ -412,7 +421,7 @@ class PeerCoordinator implements PeerListener
  public void halt()
  {
    halted = true;
-    List<Peer> removed = new ArrayList();
+    List<Peer> removed = new ArrayList<Peer>();
    synchronized(peers)
      {
        // Stop peer checker task.
@@ -514,7 +523,10 @@ class PeerCoordinator implements PeerListener
            // Can't add to beginning since we converted from a List to a Queue
            // We can do this in Java 6 with a Deque
            //peers.add(0, peer);
-            peers.add(peer);
+            if (_util.getContext().random().nextInt(4) == 0)
+                peers.push(peer);
+            else
+                peers.add(peer);
            peerCount = peers.size();
            unchokePeer();

@@ -613,7 +625,7 @@ class PeerCoordinator implements PeerListener
    // linked list will contain all interested peers that we choke.
    // At the start are the peers that have us unchoked at the end the
    // other peer that are interested, but are choking us.
-    List<Peer> interested = new LinkedList();
+    List<Peer> interested = new LinkedList<Peer>();
        int count = 0;
        int unchokedCount = 0;
        int maxUploaders = allowedUploaders();
@@ -729,7 +741,7 @@ class PeerCoordinator implements PeerListener
    }

    Piece piece = null;
-    List<Piece> requested = new ArrayList(); 
+    List<Piece> requested = new ArrayList<Piece>(); 
    int wantedSize = END_GAME_THRESHOLD + 1;
    synchronized(wantedPieces)
      {
@@ -833,7 +845,7 @@ class PeerCoordinator implements PeerListener
          _log.debug("Updated piece priorities called but no priorities to set?");
          return;
      }
-      List<Piece> toCancel = new ArrayList();
+      List<Piece> toCancel = new ArrayList<Piece>();
      synchronized(wantedPieces) {
          // Add incomplete and previously unwanted pieces to the list
          // Temp to avoid O(n**2)
@@ -999,13 +1011,13 @@ class PeerCoordinator implements PeerListener
          }
        catch (IOException ioe)
          {
-            snark.stopTorrent();
            String msg = "Error writing storage (piece " + piece + ") for " + metainfo.getName() + ": " + ioe;
            _log.error(msg, ioe);
            if (listener != null) {
                listener.addMessage(msg);
                listener.addMessage("Fatal storage error: Stopping torrent " + metainfo.getName());
            }
+            snark.stopTorrent();
            throw new RuntimeException(msg, ioe);
          }
        wantedPieces.remove(p);
@@ -1019,7 +1031,7 @@ class PeerCoordinator implements PeerListener

    // Announce to the world we have it!
    // Disconnect from other seeders when we get the last piece
-    List<Peer> toDisconnect = done ? new ArrayList() : null; 
+    List<Peer> toDisconnect = done ? new ArrayList<Peer>() : null; 
    for (Peer p : peers) {
            if (p.isConnected())
              {
@@ -1202,22 +1214,23 @@ class PeerCoordinator implements PeerListener
                 boolean skipped = false;
                 for(Piece piece : wantedPieces) {
                     if (piece.getId() == savedPiece) {
-                         if (peer.isCompleted() && piece.getPeerCount() > 1) {
+                         if (peer.isCompleted() && piece.getPeerCount() > 1 &&
+                             wantedPieces.size() > 2*END_GAME_THRESHOLD) {
                             // Try to preserve rarest-first
-                             // by not requesting a partial piece that non-seeders also have
+                             // by not requesting a partial piece that at least two non-seeders also have
                             // from a seeder
-                             boolean nonSeeds = false;
+                             int nonSeeds = 0;
                             for (Peer pr : peers) {
                                 PeerState state = pr.state;
                                 if (state == null) continue;
                                 BitField bf = state.bitfield;
                                 if (bf == null) continue;
                                 if (bf.get(savedPiece) && !pr.isCompleted()) {
-                                     nonSeeds = true;
-                                     break;
+                                     if (++nonSeeds > 1)
+                                         break;
                                 }
                             }
-                             if (nonSeeds) {
+                             if (nonSeeds > 1) {
                                 skipped = true;
                                 break;
                             }
@@ -1231,16 +1244,16 @@ class PeerCoordinator implements PeerListener
                         return pp;
                      }
                  }
-                  if (_log.shouldLog(Log.WARN)) {
+                  if (_log.shouldLog(Log.INFO)) {
                      if (skipped)
-                          _log.warn("Partial piece " + pp + " with multiple peers skipped for seeder");
+                          _log.info("Partial piece " + pp + " with multiple peers skipped for seeder");
                      else
-                          _log.warn("Partial piece " + pp + " NOT in wantedPieces??");
+                          _log.info("Partial piece " + pp + " NOT in wantedPieces??");
                  }
              }
          }
-          if (_log.shouldLog(Log.WARN) && !partialPieces.isEmpty())
-              _log.warn("Peer " + peer + " has none of our partials " + partialPieces);
+          if (_log.shouldLog(Log.INFO) && !partialPieces.isEmpty())
+              _log.info("Peer " + peer + " has none of our partials " + partialPieces);
      }
      // ...and this section turns this into the general move-requests-around code!
      // Temporary? So PeerState never calls wantPiece() directly for now...
@@ -1452,8 +1465,8 @@ class PeerCoordinator implements PeerListener
  public int allowedUploaders()
  {
    if (listener != null && listener.overUploadLimit(uploaders)) {
-        // if (_log.shouldLog(Log.DEBUG))
-        //   _log.debug("Over limit, uploaders was: " + uploaders);
+           if (_log.shouldLog(Log.DEBUG))
+             _log.debug("Over limit, uploaders was: " + uploaders);
        return uploaders - 1;
    } else if (uploaders < MAX_UPLOADERS)
        return uploaders + 1;
--- a/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinatorSet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinatorSet.java
@@ -12,11 +12,11 @@ import net.i2p.crypto.SHA1Hash;
 * Each PeerCoordinator is added to the set from within the Snark (and removed
 * from it there too)
 */
-public class PeerCoordinatorSet {
+class PeerCoordinatorSet implements Iterable<PeerCoordinator> {
    private final Map<SHA1Hash, PeerCoordinator> _coordinators;
    
    public PeerCoordinatorSet() {
-        _coordinators = new ConcurrentHashMap();
+        _coordinators = new ConcurrentHashMap<SHA1Hash, PeerCoordinator>();
    }
     
    public Iterator<PeerCoordinator> iterator() {
--- a/apps/i2psnark/java/src/org/klomp/snark/PeerID.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/PeerID.java
@@ -24,7 +24,6 @@ import java.io.IOException;
 import java.net.UnknownHostException;
 import java.util.Map;

-import net.i2p.I2PAppContext;
 import net.i2p.data.Base32;
 import net.i2p.data.Base64;
 import net.i2p.data.DataHelper;
@@ -43,7 +42,7 @@ import org.klomp.snark.bencode.InvalidBEncodingException;
 *  and the PeerID is not required.
 *  Equality is now determined solely by the dest hash.
 */
-public class PeerID implements Comparable
+public class PeerID implements Comparable<PeerID>
 {
  private byte[] id;
  private Destination address;
@@ -53,12 +52,13 @@ public class PeerID implements Comparable
  private boolean triedDestLookup;
  private final int hash;
  private final I2PSnarkUtil util;
+  private String _toStringCache;

  public PeerID(byte[] id, Destination address)
  {
    this.id = id;
    this.address = address;
-    this.port = 6881;
+    this.port = TrackerClient.PORT;
    this.destHash = address.calculateHash().getData();
    hash = calculateHash();
    util = null;
@@ -77,22 +77,22 @@ public class PeerID implements Comparable
   * Creates a PeerID from a Map containing BEncoded peer id, ip and
   * port.
   */
-  public PeerID(Map m)
+  public PeerID(Map<String, BEValue> m)
    throws InvalidBEncodingException, UnknownHostException
  {
-    BEValue bevalue = (BEValue)m.get("peer id");
+    BEValue bevalue = m.get("peer id");
    if (bevalue == null)
      throw new InvalidBEncodingException("peer id missing");
    id = bevalue.getBytes();

-    bevalue = (BEValue)m.get("ip");
+    bevalue = m.get("ip");
    if (bevalue == null)
      throw new InvalidBEncodingException("ip missing");
    address = I2PSnarkUtil.getDestinationFromBase64(bevalue.getString());
    if (address == null)
        throw new InvalidBEncodingException("Invalid destination [" + bevalue.getString() + "]");

-    port = 6881;
+    port = TrackerClient.PORT;
    this.destHash = address.calculateHash().getData();
    hash = calculateHash();
    util = null;
@@ -106,7 +106,7 @@ public class PeerID implements Comparable
  public PeerID(byte[] dest_hash, I2PSnarkUtil util) throws InvalidBEncodingException
  {
    // id and address remain null
-    port = 6881;
+    port = TrackerClient.PORT;
    if (dest_hash.length != 32)
        throw new InvalidBEncodingException("bad hash length");
    destHash = dest_hash;
@@ -196,10 +196,8 @@ public class PeerID implements Comparable
   * Compares port, address and id.
   * @deprecated unused? and will NPE now that address can be null?
   */
-  public int compareTo(Object o)
+  public int compareTo(PeerID pid)
  {
-    PeerID pid = (PeerID)o;
-
    int result = port - pid.port;
    if (result != 0)
      return result;
@@ -219,13 +217,15 @@ public class PeerID implements Comparable
  }

  /**
-   * Returns the String "id@address" where id is the base64 encoded id
-   * and address is the base64 dest (was the base64 hash of the dest) which
+   * Returns the String "id@address" where id is the first 4 chars of the base64 encoded id
+   * and address is the first 6 chars of the base64 dest (was the base64 hash of the dest) which
   * should match what the bytemonsoon tracker reports on its web pages.
   */
-    @Override
+  @Override
  public String toString()
  {
+    if (_toStringCache != null)
+        return _toStringCache;
    if (id == null || address == null)
        return "unkn@" + Base64.encode(destHash).substring(0, 6);
    int nonZero = 0;
@@ -235,7 +235,8 @@ public class PeerID implements Comparable
            break;
        }
    }
-    return Base64.encode(id, nonZero, id.length-nonZero).substring(0,4) + "@" + address.toBase64().substring(0,6);
+    _toStringCache = Base64.encode(id, nonZero, id.length-nonZero).substring(0,4) + "@" + address.toBase64().substring(0,6);
+    return _toStringCache;
  }

  /**
--- a/apps/i2psnark/java/src/org/klomp/snark/PeerMonitorTask.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/PeerMonitorTask.java
@@ -27,6 +27,8 @@ import net.i2p.data.DataHelper;
 /**
 * TimerTask that monitors the peers and total up/download speeds.
 * Works together with the main Snark class to report periodical statistics.
+ *
+ * @deprecated unused, for command line client only, commented out in Snark.java
 */
 class PeerMonitorTask implements Runnable
 {
@@ -35,8 +37,8 @@ class PeerMonitorTask implements Runnable

  private final PeerCoordinator coordinator;

-  private long lastDownloaded = 0;
-  private long lastUploaded = 0;
+  //private long lastDownloaded = 0;
+  //private long lastUploaded = 0;

  PeerMonitorTask(PeerCoordinator coordinator)
  {
@@ -45,6 +47,7 @@ class PeerMonitorTask implements Runnable

  public void run()
  {
+/*****
    // Get some statistics
    int peers = 0;
    int uploaders = 0;
@@ -117,5 +120,6 @@ class PeerMonitorTask implements Runnable

    lastDownloaded = downloaded;
    lastUploaded = uploaded;
+****/
  }
 }
--- a/apps/i2psnark/java/src/org/klomp/snark/PeerState.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/PeerState.java
@@ -56,7 +56,7 @@ class PeerState implements DataLoader
  final PeerConnectionOut out;

  // Outstanding request
-  private final List<Request> outstandingRequests = new ArrayList();
+  private final List<Request> outstandingRequests = new ArrayList<Request>();
  /** the tail (NOT the head) of the request queue */
  private Request lastRequest = null;

@@ -163,7 +163,7 @@ class PeerState implements DataLoader
          _log.debug(peer + " rcv bitfield");
        if (bitfield != null)
          {
-            // XXX - Be liberal in what you except?
+            // XXX - Be liberal in what you accept?
            if (_log.shouldLog(Log.WARN))
              _log.warn("Got unexpected bitfield message from " + peer);
            return;
@@ -451,7 +451,7 @@ class PeerState implements DataLoader
  synchronized List<Request> returnPartialPieces()
  {
      Set<Integer> pcs = getRequestedPieces();
-      List<Request> rv = new ArrayList(pcs.size());
+      List<Request> rv = new ArrayList<Request>(pcs.size());
      for (Integer p : pcs) {
          Request req = getLowestOutstandingRequest(p.intValue());
          if (req != null) {
@@ -469,7 +469,7 @@ class PeerState implements DataLoader
   * @return all pieces we are currently requesting, or empty Set
   */
  synchronized private Set<Integer> getRequestedPieces() {
-      Set<Integer> rv = new HashSet(outstandingRequests.size() + 1);
+      Set<Integer> rv = new HashSet<Integer>(outstandingRequests.size() + 1);
      for (Request req : outstandingRequests) {
          rv.add(Integer.valueOf(req.getPiece()));
      if (pendingRequest != null)
--- a/apps/i2psnark/java/src/org/klomp/snark/Piece.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/Piece.java
@@ -7,7 +7,7 @@ import java.util.Set;
 * This class is used solely by PeerCoordinator.
 * Caller must synchronize on many of these methods.
 */
-class Piece implements Comparable {
+class Piece implements Comparable<Piece> {

    private final int id;
    private final Set<PeerID> peers;
@@ -18,7 +18,7 @@ class Piece implements Comparable {
    
    public Piece(int id) {
        this.id = id;
-        this.peers = new HashSet(I2PSnarkUtil.MAX_CONNECTIONS / 2);
+        this.peers = new HashSet<PeerID>(I2PSnarkUtil.MAX_CONNECTIONS / 2);
        // defer creating requests to save memory
    }
    
@@ -26,11 +26,11 @@ class Piece implements Comparable {
     *  Highest priority first,
     *  then rarest first
     */
-    public int compareTo(Object o) throws ClassCastException {
-        int pdiff = ((Piece)o).priority - this.priority;   // reverse
+    public int compareTo(Piece op) {
+        int pdiff = op.priority - this.priority;   // reverse
        if (pdiff != 0)
            return pdiff;
-        return this.peers.size() - ((Piece)o).peers.size();
+        return this.peers.size() - op.peers.size();
    }
    
    @Override
@@ -82,7 +82,7 @@ class Piece implements Comparable {
    public void setRequested(Peer peer, boolean requested) {
        if (requested) {
            if (this.requests == null)
-                this.requests = new HashSet(2);
+                this.requests = new HashSet<PeerID>(2);
            this.requests.add(peer.getPeerID());
        } else {
            if (this.requests != null)
--- a/apps/i2psnark/java/src/org/klomp/snark/Snark.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/Snark.java
@@ -25,17 +25,15 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
-import java.util.Random;
 import java.util.StringTokenizer;

 import net.i2p.I2PAppContext;
 import net.i2p.client.streaming.I2PServerSocket;
 import net.i2p.data.Destination;
-import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
+import net.i2p.util.SecureFile;

 /**
 * Main Snark program startup class.
@@ -71,8 +69,6 @@ public class Snark
  "Commands: 'info', 'list', 'quit'.";
 ****/

-  // String indicating main activity
-  String activity = "Not started";
  
 /****
  private static class OOMListener implements I2PThread.OOMEventListener {
@@ -225,27 +221,42 @@ public class Snark
  private PeerCoordinator coordinator;
  private ConnectionAcceptor acceptor;
  private TrackerClient trackerclient;
-  private String rootDataDir = ".";
+  private final File rootDataDir;
  private final CompleteListener completeListener;
  private volatile boolean stopped;
  private volatile boolean starting;
-  private byte[] id;
+  private final byte[] id;
  private final byte[] infoHash;
  private String additionalTrackerURL;
-  private final I2PSnarkUtil _util;
+  protected final I2PSnarkUtil _util;
  private final Log _log;
  private final PeerCoordinatorSet _peerCoordinatorSet;
-  private String trackerProblems;
-  private int trackerSeenPeers;
+  private volatile String trackerProblems;
+  private volatile int trackerSeenPeers;
+  private volatile boolean _autoStoppable;
+  // String indicating main activity
+  private volatile String activity = "Not started";
+  private final long savedUploaded;


-  /** from main() via parseArguments() single torrent */
+  /**
+   * from main() via parseArguments() single torrent
+   *
+   * @deprecated unused
+   */
+/****
  Snark(I2PSnarkUtil util, String torrent, String ip, int user_port,
        StorageListener slistener, CoordinatorListener clistener) { 
    this(util, torrent, ip, user_port, slistener, clistener, null, null, null, true, "."); 
  }
+****/

-  /** single torrent - via router */
+  /**
+   * single torrent - via router
+   *
+   * @deprecated unused
+   */
+/****
  public Snark(I2PAppContext ctx, Properties opts, String torrent,
               StorageListener slistener, boolean start, String rootDir) { 
    this(new I2PSnarkUtil(ctx), torrent, null, -1, slistener, null, null, null, null, false, rootDir);
@@ -275,12 +286,30 @@ public class Snark
    if (start)
        this.startTorrent();
  }
+****/

-  /** multitorrent */
+  /**
+   * multitorrent
+   */
  public Snark(I2PSnarkUtil util, String torrent, String ip, int user_port,
        StorageListener slistener, CoordinatorListener clistener,
        CompleteListener complistener, PeerCoordinatorSet peerCoordinatorSet,
        ConnectionAcceptor connectionAcceptor, boolean start, String rootDir)
+  {
+      this(util, torrent, ip, user_port, slistener, clistener, complistener,
+           peerCoordinatorSet, connectionAcceptor, start, rootDir, null);
+  }
+
+  /**
+   * multitorrent
+   *
+   * @param baseFile if null, use rootDir/torrentName; if non-null, use it instead
+   * @since 0.9.11
+   */
+  public Snark(I2PSnarkUtil util, String torrent, String ip, int user_port,
+        StorageListener slistener, CoordinatorListener clistener,
+        CompleteListener complistener, PeerCoordinatorSet peerCoordinatorSet,
+        ConnectionAcceptor connectionAcceptor, boolean start, String rootDir, File baseFile)
  {
    if (slistener == null)
      slistener = this;
@@ -292,7 +321,7 @@ public class Snark
    acceptor = connectionAcceptor;

    this.torrent = torrent;
-    this.rootDataDir = rootDir;
+    this.rootDataDir = new File(rootDir);

    stopped = true;
    activity = "Network setup";
@@ -318,7 +347,6 @@ public class Snark
 */

    // Figure out what the torrent argument represents.
-    meta = null;
    File f = null;
    InputStream in = null;
    byte[] x_infoHash = null;
@@ -396,13 +424,22 @@ public class Snark
        try
          {
            activity = "Checking storage";
-            storage = new Storage(_util, meta, slistener);
+            boolean shouldPreserve = completeListener != null && completeListener.getSavedPreserveNamesSetting(this);
+            if (baseFile == null) {
+                String base = meta.getName();
+                if (!shouldPreserve)
+                    base = Storage.filterName(base);
+                if (_util.getFilesPublic())
+                    baseFile = new File(rootDataDir, base);
+                else
+                    baseFile = new SecureFile(rootDataDir, base);
+            }
+            storage = new Storage(_util, baseFile, meta, slistener, shouldPreserve);
            if (completeListener != null) {
-                storage.check(rootDataDir,
-                              completeListener.getSavedTorrentTime(this),
+                storage.check(completeListener.getSavedTorrentTime(this),
                              completeListener.getSavedTorrentBitField(this));
            } else {
-                storage.check(rootDataDir);
+                storage.check();
            }
            // have to figure out when to reopen
            // if (!start)
@@ -430,6 +467,7 @@ public class Snark
    trackerclient = new TrackerClient(meta, coordinator);
 */
    
+    savedUploaded = (completeListener != null) ? completeListener.getSavedUploaded(this) : 0;
    if (start)
        startTorrent();
  }
@@ -454,7 +492,8 @@ public class Snark
    this.torrent = torrent;
    this.infoHash = ih;
    this.additionalTrackerURL = trackerURL;
-    this.rootDataDir = rootDir;
+    this.rootDataDir = rootDir != null ? new File(rootDir) : null;   // null only for FetchAndAdd extension
+    savedUploaded = 0;
    stopped = true;
    id = generateID();

@@ -479,18 +518,13 @@ public class Snark

    // Create a new ID and fill it with something random.  First nine
    // zeros bytes, then three bytes filled with snark and then
-    // sixteen random bytes.
+    // eight random bytes.
    byte snark = (((3 + 7 + 10) * (1000 - 8)) / 992) - 17;
    byte[] rv = new byte[20];
-    Random random = I2PAppContext.getGlobalContext().random();
-    int i;
-    for (i = 0; i < 9; i++)
-      rv[i] = 0;
-    rv[i++] = snark;
-    rv[i++] = snark;
-    rv[i++] = snark;
-    while (i < 20)
-      rv[i++] = (byte)random.nextInt(256);
+    rv[9] = snark;
+    rv[10] = snark;
+    rv[11] = snark;
+    I2PAppContext.getGlobalContext().random().nextBytes(rv, 12, 8);
    return rv;
  }

@@ -523,21 +557,21 @@ public class Snark
            _log.info("Starting PeerCoordinator, ConnectionAcceptor, and TrackerClient");
        activity = "Collecting pieces";
        coordinator = new PeerCoordinator(_util, id, infoHash, meta, storage, this, this);
+        coordinator.setUploaded(savedUploaded);
        if (_peerCoordinatorSet != null) {
            // multitorrent
            _peerCoordinatorSet.add(coordinator);
-            if (acceptor != null) {
-                acceptor.startAccepting(_peerCoordinatorSet, serversocket);
-            } else {
-              // error
-            }
        } else {
            // single torrent
-            acceptor = new ConnectionAcceptor(_util, serversocket, new PeerAcceptor(coordinator));
+            acceptor = new ConnectionAcceptor(_util, new PeerAcceptor(coordinator));
        }
        // TODO pass saved closest DHT nodes to the tracker? or direct to the coordinator?
        trackerclient = new TrackerClient(_util, meta, additionalTrackerURL, coordinator, this);
    }
+    // ensure acceptor is running when in multitorrent
+    if (_peerCoordinatorSet != null && acceptor != null) {
+        acceptor.startAccepting();
+    }

    stopped = false;
    if (coordinator.halted()) {
@@ -550,7 +584,7 @@ public class Snark
    } else if (trackerclient.halted()) {
        if (storage != null) {
            try {
-                 storage.reopen(rootDataDir);
+                 storage.reopen();
             }   catch (IOException ioe) {
                 try { storage.close(); } catch (IOException ioee) {
                     ioee.printStackTrace();
@@ -587,7 +621,7 @@ public class Snark
        pc.halt();
    Storage st = storage;
    if (st != null) {
-        boolean changed = storage.isChanged();
+        boolean changed = storage.isChanged() || getUploaded() != savedUploaded;
        try { 
            storage.close(); 
        } catch (IOException ioe) {
@@ -741,7 +775,7 @@ public class Snark
        PeerCoordinator coord = coordinator;
        if (coord != null)
            return coord.getUploaded();
-        return 0;
+        return savedUploaded;
    }

    /**
@@ -761,10 +795,11 @@ public class Snark
        PeerCoordinator coord = coordinator;
        if (coord != null)
            return coord.peerList();
-        return Collections.EMPTY_LIST;
+        return Collections.emptyList();
    }

    /**
+     *  Not HTML escaped.
     *  @return String returned from tracker, or null if no error
     *  @since 0.8.4
     */
@@ -837,7 +872,7 @@ public class Snark
    }

    /**
-     *  Bytes still wanted. DOES account for skipped files.
+     *  Bytes still wanted. DOES account for (i.e. does not include) skipped files.
     *  FIXME -1 when not running.
     *  @return exact value. or -1 if no storage yet or when not running.
     *  @since 0.9.1
@@ -850,7 +885,7 @@ public class Snark
    }

    /**
-     *  Does not account for skipped files.
+     *  Does not account (i.e. includes) for skipped files.
     *  @return number of pieces still needed (magnet mode or not), or -1 if unknown
     *  @since 0.8.4
     */
@@ -905,12 +940,23 @@ public class Snark
        return additionalTrackerURL;
    }

+    /**
+     *  @since 0.9.9
+     */
+    public boolean isAutoStoppable() { return _autoStoppable; }
+
+    /**
+     *  @since 0.9.9
+     */
+    public void setAutoStoppable(boolean yes) { _autoStoppable = yes; }
+
  /**
   * Sets debug, ip and torrent variables then creates a Snark
   * instance.  Calls usage(), which terminates the program, if
   * non-valid argument list.  The given listeners will be
   * passed to all components that take one.
   */
+/****
  private static Snark parseArguments(String[] args,
                              StorageListener slistener,
                              CoordinatorListener clistener)
@@ -925,6 +971,7 @@ public class Snark
    int i = 0;
    while (i < args.length)
      {
+****/
 /*
        if (args[i].equals("--debug"))
          {
@@ -946,7 +993,9 @@ public class Snark
                catch (NumberFormatException nfe) { }
              }
          }
-        else */ if (args[i].equals("--port"))
+        else */
+/****
+          if (args[i].equals("--port"))
          {
            if (args.length - 1 < i + 1)
              usage("--port needs port number to listen on");
@@ -1052,6 +1101,7 @@ public class Snark
    System.out.println
      ("         \tor (with --share) a file to share.");
  }
+****/

  /**
   * Aborts program abnormally.
@@ -1095,9 +1145,15 @@ public class Snark
   */
  public void gotMetaInfo(PeerCoordinator coordinator, MetaInfo metainfo) {
      try {
+          String base = Storage.filterName(metainfo.getName());
+          File baseFile;
+          if (_util.getFilesPublic())
+              baseFile = new File(rootDataDir, base);
+          else
+              baseFile = new SecureFile(rootDataDir, base);
          // The following two may throw IOE...
-          storage = new Storage(_util, metainfo, this);
-          storage.check(rootDataDir);
+          storage = new Storage(_util, baseFile, metainfo, this, false);
+          storage.check();
          // ... so don't set meta until here
          meta = metainfo;
          if (completeListener != null) {
@@ -1144,8 +1200,8 @@ public class Snark
    //  System.out.println(); // We have all the disk space we need.
  }

-  private boolean allChecked = false;
-  private boolean checking = false;
+  private boolean allChecked;
+  private boolean checking;
  //private boolean prechecking = true;

  public void storageChecked(Storage storage, int num, boolean checked)
@@ -1222,17 +1278,18 @@ public class Snark
   */
  final static int MIN_TOTAL_UPLOADERS = 4;
  final static int MAX_TOTAL_UPLOADERS = 10;
+
  public boolean overUploadLimit(int uploaders) {
    if (_peerCoordinatorSet == null || uploaders <= 0)
      return false;
    int totalUploaders = 0;
-    for (Iterator<PeerCoordinator> iter = _peerCoordinatorSet.iterator(); iter.hasNext(); ) {
-      PeerCoordinator c = iter.next();
+    for (PeerCoordinator c : _peerCoordinatorSet) {
      if (!c.halted())
        totalUploaders += c.uploaders;
    }
    int limit = _util.getMaxUploaders();
-    // debug("Total uploaders: " + totalUploaders + " Limit: " + limit, Snark.DEBUG);
+    if (_log.shouldLog(Log.DEBUG))
+        _log.debug("Total uploaders: " + totalUploaders + " Limit: " + limit);
    return totalUploaders > limit;
  }

@@ -1240,8 +1297,7 @@ public class Snark
    if (_peerCoordinatorSet == null)
      return false;
    long total = 0;
-    for (Iterator<PeerCoordinator> iter = _peerCoordinatorSet.iterator(); iter.hasNext(); ) {
-      PeerCoordinator c = iter.next();
+    for (PeerCoordinator c : _peerCoordinatorSet) {
      if (!c.halted())
        total += c.getCurrentUploadRate();
    }
--- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
--- a/apps/i2psnark/java/src/org/klomp/snark/Storage.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/Storage.java
--- a/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java
@@ -21,8 +21,6 @@
 package org.klomp.snark;

 import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
@@ -38,8 +36,9 @@ import java.util.Locale;
 import java.util.Random;
 import java.util.Set;

-import net.i2p.I2PAppContext;
+import net.i2p.crypto.SigType;
 import net.i2p.data.DataHelper;
+import net.i2p.data.Destination;
 import net.i2p.data.Hash;
 import net.i2p.util.ConvertToHash;
 import net.i2p.util.I2PAppThread;
@@ -74,8 +73,9 @@ public class TrackerClient implements Runnable {
  private static final String COMPLETED_EVENT = "completed";
  private static final String STOPPED_EVENT = "stopped";
  private static final String NOT_REGISTERED  = "torrent not registered"; //bytemonsoon
-  /** this is our equivalent to router.utorrent.com for bootstrap */
-  private static final String DEFAULT_BACKUP_TRACKER = "http://tracker.welterde.i2p/a";
+  private static final String NOT_REGISTERED_2  = "torrent not found";    // diftracker
+  private static final String NOT_REGISTERED_3  = "torrent unauthorised"; // vuze
+  private static final String ERROR_GOT_HTML  = "received html";             // fake return

  private final static int SLEEP = 5; // 5 minutes.
  private final static int DELAY_MIN = 2000; // 2 secs.
@@ -85,7 +85,13 @@ public class TrackerClient implements Runnable {
  private final static int MAX_CONSEC_FAILS = 5;    // slow down after this
  private final static int LONG_SLEEP = 30*60*1000; // sleep a while after lots of fails
  private final static long MIN_TRACKER_ANNOUNCE_INTERVAL = 15*60*1000;
-  private final static long MIN_DHT_ANNOUNCE_INTERVAL = 10*60*1000;
+  private final static long MIN_DHT_ANNOUNCE_INTERVAL = 39*60*1000;
+  /** No guidance in BEP 5; standard practice is K (=8) */
+  private static final int DHT_ANNOUNCE_PEERS = 4;
+  public static final int PORT = 6881;
+  private static final int MAX_TRACKERS = 12;
+  // tracker.welterde.i2p
+  private static final Hash DSA_ONLY_TRACKER = ConvertToHash.getHash("cfmqlafjfmgkzbt4r3jsfyhgsr5abgxryl6fnz3d3y5a365di5aa.b32.i2p");

  private final I2PSnarkUtil _util;
  private final MetaInfo meta;
@@ -108,11 +114,14 @@ public class TrackerClient implements Runnable {
  // these 2 used in loop()
  private volatile boolean runStarted;
  private volatile  int consecutiveFails;
+  // if we don't want anything else.
+  // Not necessarily seeding, as we may have skipped some files.
  private boolean completed;
  private volatile boolean _fastUnannounce;
  private long lastDHTAnnounce;
  private final List<TCTracker> trackers;
  private final List<TCTracker> backupTrackers;
+  private long _startedOn;

  /**
   * Call start() to start it.
@@ -134,11 +143,11 @@ public class TrackerClient implements Runnable {
    this.coordinator = coordinator;
    this.snark = snark;

-    this.port = 6881; //(port == -1) ? 9 : port;
+    this.port = PORT; //(port == -1) ? 9 : port;
    this.infoHash = urlencode(snark.getInfoHash());
    this.peerID = urlencode(snark.getID());
-    this.trackers = new ArrayList(2);
-    this.backupTrackers = new ArrayList(2);
+    this.trackers = new ArrayList<TCTracker>(2);
+    this.backupTrackers = new ArrayList<TCTracker>(2);
  }

  public synchronized void start() {
@@ -151,6 +160,7 @@ public class TrackerClient implements Runnable {
      consecutiveFails = 0;
      runStarted = false;
      _fastUnannounce = false;
+      snark.setTrackerProblems(null);
      _thread = new I2PAppThread(this, _threadName + " #" + (++_runCount), true);
      _thread.start();
      started = true;
@@ -272,7 +282,7 @@ public class TrackerClient implements Runnable {
        primary = meta.getAnnounce();
    else if (additionalTrackerURL != null)
        primary = additionalTrackerURL;
-    Set<Hash> trackerHashes = new HashSet(8);
+    Set<Hash> trackerHashes = new HashSet<Hash>(8);

    // primary tracker
    if (primary != null) {
@@ -289,6 +299,7 @@ public class TrackerClient implements Runnable {
    }

    // announce list
+    // We completely ignore the BEP 12 processing rules
    if (meta != null && !meta.isPrivate()) {
        List<List<String>> list = meta.getAnnounceList();
        if (list != null) {
@@ -301,6 +312,12 @@ public class TrackerClient implements Runnable {
                        _log.debug("Additional announce (list): [" + url + "] for infoHash: " + infoHash);
                }
            }
+            if (trackers.size() > 2) {
+                // shuffle everything but the primary
+                TCTracker pri = trackers.remove(0);
+                Collections.shuffle(trackers, _util.getContext().random());
+                trackers.add(0, pri);
+            }
        }
    }

@@ -330,10 +347,13 @@ public class TrackerClient implements Runnable {
                _log.debug("Backup announce: [" + url + "] for infoHash: " + infoHash);
        }
        if (backupTrackers.isEmpty()) {
-            backupTrackers.add(new TCTracker(DEFAULT_BACKUP_TRACKER, false));
+            backupTrackers.add(new TCTracker(SnarkManager.DEFAULT_BACKUP_TRACKER, false));
+        } else if (trackers.size() > 1) {
+            Collections.shuffle(backupTrackers, _util.getContext().random());
        }
    }
    this.completed = coordinator.getLeft() == 0;
+    _startedOn = _util.getContext().clock().now();
  }

  /**
@@ -345,8 +365,23 @@ public class TrackerClient implements Runnable {
  private boolean isNewValidTracker(Set<Hash> existing, String ann) {
      Hash h = getHostHash(ann);
      if (h == null) {
-         _log.error("Bad announce URL: [" + ann + ']');
-         return false;
+          if (_log.shouldLog(Log.WARN))
+              _log.warn("Bad announce URL: [" + ann + ']');
+          return false;
+      }
+      // comment this out if tracker.welterde.i2p upgrades
+      if (h.equals(DSA_ONLY_TRACKER)) {
+          Destination dest = _util.getMyDestination();
+          if (dest != null && dest.getSigType() != SigType.DSA_SHA1) {
+              if (_log.shouldLog(Log.WARN))
+                  _log.warn("Skipping incompatible tracker: " + ann);
+              return false;
+          }
+      }
+      if (existing.size() >= MAX_TRACKERS) {
+          if (_log.shouldLog(Log.INFO))
+              _log.info("Not using announce URL, we have enough: [" + ann + ']');
+          return false;
      }
      boolean rv = existing.add(h);
      if (!rv) {
@@ -375,17 +410,26 @@ public class TrackerClient implements Runnable {
            // Local DHT tracker announce
            DHT dht = _util.getDHT();
            if (dht != null && (meta == null || !meta.isPrivate()))
-                dht.announce(snark.getInfoHash());
+                dht.announce(snark.getInfoHash(), coordinator.completed());

+            int oldSeenPeers = snark.getTrackerSeenPeers();
            int maxSeenPeers = 0;
-            if (!trackers.isEmpty())
+            if (!trackers.isEmpty()) {
                maxSeenPeers = getPeersFromTrackers(trackers);
+                // fast update for UI at startup
+                if (maxSeenPeers > oldSeenPeers)
+                    snark.setTrackerSeenPeers(maxSeenPeers);
+            }
            int p = getPeersFromPEX();
            if (p > maxSeenPeers)
                maxSeenPeers = p;
            p = getPeersFromDHT();
-            if (p > maxSeenPeers)
+            if (p > maxSeenPeers) {
                maxSeenPeers = p;
+                // fast update for UI at startup
+                if (maxSeenPeers > oldSeenPeers)
+                    snark.setTrackerSeenPeers(maxSeenPeers);
+            }
            // backup if DHT needs bootstrapping
            if (trackers.isEmpty() && !backupTrackers.isEmpty() && dht != null && dht.size() < 16) {
                p = getPeersFromTrackers(backupTrackers);
@@ -439,31 +483,40 @@ public class TrackerClient implements Runnable {
   *  @return max peers seen
   */
  private int getPeersFromTrackers(List<TCTracker> trckrs) {
-            long uploaded = coordinator.getUploaded();
-            long downloaded = coordinator.getDownloaded();
            long left = coordinator.getLeft();   // -1 in magnet mode
            
            // First time we got a complete download?
-            String event;
-            if (!completed && left == 0)
-              {
+            boolean newlyCompleted;
+            if (!completed && left == 0) {
                completed = true;
-                event = COMPLETED_EVENT;
-              }
-            else
-              event = NO_EVENT;
+                newlyCompleted = true;
+            } else {
+                newlyCompleted = false;
+            }

            // *** loop once for each tracker
            int maxSeenPeers = 0;
            for (TCTracker tr : trckrs) {
              if ((!stop) && (!tr.stop) &&
                  (completed || coordinator.needOutboundPeers() || !tr.started) &&
-                  (event.equals(COMPLETED_EVENT) || System.currentTimeMillis() > tr.lastRequestTime + tr.interval))
+                  (newlyCompleted || System.currentTimeMillis() > tr.lastRequestTime + tr.interval))
              {
                try
                  {
-                    if (!tr.started)
-                      event = STARTED_EVENT;
+                    long uploaded = coordinator.getUploaded();
+                    long downloaded = coordinator.getDownloaded();
+                    long len = snark.getTotalLength();
+                    if (len > 0 && downloaded > len)
+                        downloaded = len;
+                    left = coordinator.getLeft();
+                    String event;
+                    if (!tr.started) {
+                        event = STARTED_EVENT;
+                    } else if (newlyCompleted) {
+                        event = COMPLETED_EVENT;
+                    } else {
+                        event = NO_EVENT;
+                    }
                    TrackerInfo info = doRequest(tr, infoHash, peerID,
                                                 uploaded, downloaded, left,
                                                 event);
@@ -476,24 +529,44 @@ public class TrackerClient implements Runnable {
                        consecutiveFails = 0;
                    runStarted = true;
                    tr.started = true;
-
-                    Set<Peer> peers = info.getPeers();
                    tr.seenPeers = info.getPeerCount();
                    if (snark.getTrackerSeenPeers() < tr.seenPeers) // update rising number quickly
                        snark.setTrackerSeenPeers(tr.seenPeers);

+                    // auto stop
+                    // These are very high thresholds for now, not configurable,
+                    // just for update torrent
+                    if (completed &&
+                        tr.isPrimary &&
+                        snark.isAutoStoppable() &&
+                        !snark.isChecking() &&
+                        info.getSeedCount() > 100 &&
+                        coordinator.getPeerCount() <= 0 &&
+                        _util.getContext().clock().now() > _startedOn + 30*60*1000 &&
+                        snark.getTotalLength() > 0 &&
+                        uploaded >= snark.getTotalLength() / 2) {
+                        if (_log.shouldLog(Log.WARN))
+                            _log.warn("Auto stopping " + snark.getBaseName());
+                        snark.setAutoStoppable(false);
+                        snark.stopTorrent();
+                        return tr.seenPeers;
+                    }
+
+                    Set<Peer> peers = info.getPeers();
+
                    // pass everybody over to our tracker
                    DHT dht = _util.getDHT();
                    if (dht != null) {
                        for (Peer peer : peers) {
-                            dht.announce(snark.getInfoHash(), peer.getPeerID().getDestHash());
+                            dht.announce(snark.getInfoHash(), peer.getPeerID().getDestHash(),
+                                         false);  // TODO actual seed/leech status
                        }
                    }

                    if (coordinator.needOutboundPeers()) {
                        // we only want to talk to new people if we need things
                        // from them (duh)
-                        List<Peer> ordered = new ArrayList(peers);
+                        List<Peer> ordered = new ArrayList<Peer>(peers);
                        Random r = _util.getContext().random();
                        Collections.shuffle(ordered, r);
                        Iterator<Peer> it = ordered.iterator();
@@ -519,13 +592,21 @@ public class TrackerClient implements Runnable {
                    // don't show secondary tracker problems to the user
                    if (tr.isPrimary)
                      snark.setTrackerProblems(tr.trackerProblems);
-                    if (tr.trackerProblems.toLowerCase(Locale.US).startsWith(NOT_REGISTERED)) {
+                    String tplc = tr.trackerProblems.toLowerCase(Locale.US);
+                    if (tplc.startsWith(NOT_REGISTERED) || tplc.startsWith(NOT_REGISTERED_2) ||
+                        tplc.startsWith(NOT_REGISTERED_3) || tplc.startsWith(ERROR_GOT_HTML)) {
                      // Give a guy some time to register it if using opentrackers too
                      //if (trckrs.size() == 1) {
                      //  stop = true;
                      //  snark.stopTorrent();
                      //} else { // hopefully each on the opentrackers list is really open
-                        if (tr.registerFails++ > MAX_REGISTER_FAILS)
+                        if (tr.registerFails++ > MAX_REGISTER_FAILS ||
+                            !completed ||              // no use retrying if we aren't seeding
+                            tplc.startsWith(ERROR_GOT_HTML) ||   // fake msg from doRequest()
+                            (!tr.isPrimary && tr.registerFails > MAX_REGISTER_FAILS / 2))
+                          if (_log.shouldLog(Log.WARN))
+                              _log.warn("Not longer announcing to " + tr.announce + " : " +
+                                        tr.trackerProblems + " after " + tr.registerFails + " failures");
                          tr.stop = true;
                      //
                    }
@@ -558,7 +639,7 @@ public class TrackerClient implements Runnable {
                if (!pids.isEmpty()) {
                    if (_log.shouldLog(Log.INFO))
                        _log.info("Got " + pids.size() + " from PEX");
-                    List<Peer> peers = new ArrayList(pids.size());
+                    List<Peer> peers = new ArrayList<Peer>(pids.size());
                    for (PeerID pID : pids) {
                        peers.add(new Peer(pID, snark.getID(), snark.getInfoHash(), snark.getMetaInfo()));
                    }
@@ -590,33 +671,31 @@ public class TrackerClient implements Runnable {
            // FIXME this needs to be in its own thread
            int rv = 0;
            DHT dht = _util.getDHT();
-            if (dht != null && (meta == null || !meta.isPrivate()) && (!stop) &&
-                _util.getContext().clock().now() >  lastDHTAnnounce + MIN_DHT_ANNOUNCE_INTERVAL) {
+            if (dht != null &&
+                (meta == null || !meta.isPrivate()) &&
+                (!stop) &&
+                (meta == null || _util.getContext().clock().now() >  lastDHTAnnounce + MIN_DHT_ANNOUNCE_INTERVAL)) {
                int numwant;
                if (!coordinator.needOutboundPeers())
                    numwant = 1;
                else
                    numwant = _util.getMaxConnections();
-                Collection<Hash> hashes = dht.getPeers(snark.getInfoHash(), numwant, 2*60*1000);
+                Collection<Hash> hashes = dht.getPeersAndAnnounce(snark.getInfoHash(), numwant,
+                                                                  5*60*1000, DHT_ANNOUNCE_PEERS, 3*60*1000,
+                                                                  coordinator.completed(), numwant <= 1);
                if (!hashes.isEmpty()) {
                    runStarted = true;
                    lastDHTAnnounce = _util.getContext().clock().now();
                    rv = hashes.size();
+                } else {
+                    lastDHTAnnounce = 0;
                }
                if (_log.shouldLog(Log.INFO))
                    _log.info("Got " + hashes + " from DHT");
-                // announce  ourselves while the token is still good
-                // FIXME this needs to be in its own thread
-                if (!stop) {
-                    // announce only to the 1 closest
-                    int good = dht.announce(snark.getInfoHash(), 1, 5*60*1000);
-                    if (_log.shouldLog(Log.INFO))
-                        _log.info("Sent " + good + " good announces to DHT");
-                }

                // now try these peers
                if ((!stop) && !hashes.isEmpty()) {
-                    List<Peer> peers = new ArrayList(hashes.size());
+                    List<Peer> peers = new ArrayList<Peer>(hashes.size());
                    for (Hash h : hashes) {
                        try {
                            PeerID pID = new PeerID(h.getData(), _util);
@@ -683,6 +762,9 @@ public class TrackerClient implements Runnable {
            _log.debug("Running unannounce " + _threadName + " to " + tr.announce);
        long uploaded = coordinator.getUploaded();
        long downloaded = coordinator.getDownloaded();
+        long len = snark.getTotalLength();
+        if (len > 0 && downloaded > len)
+            downloaded = len;
        long left = coordinator.getLeft();
        try
          {
@@ -737,10 +819,15 @@ public class TrackerClient implements Runnable {
    tr.lastRequestTime = System.currentTimeMillis();
    // Don't wait for a response to stopped when shutting down
    boolean fast = _fastUnannounce && event.equals(STOPPED_EVENT);
-    byte[] fetched = _util.get(s, true, fast ? -1 : 0, small ? 128 : 1024, small ? 1024 : 8*1024);
-    if (fetched == null) {
-        throw new IOException("Error fetching " + s);
-    }
+    byte[] fetched = _util.get(s, true, fast ? -1 : 0, small ? 128 : 1024, small ? 1024 : 32*1024);
+    if (fetched == null)
+        throw new IOException("Error fetching");
+    if (fetched.length == 0)
+        throw new IOException("No data");
+    // The HTML check only works if we didn't exceed the maxium fetch size specified in get(),
+    // otherwise we already threw an IOE.
+    if (fetched[0] == '<')
+        throw new IOException(ERROR_GOT_HTML);
    
        InputStream in = new ByteArrayInputStream(fetched);

@@ -800,8 +887,7 @@ public class TrackerClient implements Runnable {
       return false;
    }
    return url.getProtocol().equals("http") &&
-           (url.getHost().endsWith(".i2p") || url.getHost().equals("i2p")) &&
-           url.getPort() < 0;
+           (url.getHost().endsWith(".i2p") || url.getHost().equals("i2p"));
  }

  /**
@@ -816,7 +902,7 @@ public class TrackerClient implements Runnable {
    } catch (MalformedURLException mue) {
        return null;
    }
-    if (url.getPort() >= 0 || !url.getProtocol().equals("http"))
+    if (!url.getProtocol().equals("http"))
        return null;
    String host = url.getHost();
    if (host.endsWith(".i2p"))
@@ -826,7 +912,7 @@ public class TrackerClient implements Runnable {
        if (path == null || path.length() < 517 ||
            !path.startsWith("/"))
            return null;
-        String[] parts = path.substring(1).split("/?&;", 2);
+        String[] parts = path.substring(1).split("[/\\?&;]", 2);
        return ConvertToHash.getHash(parts[0]);
    }
    return null;
--- a/Show More
+++ b/Show More