Fix bad reversion

0.9.41

.editorconfig

@@ -0,0 +1,67 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+charset = utf-8
+indent_style = space
+indent_size = 4
+
+[{*.bat,**/*.bat,installer/resources/proxy/*.ht}]
+end_of_line = crlf
+
+[**/*.css]
+indent_size = 5
+
+[{history.txt,LICENSE.txt}]
+indent_size = 3
+
+[**/.project]
+indent_style = tab
+
+[README.txt]
+indent_style = tab
+
+[apps/BOB/**/*.java]
+indent_style = tab
+
+[apps/routerconsole/java/src/com/vuze/plugins/mlab/tools/ndt/swingemu/*.java]
+indent_style = tab
+
+[apps/routerconsole/java/src/edu/internet2/ndt/*.java]
+indent_style = tab
+
+[apps/routerconsole/jsp/{createreseed.jsp,exportfamily.jsp,flags.jsp,index.jsp,viewhistory.jsp,viewrouterlog.jsp,viewstat.jsp,viewtheme.jsp,viewwrapperlog.jsp}]
+insert_final_newline = false
+
+[apps/susimail/**/{*.java,*.js}]
+indent_style = tab
+
+[apps/susimail/**/{Attachments.java,MailPart.java,WebMail.java}]
+end_of_line = crlf
+
+[core/java/src/com/nettgryppa/**/*.java]
+indent_size = 2
+
+[core/java/src/gnu/**/*.java]
+indent_size = 2
+
+[core/java/src/gnu/getopt/*.properties]
+charset = iso-8859-1
+
+[core/java/src/org/json/simple/**/*.java]
+end_of_line = crlf
+indent_style = tab
+
+[core/java/src/com/southernstorm/**/*.java]
+indent_style = tab
+
+[router/java/src/org/cybergarage/**/*.java]
+indent_style = tab
+
+[router/java/src/org/freenetproject/*.java]
+indent_style = tab
+
+[router/java/src/com/southernstorm/**/*.java]
+indent_style = tab

.gitignore

@@ -46,3 +46,12 @@ sloccount.sc
 
 # but allow debian/patches
 !/debian/patches/*.(patch|diff)
+
+# IDE project files
+# Eclipse
+.classpath
+.project
+.settings/
+# IDEA
+*.iml
+

.idea/ant.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AntConfiguration">
+    <buildFile url="file://$PROJECT_DIR$/build.xml" />
+  </component>
+</project>

.idea/compiler.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel>
+      <module name="addressbook_main" target="1.7" />
+      <module name="addressbook_test" target="1.7" />
+      <module name="BOB_main" target="1.7" />
+      <module name="BOB_test" target="1.7" />
+      <module name="core_main" target="1.7" />
+      <module name="core_test" target="1.7" />
+      <module name="desktopgui_main" target="1.7" />
+      <module name="desktopgui_test" target="1.7" />
+      <module name="i2psnark_main" target="1.7" />
+      <module name="i2psnark_test" target="1.7" />
+      <module name="i2ptunnel_main" target="1.7" />
+      <module name="i2ptunnel_test" target="1.7" />
+      <module name="installer_main" target="1.7" />
+      <module name="installer_test" target="1.7" />
+      <module name="jetty_main" target="1.7" />
+      <module name="jetty_test" target="1.7" />
+      <module name="jrobin_main" target="1.7" />
+      <module name="jrobin_test" target="1.7" />
+      <module name="ministreaming_main" target="1.7" />
+      <module name="ministreaming_test" target="1.7" />
+      <module name="router_main" target="1.7" />
+      <module name="router_test" target="1.7" />
+      <module name="routerconsole_main" target="1.7" />
+      <module name="routerconsole_test" target="1.7" />
+      <module name="sam_main" target="1.7" />
+      <module name="sam_test" target="1.7" />
+      <module name="streaming_main" target="1.7" />
+      <module name="streaming_test" target="1.7" />
+      <module name="susidns_main" target="1.7" />
+      <module name="susidns_test" target="1.7" />
+      <module name="susimail_main" target="1.7" />
+      <module name="susimail_test" target="1.7" />
+      <module name="systray_main" target="1.7" />
+      <module name="systray_test" target="1.7" />
+    </bytecodeTargetLevel>
+  </component>
+</project>

.idea/copyright/profiles_settings.xml

@@ -0,0 +1,3 @@
+<component name="CopyrightManager">
+  <settings default="" />
+</component>

.idea/libraries/javax_servlet_jsp_2_2_0_v201112011158.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="javax.servlet.jsp-2.2.0.v201112011158">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jsp/javax.servlet.jsp-2.2.0.v201112011158.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/jettylib.xml

@@ -0,0 +1,22 @@
+<component name="libraryTable">
+  <library name="jettylib">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-security-8.1.17.v20150415.jar!/" />
+      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-servlets-8.1.17.v20150415.jar!/" />
+      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-deploy-8.1.17.v20150415.jar!/" />
+      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-util-8.1.17.v20150415.jar!/" />
+      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-servlet-8.1.17.v20150415.jar!/" />
+      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-http-8.1.17.v20150415.jar!/" />
+      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-xml-8.1.17.v20150415.jar!/" />
+      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-server-8.1.17.v20150415.jar!/" />
+      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/servlet-api-3.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-jmx-8.1.17.v20150415.jar!/" />
+      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-webapp-8.1.17.v20150415.jar!/" />
+      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-io-8.1.17.v20150415.jar!/" />
+      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-continuation-8.1.17.v20150415.jar!/" />
+      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-rewrite-8.1.17.v20150415.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/jrobin_1_5_9_1.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="jrobin-1.5.9.1">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/apps/jrobin/jrobin-1.5.9.1.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/lib.xml

@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="lib">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/apps/susidns/src/lib/jstl.jar!/" />
+      <root url="jar://$PROJECT_DIR$/apps/susidns/src/lib/standard.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/start.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="start">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/start.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/systray4j.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="systray4j">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/apps/systray/java/lib/systray4j.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/tomcat_coyote_util.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="tomcat-coyote-util">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/apps/jetty/apache-tomcat/lib/tomcat-coyote-util.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/tomcat_lib.xml

@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="tomcat-lib">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/apps/jetty/apache-tomcat-deployer/lib/tomcat-juli.jar!/" />
+      <root url="jar://$PROJECT_DIR$/apps/jetty/apache-tomcat-deployer/lib/el-api.jar!/" />
+      <root url="jar://$PROJECT_DIR$/apps/jetty/apache-tomcat-deployer/lib/jasper.jar!/" />
+      <root url="jar://$PROJECT_DIR$/apps/jetty/apache-tomcat-deployer/lib/jasper-el.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/wrapper.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="wrapper">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/installer/lib/wrapper/all/wrapper.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/wrapper_win.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="wrapper-win">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/installer/lib/wrapper/win-all/wrapper.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/misc.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ClientPropertiesManager">
+    <properties class="javax.swing.AbstractButton">
+      <property name="hideActionText" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JComponent">
+      <property name="html.disable" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JEditorPane">
+      <property name="JEditorPane.w3cLengthUnits" class="java.lang.Boolean" />
+      <property name="JEditorPane.honorDisplayProperties" class="java.lang.Boolean" />
+      <property name="charset" class="java.lang.String" />
+    </properties>
+    <properties class="javax.swing.JList">
+      <property name="List.isFileList" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JPasswordField">
+      <property name="JPasswordField.cutCopyAllowed" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JSlider">
+      <property name="Slider.paintThumbArrowShape" class="java.lang.Boolean" />
+      <property name="JSlider.isFilled" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JTable">
+      <property name="Table.isFileList" class="java.lang.Boolean" />
+      <property name="JTable.autoStartsEdit" class="java.lang.Boolean" />
+      <property name="terminateEditOnFocusLost" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JToolBar">
+      <property name="JToolBar.isRollover" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JTree">
+      <property name="JTree.lineStyle" class="java.lang.String" />
+    </properties>
+    <properties class="javax.swing.text.JTextComponent">
+      <property name="caretAspectRatio" class="java.lang.Double" />
+      <property name="caretWidth" class="java.lang.Integer" />
+    </properties>
+  </component>
+  <component name="EntryPointsManager">
+    <entry_points version="2.0" />
+  </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
+    <OptionsSetting value="true" id="Add" />
+    <OptionsSetting value="true" id="Remove" />
+    <OptionsSetting value="true" id="Checkout" />
+    <OptionsSetting value="true" id="Update" />
+    <OptionsSetting value="true" id="Status" />
+    <OptionsSetting value="true" id="Edit" />
+    <ConfirmationsSetting value="0" id="Add" />
+    <ConfirmationsSetting value="0" id="Remove" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build" />
+  </component>
+</project>

.idea/modules.xml

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/BOB/BOB.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/BOB/BOB.iml" group="apps/BOB" />
+      <module fileurl="file://$PROJECT_DIR$/apps/BOB/BOB.iml" filepath="$PROJECT_DIR$/apps/BOB/BOB.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/BOB/BOB_main.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/BOB/BOB_main.iml" group="apps/BOB" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/BOB/BOB_test.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/BOB/BOB_test.iml" group="apps/BOB" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/addressbook/addressbook.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/addressbook/addressbook.iml" group="apps/addressbook" />
+      <module fileurl="file://$PROJECT_DIR$/apps/addressbook/addressbook.iml" filepath="$PROJECT_DIR$/apps/addressbook/addressbook.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/addressbook/addressbook_main.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/addressbook/addressbook_main.iml" group="apps/addressbook" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/addressbook/addressbook_test.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/addressbook/addressbook_test.iml" group="apps/addressbook" />
+      <module fileurl="file://$PROJECT_DIR$/apps/admin/admin.iml" filepath="$PROJECT_DIR$/apps/admin/admin.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/apps.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/apps.iml" group="apps" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/core/core.iml" filepath="$PROJECT_DIR$/.idea/modules/core/core.iml" group="core" />
+      <module fileurl="file://$PROJECT_DIR$/core/core.iml" filepath="$PROJECT_DIR$/core/core.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/core/core_main.iml" filepath="$PROJECT_DIR$/.idea/modules/core/core_main.iml" group="core" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/core/core_test.iml" filepath="$PROJECT_DIR$/.idea/modules/core/core_test.iml" group="core" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/desktopgui/desktopgui.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/desktopgui/desktopgui.iml" group="apps/desktopgui" />
+      <module fileurl="file://$PROJECT_DIR$/apps/desktopgui/desktopgui.iml" filepath="$PROJECT_DIR$/apps/desktopgui/desktopgui.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/desktopgui/desktopgui_main.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/desktopgui/desktopgui_main.iml" group="apps/desktopgui" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/desktopgui/desktopgui_test.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/desktopgui/desktopgui_test.iml" group="apps/desktopgui" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/i2p.i2p.sl.iml" filepath="$PROJECT_DIR$/.idea/modules/i2p.i2p.sl.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/i2psnark/i2psnark.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/i2psnark/i2psnark.iml" group="apps/i2psnark" />
+      <module fileurl="file://$PROJECT_DIR$/apps/i2psnark/i2psnark.iml" filepath="$PROJECT_DIR$/apps/i2psnark/i2psnark.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/i2psnark/i2psnark_main.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/i2psnark/i2psnark_main.iml" group="apps/i2psnark" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/i2psnark/i2psnark_test.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/i2psnark/i2psnark_test.iml" group="apps/i2psnark" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/i2ptunnel/i2ptunnel.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/i2ptunnel/i2ptunnel.iml" group="apps/i2ptunnel" />
+      <module fileurl="file://$PROJECT_DIR$/apps/i2ptunnel/i2ptunnel.iml" filepath="$PROJECT_DIR$/apps/i2ptunnel/i2ptunnel.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/i2ptunnel/i2ptunnel_main.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/i2ptunnel/i2ptunnel_main.iml" group="apps/i2ptunnel" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/i2ptunnel/i2ptunnel_test.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/i2ptunnel/i2ptunnel_test.iml" group="apps/i2ptunnel" />
+      <module fileurl="file://$PROJECT_DIR$/apps/imagegen/identicon/identicon.iml" filepath="$PROJECT_DIR$/apps/imagegen/identicon/identicon.iml" />
+      <module fileurl="file://$PROJECT_DIR$/apps/imagegen/imagegen/imagegen.iml" filepath="$PROJECT_DIR$/apps/imagegen/imagegen/imagegen.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/installer/installer.iml" filepath="$PROJECT_DIR$/.idea/modules/installer/installer.iml" group="installer" />
+      <module fileurl="file://$PROJECT_DIR$/installer/installer.iml" filepath="$PROJECT_DIR$/installer/installer.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/installer/installer_main.iml" filepath="$PROJECT_DIR$/.idea/modules/installer/installer_main.iml" group="installer" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/installer/installer_test.iml" filepath="$PROJECT_DIR$/.idea/modules/installer/installer_test.iml" group="installer" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/jetty/jetty.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/jetty/jetty.iml" group="apps/jetty" />
+      <module fileurl="file://$PROJECT_DIR$/apps/jetty/jetty.iml" filepath="$PROJECT_DIR$/apps/jetty/jetty.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/jetty/jetty_main.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/jetty/jetty_main.iml" group="apps/jetty" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/jetty/jetty_test.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/jetty/jetty_test.iml" group="apps/jetty" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/jrobin/jrobin.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/jrobin/jrobin.iml" group="apps/jrobin" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/jrobin/jrobin_main.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/jrobin/jrobin_main.iml" group="apps/jrobin" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/jrobin/jrobin_test.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/jrobin/jrobin_test.iml" group="apps/jrobin" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/ministreaming/ministreaming.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/ministreaming/ministreaming.iml" group="apps/ministreaming" />
+      <module fileurl="file://$PROJECT_DIR$/apps/ministreaming/ministreaming.iml" filepath="$PROJECT_DIR$/apps/ministreaming/ministreaming.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/ministreaming/ministreaming_main.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/ministreaming/ministreaming_main.iml" group="apps/ministreaming" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/ministreaming/ministreaming_test.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/ministreaming/ministreaming_test.iml" group="apps/ministreaming" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/router/router.iml" filepath="$PROJECT_DIR$/.idea/modules/router/router.iml" group="router" />
+      <module fileurl="file://$PROJECT_DIR$/router/router.iml" filepath="$PROJECT_DIR$/router/router.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/router/router_main.iml" filepath="$PROJECT_DIR$/.idea/modules/router/router_main.iml" group="router" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/router/router_test.iml" filepath="$PROJECT_DIR$/.idea/modules/router/router_test.iml" group="router" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/routerconsole/routerconsole.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/routerconsole/routerconsole.iml" group="apps/routerconsole" />
+      <module fileurl="file://$PROJECT_DIR$/apps/routerconsole/routerconsole.iml" filepath="$PROJECT_DIR$/apps/routerconsole/routerconsole.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/routerconsole/routerconsole_main.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/routerconsole/routerconsole_main.iml" group="apps/routerconsole" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/routerconsole/routerconsole_test.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/routerconsole/routerconsole_test.iml" group="apps/routerconsole" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/sam/sam.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/sam/sam.iml" group="apps/sam" />
+      <module fileurl="file://$PROJECT_DIR$/apps/sam/sam.iml" filepath="$PROJECT_DIR$/apps/sam/sam.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/sam/sam_main.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/sam/sam_main.iml" group="apps/sam" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/sam/sam_test.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/sam/sam_test.iml" group="apps/sam" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/streaming/streaming.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/streaming/streaming.iml" group="apps/streaming" />
+      <module fileurl="file://$PROJECT_DIR$/apps/streaming/streaming.iml" filepath="$PROJECT_DIR$/apps/streaming/streaming.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/streaming/streaming_main.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/streaming/streaming_main.iml" group="apps/streaming" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/streaming/streaming_test.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/streaming/streaming_test.iml" group="apps/streaming" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/susidns/susidns.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/susidns/susidns.iml" group="apps/susidns" />
+      <module fileurl="file://$PROJECT_DIR$/apps/susidns/susidns.iml" filepath="$PROJECT_DIR$/apps/susidns/susidns.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/susidns/susidns_main.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/susidns/susidns_main.iml" group="apps/susidns" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/susidns/susidns_test.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/susidns/susidns_test.iml" group="apps/susidns" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/susimail/susimail.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/susimail/susimail.iml" group="apps/susimail" />
+      <module fileurl="file://$PROJECT_DIR$/apps/susimail/susimail.iml" filepath="$PROJECT_DIR$/apps/susimail/susimail.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/susimail/susimail_main.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/susimail/susimail_main.iml" group="apps/susimail" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/susimail/susimail_test.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/susimail/susimail_test.iml" group="apps/susimail" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/systray/systray.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/systray/systray.iml" group="apps/systray" />
+      <module fileurl="file://$PROJECT_DIR$/apps/systray/systray.iml" filepath="$PROJECT_DIR$/apps/systray/systray.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/systray/systray_main.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/systray/systray_main.iml" group="apps/systray" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/systray/systray_test.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/systray/systray_test.iml" group="apps/systray" />
+      <module fileurl="file://$PROJECT_DIR$/apps/imagegen/zxing/zxing.iml" filepath="$PROJECT_DIR$/apps/imagegen/zxing/zxing.iml" />
+    </modules>
+  </component>
+</project>

.idea/runConfigurations/updater.xml

@@ -0,0 +1,6 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="updater" type="AntRunConfiguration" factoryName="Ant Target">
+    <antsettings antfile="file://$PROJECT_DIR$/build.xml" target="updater" />
+    <method />
+  </configuration>
+</component>

.mtn-ignore

@@ -28,23 +28,63 @@ web-fragment.xml
 web-out.xml
 
 # Temporary/build dirs
-^build
+^build$
 ^pkg-temp
-/build
+/build$
 /classes
 /dist
 ^installer/resources/locale/mo
 /tmp
 ^apps/jetty/jettylib
 
+# MSVC files
+core/c/jcpuid/msvc/*.opendb
+core/c/jcpuid/msvc/*.pdb
+core/c/jcpuid/msvc/*.sdf
+core/c/jcpuid/msvc/*.user
+
 # Debian-related
 ^debian/copyright
-^debian/changelog
 ^.pc/
 
 # Build property overrides
 override.properties
 
+# Launcher build paths
+launchers/macosx/target
+launchers/browserbundle/target
+launchers/macosx/project/target
+launchers/browserbundle/project/target
+launchers/target
+launchers/project/target
+launchers/common/target
+launchers/output
+launchers/project/project
+
 # Reporting
 sloccount.sc
 ^reports/
+
+# IDE project files
+# Eclipse
+/.classpath$
+/.project$
+/.settings
+# IDEA
+\.iml$
+
+
+# Meeh stuff
+target/scala-2.12
+target/streams
+project/target
+launchers/macosx/version.h
+launchers/macosx/project/project/target
+launchers/macosx/I2PLauncher.xcodeproj/project.xcworkspace/xcuserdata
+launchers/macosx/I2PLauncher.xcodeproj/xcuserdata
+launchers/macosx/I2PLauncher.xcworkspace/xcuserdata
+launchers/macosx/Sparkle.framework
+launchers/macosx/I2PLauncher.app
+launchers/macosx/releases.done
+launchers/macosx/target
+

.travis.yml

@@ -0,0 +1,63 @@
+language: java
+
+jdk:
+  - oraclejdk11
+  - oraclejdk9
+  - openjdk12
+  - openjdk11
+  - openjdk10
+  - openjdk9
+
+matrix:
+  include:
+    - jdk: oraclejdk8
+      addons:
+        sonarcloud:
+          organization: "i2p"
+      before_install:
+        - export JAVA7_HOME=$(jdk_switcher home openjdk7)
+        - sed -i "1iplugins {\n    id 'org.sonarqube' version '2.6.1'\n}\n" build.gradle
+    - jdk: openjdk8
+      before_install:
+        - export JAVA7_HOME=$(jdk_switcher home openjdk7)
+    - jdk: openjdk7
+      sudo: required
+      before_install: # Work around missing crypto in openjdk7
+        - export JAVA7_HOME=$(jdk_switcher home openjdk7)
+        - sudo wget "https://bouncycastle.org/download/bcprov-ext-jdk15on-158.jar" -O "${JAVA_HOME}/jre/lib/ext/bcprov-ext-jdk15on-158.jar"
+        - sudo perl -pi.bak -e 's/^(security\.provider\.)([0-9]+)/$1.($2+1)/ge' /etc/java-7-openjdk/security/java.security
+        - echo "security.provider.1=org.bouncycastle.jce.provider.BouncyCastleProvider" | sudo tee -a /etc/java-7-openjdk/security/java.security
+      install:
+        - export TARGET_JAVA_HOME=$JAVA_HOME
+        - jdk_switcher use oraclejdk8
+        - ./gradlew assemble
+  allow_failures:
+    - jdk: openjdk12
+
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+cache:
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/
+    - $HOME/.sonar/cache/
+    - .gradle
+
+script:
+  - |
+    if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ]; then
+      ./gradlew sonarqube codeCoverageReport
+    else
+      ./gradlew check codeCoverageReport
+    fi
+
+after_success:
+  - bash <(curl -s https://codecov.io/bash)
+
+notifications:
+  irc:
+    channels:
+      - "chat.freenode.net#i2p-dev"
+    on_success: change
+    on_failure: always

.tx/config

@@ -6,10 +6,15 @@ trans.cs = apps/i2ptunnel/locale/messages_cs.po
 trans.da = apps/i2ptunnel/locale/messages_da.po
 trans.de = apps/i2ptunnel/locale/messages_de.po
 trans.es = apps/i2ptunnel/locale/messages_es.po
+trans.fa = apps/i2ptunnel/locale/messages_fa.po
+trans.fi = apps/i2ptunnel/locale/messages_fi.po
 trans.fr = apps/i2ptunnel/locale/messages_fr.po
 trans.hu = apps/i2ptunnel/locale/messages_hu.po
+;; Java converts id to in
+trans.id = apps/i2ptunnel/locale/messages_in.po
 trans.it = apps/i2ptunnel/locale/messages_it.po
 trans.ja = apps/i2ptunnel/locale/messages_ja.po
+trans.ko = apps/i2ptunnel/locale/messages_ko.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
@@ -20,9 +25,11 @@ 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.tr_TR = apps/i2ptunnel/locale/messages_tr.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
+trans.zh_TW = apps/i2ptunnel/locale/messages_zh_TW.po
 
 [I2P.proxy]
 source_file = apps/i2ptunnel/locale-proxy/messages_en.po
@@ -30,12 +37,18 @@ 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.el = apps/i2ptunnel/locale-proxy/messages_el.po
 trans.es = apps/i2ptunnel/locale-proxy/messages_es.po
+trans.fi = apps/i2ptunnel/locale-proxy/messages_fi.po
 trans.fr = apps/i2ptunnel/locale-proxy/messages_fr.po
 trans.hu = apps/i2ptunnel/locale-proxy/messages_hu.po
+;; Java converts id to in
+trans.id = apps/i2ptunnel/locale-proxy/messages_in.po
 trans.it = apps/i2ptunnel/locale-proxy/messages_it.po
+trans.ko = apps/i2ptunnel/locale-proxy/messages_ko.po
 trans.nb = apps/i2ptunnel/locale-proxy/messages_nb.po
 trans.nl = apps/i2ptunnel/locale-proxy/messages_nl.po
+trans.nn = apps/i2ptunnel/locale-proxy/messages_nn.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
@@ -43,6 +56,7 @@ 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.tr_TR = apps/i2ptunnel/locale-proxy/messages_tr.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
@@ -60,8 +74,11 @@ trans.et_EE = apps/routerconsole/locale/messages_et.po
 trans.fi = apps/routerconsole/locale/messages_fi.po
 trans.fr = apps/routerconsole/locale/messages_fr.po
 trans.hu = apps/routerconsole/locale/messages_hu.po
+;; Java converts id to in
+trans.id = apps/routerconsole/locale/messages_in.po
 trans.it = apps/routerconsole/locale/messages_it.po
 trans.ja = apps/routerconsole/locale/messages_ja.po
+trans.ko = apps/routerconsole/locale/messages_ko.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
@@ -74,18 +91,27 @@ 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
+trans.zh_TW = apps/routerconsole/locale/messages_zh_TW.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.az = apps/routerconsole/locale-news/messages_az.po
+trans.cs = apps/routerconsole/locale-news/messages_cs.po
 trans.de = apps/routerconsole/locale-news/messages_de.po
+trans.el = apps/routerconsole/locale-news/messages_el.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.gl = apps/routerconsole/locale-news/messages_gl.po
 trans.he = apps/routerconsole/locale-news/messages_he.po
+;; Java converts id to in
+trans.id = apps/routerconsole/locale-news/messages_in.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
@@ -94,26 +120,38 @@ 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.sr = apps/routerconsole/locale-news/messages_sr.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
+trans.zh_TW = apps/routerconsole/locale-news/messages_zh_TW.po
 
 [I2P.countries]
 type = PO
 source_file = apps/routerconsole/locale-countries/messages_en.po
 source_lang = en
+trans.ar = apps/routerconsole/locale-countries/messages_ar.po
+trans.az = apps/routerconsole/locale-countries/messages_az.po
 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.fa = apps/routerconsole/locale-countries/messages_fa.po
 trans.fi = apps/routerconsole/locale-countries/messages_fi.po
 trans.fr = apps/routerconsole/locale-countries/messages_fr.po
+trans.gl = apps/routerconsole/locale-countries/messages_gl.po
+trans.hr = apps/routerconsole/locale-countries/messages_hr.po
 trans.hu = apps/routerconsole/locale-countries/messages_hu.po
+;; Java converts id to in
+trans.id = apps/routerconsole/locale-countries/messages_in.po
 trans.it = apps/routerconsole/locale-countries/messages_it.po
 trans.ja = apps/routerconsole/locale-countries/messages_ja.po
+trans.ko = apps/routerconsole/locale-countries/messages_ko.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
@@ -124,10 +162,11 @@ 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.uk_UA = apps/routerconsole/locale-countries/messages_uk.po
 trans.vi = apps/routerconsole/locale-countries/messages_vi.po
 trans.zh_CN = apps/routerconsole/locale-countries/messages_zh.po
+trans.zh_TW = apps/routerconsole/locale-countries/messages_zh_TW.po
 
 [I2P.i2psnark]
 source_file = apps/i2psnark/locale/messages_en.po
@@ -135,19 +174,29 @@ source_lang = en
 trans.ar = apps/i2psnark/locale/messages_ar.po
 trans.cs = apps/i2psnark/locale/messages_cs.po
 trans.de = apps/i2psnark/locale/messages_de.po
+trans.el = apps/i2psnark/locale/messages_el.po
 trans.es = apps/i2psnark/locale/messages_es.po
+trans.fa = apps/i2psnark/locale/messages_fa.po
+trans.fi = apps/i2psnark/locale/messages_fi.po
 trans.fr = apps/i2psnark/locale/messages_fr.po
 trans.hu = apps/i2psnark/locale/messages_hu.po
+;; Java converts id to in
+trans.id = apps/i2psnark/locale/messages_in.po
 trans.it = apps/i2psnark/locale/messages_it.po
+trans.ja = apps/i2psnark/locale/messages_ja.po
+trans.ko = apps/i2psnark/locale/messages_ko.po
 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.pt_BR = apps/i2psnark/locale/messages_pt_bR.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.sq = apps/i2psnark/locale/messages_sq.po
+trans.tr_TR = apps/i2psnark/locale/messages_tr.po
+trans.uk_UA = apps/i2psnark/locale/messages_uk.po
 trans.vi = apps/i2psnark/locale/messages_vi.po
 trans.zh_CN = apps/i2psnark/locale/messages_zh.po
 
@@ -160,10 +209,15 @@ trans.da = apps/susidns/locale/messages_da.po
 trans.de = apps/susidns/locale/messages_de.po
 trans.el = apps/susidns/locale/messages_el.po
 trans.es = apps/susidns/locale/messages_es.po
+trans.fi = apps/susidns/locale/messages_fi.po
 trans.fr = apps/susidns/locale/messages_fr.po
+trans.gl = apps/susidns/locale/messages_gl.po
 trans.hu = apps/susidns/locale/messages_hu.po
+;; Java converts id to in
+trans.id = apps/susidns/locale/messages_in.po
 trans.it = apps/susidns/locale/messages_it.po
 trans.ja = apps/susidns/locale/messages_ja.po
+trans.ko = apps/susidns/locale/messages_ko.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
@@ -175,27 +229,41 @@ 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
+trans.zh_TW = apps/susidns/locale/messages_zh_TW.po
 
 [I2P.desktopgui]
 source_file = apps/desktopgui/locale/messages_en.po
 source_lang = en
 trans.ar = apps/desktopgui/locale/messages_ar.po
+trans.az = apps/desktopgui/locale/messages_az.po
+trans.bg = apps/desktopgui/locale/messages_bg.po
+trans.ca = apps/desktopgui/locale/messages_ca.po
 trans.cs = apps/desktopgui/locale/messages_cs.po
 trans.da = apps/desktopgui/locale/messages_da.po
 trans.de = apps/desktopgui/locale/messages_de.po
 trans.el = apps/desktopgui/locale/messages_el.po
 trans.es = apps/desktopgui/locale/messages_es.po
+trans.fa = apps/desktopgui/locale/messages_fa.po
+trans.fi = apps/desktopgui/locale/messages_fi.po
 trans.fr = apps/desktopgui/locale/messages_fr.po
+trans.gl = apps/desktopgui/locale/messages_gl.po
 trans.hu = apps/desktopgui/locale/messages_hu.po
+;; Java converts id to in
+trans.id = apps/desktopgui/locale/messages_in.po
 trans.it = apps/desktopgui/locale/messages_it.po
 trans.ja = apps/desktopgui/locale/messages_ja.po
+trans.ko = apps/desktopgui/locale/messages_ko.po
+trans.mg = apps/desktopgui/locale/messages_mg.po
+trans.nb = apps/desktopgui/locale/messages_nb.po
 trans.nl = apps/desktopgui/locale/messages_nl.po
 trans.pl = apps/desktopgui/locale/messages_pl.po
+trans.pt = apps/desktopgui/locale/messages_pt.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.sq = apps/desktopgui/locale/messages_sq.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
@@ -204,56 +272,88 @@ trans.zh_CN = apps/desktopgui/locale/messages_zh.po
 [I2P.susimail]
 source_file = apps/susimail/locale/messages_en.po
 source_lang = en
+trans.ar = apps/susimail/locale/messages_ar.po
+trans.az = apps/susimail/locale/messages_az.po
 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.el = apps/susimail/locale/messages_el.po
 trans.es = apps/susimail/locale/messages_es.po
+trans.fa = apps/susimail/locale/messages_fa.po
+trans.fi = apps/susimail/locale/messages_fi.po
 trans.fr = apps/susimail/locale/messages_fr.po
+trans.gl = apps/susimail/locale/messages_gl.po
 trans.hu = apps/susimail/locale/messages_hu.po
+;; Java converts id to in
+trans.id = apps/susimail/locale/messages_in.po
 trans.it = apps/susimail/locale/messages_it.po
 trans.ja = apps/susimail/locale/messages_ja.po
+trans.ko = apps/susimail/locale/messages_ko.po
+trans.mg = apps/susimail/locale/messages_mg.po
+trans.nb = apps/susimail/locale/messages_nb.po
 trans.nl = apps/susimail/locale/messages_nl.po
-trans.ru_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.sk = apps/susimail/locale/messages_sk.po
+trans.sq = apps/susimail/locale/messages_sq.po
+trans.sv_SE = apps/susimail/locale/messages_sv.po
+trans.tr_TR = apps/susimail/locale/messages_tr.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
+trans.zh_TW = apps/susimail/locale/messages_zh_TW.po
 
 [I2P.debconf]
 source_file = debian/po/templates.pot
 source_lang = en
+trans.ar = debian/po/ar.po
+trans.az = debian/po/az.po
 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.gl = debian/po/gl.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.nb = debian/po/nb.po
+trans.nl = debian/po/nl.po
 trans.pl = debian/po/pl.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.uk_UA = debian/po/uk.po
 trans.zh_CN = debian/po/zh.po
+trans.zh_TW = debian/po/zh_TW.po
 
 [I2P.i2prouter-script]
 source_file = installer/resources/locale/po/messages_en.po
 source_lang = en
+trans.ar = installer/resources/locale/po/messages_ar.po
+trans.az = installer/resources/locale/po/messages_az.po
+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.fi = installer/resources/locale/po/messages_fi.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
+trans.ko = installer/resources/locale/po/messages_ko.po
+trans.nb = installer/resources/locale/po/messages_nb.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
@@ -262,40 +362,161 @@ 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
+trans.uk_UA = installer/resources/locale/po/messages_uk.po
 trans.zh_CN = installer/resources/locale/po/messages_zh.po
 
 [I2P.getopt]
+;;
+;; Java properties files (when not read with our DataHelper methods) must be ISO-8859-1 encoded.
+;; See https://docs.oracle.com/javase/6/docs/api/java/util/Properties.html
+;; Several getopt translations from Transifex are ISO-8859-1 encoded.
+;; So that all our source files are consistently UTF-8 encoded,
+;; you may optionally convert them to ASCII with Unicode escapes after downloading.
+;; Convert files with:
+;;   native2ascii -encoding iso-8859-1 foo.properties foo.properties.new
+;; Then review that it looks right:
+;;   native2ascii -reverse -encoding UTF-8 foo.properties.new
+;; Then copy it over:
+;;   mv foo.properties.new foo.properties
+;; The following files from Transifex are known to be ISO-8859-1 encoded,
+;; and should be escaped using native2ascii after downloading:
+;;   gl, pt, pt_BR, sq, sv, tr
+;;
 source_file = core/java/src/gnu/getopt/MessagesBundle.properties
 source_lang = en
 type = PROPERTIES
+trans.ar = core/java/src/gnu/getopt/MessagesBundle_ar.properties
+trans.az = core/java/src/gnu/getopt/MessagesBundle_az.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.fi = core/java/src/gnu/getopt/MessagesBundle_fi.properties
 trans.fr = core/java/src/gnu/getopt/MessagesBundle_fr.properties
+trans.gl = core/java/src/gnu/getopt/MessagesBundle_gl.properties
 trans.hu = core/java/src/gnu/getopt/MessagesBundle_hu.properties
+;; Java converts id to in
+trans.id = core/java/src/gnu/getopt/MessagesBundle_in.properties
 trans.it = core/java/src/gnu/getopt/MessagesBundle_it.properties
 trans.ja = core/java/src/gnu/getopt/MessagesBundle_ja.properties
-trans.nl = core/java/src/gnu/getopt/MessagesBundle_nl.properties
+trans.ko = core/java/src/gnu/getopt/MessagesBundle_ko.properties
 trans.nb = core/java/src/gnu/getopt/MessagesBundle_nb.properties
+trans.nl = core/java/src/gnu/getopt/MessagesBundle_nl.properties
 trans.pl = core/java/src/gnu/getopt/MessagesBundle_pl.properties
+trans.pt = core/java/src/gnu/getopt/MessagesBundle_pt.properties
 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
+trans.sq = core/java/src/gnu/getopt/MessagesBundle_sq.properties
+trans.sr = core/java/src/gnu/getopt/MessagesBundle_sr.properties
+trans.sv_SE = core/java/src/gnu/getopt/MessagesBundle_sv.properties
+trans.tr_TR = core/java/src/gnu/getopt/MessagesBundle_tr.properties
+trans.uk_UA = core/java/src/gnu/getopt/MessagesBundle_uk.properties
 trans.zh_CN = core/java/src/gnu/getopt/MessagesBundle_zh.properties
+trans.zh_TW = core/java/src/gnu/getopt/MessagesBundle_zh_TW.properties
 
 [I2P.streaming]
 source_file = apps/ministreaming/locale/messages_en.po
 source_lang = en
+trans.ar = apps/ministreaming/locale/messages_ar.po
+trans.az = apps/ministreaming/locale/messages_az.po
+trans.ca = apps/ministreaming/locale/messages_ca.po
+trans.cs = apps/ministreaming/locale/messages_cs.po
 trans.de = apps/ministreaming/locale/messages_de.po
 trans.es = apps/ministreaming/locale/messages_es.po
+trans.fi = apps/ministreaming/locale/messages_fi.po
 trans.fr = apps/ministreaming/locale/messages_fr.po
+trans.gl = apps/ministreaming/locale/messages_gl.po
+;; Java converts id to in
+trans.id = apps/ministreaming/locale/messages_in.po
 trans.it = apps/ministreaming/locale/messages_it.po
+trans.ko = apps/ministreaming/locale/messages_ko.po
 trans.nb = apps/ministreaming/locale/messages_nb.po
+trans.nl = apps/ministreaming/locale/messages_nl.po
+trans.pl = apps/ministreaming/locale/messages_pl.po
+trans.pt = apps/ministreaming/locale/messages_pt.po
+trans.pt_BR = apps/ministreaming/locale/messages_pt_BR.po
+trans.ro = apps/ministreaming/locale/messages_ro.po
 trans.ru_RU = apps/ministreaming/locale/messages_ru.po
+trans.sv_SE = apps/ministreaming/locale/messages_sv.po
+trans.tr_TR = apps/ministreaming/locale/messages_tr.po
 trans.uk_UA = apps/ministreaming/locale/messages_uk.po
 trans.zh_CN = apps/ministreaming/locale/messages_zh.po
 
+[I2P.manpages]
+;;
+;; after adding languages here, add to debian/*.manpages also
+;;
+type = PO
+source_file = installer/resources/locale-man/man.pot
+source_lang = en
+trans.ar = installer/resources/locale-man/man_ar.po
+trans.az = installer/resources/locale-man/man_az.po
+trans.de = installer/resources/locale-man/man_de.po
+trans.es = installer/resources/locale-man/man_es.po
+trans.fi = installer/resources/locale-man/man_fi.po
+trans.fr = installer/resources/locale-man/man_fr.po
+trans.id = installer/resources/locale-man/man_id.po
+trans.it = installer/resources/locale-man/man_it.po
+trans.ko = installer/resources/locale-man/man_ko.po
+trans.nl = installer/resources/locale-man/man_nl.po
+trans.pl = installer/resources/locale-man/man_pl.po
+trans.pt = installer/resources/locale-man/man_pt.po
+trans.pt_BR = installer/resources/locale-man/man_pt_BR.po
+trans.ru_RU = installer/resources/locale-man/man_ru.po
+trans.sv_SE = installer/resources/locale-man/man_sv.po
+trans.tr_TR = installer/resources/locale-man/man_tr.po
+trans.zh_CN = installer/resources/locale-man/man_zh.po
+
+[I2P.eepsite]
+;;
+;; For any new translations, add links in installer/resources/eepsite/docroot/help/index.html
+;; and copy new flags in build.xml copyflags-unlesspkg target,
+;; and add to debian/i2p-router.links and debian-alt/*/i2p-router.links
+;;
+type = HTML
+source_file = installer/resources/eepsite/docroot/help/index.html
+source_lang = en
+trans.ar = installer/resources/eepsite/docroot/help/index_ar.html
+trans.az = installer/resources/eepsite/docroot/help/index_az.html
+trans.de = installer/resources/eepsite/docroot/help/index_de.html
+;; not yet translated on TX, use old page
+;;trans.es = installer/resources/eepsite/docroot/help/index_es.html
+trans.fr = installer/resources/eepsite/docroot/help/index_fr.html
+trans.hu = installer/resources/eepsite/docroot/help/index_hu.html
+;; Java converts id to in
+trans.id = installer/resources/eepsite/docroot/help/index_in.html
+trans.it = installer/resources/eepsite/docroot/help/index_it.html
+;; not yet translated on TX, use old page
+;;trans.nl = installer/resources/eepsite/docroot/help/index_nl.html
+trans.pl = installer/resources/eepsite/docroot/help/index_pl.html
+trans.pt = installer/resources/eepsite/docroot/help/index_pt.html
+trans.ru_RU = installer/resources/eepsite/docroot/help/index_ru.html
+;; not yet translated on TX, use old page
+;;trans.sv_SE = installer/resources/eepsite/docroot/help/index_sv.html
+trans.tr_TR = installer/resources/eepsite/docroot/help/index_tr.html
+;; not yet translated on TX, use old page
+;;trans.zh_CN = installer/resources/eepsite/docroot/help/index_zh.html
+
+[I2P.readme]
+;;
+;; Text on /console
+;;
+type = HTML
+source_file = installer/resources/readme/readme.html
+source_lang = en
+trans.ar = installer/resources/readme/readme_ar.html
+trans.de = installer/resources/readme/readme_de.html
+;; Java converts id to in
+trans.id = installer/resources/readme/readme_in.html
+trans.it = installer/resources/readme/readme_it.html
+trans.ja = installer/resources/readme/readme_ja.html
+trans.pl = installer/resources/readme/readme_pl.html
+trans.pt = installer/resources/readme/readme_pt.html
+trans.ro = installer/resources/readme/readme_ro.html
+trans.ru_RU = installer/resources/readme/readme_ru.html
+trans.tr_TR = installer/resources/readme/readme_tr.html
+
 [main]
 host = https://www.transifex.com
 

Docker.entrypoint.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+export JAVA_HOME=/opt/jdk/jre
+
+# Ensure user rights
+chown -R i2p:nobody /opt/i2p
+chmod -R u+rwx /opt/i2p
+
+gosu i2p /opt/i2p/i2psvc /opt/i2p/wrapper.config wrapper.pidfile=/var/tmp/i2p.pid \
+   wrapper.name=i2p \
+   wrapper.displayname="I2P Service" \
+   wrapper.statusfile=/var/tmp/i2p.status \
+   wrapper.java.statusfile=/var/tmp/i2p.java.status \
+   wrapper.logfile=/var/tmp/wrapper.log

Docker.expt

@@ -0,0 +1,7 @@
+#!/usr/bin/expect
+set timeout 15;
+spawn java -jar /tmp/i2pinstall.jar -console
+expect {
+ -re ".*press 1 to continue, 2 to quit, 3 to redisplay" {send "1\r"; exp_continue;}
+ -re "Select target path *" {send "/opt/i2p\r"; exp_continue;}
+}

Dockerfile

@@ -0,0 +1,62 @@
+FROM meeh/java8server:latest
+# Docker image based on Alpine with Java.
+
+# We use Oracle Java to run I2P, but uses the openjdk to build it.
+
+
+MAINTAINER Mikal Villa <mikal@sigterm.no>
+
+ENV GIT_BRANCH="master"
+ENV I2P_PREFIX="/opt/i2p"
+ENV PATH=${I2P_PREFIX}/bin:$PATH
+ENV JAVA_HOME=/usr/lib/jvm/default-jvm
+
+ENV GOSU_VERSION=1.7
+ENV GOSU_SHASUM="34049cfc713e8b74b90d6de49690fa601dc040021980812b2f1f691534be8a50  /usr/local/bin/gosu"
+
+RUN mkdir /user && adduser -S -h /user i2p && chown -R i2p:nobody /user
+
+# Adding files first, since Docker.expt is required for installation
+ADD Docker.expt /tmp/Docker.expt
+ADD Docker.entrypoint.sh /entrypoint.sh
+
+# Required for wget https
+RUN apk add --no-cache openssl
+# Gosu is a replacement for su/sudo in docker and not a backdoor :) See https://github.com/tianon/gosu
+RUN wget -O /usr/local/bin/gosu https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-amd64 \
+    && echo "${GOSU_SHASUM}" | sha256sum -c && chmod +x /usr/local/bin/gosu
+
+#
+# Each RUN is a layer, adding the dependencies and building i2pd in one layer takes around 8-900Mb, so to keep the
+# image under 200mb we need to remove all the build dependencies in the same "RUN" / layer.
+#
+
+# The main layer
+RUN apk --no-cache add build-base git gettext tar bzip2 apache-ant openjdk8 expect \
+    && mkdir -p /usr/src/build \
+    && cd /usr/src/build \
+    && git clone -b ${GIT_BRANCH} https://github.com/i2p/i2p.i2p.git \
+    && cd /usr/src/build/i2p.i2p \
+    && echo "noExe=true" >> build.properties \
+    && ant installer-linux \
+    && cp i2pinstall*.jar /tmp/i2pinstall.jar \
+    && mkdir -p /opt \
+    && chown i2p:root /opt \
+    && chmod u+rw /opt \
+    && gosu i2p expect -f /tmp/Docker.expt \
+    && cd ${I2P_PREFIX} \
+    && rm -fr man docs *.bat *.command *.app /tmp/i2pinstall.jar /tmp/Docker.expt \
+    && rm -fr /usr/src/build \
+    && apk --purge del build-base apache-ant expect tcl expat git openjdk8 openjdk8-jre openjdk8-jre-base openjdk8-jre-lib bzip2 tar \
+      binutils-libs binutils pkgconfig libcurl libc-dev musl-dev g++ make fortify-headers pkgconf giflib libssh2 libxdmcp libxcb \
+      libx11 pcre alsa-lib libxi libxrender libxml2 readline bash openssl \
+    && rm -fr /usr/lib/jvm/default-jre \
+    && ln -sf /opt/jdk/jre /usr/lib/jvm/default-jre \
+    && chmod a+x /entrypoint.sh
+
+
+
+EXPOSE 7654 7656 7657 7658 4444 6668 8998 7659 7660 4445 15000-20000
+
+ENTRYPOINT [ "/entrypoint.sh" ]
+

INSTALL-headless.txt

@@ -11,7 +11,7 @@ you may use:
   lynx http://localhost:7657/
 to configure the router.
 
-If you're having trouble, swing by http://forum.i2p/, check the
+If you're having trouble, check the
 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
@@ -25,21 +25,22 @@ where there are comments labeled "PORTABLE". Do this before you
 run I2P for the first time.
 
 To start I2P:
-   (*nix): sh i2prouter start
+   (*nix, BSD, Mac): sh i2prouter start
    (win*): I2P.exe
-   (non-x86 platforms PPC, ARM, etc): sh runplain.sh
+   (platforms without wrapper support): sh runplain.sh
 
 To stop I2P (gracefully):
    lynx http://localhost:7657/summaryframe (click "Shutdown")
+   or (*nix, BSD, Mac) sh i2prouter graceful
 
 To stop I2P immediately:
-   sh i2prouter stop
+   (*nix, BSD, Mac) sh i2prouter stop
 
 To uninstall I2P:
    rm -rf $I2PInstallDir ~/.i2p
 
 Supported JVMs:
-  All platforms: Java 1.6 or higher required; 1.7 or higher recommended
+  All platforms: Java 1.7 or higher required
   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

INSTALL.txt

@@ -1,11 +1,13 @@
 I2P source installation instructions
 
 Prerequisites to build from source:
-	Java SDK (preferably Oracle/Sun or OpenJDK) 1.6.0 or higher
+	Java SDK (preferably Oracle/Sun or OpenJDK) 1.7.0 or higher
           Non-linux operating systems and JVMs: See https://trac.i2p2.de/wiki/java
+          Certain subsystems for embedded (core, router, mstreaming, streaming, i2ptunnel) require only Java 1.6
 	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/
+	  from the GNU gettext package http://www.gnu.org/software/gettext/
+	Build environment must use a UTF-8 locale.
 
 To build and install I2P from source, you must first build
 and package up the appropriate installer by running:
@@ -40,29 +42,30 @@ or on Windows, just double-click on i2pinstall.exe.
 Or move the i2pupdate.zip file into an existing installation directory and restart.
 
 To start I2P:
-   (*nix): sh i2prouter start
+   (*nix, BSD, Mac): sh i2prouter start
    (win*): I2P.exe or i2prouter.bat
-   (non-x86 platforms PPC, ARM, etc): sh runplain.sh
+   (platforms without wrapper support): sh runplain.sh
 
 To install I2P as a system service:
-   (*nix) sh i2prouter install
+   (*nix, BSD, Mac) sh i2prouter install
    (win*) install_i2p_service_winnt.bat
 
 To uninstall I2P as a system service:
-   (*nix) sh i2prouter remove
+   (*nix, BSD, Mac) sh i2prouter remove
    (win*) uninstall_i2p-service_winnt.bat
 
 To stop I2P (gracefully):
    lynx http://localhost:7657/summaryframe (click "Shutdown")
+   or (*nix, BSD, Mac) sh i2prouter graceful
 
 To stop I2P immediately:
-   sh i2prouter stop
+   (*nix, BSD, Mac) sh i2prouter stop
 
 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)
+  Windows: Latest available from http://java.com/download (1.7+ supported)
+  Linux:   Latest available from http://java.com/download (1.7+ supported)
+  FreeBSD: 1.7-compatible (NIO required)
   Other operating systems and JVMs: See http://trac.i2p2.de/wiki/java

LICENSE.txt

@@ -29,17 +29,21 @@ POSSIBILITY OF SUCH DAMAGES.
 LICENSES
 --------
 
-Core (i2p.jar):
+Core API (i2p.jar):
 Public domain except as listed below:
 
    ElGamal and DSA code:
    Copyright (c) 2003, TheCrypto
    See licenses/LICENSE-ElGamalDSA.txt
 
-   SHA256 and HMAC:
+   HMAC:
    Copyright (c) 2000 - 2004 The Legion Of The Bouncy Castle
    See licenses/LICENSE-SHA256.txt
 
+   ElGamal:
+   Copyright (c) 2000 - 2013 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
+   See licenses/LICENSE-SHA256.txt
+
    AES code:
    Copyright (c) 1995-2005 The Cryptix Foundation Limited.
    See licenses/LICENSE-Cryptix.txt
@@ -54,13 +58,14 @@ Public domain except as listed below:
 
    PRNG:
    Copyright (C) 2001, 2002, Free Software Foundation, Inc.
-   See licenses/LICENSE-LGPLv2.1.txt
+   See licenses/LICENSE-LGPLv2.1.txt or /usr/share/common-licenses/LGPL-2.1
 
    HashCash code:
    Copyright 2006 Gregory Rubin grrubin@gmail.com
    See licenses/LICENSE-HashCash.txt
 
-   GettextResource from gettext v0.18:
+   GettextResource from gettext v0.19.8:
+   (not included in most distribution packages)
    Copyright (C) 2001, 2007 Free Software Foundation, Inc.
    See licenses/LICENSE-LGPLv2.1.txt
 
@@ -68,18 +73,27 @@ Public domain except as listed below:
    Contains some code Copyright 2006 Sun Microsystems, Inc.
    See licenses/LICENSE-InstallCert.txt
 
-   BlockFile:
-   Copyright (c) 2006, Matthew Estes
-   See licenses/LICENSE-BlockFile.txt
-
    SipHashInline:
    Copyright 2012  Hiroshi Nakamura <nahi@ruby-lang.org>
    See licenses/LICENSE-Apache2.0.txt
 
    Getopt:
+   (not included in most distribution packages)
    Copyright (c) 1998 by Aaron M. Renn (arenn@urbanophile.com)
    See licenses/LICENSE-LGPLv2.1.txt
 
+   HostnameVerifier:
+   From Apache HttpClient 4.4.1 and HttpCore 4.4.1
+   See licenses/LICENSE-Apache2.0.txt
+
+   json-simple 1.1.1
+   (not included in most distribution packages)
+   See licenses/LICENSE-Apache2.0.txt
+
+   Noise library:
+   Copyright (C) 2016 Southern Storm Software, Pty Ltd.
+   See licenses/LICENSE-Noise.txt
+
 
 Router (router.jar):
 Public domain except as listed below:
@@ -87,17 +101,29 @@ Public domain except as listed below:
    From freenet
    See licenses/LICENSE-GPLv2.txt
 
-   UPnP subsystem (CyberLink) 2.1:
+   UPnP subsystem (CyberLink) 3.0:
    Copyright (C) 2003-2010 Satoshi Konno
    See licenses/LICENSE-UPnP.txt
 
-   GeoIP: GeoLite databases are licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License.
-   http://creativecommons.org/licenses/by-sa/3.0/
-   This product includes GeoLite data created by MaxMind, available from http://www.maxmind.com/
+   GeoIP API 1.3.1:
+   See licenses/LICENSE-LGPLv2.1.txt
+
+   GeoIP2-java 2.12.0:
+   See licenses/LICENSE-Apache2.0.txt
+
+   Maxmind-DB-Reader-java 1.2.2:
+   See licenses/LICENSE-Apache2.0.txt
+
+   Noise library:
+   Copyright (C) 2016 Southern Storm Software, Pty Ltd.
+   See licenses/LICENSE-Noise.txt
 
 
 Installer:
+   (not included in distribution packages)
    Launch4j 3.0.1:
+   (Launch4j is only included in the upstream source package and Windows binaries.
+    Not applicable for non-Windows binaries or Debian/Launchpad packages.)
    Copyright (c) 2004, 2008 Grzegorz Kowal
    See licenses/LICENSE-Launch4j.txt (in binary packages)
    See installer/lib/launch4j/LICENSE.txt (in source packages)
@@ -110,7 +136,7 @@ Installer:
         See licenses/LICENSE-Apache2.0.txt
         See licenses/NOTICE-Commons-Logging.txt
 
-        XStream (http://xstream.codehaus.org/)
+        XStream (http://xstream.github.io/)
         Copyright (c) 2003-2004, Joe Walnes
         See licenses/LICENSE-XStream.txt
 
@@ -136,120 +162,171 @@ Installer:
    See licenses/LICENSE-Apache2.0.txt
 
 
+GeoIP Data:
+   (not included in most distribution packages)
+   This product includes GeoLite2 data created by MaxMind, available from http://www.maxmind.com/
+   See licenses/LICENSE-GeoIP.txt
 
-Java Service Wrapper Community Edition 32-bit 3.5.25:
-   Copyright (C) 1999-2011 Tanuki Software, Ltd. All Rights Reserved.
+Launchers:
+   (not included in distribution packages)
+   Copyright (c) 2002-2018 EPFL, Lausanne / Lightbend, Inc. , unless otherwise specified.
+   See licenses/LICENSE-Scala.md
+
+Java Service Wrapper Community Edition 32-bit 3.5.39:
+   (not included in most distribution packages)
+   Copyright (C) 1999-2019 Tanuki Software, Ltd. All Rights Reserved.
    See licenses/LICENSE-Wrapper.txt
 
 
 Jbigi Libraries (jbigi.jar):
-   JNI code public domain.
+   JNI code: public domain.
 
    GMP 4.3.2 / 5.0.2:
    Copyright 1991, 1996, 1999, 2000, 2007 Free Software Foundation, Inc.
    See licenses/LICENSE-LGPLv3.txt
+   GMP 6.0.0:
+   See licenses/LICENSE-GPLv2.txt
 
 
 Applications:
 
-   Addressbook:
+   Addressbook (addressbook.jar):
    Copyright (c) 2004 Ragnarok
    See licenses/LICENSE-Addressbook.txt
+     BlockFile:
+       Copyright (c) 2006, Matthew Estes
+       See licenses/LICENSE-BlockFile.txt
 
-   BOB:
+   BOB (BOB.jar):
    Copyright (C) sponge
    See licenses/COPYING-BOB.txt
 
-   I2PSnark:
+   Desktopgui (desktopgui.jar):
+   Copyright (c) Mathias De Maré
+   See licenses/LICENSE-DesktopGUI.txt
+
+   Glassfish Standard Tag Library (JSTL) 1.2 (commons-el.jar):
+   (not included in most distribution packages)
+   Common Development and Distribution License (CDDL) version 1.0 + GNU General Public License (GPL) version 2
+   See https://glassfish.dev.java.net/public/CDDL+GPL.html
+   See licenses/LICENSE-GPLv2.txt
+
+   I2PControl
+   See licenses/LICENSE-Apache2.0.txt
+   Includes jBCrypt:
+   Copyright (c) 2006 Damien Miller <djm@mindrot.org>
+   See licenses/LICENSE-jBCrypt.txt
+   Includes jsonrpc2 1.38.1 (base) 1.11 (server)
+   See licenses/LICENSE-Apache2.0.txt
+
+   I2PSnark (i2psnark.jar, i2psnark.war):
    Copyright (C) 2003 Mark J. Wielaard
    GPLv2 (or any later version)
    See licenses/LICENSE-GPLv2.txt
-       Silk icons: See licenses/LICENSE-SilkIcons.txt
 
-   I2PTunnel:
+   I2PTunnel (i2ptunnel.jar, i2ptunnel.war):
    (c) 2003 - 2004 mihi
    GPLv2 (or any later version) with exception.
    See licenses/LICENSE-I2PTunnel.txt
    See licenses/LICENSE-GPLv2.txt
+     I2PTunnel SOCKS Proxy:
+       Copyright (c) 2004 by human
+       GPLv2 (or any later version) with exception.
+       See licenses/LICENSE-I2PTunnel.txt
+       See licenses/LICENSE-GPLv2.txt
+     I2PTunnel UDP and Streamr (i2ptunnel.jar):
+       By welterde.
+       See licenses/LICENSE-GPLv2.txt
 
-   I2PTunnel SOCKS Proxy:
-   Copyright (c) 2004 by human
-   GPLv2 (or any later version) with exception.
-   See licenses/LICENSE-I2PTunnel.txt
-   See licenses/LICENSE-GPLv2.txt
+   Imagegen (imagegen.war):
+     Identicon:
+       Copyright (c) 2007-2014 Don Park <donpark@docuverse.com>
+       See licenses/LICENSE-Identicon.txt
+     RandomArt:
+       Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
+       Copyright (c) 2008 Alexander von Gernler.  All rights reserved.
+       See licenses/LICENSE-BSD.txt
+     Zxing 3.3.0:
+       See licenses/LICENSE-Apache2.0.txt
 
-   I2PTunnel UDP and Streamr:
-   By welterde.
-   See licenses/LICENSE-GPLv2.txt
-
-   Jetty 8.1.16.v20140903:
+   Jetty 9.2.25.v20180606 (jetty-*.jar, org.mortbay.*.jar):
+   (not included in most distribution packages, except for jetty-i2p.jar)
    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:
+   JRobin 1.6.0-1 (jrobin.jar):
+   Copyright (c) 2001-2005 Sasa Markovic and Ciaran Treanor.
+   Copyright (c) 2011 The OpenNMS Group, Inc.
    See licenses/LICENSE-LGPLv2.1.txt
+   DeallocationHelper:
+   Copyright (c) 2006-2016 Julien Gouesse
+   See licenses/LICENSE-GPLv2.txt
 
-   Ministreaming Lib:
+   Ministreaming Lib (mstreaming.jar):
    By mihi.
    See licenses/LICENSE-BSD.txt
 
-   Proxyscript:
+   Proxyscript (i2pProxy.pac):
+   (not included in distribution packages)
    By Cervantes.
    Public domain.
 
-   Router console:
+   Router console (routerconsole.jar, routerconsole.war):
    Public domain.
+
+   Router Console themes:
        Flag icons:
          - Jersey and EU flag icons: public domain, courtesy Xrmap flag
            collection http://www.arvernes.com/wiki/index.php/Xrmap
          - Guernsey and Isle of Man flags from the Open Clip Art Library, released into the public domain
          - Curaçao, courtesy of David Benbennick, released into the public domain
          - All other flag icons: public domain, courtesy mjames@gmail.com http://www.famfamfam.com/
-       Silk icons: See licenses/LICENSE-SilkIcons.txt
        FatCow icons: See licenses/LICENSE-FatCowIcons.txt
+       Fugue Icons: See licenses/LICENSE-FugueIcons.txt
+       Feather icons: Copyright (c) 2013-2017 Cole Bemis; see licenses/LICENSE-Feather.txt
 
-       GeoIP Data:
-       This product includes GeoLite data created by MaxMind, available from http://www.maxmind.com/
-       See licenses/LICENSE-GeoIP.txt
+   Router Console unthemed, light, and dark theme logos:
+   Copyright (c) 2019 The Invisible Internet Project. All rights reserved.
+   Creative Commons Attribution-ShareAlike 4.0 International License
+   See https://creativecommons.org/licenses/by-sa/4.0/
 
    Router Console and I2PSnark themes:
-   "Man with hat over face" & related images licensed under a Creative Commons 2.0 license.
-   Original photos by Florian Kuhlmann. http://www.flickr.com/photos/floriankuhlmann/3117758155
+   Some images licensed under a Creative Commons 2.0 license.
+       Silk icons: See licenses/LICENSE-SilkIcons.txt
 
-   I2PSnark light theme:
-   "Creative Commons Cat" licensed under a Creative Commons Attribution 3.0 Unported License.
-   Original photo by Boaz Arad. http://www.luxphile.com/2011/01/creative-commons-cat.html
+   Router Console M-Lab subsystem:
+   Copyright 2010 Vuze, Inc.  All rights reserved.
+   See licenses/LICENSE-GPLv2.txt
 
-   SAM:
+   Router Console NDT subsystem:
+   Copyright (c) 2003 University of Chicago.  All rights reserved.
+   See licenses/LICENSE-NDT.txt
+   Notice: I2P has changed specified portions of the Software, including the package edu.internet2.ndt.
+
+   SAM (sam.jar):
    Public domain.
 
-   Streaming Lib:
+   Streaming Lib (streaming.jar):
    Public domain.
 
-   SusiDNS:
+   SusiDNS (susidns.war):
    Copyright (C) 2005 <susi23@mail.i2p>
    GPLv2 (or any later version)
    See licenses/LICENSE-GPLv2.txt
-       Uses Glassfish Standard Tag Library (JSTL) 1.2:
-       Common Development and Distribution License (CDDL) version 1.0 + GNU General Public License (GPL) version 2
-       See https://glassfish.dev.java.net/public/CDDL+GPL.html
-       See licenses/LICENSE-GPLv2.txt
 
-   SusiMail:
+   SusiMail (susimail.war):
    Copyright (C) 2004-2005  <susi23@mail.i2p>
    GPLv2 (or any later version)
    See licenses/LICENSE-GPLv2.txt
 
-   Systray:
+   Systray (systray.jar):
    Public domain.
-      Bundles systray4j-2.4.1:
-      See licenses/LICENSE-LGPLv2.1.txt
 
-   Tomcat 6.0.41:
-   Copyright 1999-2014 The Apache Software Foundation
+   Tomcat 8.5.40 (jasper-runtime.jar):
+   (not included in most distribution packages)
+   Copyright 1999-2019 The Apache Software Foundation
    See licenses/LICENSE-Apache2.0.txt
    See licenses/NOTICE-Tomcat.txt
 
@@ -267,9 +344,9 @@ distributions. See the source package for the additional license information.
    Copyright (C) sponge
    DWTFYWTPL
 
-   Desktopgui
-   Copyright (c) Mathias De Maré
-   See apps/desktopgui/LICENSE
+   Gradle wrapper:
+   Copyright (c) 2017 the original author or authors.
+   See licenses/LICENSE-Apache2.0.txt
 
    SAM C Library:
    Copyright (c) 2004, Matthew P. Cashdollar <mpc@innographx.com>

README.md

@@ -0,0 +1,80 @@
+# I2P
+
+This is the source code for the reference Java implementation of I2P.
+
+Latest release: https://geti2p.net/download
+
+## Installing
+
+See INSTALL.txt or https://geti2p.net/download for installation instructions.
+
+## Documentation
+
+https://geti2p.net/how
+
+FAQ: https://geti2p.net/faq
+
+API: http://docs.i2p-projekt.de/javadoc/
+or run 'ant javadoc' then start at build/javadoc/index.html
+
+## How to contribute / Hack on I2P
+
+Please check out [HACKING.md](docs/HACKING.md) and other documents in the docs directory.
+
+## Building packages from source
+
+To get development branch from source control: https://geti2p.net/newdevelopers
+
+### Prerequisites
+
+- Java SDK (preferably Oracle/Sun or OpenJDK) 1.7.0 or higher
+  - Non-linux operating systems and JVMs: See https://trac.i2p2.de/wiki/java
+  - Certain subsystems for embedded (core, router, mstreaming, streaming, i2ptunnel)
+    require only Java 1.6
+- 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/
+- Build environment must use a UTF-8 locale.
+
+### Ant build process
+
+On x86 systems do:
+
+    ant pkg
+
+On non-x86, use one of the following instead:
+
+    ant installer-linux
+    ant installer-freebsd
+    ant installer-osx
+
+Run 'ant' with no arguments to see other build options.
+
+### Gradle build process
+
+Full builds of installers or updates are not yet possible, but the code can be
+compiled with:
+
+    ./gradlew assemble
+
+This will download dependencies over the clearnet by default, including Gradle
+itself. To download through a SOCKS proxy (e.g. Tor), add the following lines to
+your `~/.gradle/gradle.properties`:
+
+    systemProp.socksProxyHost=localhost
+    systemProp.socksProxyPort=9150
+
+## Contact info
+
+Need help? See the IRC channel #i2p on irc.freenode.net
+
+Bug reports: https://trac.i2p2.de/report/1
+
+Contact information, security issues, press inquiries: https://geti2p.net/en/contact
+
+Twitter: @i2p, @geti2p
+
+## Licenses
+
+See LICENSE.txt
+

README.txt

@@ -1,9 +1,11 @@
 Prerequisites to build from source:
-	Java SDK (preferably Oracle/Sun or OpenJDK) 1.6.0 or higher
+	Java SDK (preferably Oracle/Sun or OpenJDK) 1.7.0 or higher
           Non-linux operating systems and JVMs: See https://trac.i2p2.de/wiki/java
+          Certain subsystems for embedded (core, router, mstreaming, streaming, i2ptunnel) require only Java 1.6
 	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/
+	Build environment must use a UTF-8 locale.
 
 To build:
 	On x86 systems do:
@@ -17,9 +19,20 @@ To build:
 	Run 'ant' with no arguments to see other build options.
 	See INSTALL.txt or https://geti2p.net/download for installation instructions.
 
+Gradle build system:
+	Full builds are not yet possible, but the command is:
+		./gradlew assemble
+
+	gradlew will download dependencies over the clearnet by default, including
+	Gradle itself. To download over Tor, create a gradle.properties file
+	containing:
+		systemProp.socksProxyHost=localhost
+		systemProp.socksProxyPort=9150
+
 Documentation:
 	https://geti2p.net/how
-	API: run 'ant javadoc' then start at build/javadoc/index.html
+	API: http://docs.i2p-projekt.de/javadoc/
+	     or run 'ant javadoc' then start at build/javadoc/index.html
 
 Latest release:
 	https://geti2p.net/download
@@ -32,7 +45,15 @@ FAQ:
 
 Need help?
 	IRC irc.freenode.net #i2p
-	http://forum.i2p/
+
+Bug reports:
+	https://trac.i2p2.de/report/1
+
+Contact information, security issues, press inquiries:
+	https://geti2p.net/en/contact
+
+Twitter:
+	@i2p, @geti2p
 
 Licenses:
 	See LICENSE.txt

Slackware/i2p/doinst.sh

@@ -49,7 +49,7 @@ config /etc/rc.d/rc.i2p.new
 config $INST_DIR/wrapper.config.new
 
 if [ -e /var/log/packages/i2p-base* ]; then
-    echo "Warning: This package supercedes the 'i2p-base' package." >&2
+    echo "Warning: This package supersedes 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

apps/BOB/.classpath

@@ -1,8 +0,0 @@
-<?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>

apps/BOB/.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>BOB</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>

apps/BOB/Demos/echo/echoclient/src/net/i2p/BOB/Demos/echo/echoclient/Main.java

@@ -66,7 +66,7 @@ public class Main {
 	}
 
 	static void wrtxt(OutputStream CMDout, String s) throws IOException {
-		CMDout.write(s.getBytes());
+		CMDout.write(DataHelper.getUTF8(s));
 		CMDout.write('\n');
 		CMDout.flush();
 	}

apps/BOB/Demos/echo/echoserver/src/net/i2p/BOB/Demos/echo/echoserver/Main.java

@@ -63,7 +63,7 @@ public class Main {
 	}
 
 	static void wrtxt(OutputStream CMDout, String s) throws IOException {
-		CMDout.write(s.getBytes());
+		CMDout.write(DataHelper.getUTF8(s));
 		CMDout.write('\n');
 		CMDout.flush();
 	}

apps/BOB/build.gradle

@@ -0,0 +1,12 @@
+sourceSets {
+    main {
+        java {
+            srcDir 'src'
+        }
+    }
+}
+
+dependencies {
+    compile project(':core')
+    compile project(':apps:ministreaming')
+}

apps/BOB/nbproject/project.properties

@@ -48,8 +48,9 @@ javac.classpath=\
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
-javac.source=1.5
-javac.target=1.5
+javac.version=1.7
+javac.source=${javac.version}
+javac.target=${javac.version}
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\

apps/BOB/src/net/i2p/BOB/BOB.java

@@ -38,7 +38,7 @@ import net.i2p.I2PAppContext;
 import net.i2p.app.*;
 import net.i2p.client.I2PClient;
 import net.i2p.util.I2PAppThread;
-import net.i2p.util.SimpleScheduler;
+import net.i2p.util.PortMapper;
 import net.i2p.util.SimpleTimer2;
 
 /**
@@ -132,6 +132,7 @@ public class BOB implements Runnable, ClientApp {
 	// no longer used.
 	// private static int maxConnections = 0;
 
+	private final I2PAppContext _context;
 	private final Logger _log;
 	private final ClientAppManager _mgr;
 	private final String[] _args;
@@ -144,6 +145,7 @@ public class BOB implements Runnable, ClientApp {
 	 * Stop BOB gracefully
 	 * @deprecated unused
 	 */
+	@Deprecated
 	public synchronized static void stop() {
 		if (_bob != null)
 			_bob.shutdown(null);
@@ -155,17 +157,17 @@ public class BOB implements Runnable, ClientApp {
 	 *
 	 *  @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) {
+		_context = context;
 		// 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) +
+		        String manifestPath = classPath.substring(0, classPath.lastIndexOf('!') + 1) +
 		                "/META-INF/MANIFEST.MF";
 		        try {
 		            Manifest manifest = new Manifest(new URL(manifestPath).openStream());
@@ -214,14 +216,12 @@ public class BOB implements Runnable, ClientApp {
 		// Re-reading the config file in each thread is pretty damn stupid.
 		String configLocation = System.getProperty(PROP_CONFIG_LOCATION, "bob.config");
 		// This is here just to ensure there is no interference with our threadgroups.
-		SimpleScheduler Y1 = SimpleScheduler.getInstance();
 		SimpleTimer2 Y2 = SimpleTimer2.getInstance();
-		i = Y1.hashCode();
 		i = Y2.hashCode();
 		{
 			File cfg = new File(configLocation);
 			if (!cfg.isAbsolute()) {
-				cfg = new File(I2PAppContext.getGlobalContext().getConfigDir(), configLocation);
+				cfg = new File(_context.getConfigDir(), configLocation);
 			}
 			FileInputStream fi = null;
 			try {
@@ -242,7 +242,7 @@ public class BOB implements Runnable, ClientApp {
 			save = true;
 		}
 		if (!props.containsKey(I2PClient.PROP_TCP_PORT)) {
-			props.setProperty(I2PClient.PROP_TCP_PORT, "7654");
+			props.setProperty(I2PClient.PROP_TCP_PORT, Integer.toString(I2PClient.DEFAULT_LISTEN_PORT));
 			save = true;
 		}
 		if (!props.containsKey(PROP_BOB_PORT)) {
@@ -250,11 +250,11 @@ public class BOB implements Runnable, ClientApp {
 			save = true;
 		}
 		if (!props.containsKey("inbound.length")) {
-			props.setProperty("inbound.length", "1");
+			props.setProperty("inbound.length", "3");
 			save = true;
 		}
 		if (!props.containsKey("outbound.length")) {
-			props.setProperty("outbound.length", "1");
+			props.setProperty("outbound.length", "3");
 			save = true;
 		}
 		if (!props.containsKey("inbound.lengthVariance")) {
@@ -278,7 +278,7 @@ public class BOB implements Runnable, ClientApp {
 		if (save) {
 			File cfg = new File(configLocation);
 			if (!cfg.isAbsolute()) {
-				cfg = new File(I2PAppContext.getGlobalContext().getConfigDir(), configLocation);
+				cfg = new File(_context.getConfigDir(), configLocation);
 			}
 			FileOutputStream fo = null;
 			try {
@@ -319,6 +319,8 @@ public class BOB implements Runnable, ClientApp {
 		_log.info("BOB is now running.");
 		if (_mgr != null)
 			_mgr.register(this);
+		_context.portMapper().register(PortMapper.SVC_BOB, props.getProperty(PROP_BOB_HOST),
+		                               Integer.parseInt(props.getProperty(PROP_BOB_PORT)));
 
 		int i = 0;
 		boolean g = false;
@@ -341,7 +343,7 @@ public class BOB implements Runnable, ClientApp {
 
 				if (g) {
 					DoCMDS conn_c = new DoCMDS(spin, lock, server, props, database, _log);
-					Thread t = new Thread(conn_c);
+					Thread t = new I2PAppThread(conn_c);
 					t.setName("BOB.DoCMDS " + i);
 					t.start();
 					i++;
@@ -356,6 +358,7 @@ public class BOB implements Runnable, ClientApp {
 			changeState(STOPPING, e);
 		} finally {
 			_log.info("BOB is now shutting down...");
+			_context.portMapper().unregister(PortMapper.SVC_BOB);
 			// Clean up everything.
 			try {
 				listener.close();
@@ -366,25 +369,30 @@ public class BOB implements Runnable, ClientApp {
 			// We could order them to stop, but that could cause nasty issues in the locks.
 			visitAllThreads();
 			database.getReadLock();
-			int all = database.getcount();
-			database.releaseReadLock();
 			NamedDB nickinfo;
-			for (i = 0; i < all; i++) {
-				database.getReadLock();
-				nickinfo = (NamedDB) database.getnext(i);
-				nickinfo.getReadLock();
-				if (nickinfo.get(P_RUNNING).equals(Boolean.TRUE) && nickinfo.get(P_STOPPING).equals(Boolean.FALSE) && nickinfo.get(P_STARTING).equals(Boolean.FALSE)) {
-					nickinfo.releaseReadLock();
-					database.releaseReadLock();
-					database.getWriteLock();
-					nickinfo.getWriteLock();
-					nickinfo.add(P_STOPPING, Boolean.valueOf(true));
-					nickinfo.releaseWriteLock();
-					database.releaseWriteLock();
-				} else {
-					nickinfo.releaseReadLock();
-					database.releaseReadLock();
+			try {
+				for (Object ndb : database.values()) {
+					nickinfo = (NamedDB) ndb;
+					nickinfo.getReadLock();
+					boolean released = false;
+					try {
+						if (nickinfo.get(P_RUNNING).equals(Boolean.TRUE) && nickinfo.get(P_STOPPING).equals(Boolean.FALSE) && nickinfo.get(P_STARTING).equals(Boolean.FALSE)) {
+							nickinfo.releaseReadLock();
+							released = true;
+							nickinfo.getWriteLock();
+							try {
+								nickinfo.add(P_STOPPING, Boolean.TRUE);
+							} finally {
+								nickinfo.releaseWriteLock();
+							}
+						}
+					} finally {
+						if (!released)
+							nickinfo.releaseReadLock();
+					}
 				}
+			} finally {
+				database.releaseReadLock();
 			}
 			changeState(STOPPED);
 			_log.info("BOB is now stopped.");

apps/BOB/src/net/i2p/BOB/I2Plistener.java

@@ -18,10 +18,12 @@ package net.i2p.BOB;
 import java.net.ConnectException;
 import java.net.SocketTimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
+
 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.I2PAppThread;
 
 /**
  * Listen on I2P and connect to TCP
@@ -30,16 +32,15 @@ import net.i2p.client.streaming.I2PSocketManager;
  */
 public class I2Plistener implements Runnable {
 
-	private NamedDB info,  database;
-	private Logger _log;
-	public I2PSocketManager socketManager;
-	public I2PServerSocket serverSocket;
-	private AtomicBoolean lives;
+	private final NamedDB info,  database;
+	private final Logger _log;
+	private final I2PServerSocket serverSocket;
+	private final AtomicBoolean lives;
 
 	/**
 	 * Constructor
 	 * @param SS
-	 * @param S
+	 * @param S unused
 	 * @param info
 	 * @param database
 	 * @param _log
@@ -48,7 +49,6 @@ public class I2Plistener implements Runnable {
 		this.database = database;
 		this.info = info;
 		this._log = _log;
-		this.socketManager = S;
 		this.serverSocket = SS;
 		this.lives = lives;
 	}
@@ -79,7 +79,7 @@ public class I2Plistener implements Runnable {
 						conn++;
 						// toss the connection to a new thread.
 						I2PtoTCP conn_c = new I2PtoTCP(sessSocket, info, database, lives);
-						Thread t = new Thread(conn_c, Thread.currentThread().getName() + " I2PtoTCP " + conn);
+						Thread t = new I2PAppThread(conn_c, Thread.currentThread().getName() + " I2PtoTCP " + conn);
 						t.start();
 					}
 

apps/BOB/src/net/i2p/BOB/I2PtoTCP.java

@@ -19,19 +19,22 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.Socket;
 import java.util.concurrent.atomic.AtomicBoolean;
+
 import net.i2p.client.streaming.I2PSocket;
+import net.i2p.data.DataHelper;
+import net.i2p.util.I2PAppThread;
 
 /**
- * Process I2P->TCP
+ * Process I2P->TCP
  *
  * @author sponge
  */
 public class I2PtoTCP implements Runnable {
 
 	private I2PSocket I2P;
-	private NamedDB info,  database;
+	private final NamedDB info, database;
 	private Socket sock;
-	private AtomicBoolean lives;
+	private final AtomicBoolean lives;
 
 	/**
 	 * Constructor
@@ -53,8 +56,8 @@ public class I2PtoTCP implements Runnable {
 	}
 
 	private void runlock() {
-		database.releaseReadLock();
 		info.releaseReadLock();
+		database.releaseReadLock();
 	}
 
 	/**
@@ -75,23 +78,15 @@ public class I2PtoTCP implements Runnable {
 			die:
 			{
 				try {
-					try {
-						rlock();
-					} catch (Exception e) {
-						break die;
-					}
+					rlock();
 					try {
 						host = info.get("OUTHOST").toString();
 						port = Integer.parseInt(info.get("OUTPORT").toString());
 						tell = info.get("QUIET").equals(Boolean.FALSE);
 					} catch (Exception e) {
-						runlock();
 						break die;
-					}
-					try {
+					} finally {
 						runlock();
-					} catch (Exception e) {
-						break die;
 					}
 					sock = new Socket(host, port);
 					sock.setKeepAlive(true);
@@ -104,15 +99,15 @@ public class I2PtoTCP implements Runnable {
 
 					if (tell) {
 						// tell who is connecting
-						out.write(I2P.getPeerDestination().toBase64().getBytes());
+						out.write(DataHelper.getASCII(I2P.getPeerDestination().toBase64()));
 						out.write(10); // nl
 						out.flush(); // not really needed, but...
 					}
 					// setup to cross the streams
 					TCPio conn_c = new TCPio(in, Iout, lives); // app -> I2P
 					TCPio conn_a = new TCPio(Iin, out, lives); // I2P -> app
-					t = new Thread(conn_c, Thread.currentThread().getName() + " TCPioA");
-					q = new Thread(conn_a, Thread.currentThread().getName() + " TCPioB");
+					t = new I2PAppThread(conn_c, Thread.currentThread().getName() + " TCPioA");
+					q = new I2PAppThread(conn_a, Thread.currentThread().getName() + " TCPioB");
 					// Fire!
 					t.start();
 					q.start();

apps/BOB/src/net/i2p/BOB/MUXlisten.java

@@ -21,11 +21,13 @@ import java.net.InetAddress;
 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;
+import net.i2p.util.I2PAppThread;
 import net.i2p.util.Log;
 
 /**
@@ -36,18 +38,18 @@ import net.i2p.util.Log;
  */
 public class MUXlisten implements Runnable {
 
-	private NamedDB database,  info;
-	private Logger _log;
-	private I2PSocketManager socketManager;
-	private ByteArrayInputStream prikey;
+	private final NamedDB database, info;
+	private final Logger _log;
+	private final I2PSocketManager socketManager;
+	private final ByteArrayInputStream prikey;
 	private ThreadGroup tg;
-	private String N;
-	private ServerSocket listener = null;
-	private int backlog = 50; // should this be more? less?
-	boolean go_out;
-	boolean come_in;
-	private AtomicBoolean lock;
-	private AtomicBoolean lives;
+	private final String N;
+	private ServerSocket listener;
+	private static final int backlog = 50; // should this be more? less?
+	private final boolean go_out;
+	private final boolean come_in;
+	private final AtomicBoolean lock;
+	private final AtomicBoolean lives;
 
 	/**
 	 * Constructor Will fail if INPORT is occupied.
@@ -59,51 +61,49 @@ public class MUXlisten implements Runnable {
 	 * @throws java.io.IOException
 	 */
 	MUXlisten(AtomicBoolean lock, NamedDB database, NamedDB info, Logger _log) throws I2PException, IOException, RuntimeException {
+		int port = 0;
+		InetAddress host = null;
+		this.lock = lock;
+		this.tg = null;
+		this.database = database;
+		this.info = info;
+		this._log = _log;
+		lives = new AtomicBoolean(false);
 		try {
-			int port = 0;
-			InetAddress host = null;
-			this.lock = lock;
-			this.tg = null;
-			this.database = database;
-			this.info = info;
-			this._log = _log;
-			lives = new AtomicBoolean(false);
-
-			this.database.getWriteLock();
-			this.info.getWriteLock();
-			this.info.add("STARTING", Boolean.valueOf(true));
-			this.info.releaseWriteLock();
-			this.database.releaseWriteLock();
-			this.database.getReadLock();
-			this.info.getReadLock();
-
-			N = this.info.get("NICKNAME").toString();
-			prikey = new ByteArrayInputStream((byte[]) info.get("KEYS"));
-			// Make a new copy so that anything else won't muck with our database.
-			Properties R = (Properties) info.get("PROPERTIES");
-			Properties Q = new Properties();
-			Lifted.copyProperties(R, Q);
-			this.database.releaseReadLock();
-			this.info.releaseReadLock();
-
-			this.database.getReadLock();
-			this.info.getReadLock();
-			this.go_out = info.exists("OUTPORT");
-			this.come_in = info.exists("INPORT");
-			if (this.come_in) {
-				port = Integer.parseInt(info.get("INPORT").toString());
-				host = InetAddress.getByName(info.get("INHOST").toString());
+			wlock();
+			try {
+				this.info.add("STARTING", Boolean.TRUE);
+			} finally {
+				wunlock();
+			}
+			Properties Q = new Properties();
+			rlock();
+			try {
+				N = this.info.get("NICKNAME").toString();
+				prikey = new ByteArrayInputStream((byte[]) info.get("KEYS"));
+				// Make a new copy so that anything else won't muck with our database.
+				Properties R = (Properties) info.get("PROPERTIES");
+				Lifted.copyProperties(R, Q);
+
+				this.go_out = info.exists("OUTPORT");
+				this.come_in = info.exists("INPORT");
+				if (this.come_in) {
+					port = Integer.parseInt(info.get("INPORT").toString());
+					host = InetAddress.getByName(info.get("INHOST").toString());
+				}
+			} finally {
+				runlock();
 			}
-			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 + "]");
+			int i2cpPort = I2PClient.DEFAULT_LISTEN_PORT;
+			String i2cpPortStr = Q.getProperty(I2PClient.PROP_TCP_PORT);
+			if (i2cpPortStr != null) {
+				try {
+					i2cpPort = Integer.parseInt(i2cpPortStr);
+				} catch (NumberFormatException nfe) {
+					throw new IllegalArgumentException("Invalid I2CP port specified [" + i2cpPortStr + "]");
+				}
 			}
 
 			if (this.come_in) {
@@ -113,48 +113,51 @@ public class MUXlisten implements Runnable {
 					prikey, i2cpHost, i2cpPort, Q);
 		} catch (IOException e) {
 			// Something went bad.
-			this.database.getWriteLock();
-			this.info.getWriteLock();
-			this.info.add("STARTING", Boolean.valueOf(false));
-			this.info.releaseWriteLock();
-			this.database.releaseWriteLock();
-			throw new IOException(e.toString());
+			wlock();
+			try {
+				this.info.add("STARTING", Boolean.FALSE);
+			} finally {
+				wunlock();
+			}
+			throw e;
 		} catch (RuntimeException e) {
 			// Something went bad.
-			this.database.getWriteLock();
-			this.info.getWriteLock();
-			this.info.add("STARTING", Boolean.valueOf(false));
-			this.info.releaseWriteLock();
-			this.database.releaseWriteLock();
-			throw new RuntimeException(e);
+			wlock();
+			try {
+				this.info.add("STARTING", Boolean.FALSE);
+			} finally {
+				wunlock();
+			}
+			throw e;
 		} catch (Exception e) {
 			// Something else went bad.
-			this.database.getWriteLock();
-			this.info.getWriteLock();
-			this.info.add("STARTING", Boolean.valueOf(false));
-			this.info.releaseWriteLock();
-			this.database.releaseWriteLock();
+			wlock();
+			try {
+				this.info.add("STARTING", Boolean.FALSE);
+			} finally {
+				wunlock();
+			}
 			e.printStackTrace();
 			throw new RuntimeException(e);
 		}
 	}
 
-	private void rlock() throws Exception {
+	private void rlock() {
 		database.getReadLock();
 		info.getReadLock();
 	}
 
-	private void runlock() throws Exception {
-		database.releaseReadLock();
+	private void runlock() {
 		info.releaseReadLock();
+		database.releaseReadLock();
 	}
 
-	private void wlock() throws Exception {
+	private void wlock() {
 		database.getWriteLock();
 		info.getWriteLock();
 	}
 
-	private void wunlock() throws Exception {
+	private void wunlock() {
 		info.releaseWriteLock();
 		database.releaseWriteLock();
 	}
@@ -168,24 +171,19 @@ public class MUXlisten implements Runnable {
 		Thread t = null;
 		Thread q = null;
 		try {
+			wlock();
 			try {
-				wlock();
 				try {
-					info.add("RUNNING", Boolean.valueOf(true));
+					info.add("RUNNING", Boolean.TRUE);
 				} catch (Exception e) {
 					lock.set(false);
-					wunlock();
 					return;
 				}
 			} catch (Exception e) {
 				lock.set(false);
 				return;
-			}
-			try {
+			} finally {
 				wunlock();
-			} catch (Exception e) {
-				lock.set(false);
-				return;
 			}
 			lives.set(true);
 			lock.set(false);
@@ -201,32 +199,28 @@ public class MUXlisten implements Runnable {
 							// I2P -> TCP
 							SS = socketManager.getServerSocket();
 							I2Plistener conn = new I2Plistener(SS, socketManager, info, database, _log, lives);
-							t = new Thread(tg, conn, "BOBI2Plistener " + N);
+							t = new I2PAppThread(tg, conn, "BOBI2Plistener " + N);
 							t.start();
 						}
 
 						if (come_in) {
 							// TCP -> I2P
 							TCPlistener conn = new TCPlistener(listener, socketManager, info, database, _log, lives);
-							q = new Thread(tg, conn, "BOBTCPlistener " + N);
+							q = new I2PAppThread(tg, conn, "BOBTCPlistener " + N);
 							q.start();
 						}
 
+						wlock();
 						try {
-							wlock();
 							try {
-								info.add("STARTING", Boolean.valueOf(false));
+								info.add("STARTING", Boolean.FALSE);
 							} catch (Exception e) {
-								wunlock();
 								break quit;
 							}
 						} catch (Exception e) {
 							break quit;
-						}
-						try {
+						} finally {
 							wunlock();
-						} catch (Exception e) {
-							break quit;
 						}
 						boolean spin = true;
 						while (spin && lives.get()) {
@@ -235,21 +229,17 @@ public class MUXlisten implements Runnable {
 							} catch (InterruptedException e) {
 								break quit;
 							}
+							rlock();
 							try {
-								rlock();
 								try {
 									spin = info.get("STOPPING").equals(Boolean.FALSE);
 								} catch (Exception e) {
-									runlock();
 									break quit;
 								}
 							} catch (Exception e) {
 								break quit;
-							}
-							try {
+							} finally {
 								runlock();
-							} catch (Exception e) {
-								break quit;
 							}
 						}
 					} // die
@@ -269,16 +259,16 @@ public class MUXlisten implements Runnable {
 			try {
 				wlock();
 				try {
-					info.add("STARTING", Boolean.valueOf(false));
-					info.add("STOPPING", Boolean.valueOf(true));
-					info.add("RUNNING", Boolean.valueOf(false));
+					info.add("STARTING", Boolean.FALSE);
+					info.add("STOPPING", Boolean.TRUE);
+					info.add("RUNNING", Boolean.FALSE);
 				} catch (Exception e) {
 					lock.set(false);
-					wunlock();
 					return;
 				}
-				wunlock();
 			} catch (Exception e) {
+			} finally {
+				wunlock();
 			}
 			// Start cleanup.
 			while (!lock.compareAndSet(false, true)) {
@@ -320,15 +310,15 @@ public class MUXlisten implements Runnable {
 			try {
 				wlock();
 				try {
-					info.add("STARTING", Boolean.valueOf(false));
-					info.add("STOPPING", Boolean.valueOf(false));
-					info.add("RUNNING", Boolean.valueOf(false));
+					info.add("STARTING", Boolean.FALSE);
+					info.add("STOPPING", Boolean.FALSE);
+					info.add("RUNNING", Boolean.FALSE);
 				} catch (Exception e) {
 					lock.set(false);
-					wunlock();
 					return;
-				}
-				wunlock();
+				} finally {
+					wunlock();
+				}	
 			} catch (Exception e) {
 			}
 

apps/BOB/src/net/i2p/BOB/Main.java

@@ -15,7 +15,6 @@
  */
 package net.i2p.BOB;
 
-import net.i2p.util.SimpleScheduler;
 import net.i2p.util.SimpleTimer2;
 
 /**
@@ -31,12 +30,10 @@ public class Main {
 	 */
 	public static void main(String[] args) {
 		// THINK THINK THINK THINK THINK THINK
-		SimpleScheduler Y1 = SimpleScheduler.getInstance();
 		SimpleTimer2 Y2 = SimpleTimer2.getInstance();
 
 		BOB.main(args);
 
 		Y2.stop();
-		Y1.stop();
 	}
 }

apps/BOB/src/net/i2p/BOB/NamedDB.java

@@ -15,6 +15,12 @@
  */
 package net.i2p.BOB;
 
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+
 /**
  * Internal database to relate nicknames to options to values
  *
@@ -22,129 +28,62 @@ package net.i2p.BOB;
  */
 public class NamedDB {
 
-	private volatile Object[][] data;
-	private int index,  writersWaiting,  readers;
+	private final Map<String, Object> data;
+	private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(false);
 
 	/**
-	 * make initial NULL object
 	 *
 	 */
 	public NamedDB() {
-		this.data = new Object[1][2];
+		this.data = new HashMap<String, Object>();
 	}
 
-	synchronized public void getReadLock() {
-		while ((writersWaiting != 0)) {
-			try {
-				wait();
-			} catch (InterruptedException ie) {
-			}
-		}
-		readers++;
+	public void getReadLock() {
+		lock.readLock().lock();
 	}
 
-	synchronized public void releaseReadLock() {
-		readers--;
-		notifyAll();
+	public void releaseReadLock() {
+		lock.readLock().unlock();
 	}
 
-	synchronized public void getWriteLock() {
-		writersWaiting++;
-		while (readers != 0 && writersWaiting != 1) {
-			try {
-				wait();
-			} catch (InterruptedException ie) {
-			}
-		}
+	public void getWriteLock() {
+		lock.writeLock().lock();
 	}
 
-	synchronized public void releaseWriteLock() {
-		writersWaiting--;
-		notifyAll();
+	public void releaseWriteLock() {
+		lock.writeLock().unlock();
 	}
 
 	/**
-	 * Find objects in the array, returns it's index or throws exception
-	 * @param key
-	 * @return an objects index
-	 * @throws ArrayIndexOutOfBoundsException when key does not exist
-	 */
-	public int idx(Object key) throws ArrayIndexOutOfBoundsException {
-		for (int i = 0; i < index; i++) {
-			if (key.equals(data[i][0])) {
-				return i;
-			}
-		}
-		throw new ArrayIndexOutOfBoundsException("Can't locate key for index");
-	}
-
-	/**
-	 * Delete an object from array if it exists
+	 * Delete an object if it exists
 	 *
 	 * @param key
 	 */
-	public void kill(Object key) {
-
-		int i, j, k, l;
-		Object[][] olddata;
-		int didsomething = 0;
-
-		try {
-			k = idx(key);
-		} catch (ArrayIndexOutOfBoundsException b) {
-			return;
-		}
-		olddata = new Object[index + 2][2];
-		// copy to olddata, skipping 'k'
-		for (i = 0, l = 0; l < index; i++, l++) {
-			if (i == k) {
-				l++;
-				didsomething++;
-			}
-			for (j = 0; j < 2; j++) {
-				olddata[i][j] = data[l][j];
-			}
-		}
-		index -= didsomething;
-		data = olddata;
+	public void kill(String key) {
+		data.remove(key);
 	}
 
 	/**
-	 * Add object to the array, deletes the old one if it exists
+	 * Add object, deletes the old one if it exists
 	 *
 	 * @param key
 	 * @param val
 	 */
-	public void add(Object key, Object val) {
-		Object[][] olddata;
-		int i, j;
-		i = 0;
-		kill(key);
-
-		olddata = new Object[index + 2][2];
-		// copy to olddata
-		for (i = 0; i < index; i++) {
-			for (j = 0; j < 2; j++) {
-				olddata[i][j] = data[i][j];
-			}
-		}
-		data = olddata;
-		data[index++] = new Object[]{key, val};
+	public void add(String key, Object val) {
+		data.put(key, val);
 	}
 
 	/**
-	 * Get the object, and return it, throws RuntimeException
+	 * Get the object, and return it, throws RuntimeException if not found
 	 *
-	 * @param key
-	 * @return Object
-	 * @throws java.lang.RuntimeException
+	 * @param key non-null
+	 * @return Object non-null
+	 * @throws java.lang.RuntimeException if not found
 	 */
-	public Object get(Object key) throws RuntimeException {
-		for (int i = 0; i < index; i++) {
-			if (key.equals(data[i][0])) {
-				return data[i][1];
-			}
-		}
+	public Object get(String key) throws RuntimeException {
+		Object rv = data.get(key);
+		if (rv != null)
+			return rv;
 		throw new RuntimeException("Key not found");
 	}
 
@@ -154,33 +93,14 @@ public class NamedDB {
 	 * @param key
 	 * @return true if an object exists, else returns false
 	 */
-	public boolean exists(Object key) {
-		for (int i = 0; i < index; i++) {
-			if (key.equals(data[i][0])) {
-				return true;
-			}
-		}
-		return false;
-
+	public boolean exists(String key) {
+		return data.containsKey(key);
 	}
 
 	/**
-	 *
-	 * @param i index
-	 * @return an indexed Object
-	 * @throws java.lang.RuntimeException
+	 * @since 0.9.29 replaces getcount() and getnext(int)
 	 */
-	public Object getnext(int i) throws RuntimeException {
-		if (i < index && i > -1) {
-			return data[i][1];
-		}
-		throw new RuntimeException("No more data");
-	}
-
-	/**
-	 * @return the count of how many objects
-	 */
-	public int getcount() {
-		return index;
+	public Collection<Object> values() {
+		return data.values();
 	}
 }

apps/BOB/src/net/i2p/BOB/TCPio.java

@@ -27,9 +27,9 @@ import java.util.concurrent.atomic.AtomicBoolean;
  */
 public class TCPio implements Runnable {
 
-	private InputStream Ain;
-	private OutputStream Aout;
-	private AtomicBoolean lives;
+	private final InputStream Ain;
+	private final OutputStream Aout;
+	private final AtomicBoolean lives;
 
 	/**
 	 * Constructor

apps/BOB/src/net/i2p/BOB/TCPlistener.java

@@ -20,8 +20,10 @@ import java.net.ServerSocket;
 import java.net.Socket;
 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.I2PAppThread;
 
 /**
  * Listen on TCP port and connect to I2P
@@ -30,12 +32,11 @@ import net.i2p.client.streaming.I2PSocketManager;
  */
 public class TCPlistener implements Runnable {
 
-	private NamedDB info,  database;
-	private Logger _log;
-	public I2PSocketManager socketManager;
-	public I2PServerSocket serverSocket;
-	private ServerSocket listener;
-	private AtomicBoolean lives;
+	private final NamedDB info,  database;
+	private final Logger _log;
+	private final I2PSocketManager socketManager;
+	private final ServerSocket listener;
+	private final AtomicBoolean lives;
 
 	/**
 	 * Constructor
@@ -76,7 +77,7 @@ public class TCPlistener implements Runnable {
 						conn++;
 						// toss the connection to a new thread.
 						TCPtoI2P conn_c = new TCPtoI2P(socketManager, server, info, database, lives);
-						Thread t = new Thread(conn_c, Thread.currentThread().getName() + " TCPtoI2P " + conn);
+						Thread t = new I2PAppThread(conn_c, Thread.currentThread().getName() + " TCPtoI2P " + conn);
 						t.start();
 						g = false;
 					}

apps/BOB/src/net/i2p/BOB/TCPtoI2P.java

@@ -24,39 +24,37 @@ import java.net.NoRouteToHostException;
 import java.net.Socket;
 import java.util.Locale;
 import java.util.concurrent.atomic.AtomicBoolean;
+
+import net.i2p.I2PAppContext;
 import net.i2p.I2PException;
 import net.i2p.client.streaming.I2PSocket;
 import net.i2p.client.streaming.I2PSocketManager;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
-//import net.i2p.i2ptunnel.I2PTunnel;
-import net.i2p.I2PAppContext;
+import net.i2p.util.I2PAppThread;
 
 /**
  *
- * Process TCP->I2P
+ * Process TCP->I2P
  *
  * @author sponge
  */
 public class TCPtoI2P implements Runnable {
 
 	private I2PSocket I2P;
-	private NamedDB info,  database;
-	private Socket sock;
-	private I2PSocketManager socketManager;
-	private AtomicBoolean lives;
+	private final Socket sock;
+	private final I2PSocketManager socketManager;
+	private final AtomicBoolean lives;
 
 	/**
 	 * Constructor
 	 * @param i2p
 	 * @param socket
-	 * param info
-	 * param database
+	 * @param info unused
+	 * @param database unused
 	 */
 	TCPtoI2P(I2PSocketManager i2p, Socket socket, NamedDB info, NamedDB database, AtomicBoolean lives) {
 		this.sock = socket;
-		this.info = info;
-		this.database = database;
 		this.socketManager = i2p;
 		this.lives = lives;
 	}
@@ -105,16 +103,6 @@ public class TCPtoI2P implements Runnable {
 		out.flush();
 	}
 
-	private void rlock() {
-		database.getReadLock();
-		info.getReadLock();
-	}
-
-	private void runlock() {
-		info.releaseReadLock();
-		database.releaseReadLock();
-	}
-
 	/**
 	 * TCP stream to I2P stream thread starter
 	 *
@@ -158,8 +146,8 @@ public class TCPtoI2P implements Runnable {
 					// setup to cross the streams
 					TCPio conn_c = new TCPio(in, Iout, lives); // app -> I2P
 					TCPio conn_a = new TCPio(Iin, out, lives); // I2P -> app
-					t = new Thread(conn_c, Thread.currentThread().getName() + " TCPioA");
-					q = new Thread(conn_a, Thread.currentThread().getName() + " TCPioB");
+					t = new I2PAppThread(conn_c, Thread.currentThread().getName() + " TCPioA");
+					q = new I2PAppThread(conn_a, Thread.currentThread().getName() + " TCPioB");
 					// Fire!
 					t.start();
 					q.start();

apps/BOB/src/net/i2p/BOB/UDPIOthread.java

@@ -34,15 +34,18 @@ import net.i2p.util.Log;
  *  The skeletal frame is here, just needs to be finished.
  *
  * @author sponge
+ * @deprecated incomplete, unused
  */
+@Deprecated
 public class UDPIOthread implements I2PSessionListener, Runnable {
 
-	private NamedDB info;
-	private Log _log;
-	private Socket socket;
+	private final NamedDB info;
+	private final Log _log;
+	private final Socket socket;
 	private DataInputStream in;
 	private DataOutputStream out;
-	private I2PSession _session;
+	private final I2PSession _session;
+	// FIXME never set
 	private Destination _peerDestination;
 	private boolean up;
 
@@ -58,7 +61,6 @@ public class UDPIOthread implements I2PSessionListener, Runnable {
 		this._log = _log;
 		this.socket = socket;
 		this._session = _session;
-
 	}
 
 	/**

apps/addressbook/.classpath

@@ -1,8 +0,0 @@
-<?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>

apps/addressbook/.project

@@ -1,17 +0,0 @@
-<?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>

apps/addressbook/build.gradle

@@ -0,0 +1,12 @@
+sourceSets {
+    main {
+        java {
+            srcDir 'java/src'
+        }
+    }
+}
+
+dependencies {
+    compile project(':core')
+    compile project(':apps:jetty')
+}

apps/addressbook/build.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<project name="addressbook" default="war" basedir=".">
+<project name="addressbook" default="all" basedir=".">
 
 	<property name="src" value="java/src"/>
 	<property name="build" value="build"/>
@@ -7,7 +7,9 @@
 	<property name="jar" value="addressbook.jar"/>
 	<property name="war" value="addressbook.war"/>
 	<property name="javac.compilerargs" value="" />
-	<property name="javac.version" value="1.6" />
+	<property name="javac.version" value="1.7" />
+
+	<target name="all" depends="jar, emptyWar"/> 
 	
 	<target name="init">
 		<mkdir dir="${build}"/>
@@ -36,24 +38,10 @@
             </depend>
         </target>
 
-        <target name="dependServlet" 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" />
-                    <pathelement location="../jetty/jettylib/javax.servlet.jar" />
-                </classpath>
-            </depend>
-        </target>
-
-	<target name="compile" depends="init, depend">
+	<target name="compile" depends="init, depend, warUpToDate">
             <javac debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
                        includeAntRuntime="false"
-                       srcdir="${src}" destdir="${build}"
-                       excludes="net/i2p/addressbook/Servlet.java">
+                       srcdir="${src}" destdir="${build}">
             <compilerarg line="${javac.compilerargs}" />
             <classpath>
                 <pathelement location="../../core/java/build/i2p.jar" />
@@ -61,55 +49,30 @@
 		</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" />
-                <pathelement location="../jetty/jettylib/javax.servlet.jar" />
-            </classpath>
-		</javac>
-	</target>
-
-        <!-- unused for now (except for Android), as we oddly ship addressbook as a .war -->
 	<target name="jar" depends="compile, changes">
 		<!-- set if unset -->
-		<property name="workspace.changes" value="" />
+		<property name="workspace.changes.tr" value="" />
 		<jar basedir="${build}" destfile="${dist}/${jar}">
 			<manifest>
-				<attribute name="Main-Class" value="addressbook.Daemon"/>
-				<attribute name="Implementation-Version" value="${full.version}" />
-				<attribute name="Built-By" value="${build.built-by}" />
-		                <attribute name="Build-Date" value="${build.timestamp}" />
-		                <attribute name="Base-Revision" value="${workspace.version}" />
-		                <attribute name="Workspace-Changes" value="${workspace.changes}" />
-			</manifest>
-		</jar>
-	</target>
-	
-	<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"/>
-		<copy todir="${dist}/tmp/WEB-INF/classes">
-			<fileset dir="${build}"/>
-		</copy>
-		<!-- set if unset -->
-		<property name="workspace.changes.tr" value="" />
-		<war basedir="${dist}/tmp" webxml="web.xml" destfile="${dist}/${war}">
-			<manifest>
+				<attribute name="Main-Class" value="net.i2p.addressbook.Daemon"/>
 				<attribute name="Implementation-Version" value="${full.version}" />
 				<attribute name="Built-By" value="${build.built-by}" />
 		                <attribute name="Build-Date" value="${build.timestamp}" />
 		                <attribute name="Base-Revision" value="${workspace.version}" />
 		                <attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
+				<attribute name="X-Compile-Source-JDK" value="${javac.version}" />
+				<attribute name="X-Compile-Target-JDK" value="${javac.version}" />
 			</manifest>
-		</war>
-		<delete dir="${dist}/tmp"/>
+		</jar>
 	</target>
+
+        <target name="emptyWar" depends="init">
+            <jar destfile="${dist}/${war}" >
+                <manifest>
+                    <attribute name="Note" value="Intentionally empty" />
+                </manifest>
+            </jar>
+        </target>
 	
 	<target name="warUpToDate">
 	        <uptodate property="war.uptodate" targetfile="${dist}/${war}">

apps/addressbook/java/src/net/i2p/addressbook/AddressBook.java

@@ -27,8 +27,10 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.regex.Pattern;
 
 import net.i2p.I2PAppContext;
+import net.i2p.client.naming.HostTxtEntry;
 import net.i2p.util.EepGet;
 import net.i2p.util.SecureFile;
 
@@ -37,18 +39,40 @@ import net.i2p.util.SecureFile;
  * destinations. AddressBooks can be created from local and remote files, merged
  * together, and written out to local files.
  * 
+ * Methods are NOT thread-safe.
+ * 
  * @author Ragnarok
  *  
  */
-class AddressBook {
+class AddressBook implements Iterable<Map.Entry<String, HostTxtEntry>> {
 
     private final String location;
     /** either addresses or subFile will be non-null, but not both */
-    private final Map<String, String> addresses;
+    private final Map<String, HostTxtEntry> addresses;
     private final File subFile;
     private boolean modified;
     private static final boolean DEBUG = false;
 
+    private static final int MIN_DEST_LENGTH = 516;
+    private static final int MAX_DEST_LENGTH = MIN_DEST_LENGTH + 100;  // longer than any known cert type for now
+
+    /**
+     * 5-67 chars lower/upper case
+     */
+    private static final Pattern HOST_PATTERN =
+        Pattern.compile("^[0-9a-zA-Z\\.-]{5,67}$");
+
+    /**
+     * 52 chars lower/upper case
+     * Always ends in 'a' or 'q'
+     */
+    private static final Pattern B32_PATTERN =
+        Pattern.compile("^[2-7a-zA-Z]{51}[aAqQ]$");
+
+    /** not a complete qualification, just a quick check */
+    private static final Pattern B64_PATTERN =
+        Pattern.compile("^[0-9a-zA-Z~-]{" + MIN_DEST_LENGTH + ',' + MAX_DEST_LENGTH + "}={0,2}$");
+
     /**
      * Construct an AddressBook from the contents of the Map addresses.
      * 
@@ -56,7 +80,7 @@ class AddressBook {
      *            A Map containing human readable addresses as keys, mapped to
      *            base64 i2p destinations.
      */
-    public AddressBook(Map<String, String> addresses) {
+    public AddressBook(Map<String, HostTxtEntry> addresses) {
         this.addresses = addresses;
         this.subFile = null;
         this.location = null;
@@ -86,7 +110,7 @@ class AddressBook {
         new File("addressbook.tmp").delete();
     }
 */
-    static final long MAX_SUB_SIZE = 3 * 1024 * 1024l; //about 5,000 hosts
+    static final long MAX_SUB_SIZE = 5 * 1024 * 1024l; //about 8,000 hosts
 
     /**
      * Construct an AddressBook from the Subscription subscription. If the
@@ -107,10 +131,11 @@ class AddressBook {
      * @param proxyPort port number of proxy
      */
     public AddressBook(Subscription subscription, String proxyHost, int proxyPort) {
-        Map<String, String> a = null;
+        Map<String, HostTxtEntry> a = null;
         File subf = null;
+        File tmp = null;
         try {
-            File tmp = SecureFile.createTempFile("addressbook", null, I2PAppContext.getGlobalContext().getTempDir());
+            tmp = SecureFile.createTempFile("addressbook", null, I2PAppContext.getGlobalContext().getTempDir());
             EepGet get = new EepGet(I2PAppContext.getGlobalContext(), true,
                     proxyHost, proxyPort, 0, -1l, MAX_SUB_SIZE, tmp.getAbsolutePath(), null,
                     subscription.getLocation(), true, subscription.getEtag(), subscription.getLastModified(), null);
@@ -124,6 +149,8 @@ class AddressBook {
                 tmp.delete();
             }
         } catch (IOException ioe) {
+            if (tmp != null)
+                tmp.delete();
             a = Collections.emptyMap();
         }
         this.addresses = a;
@@ -144,23 +171,40 @@ class AddressBook {
      */
     public AddressBook(File file) {
         this.location = file.toString();
-        Map<String, String> a;
+        Map<String, HostTxtEntry> a;
         try {
-            a = ConfigParser.parse(file);
+            a = HostTxtParser.parse(file);
         } catch (IOException exp) {
-            a = new HashMap<String, String>();
+            a = new HashMap<String, HostTxtEntry>();
         }
         this.addresses = a;
         this.subFile = null;
     }
 
+    /**
+     * Test only.
+     * 
+     * @param testsubfile path to a file containing the simulated fetch of a subscription
+     * @since 0.9.26
+     */
+    public AddressBook(String testsubfile) {
+        this.location = testsubfile;
+        this.addresses = null;
+        this.subFile = new File(testsubfile);
+    }
+
     /**
      * Return an iterator over the addresses in the AddressBook.
      * @since 0.8.7
      */
-    public Iterator<Map.Entry<String, String>> iterator() {
-        if (this.subFile != null)
-            return new ConfigIterator(this.subFile);
+    public Iterator<Map.Entry<String, HostTxtEntry>> iterator() {
+        if (this.subFile != null) {
+            try {
+                return new HostTxtIterator(this.subFile);
+            } catch (IOException ioe) {
+                return new HostTxtIterator();
+            }
+        }
         return this.addresses.entrySet().iterator();
     }
 
@@ -201,12 +245,9 @@ class AddressBook {
         return "Map containing " + this.addresses.size() + " entries";
     }
 
-    private static final int MIN_DEST_LENGTH = 516;
-    private static final int MAX_DEST_LENGTH = MIN_DEST_LENGTH + 100;  // longer than any known cert type for now
-
     /**
      * Do basic validation of the hostname
-     * hostname was already converted to lower case by ConfigParser.parse()
+     * hostname was already converted to lower case by HostTxtParser.parse()
      */
     public static boolean isValidKey(String host) {
 	return
@@ -220,9 +261,10 @@ class AddressBook {
 		host.indexOf("..") < 0 &&
                 // IDN - basic check, not complete validation
                 (host.indexOf("--") < 0 || host.startsWith("xn--") || host.indexOf(".xn--") > 0) &&
-                host.replaceAll("[a-z0-9.-]", "").length() == 0 &&
+                HOST_PATTERN.matcher(host).matches() &&
                 // Base32 spoofing (52chars.i2p)
-                (! (host.length() == 56 && host.substring(0,52).replaceAll("[a-z2-7]", "").length() == 0)) &&
+                // We didn't do it this way, we use a .b32.i2p suffix, but let's prohibit it anyway
+                (! (host.length() == 56 && B32_PATTERN.matcher(host.substring(0,52)).matches())) &&
                 // ... or maybe we do Base32 this way ...
                 (! host.equals("b32.i2p")) &&
                 (! host.endsWith(".b32.i2p")) &&
@@ -246,7 +288,7 @@ class AddressBook {
 		 (dest.length() > MIN_DEST_LENGTH && dest.length() <= MAX_DEST_LENGTH)) &&
 		// B64 comes in groups of 2, 3, or 4 chars, but never 1
 		((dest.length() % 4) != 1) &&
-                dest.replaceAll("[a-zA-Z0-9~-]", "").length() == 0
+                B64_PATTERN.matcher(dest).matches()
                 ;	
     }
 
@@ -267,15 +309,25 @@ class AddressBook {
     public void merge(AddressBook other, boolean overwrite, Log log) {
         if (this.addresses == null)
             throw new IllegalStateException();
-        for (Iterator<Map.Entry<String, String>> iter = other.iterator(); iter.hasNext(); ) {
-            Map.Entry<String, String> entry = iter.next();
-            String otherKey = entry.getKey();
-            String otherValue = entry.getValue();
+        Iterator<Map.Entry<String, HostTxtEntry>> iter = other.iterator();
+        try {
+            merge2(other, iter, overwrite, log);
+        } finally {
+            if (iter instanceof HostTxtIterator)
+                ((HostTxtIterator) iter).close();
+        }
+    }
 
-            if (isValidKey(otherKey) && isValidDest(otherValue)) {
+    private void merge2(AddressBook other, Iterator<Map.Entry<String, HostTxtEntry>> iter, boolean overwrite, Log log) {
+        while(iter.hasNext()) {
+            Map.Entry<String, HostTxtEntry> entry = iter.next();
+            String otherKey = entry.getKey();
+            HostTxtEntry otherValue = entry.getValue();
+
+            if (isValidKey(otherKey) && isValidDest(otherValue.getDest())) {
                 if (this.addresses.containsKey(otherKey) && !overwrite) {
                     if (DEBUG && log != null &&
-                        !this.addresses.get(otherKey).equals(otherValue)) {
+                        !this.addresses.get(otherKey).equals(otherValue.getDest())) {
                         log.append("Conflict for " + otherKey + " from "
                                 + other.location
                                 + ". Destination in remote address book is "
@@ -308,7 +360,7 @@ class AddressBook {
             throw new IllegalStateException();
         if (this.modified) {
             try {
-                ConfigParser.write(this.addresses, file);
+                HostTxtParser.write(this.addresses, file);
             } catch (IOException exp) {
                 System.err.println("Error writing addressbook " + file.getAbsolutePath() + " : " + exp.toString());
             }
@@ -328,8 +380,26 @@ class AddressBook {
         this.write(new File(this.location));
     }
 
-    @Override
-    protected void finalize() {
-        delete();
+/****
+    public static void main(String[] args) {
+        String[] tests = { "foo.i2p",
+                           "3bnipzzu67cdq2rcygyxz52xhvy6ylokn4zfrk36ywn6pixmaoza.b32.i2p",
+                           "9rhEy4dT9fMlcSOhDzfWRxCV2aen4Zp4eSthOf5f9gVKMa4PtQJ-wEzm2KEYeDXkbM6wEDvMQ6ou4LIniSE6bSAwy7fokiXk5oabels-sJmftnQWRbZyyXEAsLc3gpJJvp9km7kDyZ0z0YGL5tf3S~OaWdptB5tSBOAOjm6ramcYZMWhyUqm~xSL1JyXUqWEHRYwhoDJNL6-L516VpDYVigMBpIwskjeFGcqK8BqWAe0bRwxIiFTPN6Ck8SDzQvS1l1Yj-zfzg3X3gOknzwR8nrHUkjsWtEB6nhbOr8AR21C9Hs0a7MUJvSe2NOuBoNTrtxT76jDruI78JcG5r~WKl6M12yM-SqeBNE9hQn2QCHeHAKju7FdRCbqaZ99IwyjfwvZbkiYYQVN1xlUuGaXrj98XDzK7GORYdH-PrVGfEbMXQ40KLHUWHz8w4tQXAOQrCHEichod0RIzuuxo3XltCWKrf1xGZhkAo9bk2qXi6digCijvYNaKmQdXZYWW~RtAAAA",
+                           "6IZTYacjlXjSAxu-uXEO5oGsj-f4tfePHEvGjs5pu-AMXMwD7-xFdi8kdobDMJp9yRAl96U7yLl~0t9zHeqqYmNeZnDSkTmAcSC2PT45ZJDXBobKi1~a77zuqfPwnzEatYfW3GL1JQAEkAmiwNJoG7ThTZ3zT7W9ekVJpHi9mivpTbaI~rALLfuAg~Mvr60nntZHjqhEZuiU4dTXrmc5nykl~UaMnBdwHL4jKmoN5CotqHyLYZfp74fdD-Oq4SkhuBhU8wkBIM3lz3Ul1o6-s0lNUMdYJq1CyxnyP7jeekdfAlSx4P4sU4M0dPaYvPdOFWPWwBuEh0pCs5Mj01B2xeEBhpV~xSLn6ru5Vq98TrmaR33KHxd76OYYFsWwzVbBuMVSd800XpBghGFucGw01YHYsPh3Afb01sXbf8Nb1bkxCy~DsrmoH4Ww3bpx66JhRTWvg5al3oWlCX51CnJUqaaK~dPL-pBvAyLKIA5aYvl8ca66jtA7AFDxsOb2texBBQAEAAcAAA==",
+                           "te9Ky7XvVcLLr5vQqvfmOasg915P3-ddP3iDqpMMk7v5ufFKobLAX~1k-E4WVsJVlkYvkHVOjxix-uT1IdewKmLd81s5wZtz0GQ3ZC6p0C3S2cOxz7kQqf7QYSR0BrhZC~2du3-GdQO9TqNmsnHrah5lOZf0LN2JFEFPqg8ZB5JNm3JjJeSqePBRk3zAUogNaNK3voB1MVI0ZROKopXAJM4XMERNqI8tIH4ngGtV41SEJJ5pUFrrTx~EiUPqmSEaEA6UDYZiqd23ZlewZ31ExXQj97zvkuhKCoS9A9MNkzZejJhP-TEXWF8~KHur9f51H--EhwZ42Aj69-3GuNjsMdTwglG5zyIfhd2OspxJrXzCPqIV2sXn80IbPgwxHu0CKIJ6X43B5vTyVu87QDI13MIRNGWNZY5KmM5pilGP7jPkOs4xQDo4NHzpuJR5igjWgJIBPU6fI9Pzq~BMzjLiZOMp8xNWey1zKC96L0eX4of1MG~oUvq0qmIHGNa1TlUwBQAEAAEAAA==",
+                           "(*&(*&(*&(*",
+                           "9rhEy4dT9fMlcSOhDzfWRxCV2aen4Zp4eSthOf5f9gVKMa4PtQJ-wEzm2KEYeDXkbM6wEDvMQ6ou4LIniSE6bSAwy7fokiXk5oabels-sJmftnQWRbZyyXEAsLc3gpJJvp9km7kDyZ0z0YGL5tf3S~OaWdptB5tSBOAOjm6ramcYZMWhyUqm~xSL1JyXUqWEHRYwhoDJNL6-L516VpDYVigMBpIwskjeFGcqK8BqWAe0bRwxIiFTPN6Ck8SDzQvS1l1Yj-zfzg3X3gOknzwR8nrHUkjsWtEB6nhbOr8AR21C9Hs0a7MUJvSe2NOuBoNTrtxT76jDruI78JcG5r~WKl6M12yM-SqeBNE9hQn2QCHeHAKju7FdRCbqaZ99IwyjfwvZbkiYYQVN1xlUuGaXrj98XDzK7GORYdH-PrVGfEbMXQ40KLHUWHz8w4tQXAOQrCHEichod0RIzuuxo3XltCWKrf1xGZhkAo9bk2qXi6digCijvYNaKmQdXZYWW~RtAAA",
+                           "6IZTYacjlXjSAxu-uXEO5oGsj-f4tfePHEvGjs5pu-AMXMwD7-xFdi8kdobDMJp9yRAl96U7yLl~0t9zHeqqYmNeZnDSkTmAcSC2PT45ZJDXBobKi1~a77zuqfPwnzEatYfW3GL1JQAEkAmiwNJoG7ThTZ3zT7W9ekVJpHi9mivpTbaI~rALLfuAg~Mvr60nntZHjqhEZuiU4dTXrmc5nykl~UaMnBdwHL4jKmoN5CotqHyLYZfp74fdD-Oq4SkhuBhU8wkBIM3lz3Ul1o6-s0lNUMdYJq1CyxnyP7jeekdfAlSx4P4sU4M0dPaYvPdOFWPWwBuEh0pCs5Mj01B2xeEBhpV~xSLn6ru5Vq98TrmaR33KHxd76OYYFsWwzVbBuMVSd800XpBghGFucGw01YHYsPh3Afb01sXbf8Nb1bkxCy~DsrmoH4Ww3bpx66JhRTWvg5al3oWlCX51CnJUqaaK~dPL-pBvAyLKIA5aYvl8ca66jtA7AFDxsOb2texBBQAEAAcAAA===",
+                           "!e9Ky7XvVcLLr5vQqvfmOasg915P3-ddP3iDqpMMk7v5ufFKobLAX~1k-E4WVsJVlkYvkHVOjxix-uT1IdewKmLd81s5wZtz0GQ3ZC6p0C3S2cOxz7kQqf7QYSR0BrhZC~2du3-GdQO9TqNmsnHrah5lOZf0LN2JFEFPqg8ZB5JNm3JjJeSqePBRk3zAUogNaNK3voB1MVI0ZROKopXAJM4XMERNqI8tIH4ngGtV41SEJJ5pUFrrTx~EiUPqmSEaEA6UDYZiqd23ZlewZ31ExXQj97zvkuhKCoS9A9MNkzZejJhP-TEXWF8~KHur9f51H--EhwZ42Aj69-3GuNjsMdTwglG5zyIfhd2OspxJrXzCPqIV2sXn80IbPgwxHu0CKIJ6X43B5vTyVu87QDI13MIRNGWNZY5KmM5pilGP7jPkOs4xQDo4NHzpuJR5igjWgJIBPU6fI9Pzq~BMzjLiZOMp8xNWey1zKC96L0eX4of1MG~oUvq0qmIHGNa1TlUwBQAEAAEAAA==",
+                           "x"
+        };
+        for (String s : tests) {
+            test(s);
+        }
     }
+
+    public static void test(String s) {
+        System.out.println(s + " valid host? " + isValidKey(s) + " valid dest? " + isValidDest(s));
+    }
+****/
 }

apps/addressbook/java/src/net/i2p/addressbook/ConfigParser.java

@@ -29,12 +29,13 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.StringReader;
+import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
+import net.i2p.data.DataHelper;
 import net.i2p.util.SecureFile;
 import net.i2p.util.SecureFileOutputStream;
 import net.i2p.util.SystemVersion;
@@ -43,8 +44,7 @@ import net.i2p.util.SystemVersion;
  * Utility class providing methods to parse and write files in config file
  * format, and subscription file format.
  * 
- * TODO: Change file encoding from default to UTF-8?
- *       Or switch to the DataHelper loadProps/storeProps methods?
+ * TODO: switch to the DataHelper loadProps/storeProps methods?
  * 
  * @author Ragnarok
  */
@@ -87,20 +87,23 @@ class ConfigParser {
      *             if the BufferedReader cannot be read.
      *  
      */
-    public static Map<String, String>  parse(BufferedReader input) throws IOException {
-        Map<String, String>  result = new HashMap<String, String>();
-        String inputLine;
-        inputLine = input.readLine();
-        while (inputLine != null) {
-            inputLine = stripComments(inputLine);
-            String[] splitLine = inputLine.split("=");
-            if (splitLine.length == 2) {
-                result.put(splitLine[0].trim().toLowerCase(Locale.US), splitLine[1].trim());
+    private static Map<String, String> parse(BufferedReader input) throws IOException {
+        try {
+            Map<String, String> result = new HashMap<String, String>();
+            String inputLine;
+            while ((inputLine = input.readLine()) != null) {
+                inputLine = stripComments(inputLine);
+                if (inputLine.length() == 0)
+                    continue;
+                String[] splitLine = DataHelper.split(inputLine, "=", 2);
+                if (splitLine.length == 2) {
+                    result.put(splitLine[0].trim().toLowerCase(Locale.US), splitLine[1].trim());
+                }
             }
-            inputLine = input.readLine();
+            return result;
+        } finally {
+            try { input.close(); } catch (IOException ioe) {}
         }
-        input.close();
-        return result;
     }
 
     /**
@@ -113,15 +116,21 @@ class ConfigParser {
      * @throws IOException
      *             if file cannot be read.
      */
-    public static Map<String, String>  parse(File file) throws IOException {
-        FileInputStream fileStream = new FileInputStream(file);
-        BufferedReader input = new BufferedReader(new InputStreamReader(
-                fileStream));
-        Map<String, String>  rv = parse(input);
+    public static Map<String, String> parse(File file) throws IOException {
+        FileInputStream fileStream = null;
         try {
-            fileStream.close();
-        } catch (IOException ioe) {}
-        return rv;
+            fileStream = new FileInputStream(file);
+            BufferedReader input = new BufferedReader(new InputStreamReader(
+                    fileStream, "UTF-8"));
+            Map<String, String> rv = parse(input);
+            return rv;
+        } finally {
+            if (fileStream != null) {
+                try {
+                    fileStream.close();
+                } catch (IOException ioe) {}
+            }
+        }
     }
 
     /**
@@ -134,11 +143,13 @@ class ConfigParser {
      * @throws IOException
      *             if file cannot be read.
      */
-    public static Map<String, String>  parse(String string) throws IOException {
+/****
+    public static Map<String, String> parse(String string) throws IOException {
         StringReader stringReader = new StringReader(string);
         BufferedReader input = new BufferedReader(stringReader);
         return parse(input);
     }
+****/
     
     /**
      * Return a Map using the contents of the File file. If file cannot be read,
@@ -151,8 +162,8 @@ class ConfigParser {
      * @return A Map containing the key, value pairs from file, or if file
      *         cannot be read, map.
      */
-    public static Map<String, String>  parse(File file, Map<String, String>  map) {
-        Map<String, String>  result;
+    public static Map<String, String> parse(File file, Map<String, String> map) {
+        Map<String, String> result;
         try {
             result = parse(file);
             for (Map.Entry<String, String> entry : map.entrySet()) {
@@ -178,19 +189,21 @@ class ConfigParser {
      * @throws IOException
      *             if input cannot be read.
      */
-    public static List<String> parseSubscriptions(BufferedReader input)
+    private static List<String> parseSubscriptions(BufferedReader input)
             throws IOException {
-        List<String> result = new LinkedList<String>();
-        String inputLine = input.readLine();
-        while (inputLine != null) {
-            inputLine = stripComments(inputLine).trim();
-            if (inputLine.length() > 0) {
-                result.add(inputLine);
+        try {
+            List<String> result = new ArrayList<String>(4);
+            String inputLine;
+            while ((inputLine = input.readLine()) != null) {
+                inputLine = stripComments(inputLine).trim();
+                if (inputLine.length() > 0) {
+                    result.add(inputLine);
+                }
             }
-            inputLine = input.readLine();
+            return result;
+        } finally {
+            try { input.close(); } catch (IOException ioe) {}
         }
-        input.close();
-        return result;
     }
 
     /**
@@ -202,15 +215,21 @@ class ConfigParser {
      * @throws IOException
      *             if file cannot be read.
      */
-    public static List<String> parseSubscriptions(File file) throws IOException {
-        FileInputStream fileStream = new FileInputStream(file);
-        BufferedReader input = new BufferedReader(new InputStreamReader(
-                fileStream));
-        List<String> rv = parseSubscriptions(input);
+    private static List<String> parseSubscriptions(File file) throws IOException {
+        FileInputStream fileStream = null;
         try {
-            fileStream.close();
-        } catch (IOException ioe) {}
-        return rv;
+            fileStream = new FileInputStream(file);
+            BufferedReader input = new BufferedReader(new InputStreamReader(
+                    fileStream, "UTF-8"));
+            List<String> rv = parseSubscriptions(input);
+            return rv;
+        } finally {
+            if (fileStream != null) {
+                try {
+                    fileStream.close();
+                } catch (IOException ioe) {}
+            }
+        }
     }
 
     /**
@@ -222,11 +241,13 @@ class ConfigParser {
      * @throws IOException
      *             if string cannot be read.
      */
+/****
     public static List<String> parseSubscriptions(String string) throws IOException {
         StringReader stringReader = new StringReader(string);
         BufferedReader input = new BufferedReader(stringReader);
         return parseSubscriptions(input);
     }
+****/
     
     /**
      * Return a List using the contents of the File file. If file cannot be
@@ -276,12 +297,15 @@ class ConfigParser {
      * @throws IOException
      *             if the BufferedWriter cannot be written to.
      */
-    public static void write(Map<String, String>  map, BufferedWriter output) throws IOException {
-        for (Map.Entry<String, String> entry : map.entrySet()) {
-            output.write(entry.getKey() + '=' + entry.getValue());
-            output.newLine();
+    private static void write(Map<String, String> map, BufferedWriter output) throws IOException {
+        try {
+            for (Map.Entry<String, String> entry : map.entrySet()) {
+                output.write(entry.getKey() + '=' + entry.getValue());
+                output.newLine();
+            }
+        } finally {
+            try { output.close(); } catch (IOException ioe) {}
         }
-        output.close();
     }
 
     /**
@@ -298,7 +322,7 @@ class ConfigParser {
      * @throws IOException
      *             if file cannot be written to.
      */
-    public static void write(Map<String, String>  map, File file) throws IOException {
+    public static void write(Map<String, String> map, File file) throws IOException {
         boolean success = false;
         if (!isWindows) {
             File tmp = SecureFile.createTempFile("temp-", ".tmp", file.getAbsoluteFile().getParentFile());
@@ -326,13 +350,16 @@ class ConfigParser {
      * @throws IOException
      *             if output cannot be written to.
      */
-    public static void writeSubscriptions(List<String> list, BufferedWriter output)
+    private static void writeSubscriptions(List<String> list, BufferedWriter output)
             throws IOException {
-        for (String s : list) {
-            output.write(s);
-            output.newLine();
+        try {
+            for (String s : list) {
+                output.write(s);
+                output.newLine();
+            }
+        } finally {
+            try { output.close(); } catch (IOException ioe) {}
         }
-        output.close();
     }
     
     /**
@@ -346,7 +373,7 @@ class ConfigParser {
      * @throws IOException
      *             if output cannot be written to.
      */
-    public static void writeSubscriptions(List<String> list, File file)
+    private static void writeSubscriptions(List<String> list, File file)
             throws IOException {
         writeSubscriptions(list, new BufferedWriter(
                 new OutputStreamWriter(new SecureFileOutputStream(file), "UTF-8")));

apps/addressbook/java/src/net/i2p/addressbook/Daemon.java

@@ -23,36 +23,45 @@ package net.i2p.addressbook;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
 import net.i2p.I2PAppContext;
+import net.i2p.client.naming.HostTxtEntry;
 import net.i2p.client.naming.NamingService;
 import net.i2p.client.naming.SingleFileNamingService;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
+import net.i2p.util.OrderedProperties;
 import net.i2p.util.SecureDirectory;
 import net.i2p.util.SystemVersion;
 
 /**
  * Main class of addressbook.  Performs updates, and runs the main loop.
+ * As of 0.9.30, package private, run with DaemonThread.
  * 
  * @author Ragnarok
  *
  */
-public class Daemon {
+class Daemon {
     public static final String VERSION = "2.0.4";
-    private static final Daemon _instance = new Daemon();
     private volatile boolean _running;
     private static final boolean DEBUG = false;
+    // If you change this, change in SusiDNS SubscriptionBean also
     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";
+    /** Any properties we receive from the subscription, we store to the
+     *  addressbook with this prefix, so it knows it's part of the signature.
+     *  This is also chosen so that it can't be spoofed.
+     */
+    private static final String RCVD_PROP_PREFIX = "=";
+    private static final boolean MUST_VALIDATE = false;
     
     /**
      * Update the router and published address books using remote data from the
@@ -80,10 +89,9 @@ public class Daemon {
      */
     public static void update(AddressBook master, AddressBook router,
             File published, SubscriptionList subscriptions, Log log) {
-        Iterator<AddressBook> iter = subscriptions.iterator();
-        while (iter.hasNext()) {
+        for (AddressBook book : subscriptions) {
             // yes, the EepGet fetch() is done in next()
-            router.merge(iter.next(), false, log);
+            router.merge(book, false, log);
         }
         router.write();
         if (published != null) {
@@ -122,106 +130,584 @@ public class Daemon {
         // This also has the advantage of not flushing the NamingService's LRU cache.
         String nsClass = router.getClass().getSimpleName();
         boolean isTextFile = nsClass.equals("HostsTxtNamingService") || nsClass.equals("SingleFileNamingService");
-        Set<String> knownNames = null;
+        Set<String> knownNames;
+        if (isTextFile) {
+            // load the hostname set
+            Properties opts = new Properties();
+            opts.setProperty("file", "hosts.txt");
+            knownNames = router.getNames(opts);
+        } else {
+            knownNames = null;
+        }
+        NamingService publishedNS;
+        if (published != null) {
+            publishedNS = new SingleFileNamingService(I2PAppContext.getGlobalContext(), published.getAbsolutePath());
+        } else {
+            publishedNS = null;
+        }
 
-        NamingService publishedNS = null;
         Iterator<AddressBook> iter = subscriptions.iterator();
         while (iter.hasNext()) {
             // yes, the EepGet fetch() is done in next()
             long start = System.currentTimeMillis();
-            AddressBook sub = iter.next();
-            long end = System.currentTimeMillis();
+            AddressBook addressbook = iter.next();
             // SubscriptionIterator puts in a dummy AddressBook with no location if no fetch is done
-            if (DEBUG && log != null && sub.getLocation() != null)
-                log.append("Fetch of " + sub.getLocation() + " took " + (end - start));
-            start = end;
+            if (DEBUG && log != null && addressbook.getLocation() != null) {
+                long end = System.currentTimeMillis();
+                log.append("Fetch of " + addressbook.getLocation() + " took " + (end - start));
+            }
+            Iterator<Map.Entry<String, HostTxtEntry>> iter2 = addressbook.iterator();
+            try {
+                update(router, knownNames, publishedNS, addressbook, iter2, log);
+            } finally {
+                if (iter2 instanceof HostTxtIterator)
+                    ((HostTxtIterator) iter2).close();
+                addressbook.delete();
+            }
+        }  // subscriptions
+        subscriptions.write();
+    }
+
+    /**
+     *  @param knownNames only non-null if router book is a text file
+     *  @param publishedNS only non-null if we have a published address book
+     *  @since 0.9.33 split out from above
+     */
+    private static void update(NamingService router, Set<String> knownNames,
+                               NamingService publishedNS, AddressBook addressbook,
+                               Iterator<Map.Entry<String, HostTxtEntry>> iter, Log log) {
+            long start = DEBUG ? System.currentTimeMillis() : 0;
             int old = 0, nnew = 0, invalid = 0, conflict = 0, total = 0;
-            for (Iterator<Map.Entry<String, String>> eIter = sub.iterator(); eIter.hasNext(); ) {
-                Map.Entry<String, String> entry = eIter.next();
+            int deleted = 0;
+            while(iter.hasNext()) {
+                Map.Entry<String, HostTxtEntry> entry = iter.next();
+                total++;
+                // may be null for 'remove' entries
                 String key = entry.getKey();
                 boolean isKnown;
-                Destination oldDest = null;
-                if (isTextFile) {
-                    if (knownNames == null) {
-                        // load the hostname set
-                        Properties opts = new Properties();
-                        opts.setProperty("file", "hosts.txt");
-                        knownNames = router.getNames(opts);
-                    }
-                    isKnown = knownNames.contains(key);
+                // NOT set for text file NamingService
+                Destination oldDest;
+                if (knownNames != null) {
+                    oldDest = null;
+                    isKnown = key != null ? knownNames.contains(key) : false;
                 } else {
-                    oldDest = router.lookup(key);
+                    oldDest = key != null ? router.lookup(key) : null;
                     isKnown = oldDest != null;
                 }
                 try {
-                    if (!isKnown) {
-                        if (AddressBook.isValidKey(key)) {
-                            Destination dest = new Destination(entry.getValue());
-                            Properties props = new Properties();
-                            props.setProperty("s", sub.getLocation());
+                    HostTxtEntry he = entry.getValue();
+                    Properties hprops = he.getProps();
+                    boolean mustValidate = MUST_VALIDATE || hprops != null;
+                    String action = hprops != null ? hprops.getProperty(HostTxtEntry.PROP_ACTION) : null;
+                    if (key == null && !he.hasValidRemoveSig()) {
+                        if (log != null) {
+                            log.append("Bad signature of action " + action + " for key " +
+                                       hprops.getProperty(HostTxtEntry.PROP_NAME) +
+                                       ". From: " + addressbook.getLocation());
+                        }
+                        invalid++;
+                    } else if (key != null && mustValidate && !he.hasValidSig()) {
+                        if (log != null) {
+                            log.append("Bad signature of action " + action + " for key " + key +
+                                       ". From: " + addressbook.getLocation());
+                        }
+                        invalid++;
+                    } else if (action != null || !isKnown) {
+                        if (key != null && AddressBook.isValidKey(key)) {
+                            Destination dest = new Destination(he.getDest());
+                            Properties props = new OrderedProperties();
+                            props.setProperty("s", addressbook.getLocation());
+                            boolean allowExistingKeyInPublished = false;
+                            if (mustValidate) {
+                                // sig checked above
+                                props.setProperty("v", "true");
+                            }
+                            if (hprops != null) {
+                                // merge in all the received properties
+                                for (Map.Entry<Object, Object> e : hprops.entrySet()) {
+                                    // Add prefix to indicate received property
+                                    props.setProperty(RCVD_PROP_PREFIX + e.getKey(), (String) e.getValue());
+                                }
+                            }
+                            if (action != null) {
+                                // Process commands. hprops is non-null.
+                                // Must handle isKnown in each case.
+                                if (action.equals(HostTxtEntry.ACTION_ADDDEST)) {
+                                    // Add an alternate destination (new crypto) for existing hostname
+                                    // Requires new NamingService support if the key exists
+                                    String polddest = hprops.getProperty(HostTxtEntry.PROP_OLDDEST);
+                                    if (polddest != null) {
+                                        Destination pod = new Destination(polddest);
+                                        List<Destination> pod2 = router.lookupAll(key);
+                                        if (pod2 == null) {
+                                            // we didn't know it before, so we'll add it
+                                            // check inner sig anyway
+                                            if (!he.hasValidInnerSig()) {
+                                                logInner(log, action, key, addressbook);
+                                                invalid++;
+                                                continue;
+                                            }
+                                        } else if (pod2.contains(dest)) {
+                                            // we knew it before, with the same dest
+                                            old++;
+                                            continue;
+                                        } else if (pod2.contains(pod)) {
+                                            // checks out, so verify the inner sig
+                                            if (!he.hasValidInnerSig()) {
+                                                logInner(log, action, key, addressbook);
+                                                invalid++;
+                                                continue;
+                                            }
+                                            // TODO Requires NamingService support
+                                            // if (isTextFile), do we replace or not? check sigType.isAvailable()
+                                            boolean success = router.addDestination(key, dest, props);
+                                            if (log != null) {
+                                                if (success)
+                                                    log.append("Additional address for " + key +
+                                                               " added to address book. From: " + addressbook.getLocation());
+                                                else
+                                                    log.append("Failed to add additional address for " + key +
+                                                               " From: " + addressbook.getLocation());
+                                            }
+                                            // now update the published addressbook
+                                            // ditto
+                                            if (publishedNS != null) {
+                                                // FIXME this fails, no support in SFNS
+                                                success = publishedNS.addDestination(key, dest, props);
+                                                if (log != null && !success)
+                                                    log.append("Add to published address book " + publishedNS.getName() + " failed for " + key);
+                                            }
+                                            nnew++;
+                                            continue;
+                                        } else {
+                                            // mismatch, disallow
+                                            logMismatch(log, action, key, pod2, he.getDest(), addressbook);
+                                            invalid++;
+                                            continue;
+                                        }
+                                    } else {
+                                        logMissing(log, action, key, addressbook);
+                                        invalid++;
+                                        continue;
+                                    }
+                                } else if (action.equals(HostTxtEntry.ACTION_ADDNAME)) {
+                                    // Add an alias for an existing hostname, same dest
+                                    if (isKnown) {
+                                        // could be same or different dest
+                                        old++;
+                                        continue;
+                                    }
+                                    String poldname = hprops.getProperty(HostTxtEntry.PROP_OLDNAME);
+                                    if (poldname != null) {
+                                        List<Destination> pod = router.lookupAll(poldname);
+                                        if (pod == null) {
+                                            // we didn't have the old one, so we'll add the new one
+                                        } else if (pod.contains(dest)) {
+                                            // checks out, so we'll add the new one
+                                        } else {
+                                            // mismatch, disallow
+                                            logMismatch(log, action, key, pod, he.getDest(), addressbook);
+                                            invalid++;
+                                            continue;
+                                        }
+                                    } else {
+                                        logMissing(log, action, key, addressbook);
+                                        invalid++;
+                                        continue;
+                                    }
+                                } else if (action.equals(HostTxtEntry.ACTION_ADDSUBDOMAIN)) {
+                                    // add a subdomain with verification
+                                    if (isKnown) {
+                                        old++;
+                                        continue;
+                                    }
+                                    String polddest = hprops.getProperty(HostTxtEntry.PROP_OLDDEST);
+                                    String poldname = hprops.getProperty(HostTxtEntry.PROP_OLDNAME);
+                                    if (polddest != null && poldname != null) {
+                                        // check for valid subdomain
+                                        if (!AddressBook.isValidKey(poldname) ||
+                                            key.indexOf('.' + poldname) <= 0) {
+                                            if (log != null)
+                                                log.append("Action: " + action + " failed because" +
+                                                           " old name " + poldname +
+                                                           " is invalid" +
+                                                           ". From: " + addressbook.getLocation());
+                                            invalid++;
+                                            continue;
+                                        }
+                                        Destination pod = new Destination(polddest);
+                                        List<Destination> pod2 = router.lookupAll(poldname);
+                                        if (pod2 == null) {
+                                            // we didn't have the old name
+                                            // check inner sig anyway
+                                            if (!he.hasValidInnerSig()) {
+                                                logInner(log, action, key, addressbook);
+                                                invalid++;
+                                                continue;
+                                            }
+                                        } else if (pod2.contains(pod)) {
+                                            // checks out, so verify the inner sig
+                                            if (!he.hasValidInnerSig()) {
+                                                logInner(log, action, key, addressbook);
+                                                invalid++;
+                                                continue;
+                                            }
+                                        } else {
+                                            // mismatch, disallow
+                                            logMismatch(log, action, key, pod2, polddest, addressbook);
+                                            invalid++;
+                                            continue;
+                                        }
+                                    } else {
+                                        logMissing(log, action, key, addressbook);
+                                        invalid++;
+                                        continue;
+                                    }
+                                } else if (action.equals(HostTxtEntry.ACTION_CHANGEDEST)) {
+                                    // change destination on an existing entry
+                                    // This removes all previous destinations under that hostname,
+                                    // is this what we want?
+                                    String polddest = hprops.getProperty(HostTxtEntry.PROP_OLDDEST);
+                                    if (polddest != null) {
+                                        Destination pod = new Destination(polddest);
+                                        List<Destination> pod2 = router.lookupAll(key);
+                                        if (pod2 == null) {
+                                            // we didn't have the old name
+                                            // check inner sig anyway
+                                            if (!he.hasValidInnerSig()) {
+                                                logInner(log, action, key, addressbook);
+                                                invalid++;
+                                                continue;
+                                            }
+                                        } else if (pod2.contains(dest)) {
+                                            // we already have the new dest
+                                            old++;
+                                            continue;
+                                        } else if (pod2.contains(pod)) {
+                                            // checks out, so verify the inner sig
+                                            if (!he.hasValidInnerSig()) {
+                                                logInner(log, action, key, addressbook);
+                                                invalid++;
+                                                continue;
+                                            }
+                                            if (log != null) {
+                                                if (pod2.size() == 1)
+                                                    log.append("Changing destination for " + key +
+                                                               ". From: " + addressbook.getLocation());
+                                                else
+                                                    log.append("Replacing " + pod2.size() + " destinations for " + key +
+                                                               ". From: " + addressbook.getLocation());
+                                            }
+                                            allowExistingKeyInPublished = true;
+                                            props.setProperty("m", Long.toString(I2PAppContext.getGlobalContext().clock().now()));
+                                        } else {
+                                            // mismatch, disallow
+                                            logMismatch(log, action, key, pod2, polddest, addressbook);
+                                            invalid++;
+                                            continue;
+                                        }
+                                    } else {
+                                        logMissing(log, action, key, addressbook);
+                                        invalid++;
+                                        continue;
+                                    }
+                                } else if (action.equals(HostTxtEntry.ACTION_CHANGENAME)) {
+                                    // Delete old name, replace with new
+                                    // This removes all previous destinations under that hostname,
+                                    // is this what we want?
+                                    if (isKnown) {
+                                        old++;
+                                        continue;
+                                    }
+                                    String poldname = hprops.getProperty(HostTxtEntry.PROP_OLDNAME);
+                                    if (poldname != null) {
+                                        List<Destination> pod = router.lookupAll(poldname);
+                                        if (pod == null) {
+                                            // we didn't have the old name
+                                        } else if (pod.contains(dest)) {
+                                            // checks out, so we'll delete it
+                                            if (knownNames != null)
+                                                knownNames.remove(poldname);
+                                            boolean success = router.remove(poldname, dest);
+                                            if (success)
+                                                deleted++;
+                                            if (log != null) {
+                                                if (success)
+                                                    log.append("Removed: " + poldname +
+                                                               " to be replaced with " + key +
+                                                               ". From: " + addressbook.getLocation());
+                                                else
+                                                    log.append("Remove failed for: " + poldname +
+                                                               " to be replaced with " + key +
+                                                               ". From: " + addressbook.getLocation());
+                                            }
+                                            // now update the published addressbook
+                                            if (publishedNS != null) {
+                                                success = publishedNS.remove(poldname, dest);
+                                                if (log != null && !success)
+                                                    log.append("Remove from published address book " + publishedNS.getName() + " failed for " + poldname);
+                                            }
+                                        } else {
+                                            // mismatch, disallow
+                                            logMismatch(log, action, key, pod, he.getDest(), addressbook);
+                                            continue;
+                                        }
+                                    } else {
+                                        logMissing(log, action, key, addressbook);
+                                        invalid++;
+                                        continue;
+                                    }
+                                } else if (action.equals(HostTxtEntry.ACTION_REMOVE) ||
+                                           action.equals(HostTxtEntry.ACTION_REMOVEALL)) {
+                                    // w/o name=dest handled below
+                                    if (log != null)
+                                        log.append("Action: " + action + " with name=dest invalid" +
+                                                   ". From: " + addressbook.getLocation());
+                                    invalid++;
+                                    continue;
+                                } else if (action.equals(HostTxtEntry.ACTION_UPDATE)) {
+                                    if (isKnown) {
+                                        allowExistingKeyInPublished = true;
+                                        props.setProperty("m", Long.toString(I2PAppContext.getGlobalContext().clock().now()));
+                                    }
+                                } else {
+                                    if (log != null)
+                                        log.append("Action: " + action + " unrecognized" +
+                                                   ". From: " + addressbook.getLocation());
+                                    invalid++;
+                                    continue;
+                                }
+                            } // action != null
                             boolean success = router.put(key, dest, props);
                             if (log != null) {
                                 if (success)
                                     log.append("New address " + key +
-                                               " added to address book. From: " + sub.getLocation());
+                                               " added to address book. From: " + addressbook.getLocation());
                                 else
                                     log.append("Save to naming service " + router + " failed for new key " + key);
                             }
                             // now update the published addressbook
-                            if (published != null) {
-                                if (publishedNS == null)
-                                    publishedNS = new SingleFileNamingService(I2PAppContext.getGlobalContext(), published.getAbsolutePath());
-                                success = publishedNS.putIfAbsent(key, dest);
+                            if (publishedNS != null) {
+                                if (allowExistingKeyInPublished)
+                                    success = publishedNS.put(key, dest, props);
+                                else
+                                    success = publishedNS.putIfAbsent(key, dest, props);
                                 if (log != null && !success) {
-                                    try {
-                                        log.append("Save to published address book " + published.getCanonicalPath() + " failed for new key " + key);
-                                    } catch (IOException ioe) {}
+                                    log.append("Save to published address book " + publishedNS.getName() + " failed for new key " + key);
                                 }
                             }
-                            if (isTextFile)
+                            if (knownNames != null) {
                                 // keep track for later dup check
                                 knownNames.add(key);
+                            }
                             nnew++;
+                        } else if (key == null) {
+                            // 'remove' actions
+                            // isKnown is false
+                            if (action != null) {
+                                // Process commands. hprops is non-null.
+                                if (action.equals(HostTxtEntry.ACTION_REMOVE)) {
+                                    // delete this entry
+                                    String polddest = hprops.getProperty(HostTxtEntry.PROP_DEST);
+                                    String poldname = hprops.getProperty(HostTxtEntry.PROP_NAME);
+                                    if (polddest != null && poldname != null) {
+                                        Destination pod = new Destination(polddest);
+                                        List<Destination> pod2 = router.lookupAll(poldname);
+                                        if (pod2 != null && pod2.contains(pod)) {
+                                            if (knownNames != null && pod2.size() == 1)
+                                                knownNames.remove(poldname);
+                                            boolean success = router.remove(poldname, pod);
+                                            if (success)
+                                                deleted++;
+                                            if (log != null) {
+                                                if (success)
+                                                    log.append("Removed: " + poldname +
+                                                               " as requested" +
+                                                               ". From: " + addressbook.getLocation());
+                                                else
+                                                    log.append("Remove failed for: " + poldname +
+                                                               " as requested" +
+                                                               ". From: " + addressbook.getLocation());
+                                            }
+                                            // now update the published addressbook
+                                            if (publishedNS != null) {
+                                                success = publishedNS.remove(poldname, pod);
+                                                if (log != null && !success)
+                                                    log.append("Remove from published address book " + publishedNS.getName() + " failed for " + poldname);
+                                            }
+                                        } else if (pod2 != null) {
+                                            // mismatch, disallow
+                                            logMismatch(log, action, key, pod2, polddest, addressbook);
+                                            invalid++;
+                                        } else {
+                                            old++;
+                                        }
+                                    } else {
+                                        logMissing(log, action, "delete", addressbook);
+                                        invalid++;
+                                    }
+                                } else if (action.equals(HostTxtEntry.ACTION_REMOVEALL)) {
+                                    // delete all entries with this destination
+                                    String polddest = hprops.getProperty(HostTxtEntry.PROP_DEST);
+                                    // oldname is optional, but nice because not all books support reverse lookup
+                                    if (polddest != null) {
+                                        Destination pod = new Destination(polddest);
+                                        String poldname = hprops.getProperty(HostTxtEntry.PROP_NAME);
+                                        if (poldname != null) {
+                                            List<Destination> pod2 = router.lookupAll(poldname);
+                                            if (pod2 != null && pod2.contains(pod)) {
+                                                if (knownNames != null)
+                                                    knownNames.remove(poldname);
+                                                boolean success = router.remove(poldname, pod);
+                                                if (success)
+                                                    deleted++;
+                                                if (log != null) {
+                                                    if (success)
+                                                        log.append("Removed: " + poldname +
+                                                                   " as requested" +
+                                                                   ". From: " + addressbook.getLocation());
+                                                    else
+                                                        log.append("Remove failed for: " + poldname +
+                                                                   " as requested" +
+                                                                   ". From: " + addressbook.getLocation());
+                                                }
+                                                // now update the published addressbook
+                                                if (publishedNS != null) {
+                                                    success = publishedNS.remove(poldname, pod);
+                                                    if (log != null && !success)
+                                                        log.append("Remove from published address book " + publishedNS.getName() + " failed for " + poldname);
+                                                }
+                                            } else if (pod2 != null) {
+                                                // mismatch, disallow
+                                                logMismatch(log, action, key, pod2, polddest, addressbook);
+                                                invalid++;
+                                            } else {
+                                                old++;
+                                            }
+                                        }
+                                        // reverse lookup, delete all
+                                        List<String> revs = router.reverseLookupAll(pod);
+                                        if (revs != null) {
+                                            for (String rev : revs) {
+                                                if (knownNames != null)
+                                                    knownNames.remove(rev);
+                                                boolean success = router.remove(rev, pod);
+                                                if (success)
+                                                    deleted++;
+                                                if (log != null) {
+                                                    if (success)
+                                                        log.append("Removed: " + rev +
+                                                                   " as requested" +
+                                                                   ". From: " + addressbook.getLocation());
+                                                    else
+                                                        log.append("Remove failed for: " + rev +
+                                                                   " as requested" +
+                                                                   ". From: " + addressbook.getLocation());
+                                                }
+                                                // now update the published addressbook
+                                                if (publishedNS != null) {
+                                                    success = publishedNS.remove(rev, pod);
+                                                    if (log != null && !success)
+                                                        log.append("Remove from published address book " + publishedNS.getName() + " failed for " + rev);
+                                                }
+                                            }
+                                        }
+                                    } else {
+                                        logMissing(log, action, "delete", addressbook);
+                                        invalid++;
+                                    }
+                                } else {
+                                    if (log != null)
+                                        log.append("Action: " + action + " w/o name=dest unrecognized" +
+                                                   ". From: " + addressbook.getLocation());
+                                    invalid++;
+                                }
+                                continue;
+                            } else {
+                                if (log != null)
+                                    log.append("No action in command line" +
+                                               ". From: " + addressbook.getLocation());
+                                invalid++;
+                                continue;
+                            }
                         } else if (log != null) {
-                            log.append("Bad hostname " + key + " from "
-                                   + sub.getLocation());
+                            log.append("Bad hostname " + key + ". From: "
+                                   + addressbook.getLocation());
                             invalid++;
                         }        
+                  /****
                     } else if (false && DEBUG && log != null) {
                         // lookup the conflict if we haven't yet (O(n**2) for text file)
                         if (isTextFile)
                             oldDest = router.lookup(key);
                         if (oldDest != null && !oldDest.toBase64().equals(entry.getValue())) {
-                            log.append("Conflict for " + key + " from "
-                                       + sub.getLocation()
+                            log.append("Conflict for " + key + ". From: "
+                                       + addressbook.getLocation()
                                        + ". Destination in remote address book is "
                                        + entry.getValue());
                             conflict++;
                         } else {
                             old++;
                         }
+                   ****/
                     } else {
                         old++;
                     }
                 } catch (DataFormatException dfe) {
                     if (log != null)
-                        log.append("Invalid b64 for " + key + " From: " + sub.getLocation());
+                        log.append("Invalid b64 for " + key + " From: " + addressbook.getLocation());
                     invalid++;
                 }
-                total++;
-            }
+            }  // entries
             if (DEBUG && log != null && total > 0) {
-                log.append("Merge of " + sub.getLocation() + " into " + router +
+                log.append("Merge of " + addressbook.getLocation() + " into " + router +
                            " took " + (System.currentTimeMillis() - start) + " ms with " +
                            total + " total, " +
                            nnew + " new, " +
                            old + " old, " +
+                           deleted + " deleted, " +
                            invalid + " invalid, " +
                            conflict + " conflicts");
             }
-            sub.delete();
+    }
+
+    /** @since 0.9.26 */
+    private static void logInner(Log log, String action, String name, AddressBook addressbook) {
+        if (log != null) {
+            log.append("Action: " + action + " failed because" +
+                       " inner signature for key " + name +
+                       " failed" +
+                       ". From: " + addressbook.getLocation());
+        }
+    }
+
+    /** @since 0.9.26 */
+    private static void logMissing(Log log, String action, String name, AddressBook addressbook) {
+        if (log != null) {
+            log.append("Action: " + action + " for " + name +
+                       " failed, missing required parameters" +
+                       ". From: " + addressbook.getLocation());
+        }
+    }
+
+    /** @since 0.9.26 */
+    private static void logMismatch(Log log, String action, String name, List<Destination> dests,
+                                    String olddest, AddressBook addressbook) {
+        if (log != null) {
+            StringBuilder buf = new StringBuilder(16);
+            final int sz = dests.size();
+            for (int i = 0; i < sz; i++) {
+                buf.append(dests.get(i).toBase64().substring(0, 6));
+                if (i != sz - 1)
+                    buf.append(", ");
+            }
+            log.append("Action: " + action + " failed because" +
+                       " destinations for " + name +
+                       " (" + buf + ')' +
+                       " do not include" +
+                       " (" + olddest.substring(0, 6) + ')' +
+                       ". From: " + addressbook.getLocation());
         }
-        subscriptions.write();
     }
 
     /**
@@ -236,16 +722,12 @@ public class Daemon {
         File published = null;
         boolean should_publish = Boolean.parseBoolean(settings.get("should_publish"));
         if (should_publish) 
-            published = new File(home, settings
-                .get("published_addressbook"));
-        File subscriptionFile = new File(home, settings
-                .get("subscriptions"));
+            published = new File(home, settings.get("published_addressbook"));
+        File subscriptionFile = new File(home, settings.get("subscriptions"));
         File logFile = new File(home, settings.get("log"));
         File etagsFile = new File(home, settings.get("etags"));
-        File lastModifiedFile = new File(home, settings
-                .get("last_modified"));
-        File lastFetchedFile = new File(home, settings
-                .get("last_fetched"));
+        File lastModifiedFile = new File(home, settings.get("last_modified"));
+        File lastFetchedFile = new File(home, settings.get("last_fetched"));
         long delay;
         try {
             delay = Long.parseLong(settings.get("update_delay"));
@@ -254,13 +736,14 @@ public class Daemon {
         }
         delay *= 60 * 60 * 1000;
         
-        List<String> defaultSubs = new LinkedList<String>();
+        List<String> defaultSubs = new ArrayList<String>(4);
         // defaultSubs.add("http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/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")));
+                                                              etagsFile, lastModifiedFile, lastFetchedFile,
+                                                              delay, defaultSubs, settings.get("proxy_host"),
+                                                              Integer.parseInt(settings.get("proxy_port")));
         Log log = SystemVersion.isAndroid() ? null : new Log(logFile);
 
         // If false, add hosts via naming service; if true, write hosts.txt file directly
@@ -319,14 +802,35 @@ public class Daemon {
      *            others are ignored.
      */
     public static void main(String[] args) {
-        _instance.run(args);
+        Daemon daemon = new Daemon();
+        if (args.length > 0 && args[0].equals("test"))
+            daemon.test(args);
+        else
+            daemon.run(args);
+    }
+
+    /** @since 0.9.26 */
+    public static void test(String[] args) {
+        Properties ctxProps = new Properties();
+        String PROP_FORCE = "i2p.naming.blockfile.writeInAppContext";
+        ctxProps.setProperty(PROP_FORCE, "true");
+        I2PAppContext ctx = new I2PAppContext(ctxProps);
+        NamingService ns = getNamingService("hosts.txt");
+        File published = new File("test-published.txt");
+        Log log = new Log(new File("test-log.txt"));
+        SubscriptionList subscriptions = new SubscriptionList("test-sub.txt");
+        update(ns, published, subscriptions, log);
+        ctx.logManager().flush();
     }
     
+    /**
+     *  @param args may be null
+     */
     public void run(String[] args) {
         _running = true;
         String settingsLocation = "config.txt";
         File homeFile;
-        if (args.length > 0) {
+        if (args != null && args.length > 0) {
             homeFile = new SecureDirectory(args[0]);
             if (!homeFile.isAbsolute())
                 homeFile = new SecureDirectory(I2PAppContext.getGlobalContext().getRouterDir(), args[0]);
@@ -352,10 +856,10 @@ public class Daemon {
         
         if (!homeFile.exists()) {
             boolean created = homeFile.mkdirs();
-            if (created)
-                System.out.println("INFO:  Addressbook directory " + homeFile.getName() + " created");
-            else
-                System.out.println("ERROR: Addressbook directory " + homeFile.getName() + " could not be created");
+            if (!created)
+                System.out.println("ERROR: Addressbook directory " + homeFile.getAbsolutePath() + " could not be created");
+            //else
+            //    System.out.println("INFO: Addressbook directory " + homeFile.getAbsolutePath() + " created");
         }
         
         File settingsFile = new File(homeFile, settingsLocation);
@@ -390,14 +894,14 @@ public class Daemon {
      * Call this to get the addressbook to reread its config and 
      * refetch its subscriptions.
      */
-    public static void wakeup() {
-        synchronized (_instance) {
-            _instance.notifyAll();
+    public void wakeup() {
+        synchronized (this) {
+            notifyAll();
         }
     }
 
-    public static void stop() {
-        _instance._running = false;
+    public void stop() {
+        _running = false;
         wakeup();
     }
 }

apps/addressbook/java/src/net/i2p/addressbook/DaemonThread.java

@@ -25,6 +25,7 @@ import java.util.Properties;
 
 import net.i2p.I2PAppContext;
 import net.i2p.client.naming.NamingServiceUpdater;
+import net.i2p.util.I2PAppThread;
 
 /**
  * A thread that waits five minutes, then runs the addressbook daemon.  
@@ -32,9 +33,10 @@ import net.i2p.client.naming.NamingServiceUpdater;
  * @author Ragnarok
  *
  */
-public class DaemonThread extends Thread implements NamingServiceUpdater {
+public class DaemonThread extends I2PAppThread implements NamingServiceUpdater {
 
-    private String[] args;
+    private final String[] args;
+    private final Daemon daemon;
 
     /**
      * Construct a DaemonThread with the command line arguments args.
@@ -43,6 +45,7 @@ public class DaemonThread extends Thread implements NamingServiceUpdater {
      */
     public DaemonThread(String[] args) {
         this.args = args;
+        daemon = new Daemon();
     }
 
     /* (non-Javadoc)
@@ -55,18 +58,28 @@ public class DaemonThread extends Thread implements NamingServiceUpdater {
         //} catch (InterruptedException exp) {
         //}
         I2PAppContext.getGlobalContext().namingService().registerUpdater(this);
-        Daemon.main(this.args);
-        I2PAppContext.getGlobalContext().namingService().unregisterUpdater(this);
+        try {
+            if (args != null && args.length > 0 && args[0].equals("test"))
+                daemon.test(args);
+            else
+                daemon.run(args);
+        } finally {
+            I2PAppContext.getGlobalContext().namingService().unregisterUpdater(this);
+        }
     }
 
     public void halt() {
-        Daemon.stop();
+        daemon.stop();
         interrupt();
     }
 
     /**
-     *  The NamingServiceUpdater interface
-     *  @param options ignored
+     *  The NamingServiceUpdater interface.
+     *  While this may be called directly, the recommended way
+     *  is to call I2PAppContext.namingService().requestUpdate(Properties)
+     *  which will call this.
+     *
+     *  @param options ignored, may be null
      *  @since 0.8.7
      */
     public void update(Properties options) {

apps/addressbook/java/src/net/i2p/addressbook/HostTxtIterator.java

@@ -22,6 +22,7 @@
 package net.i2p.addressbook;
 
 import java.io.BufferedReader;
+import java.io.Closeable;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -31,6 +32,9 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.NoSuchElementException;
 
+import net.i2p.client.naming.HostTxtEntry;
+import net.i2p.data.DataHelper;
+
 /**
  *  A class to iterate through a hosts.txt or config file without
  *  reading the whole thing into memory.
@@ -39,26 +43,27 @@ import java.util.NoSuchElementException;
  *  Callers should iterate all the way through or call close()
  *  to ensure the underlying stream is closed.
  *
- *  @since 0.8.7
+ *  This is not used for config files.
+ *  It is only used for subscriptions.
+ *
+ *  @since 0.8.7, renamed from ConfigIterator in 0.9.26
  */
-class ConfigIterator implements Iterator<Map.Entry<String, String>> {
+class HostTxtIterator implements Iterator<Map.Entry<String, HostTxtEntry>>, Closeable {
 
     private BufferedReader input;
-    private ConfigEntry next;
+    private MapEntry next;
 
     /**
      *  A dummy iterator in which hasNext() is always false.
      */
-    public ConfigIterator() {}
+    public HostTxtIterator() {}
 
     /**
      *  An iterator over the key/value pairs in the file.
      */
-    public ConfigIterator(File file) {
-        try {
+    public HostTxtIterator(File file) throws IOException {
             FileInputStream fileStream = new FileInputStream(file);
-            input = new BufferedReader(new InputStreamReader(fileStream));
-        } catch (IOException ioe) {}
+            input = new BufferedReader(new InputStreamReader(fileStream, "UTF-8"));
     }
 
     public boolean hasNext() {
@@ -67,15 +72,13 @@ class ConfigIterator implements Iterator<Map.Entry<String, String>> {
         if (next != null)
             return true;
         try {
-            String inputLine = input.readLine();
-            while (inputLine != null) {
-                inputLine = ConfigParser.stripComments(inputLine);
-                String[] splitLine = inputLine.split("=");
-                if (splitLine.length == 2) {
-                    next = new ConfigEntry(splitLine[0].trim().toLowerCase(Locale.US), splitLine[1].trim());
-                    return true;
-                }
-                inputLine = input.readLine();
+            String inputLine;
+            while ((inputLine = input.readLine()) != null) {
+                HostTxtEntry he = HostTxtParser.parse(inputLine, true);
+                if (he == null)
+                    continue;
+                next = new MapEntry(he.getName(), he);
+                return true;
             }
         } catch (IOException ioe) {}
         try { input.close(); } catch (IOException ioe) {}
@@ -84,10 +87,15 @@ class ConfigIterator implements Iterator<Map.Entry<String, String>> {
         return false;
     }
 
-    public Map.Entry<String, String> next() {
+    /**
+     *  'remove' entries will be returned with a null key,
+     *  and the value will contain a null name, null dest,
+     *  and non-null props.
+     */
+    public Map.Entry<String, HostTxtEntry> next() {
         if (!hasNext())
             throw new NoSuchElementException();
-        Map.Entry<String, String> rv = next;
+        Map.Entry<String, HostTxtEntry> rv = next;
         next = null;
         return rv;
     }
@@ -102,19 +110,14 @@ class ConfigIterator implements Iterator<Map.Entry<String, String>> {
         }
     }
 
-    @Override
-    protected void finalize() {
-        close();
-    }
-
     /**
      *  The object returned by the iterator.
      */
-    private static class ConfigEntry implements Map.Entry<String, String> {
+    private static class MapEntry implements Map.Entry<String, HostTxtEntry> {
         private final String key;
-        private final String value;
+        private final HostTxtEntry value;
 
-        public ConfigEntry(String k, String v) {
+        public MapEntry(String k, HostTxtEntry v) {
             key = k;
             value = v;
         }
@@ -123,11 +126,11 @@ class ConfigIterator implements Iterator<Map.Entry<String, String>> {
             return key;
         }
 
-        public String getValue() {
+        public HostTxtEntry getValue() {
             return value;
         }
 
-        public String setValue(String v) {
+        public HostTxtEntry setValue(HostTxtEntry v) {
             throw new UnsupportedOperationException();
         }
 

apps/addressbook/java/src/net/i2p/addressbook/HostTxtParser.java

@@ -0,0 +1,294 @@
+package net.i2p.addressbook;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Properties;
+
+import net.i2p.client.naming.HostTxtEntry;
+import net.i2p.data.DataHelper;
+import net.i2p.util.SecureFile;
+import net.i2p.util.SecureFileOutputStream;
+import net.i2p.util.SystemVersion;
+
+/**
+ * Utility class providing methods to parse and write files in a hosts.txt file
+ * format, and subscription file format.
+ * 
+ * @since 0.9.26 modified from ConfigParser
+ */
+class HostTxtParser {
+
+    private static final boolean isWindows = SystemVersion.isWindows();
+
+    /**
+     * Return a Map using the contents of BufferedReader input. input must have
+     * a single key, value pair on each line, in the format: key=value. Lines
+     * starting with '#' or ';' are considered comments, and ignored. Lines that
+     * are obviously not in the format key=value are also ignored.
+     * The key is converted to lower case.
+     * 
+     * Returned map will not contain null ("remove") entries.
+     * 
+     * @param input
+     *            A BufferedReader with lines in key=value format to parse into
+     *            a Map.
+     * @return A Map containing the key, value pairs from input.
+     * @throws IOException
+     *             if the BufferedReader cannot be read.
+     *  
+     */
+    private static Map<String, HostTxtEntry> parse(BufferedReader input) throws IOException {
+        try {
+            Map<String, HostTxtEntry> result = new HashMap<String, HostTxtEntry>();
+            String inputLine;
+            while ((inputLine = input.readLine()) != null) {
+                HostTxtEntry he = parse(inputLine, false);
+                if (he == null)
+                    continue;
+                result.put(he.getName(), he);
+            }
+            return result;
+        } finally {
+            try { input.close(); } catch (IOException ioe) {}
+        }
+    }
+
+    /**
+     * Return a HostTxtEntry from the contents of the inputLine.
+     * 
+     * @param inputLine key=value[#!k1=v1#k2=v2...]
+     * @param allowCommandOnly if true, a line starting with #! will return
+     *                         a HostTxtEntry with a null name and dest and non-null props.
+     *                         If false, these lines will return null.
+     * @return null if no entry found or on error
+     */
+    public static HostTxtEntry parse(String inputLine, boolean allowCommandOnly) {
+        if (inputLine.startsWith(";"))
+            return null;
+        int comment = inputLine.indexOf('#');
+        String kv;
+        String sprops;
+        if (comment >= 0) {
+            int shebang = inputLine.indexOf(HostTxtEntry.PROPS_SEPARATOR);
+            if (shebang == comment && shebang + 2 < inputLine.length()) {
+                if (comment == 0 && !allowCommandOnly)
+                    return null;
+                sprops = inputLine.substring(shebang + 2);
+            } else {
+                if (comment == 0)
+                    return null;
+                sprops = null;
+            }
+            kv = inputLine.substring(0, comment);
+        } else {
+            sprops = null;
+            kv = inputLine;
+        }
+        String name, dest;
+        if (comment != 0) {
+            // we have a name=dest
+            String[] splitLine = DataHelper.split(kv, "=", 2);
+            if (splitLine.length < 2)
+                return null;
+            name = splitLine[0].trim().toLowerCase(Locale.US);
+            dest = splitLine[1].trim();
+            if (name.length() == 0 || dest.length() == 0)
+                return null;
+        } else {
+            // line starts with #!, rv will contain props only
+            name = null;
+            dest = null;
+        }
+        HostTxtEntry he;
+        if (sprops != null) {
+            try {
+                he = new HostTxtEntry(name, dest, sprops);
+            } catch (IllegalArgumentException iae) {
+                return null;
+            }
+        } else {
+            he = new HostTxtEntry(name, dest);
+        }
+        return he;
+    }
+
+    /**
+     * Return a Map using the contents of the File file. See parse(BufferedReader)
+     * for details of the input format.
+     * 
+     * Returned map will not contain null ("remove") entries.
+     * 
+     * @param file
+     *            A File to parse.
+     * @return A Map containing the key, value pairs from file.
+     * @throws IOException
+     *             if file cannot be read.
+     */
+    public static Map<String, HostTxtEntry> parse(File file) throws IOException {
+        FileInputStream fileStream = null;
+        try {
+            fileStream = new FileInputStream(file);
+            BufferedReader input = new BufferedReader(new InputStreamReader(
+                    fileStream, "UTF-8"));
+            Map<String, HostTxtEntry> rv = parse(input);
+            return rv;
+        } finally {
+            if (fileStream != null) {
+                try {
+                    fileStream.close();
+                } catch (IOException ioe) {}
+            }
+        }
+    }
+
+    /**
+     * Return a Map using the contents of the File file. If file cannot be read,
+     * use map instead, and write the result to where file should have been.
+     * 
+     * Returned map will not contain null ("remove") entries.
+     * 
+     * @param file
+     *            A File to attempt to parse.
+     * @param map
+     *            A Map containing values to use as defaults.
+     * @return A Map containing the key, value pairs from file, or if file
+     *         cannot be read, map.
+     */
+    public static Map<String, HostTxtEntry> parse(File file, Map<String, HostTxtEntry> map) {
+        Map<String, HostTxtEntry> result;
+        try {
+            result = parse(file);
+            for (Map.Entry<String, HostTxtEntry> entry : map.entrySet()) {
+                if (!result.containsKey(entry.getKey()))
+                    result.put(entry.getKey(), entry.getValue());
+            }
+        } catch (IOException exp) {
+            result = map;
+            try {
+                write(result, file);
+            } catch (IOException exp2) {
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Write contents of Map map to BufferedWriter output. Output is written
+     * with one key, value pair on each line, in the format: key=value.
+     * 
+     * @param map
+     *            A Map to write to output.
+     * @param output
+     *            A BufferedWriter to write the Map to.
+     * @throws IOException
+     *             if the BufferedWriter cannot be written to.
+     */
+    private static void write(Map<String, HostTxtEntry> map, BufferedWriter output) throws IOException {
+        try {
+            for (Map.Entry<String, HostTxtEntry> entry : map.entrySet()) {
+                entry.getValue().write(output);
+            }
+        } finally {
+            try { output.close(); } catch (IOException ioe) {}
+        }
+    }
+
+    /**
+     * Write contents of Map map to the File file. Output is written
+     * with one key, value pair on each line, in the format: key=value.
+     * Write to a temp file in the same directory and then rename, to not corrupt
+     * simultaneous accesses by the router. Except on Windows where renameTo()
+     * will fail if the target exists.
+     *
+     * @param map
+     *            A Map to write to file.
+     * @param file
+     *            A File to write the Map to.
+     * @throws IOException
+     *             if file cannot be written to.
+     */
+    public static void write(Map<String, HostTxtEntry> map, File file) throws IOException {
+        boolean success = false;
+        if (!isWindows) {
+            File tmp = SecureFile.createTempFile("temp-", ".tmp", file.getAbsoluteFile().getParentFile());
+            write(map, new BufferedWriter(new OutputStreamWriter(new SecureFileOutputStream(tmp), "UTF-8")));
+            success = tmp.renameTo(file);
+            if (!success) {
+                tmp.delete();
+                //System.out.println("Warning: addressbook rename fail from " + tmp + " to " + file);
+            }
+        }
+        if (!success) {
+            // hmm, that didn't work, try it the old way
+            write(map, new BufferedWriter(new OutputStreamWriter(new SecureFileOutputStream(file), "UTF-8")));
+        }
+    }
+
+    /**
+     * Usage: HostTxtParser [-q] validate example.i2p=b64dest[#!key1=val1#key2=val2]
+     */
+    public static void main(String[] args) throws Exception {
+        boolean quiet = false;
+        if (args.length > 0 && args[0].equals("-q")) {
+            quiet = true;
+            args = java.util.Arrays.copyOfRange(args, 1, args.length);
+        }
+        if (args.length != 2 || !args[0].equals("validate")) {
+            System.err.println("Usage: HostTxtParser validate example.i2p=b64dest[#!key1=val1#key2=val2]");
+            System.exit(1);
+        }
+        HostTxtEntry e = parse(args[1].trim(), false);
+        if (e == null) {
+            if (!quiet)
+                System.err.println("Bad format");
+            System.exit(2);
+        }
+        if (!e.hasValidSig()) {
+            if (!quiet)
+                System.err.println("Bad signature");
+            System.exit(3);
+        }
+        Properties p = e.getProps();
+        if (p != null) {
+            if (p.containsKey(HostTxtEntry.PROP_ACTION) ||
+                p.containsKey(HostTxtEntry.PROP_OLDDEST) ||
+                p.containsKey(HostTxtEntry.PROP_OLDNAME) ||
+                p.containsKey(HostTxtEntry.PROP_OLDSIG)) {
+                if (!e.hasValidSig()) {
+                    if (!quiet)
+                        System.err.println("Bad inner signature");
+                    System.exit(4);
+                }
+            }
+        }
+        if (!quiet)
+            System.err.println("Good signature for " + e.getName());
+        System.exit(0);
+    }
+
+/****
+    public static void test(String[] args) throws Exception {
+        File f = new File("tmp-hosts.txt");
+        Map<String, HostTxtEntry> map = parse(f);
+        for (HostTxtEntry e : map.values()) {
+            System.out.println("Host: " + e.getName() +
+                               "\nDest: " + e.getDest() +
+                               "\nAction: " + (e.getProps() != null ? e.getProps().getProperty("action") : "(none)") +
+                               "\nValid Inner? " + e.hasValidInnerSig() +
+                               "\nValid? " + e.hasValidSig() +
+                               '\n');
+        }
+    }
+****/
+}

apps/addressbook/java/src/net/i2p/addressbook/Log.java

@@ -23,8 +23,9 @@ package net.i2p.addressbook;
 
 import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
 import java.util.Date;
 
 /**
@@ -35,7 +36,7 @@ import java.util.Date;
  */
 class Log {
 
-    private File file;
+    private final File file;
 
     /**
      * Construct a Log instance that writes to the File file.
@@ -56,8 +57,8 @@ class Log {
     public void append(String entry) {
         BufferedWriter bw = null;
         try {
-            bw = new BufferedWriter(new FileWriter(this.file,
-                    true));
+            bw = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(this.file,
+                    true), "UTF-8"));
             String timestamp = new Date().toString();
             bw.write(timestamp + " -- " + entry);
             bw.newLine();
@@ -73,7 +74,9 @@ class Log {
      * 
      * @return The File that the log is writing to.
      */
+/****
     public File getFile() {
         return this.file;
     }
+****/
 }

apps/addressbook/java/src/net/i2p/addressbook/Subscription.java

@@ -29,10 +29,8 @@ package net.i2p.addressbook;
  */
 class Subscription {
 
-    private String location;
-
+    private final String location;
     private String etag;
-
     private String lastModified;
     private long lastFetched;
 
@@ -41,14 +39,15 @@ class Subscription {
      * was last read at the time represented by etag and lastModified.
      * 
      * @param location
-     *            A String representing a url to a remote address book.
+     *            A String representing a url to a remote address book. Non-null.
      * @param etag
-     *            The etag header that we recieved the last time we read this
-     *            subscription.
+     *            The etag header that we received the last time we read this
+     *            subscription. May be null.
      * @param lastModified
-     *            the last-modified header we recieved the last time we read
-     *            this subscription.
-     * @param lastFetched when the subscription was last fetched (Java time, as a String)
+     *            the last-modified header we received the last time we read
+     *            this subscription. May be null.
+     * @param lastFetched when the subscription was last fetched (Java time, as a String).
+     *            May be null.
      */
     public Subscription(String location, String etag, String lastModified, String lastFetched) {
         this.location = location;
@@ -71,7 +70,7 @@ class Subscription {
     }
 
     /**
-     * Return the etag header that we recieved the last time we read this
+     * Return the etag header that we received the last time we read this
      * subscription.
      * 
      * @return A String containing the etag header.
@@ -91,7 +90,7 @@ class Subscription {
     }
 
     /**
-     * Return the last-modified header that we recieved the last time we read
+     * Return the last-modified header that we received the last time we read
      * this subscription.
      * 
      * @return A String containing the last-modified header.

apps/addressbook/java/src/net/i2p/addressbook/SubscriptionIterator.java

@@ -26,6 +26,8 @@ import java.util.Iterator;
 import java.util.List;
 
 import net.i2p.I2PAppContext;
+import net.i2p.client.naming.HostTxtEntry;
+import net.i2p.util.PortMapper;
 
 /**
  * An iterator over the subscriptions in a SubscriptionList.  Note that this iterator
@@ -36,9 +38,9 @@ import net.i2p.I2PAppContext;
  */
 class SubscriptionIterator implements Iterator<AddressBook> {
 
-    private Iterator<Subscription> subIterator;
-    private String proxyHost;
-    private int proxyPort;
+    private final Iterator<Subscription> subIterator;
+    private final String proxyHost;
+    private final int proxyPort;
     private final long delay;
 
     /**
@@ -69,11 +71,17 @@ class SubscriptionIterator implements Iterator<AddressBook> {
      * Yes, the EepGet fetch() is done in here in next().
      *
      * see java.util.Iterator#next()
-     * @return an AddressBook (empty if the minimum delay has not been met)
+     * @return non-null AddressBook (empty if the minimum delay has not been met,
+     *          or there is no proxy tunnel, or the fetch otherwise fails)
      */
     public AddressBook next() {
         Subscription sub = this.subIterator.next();
-        if (sub.getLastFetched() + this.delay < I2PAppContext.getGlobalContext().clock().now()) {
+        if (sub.getLocation().startsWith("file:")) {
+            // test only
+            return new AddressBook(sub.getLocation().substring(5));
+        } else if (sub.getLastFetched() + this.delay < I2PAppContext.getGlobalContext().clock().now() &&
+            I2PAppContext.getGlobalContext().portMapper().getPort(PortMapper.SVC_HTTP_PROXY) >= 0 &&
+            !I2PAppContext.getGlobalContext().getBooleanProperty("i2p.vmCommSystem")) {
             //System.err.println("Fetching addressbook from " + sub.getLocation());
             return new AddressBook(sub, this.proxyHost, this.proxyPort);
         } else {
@@ -81,7 +89,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.<String, String> emptyMap());
+            return new AddressBook(Collections.<String, HostTxtEntry>emptyMap());
         }
     }
 

apps/addressbook/java/src/net/i2p/addressbook/SubscriptionList.java

@@ -23,8 +23,9 @@ package net.i2p.addressbook;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
@@ -34,19 +35,15 @@ import java.util.Map;
  * @author Ragnarok
  *  
  */
-class SubscriptionList {
+class SubscriptionList implements Iterable<AddressBook> {
 
-    private List<Subscription> subscriptions;
-
-    private File etagsFile;
-
-    private File lastModifiedFile;
-    private File lastFetchedFile;
+    private final List<Subscription> subscriptions;
+    private final File etagsFile;
+    private final File lastModifiedFile;
+    private final File lastFetchedFile;
     private final long delay;
-    
-    private String proxyHost;
-    
-    private int proxyPort;
+    private final String proxyHost;
+    private final int proxyPort;
 
     /**
      * Construct a SubscriptionList using the urls from locationsFile and, if
@@ -69,7 +66,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<Subscription>();
+        this.subscriptions = new ArrayList<Subscription>(4);
         this.etagsFile = etagsFile;
         this.lastModifiedFile = lastModifiedFile;
         this.lastFetchedFile = lastFetchedFile;
@@ -84,17 +81,17 @@ class SubscriptionList {
         try {
             etags = ConfigParser.parse(etagsFile);
         } catch (IOException exp) {
-            etags = new HashMap<String, String>();
+            etags = Collections.<String, String>emptyMap();
         }
         try {
             lastModified = ConfigParser.parse(lastModifiedFile);
         } catch (IOException exp) {
-            lastModified = new HashMap<String, String>();
+            lastModified = Collections.<String, String>emptyMap();
         }
         try {
             lastFetched = ConfigParser.parse(lastFetchedFile);
         } catch (IOException exp) {
-            lastFetched = new HashMap<String, String>();
+            lastFetched = Collections.<String, String>emptyMap();
         }
         for (String location : locations) {
             this.subscriptions.add(new Subscription(location, etags.get(location),
@@ -103,6 +100,24 @@ class SubscriptionList {
         }
     }
     
+    /**
+     * Testing only.
+     * 
+     * @param hoststxt path to a local file used as the test 'subscription' input
+     * @since 0.9.26
+     */
+    public SubscriptionList(String hoststxt) {
+        File dummy = new File("/dev/null");
+        this.etagsFile = dummy;
+        this.lastModifiedFile = dummy;
+        this.lastFetchedFile = dummy;
+        this.delay = 0;
+        this.proxyHost = "127.0.0.1";
+        this.proxyPort = 4444;
+        Subscription sub = new Subscription("file:" + hoststxt, null, null, null);
+        this.subscriptions = Collections.singletonList(sub);
+    }
+    
     /**
      * Return an iterator over the AddressBooks represented by the Subscriptions
      * in this SubscriptionList.
@@ -121,9 +136,10 @@ class SubscriptionList {
      * won't be read back correctly; the '=' should be escaped.
      */
     public void write() {
-        Map<String, String> etags = new HashMap<String, String>();
-        Map<String, String>  lastModified = new HashMap<String, String>();
-        Map<String, String>  lastFetched = new HashMap<String, String>();
+        int sz = subscriptions.size();
+        Map<String, String> etags = new HashMap<String, String>(sz);
+        Map<String, String> lastModified = new HashMap<String, String>(sz);
+        Map<String, String> lastFetched = new HashMap<String, String>(sz);
         for (Subscription sub : this.subscriptions) {
             if (sub.getEtag() != null) {
                 etags.put(sub.getLocation(), sub.getEtag());
@@ -131,13 +147,16 @@ class SubscriptionList {
             if (sub.getLastModified() != null) {
                 lastModified.put(sub.getLocation(), sub.getLastModified());
             }
-            lastFetched.put(sub.getLocation(), "" + sub.getLastFetched());
+            lastFetched.put(sub.getLocation(), Long.toString(sub.getLastFetched()));
         }
         try {
             ConfigParser.write(etags, this.etagsFile);
+        } catch (IOException exp) {}
+        try {
             ConfigParser.write(lastModified, this.lastModifiedFile);
+        } catch (IOException exp) {}
+        try {
             ConfigParser.write(lastFetched, this.lastFetchedFile);
-        } catch (IOException exp) {
-        }
+        } catch (IOException exp) {}
     }
 }

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>

apps/addressbook/java/src/net/metanotion/io/RAIFile.java

@@ -36,8 +36,8 @@ import java.io.IOException;
 import java.io.RandomAccessFile;
 
 public class RAIFile implements RandomAccessInterface, DataInput, DataOutput {
-	private File f;
-	private RandomAccessFile delegate;
+	private final File f;
+	private final RandomAccessFile delegate;
 	private final boolean r, w;
 
 	public RAIFile(RandomAccessFile file) throws FileNotFoundException {

apps/addressbook/java/src/net/metanotion/io/RandomAccessInterface.java

@@ -28,9 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 package net.metanotion.io;
 
+import java.io.Closeable;
 import java.io.IOException;
 
-public interface RandomAccessInterface {
+public interface RandomAccessInterface extends Closeable {
 	public long getFilePointer() throws IOException;
 	public long length() throws IOException;
 	public int read() throws IOException;

apps/addressbook/java/src/net/metanotion/io/Serializer.java

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 package net.metanotion.io;
 
-public interface Serializer {
-	public byte[] getBytes(Object o);
-	public Object construct(byte[] b);
+public interface Serializer<T> {
+	public byte[] getBytes(T o);
+	public T construct(byte[] b);
 }

apps/addressbook/java/src/net/metanotion/io/block/BlockFile.java

@@ -28,11 +28,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 package net.metanotion.io.block;
 
+import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
 import java.io.RandomAccessFile;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
 import java.util.Set;
 
 import net.metanotion.io.RAIFile;
@@ -64,7 +68,7 @@ import net.i2p.util.Log;
  * Pages are 1 KB and are numbered starting from 1.
  * e.g. the Metaindex skiplist is at offset 1024 bytes
  */
-public class BlockFile {
+public class BlockFile implements Closeable {
 	public static final int PAGESIZE = 1024;
 	public static final long OFFSET_MOUNTED = 20;
 	public final Log log = I2PAppContext.getGlobalContext().logManager().getLog(BlockFile.class);
@@ -93,7 +97,7 @@ public class BlockFile {
 	/** I2P was the file locked when we opened it? */
 	private final boolean _wasMounted;
 
-	private final BSkipList metaIndex;
+	private final BSkipList<String, Integer> metaIndex;
 	private boolean _isClosed;
 	/** cached list of free pages, only valid if freListStart > 0 */
 	private FreeListBlock flb;
@@ -140,14 +144,17 @@ public class BlockFile {
 			return;
 		}
 		boolean init = !(new File(args[0])).exists();
+		RAIFile raif = null;
+		BlockFile bf = null;
 		try {
-			RAIFile raif = new RAIFile(new File(args[0]), true, true);
-			BlockFile bf = new BlockFile(raif, init);
+			raif = new RAIFile(new File(args[0]), true, true);
+			bf = new BlockFile(raif, init);
 			bf.bfck(true);
-			bf.close();
-			raif.close();
-		} catch (Exception e) {
+		} catch (IOException e) {
 			e.printStackTrace();
+		} finally {
+			if (bf != null) try { bf.close(); } catch (IOException ioe) {}
+			if (raif != null) try { raif.close(); } catch (IOException ioe) {}
 		}
 	}
 
@@ -319,7 +326,7 @@ public class BlockFile {
 		if (rai.canWrite())
 			mount();
 
-		metaIndex = new BSkipList(spanSize, this, METAINDEX_PAGE, new StringBytes(), new IntBytes());
+		metaIndex = new BSkipList<String, Integer>(spanSize, this, METAINDEX_PAGE, new StringBytes(), new IntBytes());
 	}
 
 	/**
@@ -333,7 +340,7 @@ public class BlockFile {
 	/**
 	 *  Go to any page but the superblock.
 	 *  Page 1 is the superblock, must use file.seek(0) to get there.
-	 *  @param page >= 2
+	 *  @param page &gt;= 2
 	 */
 	public static void pageSeek(RandomAccessInterface file, int page) throws IOException {
 		if (page < METAINDEX_PAGE)
@@ -430,18 +437,25 @@ public class BlockFile {
 	}
 
 	/**
+	 *  Open a skiplist if it exists.
+	 *  Returns null if the skiplist does not exist.
+	 *  Empty skiplists are not preserved after close.
+	 *
 	 *  If the file is writable, this runs an integrity check and repair
 	 *  on first open.
+	 *
+	 *  @return null if not found
 	 */
-	public BSkipList getIndex(String name, Serializer key, Serializer val) throws IOException {
+	@SuppressWarnings("unchecked")
+	public <K extends Comparable<? super K>, V> BSkipList<K, V> getIndex(String name, Serializer<K> key, Serializer<V> val) throws IOException {
 		// added I2P
-		BSkipList bsl = openIndices.get(name);
+		BSkipList<K, V> bsl = (BSkipList<K, V>) openIndices.get(name);
 		if (bsl != null)
 			return bsl;
 
-		Integer page = (Integer) metaIndex.get(name);
+		Integer page = metaIndex.get(name);
 		if (page == null) { return null; }
-		bsl = new BSkipList(spanSize, this, page.intValue(), key, val, true);
+		bsl = new BSkipList<K, V>(spanSize, this, page.intValue(), key, val, true);
 		if (file.canWrite()) {
 			log.info("Checking skiplist " + name + " in blockfile " + file);
 			if (bsl.bslck(true, false))
@@ -453,25 +467,43 @@ public class BlockFile {
 		return bsl;
 	}
 
-	public BSkipList makeIndex(String name, Serializer key, Serializer val) throws IOException {
+	/**
+	 *  Create and open a new skiplist if it does not exist.
+	 *  Throws IOException if it already exists.
+	 *
+	 *  @throws IOException if already exists or other errors
+	 */
+	public <K extends Comparable<? super K>, V> BSkipList<K, V> makeIndex(String name, Serializer<K> key, Serializer<V> val) throws IOException {
 		if(metaIndex.get(name) != null) { throw new IOException("Index already exists"); }
 		int page = allocPage();
 		metaIndex.put(name, Integer.valueOf(page));
 		BSkipList.init(this, page, spanSize);
-		BSkipList bsl = new BSkipList(spanSize, this, page, key, val, true);
+		BSkipList<K, V> bsl = new BSkipList<K, V>(spanSize, this, page, key, val, true);
 		openIndices.put(name, bsl);
 		return bsl;
 	}
 
+	/**
+	 *  Delete a skiplist if it exists.
+	 *  Must be open. Throws IOException if exists but is closed.
+	 *  Broken before 0.9.26.
+	 *
+	 *  @throws IOException if it is closed.
+	 */
 	public void delIndex(String name) throws IOException {
-		Integer page = (Integer) metaIndex.remove(name);
-		if (page == null) { return; }
-		Serializer nb = new IdentityBytes();
-		BSkipList bsl = new BSkipList(spanSize, this, page.intValue(), nb, nb, true);
+		if (metaIndex.get(name) == null)
+                    return;
+		BSkipList bsl = openIndices.get(name);
+		if (bsl == null)
+			throw new IOException("Cannot delete closed skiplist, open it first: " + name);
 		bsl.delete();
+		openIndices.remove(name);
+		metaIndex.remove(name);
 	}
 
 	/**
+	 *  Close a skiplist if it is open.
+	 *
 	 *  Added I2P
 	 */
 	public void closeIndex(String name) {
@@ -481,8 +513,75 @@ public class BlockFile {
 	}
 
 	/**
+	 *  Reformat a skiplist with new Serializers if it exists.
+	 *  The skiplist must be closed.
+	 *  Throws IOException if the skiplist is open.
+	 *  The skiplist will remain closed after completion.
+	 *
+	 *  @throws IOException if it is open or on errors
+	 *  @since 0.9.26
+	 */
+	public <K extends Comparable<? super K>, V> void reformatIndex(String name, Serializer<K> oldKey, Serializer<V> oldVal,
+	                          Serializer<K> newKey, Serializer<V> newVal) throws IOException {
+		if (openIndices.containsKey(name))
+			throw new IOException("Cannot reformat open skiplist " + name);
+		BSkipList<K, V> old = getIndex(name, oldKey, oldVal);
+		if (old == null)
+			return;
+		long start = System.currentTimeMillis();
+		String tmpName = "---tmp---" + name + "---tmp---";
+		BSkipList<K, V> tmp = getIndex(tmpName, newKey, newVal);
+		if (tmp != null) {
+			log.logAlways(Log.WARN, "Continuing on aborted reformat of list " + name);
+		} else {
+			tmp = makeIndex(tmpName, newKey, newVal);
+		}
+
+		// It could be much more efficient to do this at the
+		// SkipSpan layer but that's way too hard.
+		final int loop = 32;
+		List<K> keys = new ArrayList<K>(loop);
+		List<V> vals = new ArrayList<V>(loop);
+		while (true) {
+			SkipIterator<K, V> iter = old.iterator();
+			for (int i = 0; iter.hasNext() && i < loop; i++) {
+				try {
+					keys.add(iter.nextKey());
+					vals.add(iter.next());
+				} catch (NoSuchElementException nsee) {
+					throw new IOException("Unable to reformat corrupt list " + name, nsee);
+				}
+			}
+			// save state, as deleting corrupts the iterator
+			boolean done = !iter.hasNext();
+			for (int i = 0; i < keys.size(); i++) {
+				tmp.put(keys.get(i), vals.get(i));
+			}
+			for (int i = keys.size() - 1; i >= 0; i--) {
+				old.remove(keys.get(i));
+			}
+			if (done)
+				break;
+			keys.clear();
+			vals.clear();
+		}
+
+		delIndex(name);
+		closeIndex(name);
+		closeIndex(tmpName);
+		Integer page = metaIndex.get(tmpName);
+		metaIndex.put(name, page);
+		metaIndex.remove(tmpName);
+		if (log.shouldWarn())
+			log.warn("reformatted list: " + name + " in " +
+			         (System.currentTimeMillis() - start) + "ms");
+	}
+
+	/**
+	 *  Closes all open skiplists and then the blockfile itself.
+	 *
 	 *  Note (I2P)
-         *  Does NOT close the RAF / RAI.
+	 *  Does NOT close the RAF / RAI.
 	 */
 	public void close() throws IOException {
 		// added I2P
@@ -491,12 +590,7 @@ public class BlockFile {
 		_isClosed = true;
 		metaIndex.close();
 
-		Set<String> oi = openIndices.keySet();
-		Iterator<String> i = oi.iterator();
-		Object k;
-		while(i.hasNext()) {
-			k = i.next();
-			BSkipList bsl = openIndices.get(k);
+		for (BSkipList bsl : openIndices.values()) {
 			bsl.close();
 		}
 
@@ -538,9 +632,15 @@ public class BlockFile {
 			try {
 				// This uses IdentityBytes, so the value class won't be right, but at least
 				// it won't fail the out-of-order check
-				Serializer keyser = slname.equals("%%__REVERSE__%%") ? new IntBytes() : new UTF8StringBytes();
-				BSkipList bsl = getIndex(slname, keyser, new IdentityBytes());
-				if (bsl == null) {
+				boolean fail;
+				if (slname.equals("%%__REVERSE__%%")) {
+					Serializer<Integer> keyser = new IntBytes();
+					fail = getIndex(slname, keyser, new IdentityBytes()) == null;
+				} else {
+					Serializer<String> keyser = new UTF8StringBytes();
+					fail = getIndex(slname, keyser, new IdentityBytes()) == null;
+				}
+				if (fail) {
 					log.error("Can't find list? " + slname);
 					continue;
 				}

apps/addressbook/java/src/net/metanotion/io/block/index/BSkipLevels.java

@@ -30,7 +30,9 @@ package net.metanotion.io.block.index;
 
 import java.io.IOException;
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
 
@@ -53,16 +55,26 @@ import net.i2p.util.Log;
  *
  * Always fits on one page.
  */
-public class BSkipLevels extends SkipLevels {
+public class BSkipLevels<K extends Comparable<? super K>, V> extends SkipLevels<K, V> {
 	private static final long MAGIC = 0x42534c6576656c73l;  // "BSLevels"
 	static final int HEADER_LEN = 16;
 	public final int levelPage;
 	public final int spanPage;
 	public final BlockFile bf;
-	private final BSkipList bsl;
+	private final BSkipList<K, V> bsl;
 	private boolean isKilled;
+	// the level pages, passed from the constructor to initializeLevels(),
+	// NOT kept up to date
+	private final int[] lps;
 
-	public BSkipLevels(BlockFile bf, int levelPage, BSkipList bsl) throws IOException {
+	/**
+	 *  Non-recursive initializer initializeLevels()
+	 *  MUST be called on the first BSkipLevel in the skiplist
+	 *  after the constructor, unless it's a new empty
+	 *  level and init() was previously called.
+	 */
+	@SuppressWarnings("unchecked")
+	public BSkipLevels(BlockFile bf, int levelPage, BSkipList<K, V> bsl) throws IOException {
 		this.levelPage = levelPage;
 		this.bf = bf;
 		this.bsl = bsl;
@@ -86,27 +98,59 @@ public class BSkipLevels extends SkipLevels {
 			throw new IOException("No span found in cache???");
 		}
 
-		this.levels = new BSkipLevels[maxLen];
+		this.levels = (BSkipLevels<K, V>[]) new BSkipLevels[maxLen];
 		if (bf.log.shouldLog(Log.DEBUG))
-			bf.log.debug("Reading New BSkipLevels with " + nonNull + " / " + maxLen + " valid levels page " + levelPage);
+			bf.log.debug("Reading New BSkipLevels with " + nonNull + " / " + maxLen + " valid levels page " + levelPage +
+				     " in skiplist " + bsl);
 		// We have to read now because new BSkipLevels() will move the file pointer
-		int[] lps = new int[nonNull];
+		lps = new int[nonNull];
 		for(int i = 0; i < nonNull; i++) {
 			lps[i] = bf.file.readUnsignedInt();
 		}
+	}
 
+	/**
+	 *  Non-recursive initializer.
+	 *  MUST be called on the first BSkipLevel in the skiplist
+	 *  after the constructor, unless it's a new empty
+	 *  level and init() was previously called.
+	 *  Only call on the first skiplevel in the list!
+	 *
+	 *  @since 0.9.20
+	 */
+	public void initializeLevels() {
+		List<BSkipLevels<K, V>> toInit = new ArrayList<BSkipLevels<K, V>>(32);
+		List<BSkipLevels<K, V>> nextInit = new ArrayList<BSkipLevels<K, V>>(32);
+		initializeLevels(toInit);
+		while (!toInit.isEmpty()) {
+			for (BSkipLevels<K, V> bsl : toInit) {
+				bsl.initializeLevels(nextInit);
+			}
+			List<BSkipLevels<K, V>> tmp = toInit;
+			toInit = nextInit;
+			nextInit = tmp;
+			nextInit.clear();
+		}
+	}
+
+	/**
+	 *  Non-recursive initializer.
+	 *  MUST be called after constructor.
+	 *
+	 *  @param nextInit out parameter, next levels to initialize
+	 *  @since 0.9.20
+	 */
+	private void initializeLevels(List<BSkipLevels<K, V>> nextInit) {
 		boolean fail = false;
-		for(int i = 0; i < nonNull; i++) {
+		for(int i = 0; i < lps.length; i++) {
 			int lp = lps[i];
 			if(lp != 0) {
 				levels[i] = bsl.levelHash.get(Integer.valueOf(lp));
 				if(levels[i] == null) {
 					try {
-						// FIXME this will explode the stack if too big
-						// Redo this without recursion?
-						// Lots of recursion in super to be fixed also...
-						levels[i] = new BSkipLevels(bf, lp, bsl);
-						bsl.levelHash.put(Integer.valueOf(lp), levels[i]);
+						BSkipLevels<K, V> lev = new BSkipLevels<K, V>(bf, lp, bsl);
+						levels[i] = lev;
+						nextInit.add(lev);
 					} catch (IOException ioe) {
 						bf.log.error("Corrupt database, bad level " + i +
 						                    " at page " + lp, ioe);
@@ -115,8 +159,8 @@ public class BSkipLevels extends SkipLevels {
 						continue;
 					}
 				}
-				Comparable ourKey = key();
-				Comparable nextKey = levels[i].key();
+				K ourKey = key();
+				K nextKey = levels[i].key();
 				if (ourKey != null && nextKey != null &&
 				    ourKey.compareTo(nextKey) >= 0) {
 					bf.log.warn("Corrupt database, level out of order " + this +
@@ -129,7 +173,9 @@ public class BSkipLevels extends SkipLevels {
 				// TODO also check that the level[] array is not out-of-order
 			} else {
 				if (bf.log.shouldLog(Log.WARN))
-					bf.log.warn("WTF " + this + " i = " + i + " of " + nonNull + " / " + maxLen + " valid levels but page is zero");
+					bf.log.warn(this + " i = " + i + " of " +
+						    lps.length + " / " + levels.length +
+						    " valid levels but page is zero");
 				levels[i] = null;
 				fail = true;
 			}
@@ -170,9 +216,9 @@ public class BSkipLevels extends SkipLevels {
 					break;
 			}
 			bf.file.writeShort(i);
-			bf.file.writeInt(((BSkipSpan) bottom).page);
+			bf.file.writeInt(((BSkipSpan<K, V>) bottom).page);
 			for(int j = 0; j < i; j++) {
-				bf.file.writeInt(((BSkipLevels) levels[j]).levelPage);
+				bf.file.writeInt(((BSkipLevels<K, V>) levels[j]).levelPage);
 			}
 		} catch (IOException ioe) { throw new RuntimeException("Error writing to database", ioe); }
 	}
@@ -184,22 +230,23 @@ public class BSkipLevels extends SkipLevels {
 			return;
 		}
 		if (bf.log.shouldLog(Log.DEBUG))
-			bf.log.debug("Killing " + this + ' ' + print(), new Exception());
+			bf.log.debug("Killing " + this + ' ' + print() /* , new Exception() */ );
 		isKilled = true;
 		bsl.levelHash.remove(Integer.valueOf(levelPage));
 		bf.freePage(levelPage);
 	}
 
 	@Override
-	public SkipLevels newInstance(int levels, SkipSpan ss, SkipList sl) {
+	public SkipLevels<K, V> newInstance(int levels, SkipSpan<K, V> ss, SkipList<K, V> sl) {
 		try {
-			BSkipSpan bss = (BSkipSpan) ss;
-			BSkipList bsl = (BSkipList) sl;
+			BSkipSpan<K, V> bss = (BSkipSpan<K, V>) ss;
+			BSkipList<K, V> bsl = (BSkipList<K, V>) sl;
 			int page = bf.allocPage();
 			BSkipLevels.init(bf, page, bss.page, levels);
 			if (bf.log.shouldLog(Log.DEBUG))
 				bf.log.debug("New BSkipLevels height " + levels + " page " + page);
-			return new BSkipLevels(bf, page, bsl);
+			return new BSkipLevels<K, V>(bf, page, bsl);
+			// do not need to call initLevels() here
 		} catch (IOException ioe) { throw new RuntimeException("Error creating database page", ioe); }
 	}
 
@@ -227,7 +274,7 @@ public class BSkipLevels extends SkipLevels {
 	 *  @since 0.8.8
 	 */
 	private boolean blvlfix() {
-		TreeSet<SkipLevels> lvls = new TreeSet<SkipLevels>(new LevelComparator());
+		TreeSet<SkipLevels<K, V>> lvls = new TreeSet<SkipLevels<K, V>>(new LevelComparator<K, V>());
 		if (bf.log.shouldLog(Log.DEBUG))
 			bf.log.debug("Starting level search");
 		getAllLevels(this, lvls);
@@ -239,15 +286,15 @@ public class BSkipLevels extends SkipLevels {
 		}
 		// traverse the levels, back-to-front
 		boolean rv = false;
-		SkipLevels after = null;
-		for (SkipLevels lv : lvls) {
+		SkipLevels<K, V> after = null;
+		for (SkipLevels<K, V> lv : lvls) {
 			boolean modified = false;
 			if (bf.log.shouldLog(Log.DEBUG))
 				bf.log.debug("Checking " + lv.print());
 			if (after != null) {
 				int min = Math.min(after.levels.length, lv.levels.length);
 				for (int i = 0; i < min; i++) {
-					SkipLevels cur = lv.levels[i];
+					SkipLevels<K, V> cur = lv.levels[i];
 					if (cur != after) {
 						if (cur != null)
 							bf.log.warn("Level " + i + " was wrong, fixing for " + lv.print());
@@ -285,12 +332,12 @@ public class BSkipLevels extends SkipLevels {
 	 *  @param lvlSet out parameter, the result
 	 *  @since 0.8.8
 	 */
-	private void getAllLevels(SkipLevels l, Set<SkipLevels> lvlSet) {
+	private void getAllLevels(SkipLevels<K, V> l, Set<SkipLevels<K, V>> lvlSet) {
 		if (bf.log.shouldLog(Log.DEBUG))
 			bf.log.debug("GAL " + l.print());
 		// Do level 0 without recursion, on the assumption everything is findable
 		// from the root
-		SkipLevels cur = l;
+		SkipLevels<K, V> cur = l;
 		while (cur != null && lvlSet.add(cur)) {
 			if (bf.log.shouldLog(Log.DEBUG))
 				bf.log.debug("Adding " + cur.print());
@@ -301,7 +348,7 @@ public class BSkipLevels extends SkipLevels {
 		// If there were no nulls at level 0 in the middle,
 		// i.e. there are no problems, this won't find anything
 		for (int i = 1; i < l.levels.length; i++) {
-			SkipLevels lv = l.levels[i];
+			SkipLevels<K, V> lv = l.levels[i];
 			if (lv != null && !lvlSet.contains(lv))
 				getAllLevels(lv, lvlSet);
 		}
@@ -312,10 +359,10 @@ public class BSkipLevels extends SkipLevels {
          *  Sorts in REVERSE order.
 	 *  @since 0.8.8
 	 */
-	private static class LevelComparator implements Comparator<SkipLevels>, Serializable {
-		public int compare(SkipLevels l, SkipLevels r) {
-			Comparable lk = l.key();
-			Comparable rk = r.key();
+	private static class LevelComparator<K extends Comparable<? super K>, V> implements Comparator<SkipLevels<K, V>>, Serializable {
+		public int compare(SkipLevels<K, V> l, SkipLevels<K, V> r) {
+			K lk = l.key();
+			K rk = r.key();
 			if (lk == null && rk == null)
 				return 0;
 			if (lk == null)
@@ -332,13 +379,14 @@ public class BSkipLevels extends SkipLevels {
 	 *  This needs work.
 	 */
 	@Override
-	public boolean blvlck(boolean fix, int width, SkipLevels[] prevLevels) {
+	@SuppressWarnings("unchecked")
+	public boolean blvlck(boolean fix, int width, SkipLevels<K, V>[] prevLevels) {
 		bf.log.warn("    Skip level at width " + width);
 		bf.log.warn("        levels " + this.levels.length);
 		bf.log.warn("        first key " + this.key());
 		bf.log.warn("        spanPage " + this.spanPage);
 		bf.log.warn("        levelPage " + this.levelPage);
-		SkipLevels higher = null;
+		SkipLevels<K, V> higher = null;
 		for (int i = levels.length - 1; i >= 0; i--) {
 			if (levels[i] != null) {
 				bf.log.info("                level " + i + " -> " + levels[i].key() + " ");
@@ -372,7 +420,7 @@ public class BSkipLevels extends SkipLevels {
 				}
 			}
 		} else {
-			prevLevels = new SkipLevels[levels.length];
+			prevLevels = (SkipLevels<K, V>[]) new SkipLevels[levels.length];
 			System.arraycopy(levels, 0, prevLevels, 0, levels.length);
 		}
 		if (levels[0] != null)
@@ -382,7 +430,8 @@ public class BSkipLevels extends SkipLevels {
 
 	@Override
 	public String toString() {
-		String rv = "BSL height: " + levels.length + " page: " + levelPage + " span: " + bottom;
+		String rv = "BSLevel height: " + levels.length + " page: " + levelPage + " span: " + bottom +
+			    " in skiplist " + bsl;
 		if (isKilled)
 			rv += " KILLED";
 		return rv;

apps/addressbook/java/src/net/metanotion/io/block/index/BSkipList.java

@@ -28,6 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 package net.metanotion.io.block.index;
 
+import java.io.Closeable;
 import java.io.IOException;
 import java.util.HashMap;
 
@@ -50,7 +51,7 @@ import net.i2p.util.Log;
  *
  * Always fits on one page.
  */
-public class BSkipList extends SkipList {
+public class BSkipList<K extends Comparable<? super K>, V> extends SkipList<K, V> implements Closeable {
 	private static final long MAGIC = 0x536b69704c697374l;  // "SkipList"
 	public int firstSpanPage = 0;
 	public int firstLevelPage = 0;
@@ -58,16 +59,16 @@ public class BSkipList extends SkipList {
 	public final BlockFile bf;
 	private boolean isClosed;
 
-	final HashMap<Integer, BSkipSpan> spanHash = new HashMap<Integer, BSkipSpan>();
-	final HashMap<Integer, SkipLevels> levelHash = new HashMap<Integer, SkipLevels>();
+	final HashMap<Integer, BSkipSpan<K, V>> spanHash = new HashMap<Integer, BSkipSpan<K, V>>();
+	final HashMap<Integer, SkipLevels<K, V>> levelHash = new HashMap<Integer, SkipLevels<K, V>>();
 
 	private final boolean fileOnly;
 
-	public BSkipList(int spanSize, BlockFile bf, int skipPage, Serializer key, Serializer val) throws IOException {
+	public BSkipList(int spanSize, BlockFile bf, int skipPage, Serializer<K> key, Serializer<V> val) throws IOException {
 		this(spanSize, bf, skipPage, key, val, false);
 	}
 
-	public BSkipList(int spanSize, BlockFile bf, int skipPage, Serializer key, Serializer val, boolean fileOnly) throws IOException {
+	public BSkipList(int spanSize, BlockFile bf, int skipPage, Serializer<K> key, Serializer<V> val, boolean fileOnly) throws IOException {
 		if(spanSize < 1) { throw new RuntimeException("Span size too small"); }
 
 		this.skipPage = skipPage;
@@ -88,10 +89,12 @@ public class BSkipList extends SkipList {
 
 		this.fileOnly = fileOnly;
 		if (fileOnly)
-			first = new IBSkipSpan(bf, this, firstSpanPage, key, val);
+			first = new IBSkipSpan<K, V>(bf, this, firstSpanPage, key, val);
 		else
-			first = new BSkipSpan(bf, this, firstSpanPage, key, val);
-		stack = new BSkipLevels(bf, firstLevelPage, this);
+			first = new BSkipSpan<K, V>(bf, this, firstSpanPage, key, val);
+		BSkipLevels<K, V> bstack = new BSkipLevels<K, V>(bf, firstLevelPage, this);
+		bstack.initializeLevels();
+		stack = bstack;
 		int total = 0;
 		for (BSkipSpan ss : spanHash.values()) {
 			total += ss.nKeys;
@@ -101,7 +104,8 @@ public class BSkipList extends SkipList {
 		if (bf.file.canWrite() &&
 		    (levelCount != levelHash.size() || spans != spanHash.size() || size != total)) {
 			if (bf.log.shouldLog(Log.WARN))
-				bf.log.warn("On-disk counts were " + levelCount + " / " + spans + " / " +  size + ", correcting");
+				bf.log.warn("On-disk counts were " + levelCount + " levels / " + spans +
+				            " spans / " +  size + " entries, correcting to " + total + " entries");
 			size = total;
 			flush();
 		}
@@ -148,7 +152,6 @@ public class BSkipList extends SkipList {
 			curLevel.killInstance();
 			curLevel = nextLevel;
 		}
-		stack.killInstance();
 
 		SkipSpan curSpan = first;
 		while(curSpan != null) {
@@ -197,33 +200,36 @@ public class BSkipList extends SkipList {
 	}
 
 	@Override
-	public SkipIterator iterator() {
+	public SkipIterator<K, V> iterator() {
 		if (!this.fileOnly)
 			return super.iterator();
-		return new IBSkipIterator(first, 0);
+		return new IBSkipIterator<K, V>(first, 0);
 	}
 
-	@Override
-	public SkipIterator min() {
+/****
+	//@Override
+	public SkipIterator<K, V> min() {
 		return iterator();
 	}
 
-	@Override
-	public SkipIterator max() {
+	//@Override
+	public SkipIterator<K, V> max() {
 		if (!this.fileOnly)
 			return super.max();
-		SkipSpan ss = stack.getEnd();
-		return new IBSkipIterator(ss, ss.nKeys - 1);
+		SkipSpan<K, V> ss = stack.getEnd();
+		return new IBSkipIterator<K, V>(ss, ss.nKeys - 1);
 	}
+****/
 
+	/** find */
 	@Override
-	public SkipIterator find(Comparable key) {
+	public SkipIterator<K, V> find(K key) {
 		if (!this.fileOnly)
 			return super.find(key);
 		int[] search = new int[1];
-		SkipSpan ss = stack.getSpan(stack.levels.length - 1, key, search);
+		SkipSpan<K, V> ss = stack.getSpan(stack.levels.length - 1, key, search);
 		if(search[0] < 0) { search[0] = -1 * (search[0] + 1); }
-		return new IBSkipIterator(ss, search[0]);
+		return new IBSkipIterator<K, V>(ss, search[0]);
 	}
 
 	/**

apps/addressbook/java/src/net/metanotion/io/block/index/BSkipSpan.java

@@ -59,19 +59,19 @@ import net.i2p.util.Log;
  *     next overflow page (unsigned int)
  *</pre>
  */
-public class BSkipSpan extends SkipSpan {
+public class BSkipSpan<K extends Comparable<? super K>, V> extends SkipSpan<K, V> {
 	protected static final int MAGIC = 0x5370616e;  // "Span"
 	protected static final int HEADER_LEN = 20;
 	public static final int CONT_HEADER_LEN = 8;
 	protected final BlockFile bf;
-	private final BSkipList bsl;
+	private final BSkipList<K, V> bsl;
 	protected int page;
 	protected int overflowPage;
 
 	protected int prevPage;
-	protected int nextPage;
-	protected Serializer keySer;
-	protected Serializer valSer;
+	protected int nextPage = 0;
+	protected Serializer<K> keySer;
+	protected Serializer<V> valSer;
 
 	// I2P
 	protected int spanSize;
@@ -88,11 +88,11 @@ public class BSkipSpan extends SkipSpan {
 	}
 
 	@Override
-	public SkipSpan newInstance(SkipList sl) {
+	public SkipSpan<K, V> newInstance(SkipList<K, V> sl) {
 		try {
 			int newPage = bf.allocPage();
 			init(bf, newPage, bf.spanSize);
-			return new BSkipSpan(bf, (BSkipList) sl, newPage, keySer, valSer);
+			return new BSkipSpan<K, V>(bf, (BSkipList<K, V>) sl, newPage, keySer, valSer);
 		} catch (IOException ioe) { throw new RuntimeException("Error creating database page", ioe); }
 	}
 
@@ -237,7 +237,8 @@ public class BSkipSpan extends SkipSpan {
 		//bsl.flush();
 	}
 
-	private static void load(BSkipSpan bss, BlockFile bf, BSkipList bsl, int spanPage, Serializer key, Serializer val) throws IOException {
+	private static <X extends Comparable<? super X>, Y> void load(BSkipSpan<X, Y> bss, BlockFile bf, BSkipList<X, Y> bsl,
+	                                                   int spanPage, Serializer<X> key, Serializer<Y> val) throws IOException {
 		loadInit(bss, bf, bsl, spanPage, key, val);
 		bss.loadData();
 	}
@@ -246,7 +247,8 @@ public class BSkipSpan extends SkipSpan {
 	 * I2P - first half of load()
 	 * Only read the span headers
 	 */
-	protected static void loadInit(BSkipSpan bss, BlockFile bf, BSkipList bsl, int spanPage, Serializer key, Serializer val) throws IOException {
+	protected static <X extends Comparable<? super X>, Y> void loadInit(BSkipSpan<X, Y> bss, BlockFile bf, BSkipList<X, Y> bsl,
+	                                                         int spanPage, Serializer<X> key, Serializer<Y> val) throws IOException {
 		if (bss.isKilled)
 			throw new IOException("Already killed!! " + bss);
 		bss.page = spanPage;
@@ -285,11 +287,12 @@ public class BSkipSpan extends SkipSpan {
 	 * Load the whole span's keys and values into memory
 	 * @param flushOnError set to false if you are going to flush anyway
 	 */
+	@SuppressWarnings("unchecked")
 	protected void loadData(boolean flushOnError) throws IOException {
 		if (isKilled)
 			throw new IOException("Already killed!! " + this);
-		this.keys = new Comparable[this.spanSize];
-		this.vals = new Object[this.spanSize];
+		this.keys = (K[]) new Comparable[this.spanSize];
+		this.vals = (V[]) new Object[this.spanSize];
 
 		int ksz, vsz;
 		int curPage = this.page;
@@ -327,7 +330,7 @@ public class BSkipSpan extends SkipSpan {
 				break;
 			}
 //			System.out.println("i=" + i + ", Page " + curPage + ", offset " + pageCounter[0] + " ksz " + ksz + " vsz " + vsz);
-			this.keys[i] = (Comparable) this.keySer.construct(k);
+			this.keys[i] = this.keySer.construct(k);
 			this.vals[i] = this.valSer.construct(v);
 			// Drop bad entry without throwing exception
 			if (this.keys[i] == null || this.vals[i] == null) {
@@ -377,31 +380,31 @@ public class BSkipSpan extends SkipSpan {
 		}
 	}
 
-	protected BSkipSpan(BlockFile bf, BSkipList bsl) {
+	protected BSkipSpan(BlockFile bf, BSkipList<K, V> bsl) {
 		this.bf = bf;
 		this.bsl = bsl;
 	}
 
-	public BSkipSpan(BlockFile bf, BSkipList bsl, int spanPage, Serializer key, Serializer val) throws IOException {
+	public BSkipSpan(BlockFile bf, BSkipList<K, V> bsl, int spanPage, Serializer<K> key, Serializer<V> val) throws IOException {
 		this.bf = bf;
 		this.bsl = bsl;
 		BSkipSpan.load(this, bf, bsl, spanPage, key, val);
 		this.next = null;
 		this.prev = null;
 
-		BSkipSpan bss = this;
+		BSkipSpan<K, V> bss = this;
 		// findbugs ok (set in load() above)
 		int np = nextPage;
 		while(np != 0) {
-			BSkipSpan temp = bsl.spanHash.get(Integer.valueOf(np));
+			BSkipSpan<K, V> temp = bsl.spanHash.get(Integer.valueOf(np));
 			if(temp != null) {
 				bss.next = temp;
 				break;
 			}
-			bss.next = new BSkipSpan(bf, bsl);
+			bss.next = new BSkipSpan<K, V>(bf, bsl);
 			bss.next.next = null;
 			bss.next.prev = bss;
-			bss = (BSkipSpan) bss.next;
+			bss = (BSkipSpan<K, V>) bss.next;
 			
 			BSkipSpan.load(bss, bf, bsl, np, key, val);
 			np = bss.nextPage;
@@ -411,15 +414,15 @@ public class BSkipSpan extends SkipSpan {
 		bss = this;
 		np = prevPage;
 		while(np != 0) {
-			BSkipSpan temp = bsl.spanHash.get(Integer.valueOf(np));
+			BSkipSpan<K, V> temp = bsl.spanHash.get(Integer.valueOf(np));
 			if(temp != null) {
 				bss.prev = temp;
 				break;
 			}
-			bss.prev = new BSkipSpan(bf, bsl);
+			bss.prev = new BSkipSpan<K, V>(bf, bsl);
 			bss.prev.next = bss;
 			bss.prev.prev = null;
-			bss = (BSkipSpan) bss.prev;
+			bss = (BSkipSpan<K, V>) bss.prev;
 			
 			BSkipSpan.load(bss, bf, bsl, np, key, val);
 			np = bss.prevPage;

apps/addressbook/java/src/net/metanotion/io/block/index/IBSkipIterator.java

@@ -41,9 +41,9 @@ import net.metanotion.util.skiplist.SkipSpan;
 	If the caller does not iterate all the way through, the last span
 	will remain in memory.
 */
-public class IBSkipIterator extends SkipIterator {
+public class IBSkipIterator<K extends Comparable<? super K>, V> extends SkipIterator<K, V> {
 
-	public IBSkipIterator(SkipSpan ss, int index) {
+	public IBSkipIterator(SkipSpan<K, V> ss, int index) {
 		super(ss, index);
 	}
 
@@ -53,8 +53,8 @@ public class IBSkipIterator extends SkipIterator {
 	 * @throws RuntimeException on IOE
 	 */
 	@Override
-	public Object next() {
-		Object o;
+	public V next() {
+		V o;
 		if(index < ss.nKeys) {
 			if (ss.vals == null) {
 				try {
@@ -90,7 +90,7 @@ public class IBSkipIterator extends SkipIterator {
 	 * @throws RuntimeException on IOE
 	 */
 	@Override
-	public Comparable nextKey() {
+	public K nextKey() {
 		if(index < ss.nKeys) {
 			if (ss.keys == null) {
 				try {
@@ -110,7 +110,7 @@ public class IBSkipIterator extends SkipIterator {
 	 * @throws RuntimeException on IOE
 	 */
 	@Override
-	public Object previous() {
+	public V previous() {
 		if(index > 0) {
 			index--;
 		} else if(ss.prev != null) {

apps/addressbook/java/src/net/metanotion/io/block/index/IBSkipSpan.java

@@ -54,21 +54,22 @@ import net.i2p.util.Log;
  *
  * @author zzz
  */
-public class IBSkipSpan extends BSkipSpan {
+public class IBSkipSpan<K extends Comparable<? super K>, V> extends BSkipSpan<K, V> {
 
-	private Comparable firstKey;
+	private K firstKey;
 
 	@Override
-	public SkipSpan newInstance(SkipList sl) {
+	@SuppressWarnings("unchecked")
+	public SkipSpan<K, V> newInstance(SkipList<K, V> sl) {
 		if (bf.log.shouldLog(Log.DEBUG))
 			bf.log.debug("Splitting page " + this.page + " containing " + this.nKeys + '/' + this.spanSize);
 		try {
 			int newPage = bf.allocPage();
 			init(bf, newPage, bf.spanSize);
-			SkipSpan rv = new IBSkipSpan(bf, (BSkipList) sl, newPage, keySer, valSer);
+			SkipSpan<K, V> rv = new IBSkipSpan<K, V>(bf, (BSkipList<K, V>) sl, newPage, keySer, valSer);
 			// this is called after a split, so we need the data arrays initialized
-			rv.keys = new Comparable[bf.spanSize];
-			rv.vals = new Object[bf.spanSize];
+			rv.keys = (K[]) new Comparable[bf.spanSize];
+			rv.vals = (V[]) new Object[bf.spanSize];
 			return rv;
 		} catch (IOException ioe) { throw new RuntimeException("Error creating database page", ioe); }
 	}
@@ -125,7 +126,7 @@ public class IBSkipSpan extends BSkipSpan {
 		pageCounter[0] +=4;
 		byte[] k = new byte[ksz];
 		curPage = this.bf.readMultiPageData(k, curPage, pageCounter, curNextPage);
-		this.firstKey = (Comparable) this.keySer.construct(k);
+		this.firstKey = this.keySer.construct(k);
 		if (this.firstKey == null) {
 			bf.log.error("Null deserialized first key in page " + curPage);
 			repair(1);
@@ -160,7 +161,7 @@ public class IBSkipSpan extends BSkipSpan {
 	/**
 	 * Linear search through the span in the file for the value.
 	 */
-	private Object getData(Comparable key) throws IOException {
+	private V getData(K key) throws IOException {
 		seekData();
 		int curPage = this.page;
 		int[] curNextPage = new int[1];
@@ -194,7 +195,7 @@ public class IBSkipSpan extends BSkipSpan {
 				break;
 			}
 			//System.out.println("i=" + i + ", Page " + curPage + ", offset " + pageCounter[0] + " ksz " + ksz + " vsz " + vsz);
-			Comparable ckey = (Comparable) this.keySer.construct(k);
+			K ckey = this.keySer.construct(k);
 			if (ckey == null) {
 				// skip the value and keep going
 				curPage = this.bf.skipMultiPageBytes(vsz, curPage, pageCounter, curNextPage);
@@ -213,7 +214,7 @@ public class IBSkipSpan extends BSkipSpan {
 					lostEntries(i, curPage);
 					break;
 				}
-				Object rv = this.valSer.construct(v);
+				V rv = this.valSer.construct(v);
 				if (rv == null) {
 					bf.log.error("Null deserialized value in entry " + i + " page " + curPage +
 					                    " key=" + ckey);
@@ -252,11 +253,11 @@ public class IBSkipSpan extends BSkipSpan {
 	*****/
 	}
 
-	private IBSkipSpan(BlockFile bf, BSkipList bsl) {
+	private IBSkipSpan(BlockFile bf, BSkipList<K, V> bsl) {
 		super(bf, bsl);
 	}
 
-	public IBSkipSpan(BlockFile bf, BSkipList bsl, int spanPage, Serializer key, Serializer val) throws IOException {
+	public IBSkipSpan(BlockFile bf, BSkipList<K, V> bsl, int spanPage, Serializer<K> key, Serializer<V> val) throws IOException {
 		super(bf, bsl);
 		if (bf.log.shouldLog(Log.DEBUG))
 			bf.log.debug("New ibss page " + spanPage);
@@ -265,24 +266,24 @@ public class IBSkipSpan extends BSkipSpan {
 		this.next = null;
 		this.prev = null;
 
-		IBSkipSpan bss = this;
-		IBSkipSpan temp;
+		IBSkipSpan<K, V> bss = this;
+		IBSkipSpan<K, V> temp;
 		int np = nextPage;
 		while(np != 0) {
-			temp = (IBSkipSpan) bsl.spanHash.get(Integer.valueOf(np));
+			temp = (IBSkipSpan<K, V>) bsl.spanHash.get(Integer.valueOf(np));
 			if(temp != null) {
 				bss.next = temp;
 				break;
 			}
-			bss.next = new IBSkipSpan(bf, bsl);
+			bss.next = new IBSkipSpan<K, V>(bf, bsl);
 			bss.next.next = null;
 			bss.next.prev = bss;
-			Comparable previousFirstKey = bss.firstKey;
-			bss = (IBSkipSpan) bss.next;
+			K previousFirstKey = bss.firstKey;
+			bss = (IBSkipSpan<K, V>) bss.next;
 			
 			BSkipSpan.loadInit(bss, bf, bsl, np, key, val);
 			bss.loadFirstKey();
-			Comparable nextFirstKey = bss.firstKey;
+			K nextFirstKey = bss.firstKey;
 			if (previousFirstKey == null || nextFirstKey == null ||
 			    previousFirstKey.compareTo(nextFirstKey) >= 0) {
 				// TODO remove, but if we are at the bottom of a level
@@ -299,20 +300,20 @@ public class IBSkipSpan extends BSkipSpan {
 		bss = this;
 		np = prevPage;
 		while(np != 0) {
-			temp = (IBSkipSpan) bsl.spanHash.get(Integer.valueOf(np));
+			temp = (IBSkipSpan<K, V>) bsl.spanHash.get(Integer.valueOf(np));
 			if(temp != null) {
 				bss.prev = temp;
 				break;
 			}
-			bss.prev = new IBSkipSpan(bf, bsl);
+			bss.prev = new IBSkipSpan<K, V>(bf, bsl);
 			bss.prev.next = bss;
 			bss.prev.prev = null;
-			Comparable nextFirstKey = bss.firstKey;
-			bss = (IBSkipSpan) bss.prev;
+			K nextFirstKey = bss.firstKey;
+			bss = (IBSkipSpan<K, V>) bss.prev;
 			
 			BSkipSpan.loadInit(bss, bf, bsl, np, key, val);
 			bss.loadFirstKey();
-			Comparable previousFirstKey = bss.firstKey;
+			K previousFirstKey = bss.firstKey;
 			if (previousFirstKey == null || nextFirstKey == null ||
 			    previousFirstKey.compareTo(nextFirstKey) >= 0) {
 				// TODO remove, but if we are at the bottom of a level
@@ -330,7 +331,7 @@ public class IBSkipSpan extends BSkipSpan {
          * Does not call super, we always store first key here
 	 */
 	@Override
-	public Comparable firstKey() {
+	public K firstKey() {
 		return this.firstKey;
 	}
 
@@ -339,13 +340,13 @@ public class IBSkipSpan extends BSkipSpan {
 	 * This is called only via SkipList.find()
 	 */
 	@Override
-	public SkipSpan getSpan(Comparable key, int[] search) {
+	public SkipSpan<K, V> getSpan(K key, int[] search) {
 		try {
 			seekAndLoadData();
 		} catch (IOException ioe) {
 			throw new RuntimeException("Error reading database", ioe);
 		}
-		SkipSpan rv = super.getSpan(key, search);
+		SkipSpan<K, V> rv = super.getSpan(key, search);
 		this.keys = null;
 		this.vals = null;
 		return rv;
@@ -355,7 +356,7 @@ public class IBSkipSpan extends BSkipSpan {
 	 * Linear search if in file, Binary search if in memory
 	 */
 	@Override
-	public Object get(Comparable key) {
+	public V get(K key) {
 		try {
 			if (nKeys == 0) { return null; }
 			if (this.next != null && this.next.firstKey().compareTo(key) <= 0)
@@ -370,13 +371,13 @@ public class IBSkipSpan extends BSkipSpan {
 	 * Load whole span from file, do the operation, flush out, then null out in-memory data again.
 	 */
 	@Override
-	public SkipSpan put(Comparable key, Object val, SkipList sl)	{
+	public SkipSpan<K, V> put(K key, V val, SkipList<K, V> sl)	{
 		try {
 			seekAndLoadData();
 		} catch (IOException ioe) {
 			throw new RuntimeException("Error reading database", ioe);
 		}
-		SkipSpan rv = super.put(key, val, sl);
+		SkipSpan<K, V> rv = super.put(key, val, sl);
 		// flush() nulls out the data
 		return rv;
 	}
@@ -385,7 +386,7 @@ public class IBSkipSpan extends BSkipSpan {
 	 * Load whole span from file, do the operation, flush out, then null out in-memory data again.
 	 */
 	@Override
-	public Object[] remove(Comparable key, SkipList sl) {
+	public Object[] remove(K key, SkipList<K, V> sl) {
 		if (bf.log.shouldLog(Log.DEBUG))
 			bf.log.debug("Remove " + key + " in " + this);
 		if (nKeys <= 0)

apps/addressbook/java/src/net/metanotion/io/data/IdentityBytes.java

@@ -35,11 +35,11 @@ import net.metanotion.io.Serializer;
  * Will never return null.
  * Added by I2P.
  */
-public class IdentityBytes implements Serializer {
+public class IdentityBytes implements Serializer<byte[]> {
 
 	/** @return byte[] */
-	public byte[] getBytes(Object o) { return (byte[])o; }
+	public byte[] getBytes(byte[] o) { return o; }
 
 	/** @return b */
-	public Object construct(byte[] b) { return b; }
+	public byte[] construct(byte[] b) { return b; }
 }

apps/addressbook/java/src/net/metanotion/io/data/IntBytes.java

@@ -30,10 +30,10 @@ package net.metanotion.io.data;
 
 import net.metanotion.io.Serializer;
 
-public class IntBytes implements Serializer {
-	public byte[] getBytes(Object o) {
+public class IntBytes implements Serializer<Integer> {
+	public byte[] getBytes(Integer o) {
 		byte[] b = new byte[4];
-		int v = ((Integer) o).intValue();
+		int v = o.intValue();
  		b[0] = (byte)(0xff & (v >> 24));
  		b[1] = (byte)(0xff & (v >> 16));
 		b[2] = (byte)(0xff & (v >>  8));
@@ -41,7 +41,7 @@ public class IntBytes implements Serializer {
  		return b;
 	}
 
-	public Object construct(byte[] b) {
+	public Integer construct(byte[] b) {
 		int v = (((b[0] & 0xff) << 24) |
 				 ((b[1] & 0xff) << 16) |
 				 ((b[2] & 0xff) <<  8) |

apps/addressbook/java/src/net/metanotion/io/data/StringBytes.java

@@ -32,14 +32,14 @@ import java.io.UnsupportedEncodingException;
 
 import net.metanotion.io.Serializer;
 
-public class StringBytes implements Serializer {
-	public byte[] getBytes(Object o) {
+public class StringBytes implements Serializer<String> {
+	public byte[] getBytes(String o) {
 		try {
-			return ((String) o).getBytes("US-ASCII");
+			return o.getBytes("US-ASCII");
 		} catch (UnsupportedEncodingException uee) { throw new Error("Unsupported Encoding"); }
 	}
 
-	public Object construct(byte[] b) {
+	public String construct(byte[] b) {
 		try {
 			return new String(b, "US-ASCII");
 		} catch (UnsupportedEncodingException uee) { throw new Error("Unsupported Encoding"); }

apps/addressbook/java/src/net/metanotion/io/data/UTF8StringBytes.java

@@ -35,14 +35,14 @@ import net.metanotion.io.Serializer;
 /**
  * Added by I2P
  */
-public class UTF8StringBytes implements Serializer {
-	public byte[] getBytes(Object o) {
+public class UTF8StringBytes implements Serializer<String> {
+	public byte[] getBytes(String o) {
 		try {
-			return ((String) o).getBytes("UTF-8");
+			return o.getBytes("UTF-8");
 		} catch (UnsupportedEncodingException uee) { throw new Error("Unsupported Encoding"); }
 	}
 
-	public Object construct(byte[] b) {
+	public String construct(byte[] b) {
 		try {
 			return new String(b, "UTF-8");
 		} catch (UnsupportedEncodingException uee) { throw new Error("Unsupported Encoding"); }

apps/addressbook/java/src/net/metanotion/util/skiplist/SkipIterator.java

@@ -39,12 +39,13 @@ import java.util.NoSuchElementException;
 	To be clear, this is an iterator through the values.
 	To get the key, call nextKey() BEFORE calling next().
 */
-public class SkipIterator implements ListIterator {
-	protected SkipSpan ss;
+public class SkipIterator<K extends Comparable<? super K>, V> implements ListIterator<V> {
+	protected SkipSpan<K, V> ss;
 	protected int index;
 
 	protected SkipIterator() { }
-	public SkipIterator(SkipSpan ss, int index) {
+
+	public SkipIterator(SkipSpan<K, V> ss, int index) {
 		if(ss==null) { throw new NullPointerException(); }
 		this.ss = ss;
 		this.index = index;
@@ -59,8 +60,8 @@ public class SkipIterator implements ListIterator {
 	 * @return the next value, and advances the index
 	 * @throws NoSuchElementException
 	 */
-	public Object next() {
-		Object o;
+	public V next() {
+		V o;
 		if(index < ss.nKeys) {
 			o = ss.vals[index];
 		} else {
@@ -83,7 +84,7 @@ public class SkipIterator implements ListIterator {
 	 * @return the key for which the value will be returned in the subsequent call to next()
 	 * @throws NoSuchElementException
 	 */
-	public Comparable nextKey() {
+	public K nextKey() {
 		if(index < ss.nKeys) { return ss.keys[index]; }
 		throw new NoSuchElementException();
 	}
@@ -98,7 +99,7 @@ public class SkipIterator implements ListIterator {
 	 * @return the previous value, and decrements the index
 	 * @throws NoSuchElementException
 	 */
-	public Object previous() {
+	public V previous() {
 		if(index > 0) {
 			index--;
 		} else if(ss.prev != null) {
@@ -111,9 +112,9 @@ public class SkipIterator implements ListIterator {
 
 
 	// Optional methods
-	public void add(Object o)	{ throw new UnsupportedOperationException(); }
+	public void add(V o)	{ throw new UnsupportedOperationException(); }
 	public void remove()		{ throw new UnsupportedOperationException(); }
-	public void set(Object o)	{ throw new UnsupportedOperationException(); }
+	public void set(V o)	{ throw new UnsupportedOperationException(); }
 	public int nextIndex()		{ throw new UnsupportedOperationException(); }
 	public int previousIndex()	{ throw new UnsupportedOperationException(); }
 

apps/addressbook/java/src/net/metanotion/util/skiplist/SkipLevels.java

@@ -28,12 +28,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 package net.metanotion.util.skiplist;
 
+import java.io.Flushable;
+
 import net.metanotion.io.block.BlockFile;
 
 import net.i2p.I2PAppContext;
 import net.i2p.util.Log;
 
-public class SkipLevels {
+public class SkipLevels<K extends Comparable<? super K>, V> implements Flushable {
 	/** We can't have more than 2**32 pages */
 	public static final int MAX_SIZE = 32;
 
@@ -43,12 +45,15 @@ public class SkipLevels {
 	 *	The "bottom" level is the direct pointer to a SkipSpan.
 	 */
 	// levels is almost final
-	public SkipLevels[] levels;
+	public SkipLevels<K, V>[] levels;
 	// bottom is final
-	public SkipSpan bottom;
+	public SkipSpan<K, V> bottom;
 	private final Log _log = I2PAppContext.getGlobalContext().logManager().getLog(BlockFile.class);
 
-	public SkipLevels newInstance(int levels, SkipSpan ss, SkipList sl) { return new SkipLevels(levels, ss); }
+	public SkipLevels<K, V> newInstance(int levels, SkipSpan<K, V> ss, SkipList<K, V> sl) {
+		return new SkipLevels<K, V>(levels, ss);
+	}
+
 	public void killInstance() { }
 	public void flush() { }
 
@@ -57,10 +62,11 @@ public class SkipLevels {
 	/*
 	 *  @throws IllegalArgumentException if size too big or too small
 	 */
-	public SkipLevels(int size, SkipSpan span) {
+	@SuppressWarnings("unchecked")
+	public SkipLevels(int size, SkipSpan<K, V> span) {
 		if(size < 1 || size > MAX_SIZE)
 			throw new IllegalArgumentException("Invalid Level Skip size");
-		levels = new SkipLevels[size];
+		levels = (SkipLevels<K, V>[]) new SkipLevels[size];
 		bottom = span;
 	}
 
@@ -90,14 +96,14 @@ public class SkipLevels {
 		return buf.toString();
 	}
 
-	public SkipSpan getEnd() {
+	public SkipSpan<K, V> getEnd() {
 		for(int i=(levels.length - 1);i>=0;i--) {
 			if(levels[i] != null) { return levels[i].getEnd(); }
 		}
 		return bottom.getEnd();
 	}
 
-	public SkipSpan getSpan(int start, Comparable key, int[] search) {
+	public SkipSpan<K, V> getSpan(int start, K key, int[] search) {
 		for(int i=Math.min(start, levels.length - 1);i>=0;i--) {
 			if((levels[i] != null) && (levels[i].key().compareTo(key) <= 0)) {
 				return levels[i].getSpan(i,key,search);
@@ -106,9 +112,9 @@ public class SkipLevels {
 		return bottom.getSpan(key, search);
 	}
 
-	public Comparable key() { return bottom.firstKey(); }
+	public K key() { return bottom.firstKey(); }
 
-	public Object get(int start, Comparable key) {
+	public V get(int start, K key) {
 		for(int i=Math.min(start, levels.length - 1);i>=0;i--) {
 			if((levels[i] != null) && (levels[i].key().compareTo(key) <= 0)) {
 				return levels[i].get(i,key);
@@ -124,16 +130,17 @@ public class SkipLevels {
 	 *                and the deleted SkipLevels is taller than this SkipLevels.
 	 *          rv is null if no object was removed.
 	 */
-	public Object[] remove(int start, Comparable key, SkipList sl) {
+	@SuppressWarnings("unchecked")
+	public Object[] remove(int start, K key, SkipList<K, V> sl) {
 		Object[] res = null;
-		SkipLevels slvls = null;
+		SkipLevels<K, V> slvls = null;
 		for(int i = Math.min(start, levels.length - 1); i >= 0; i--) {
 			if(levels[i] != null) {
 				int cmp = levels[i].key().compareTo(key);
 				if((cmp < 0) || ((i==0) && (cmp <= 0)))  {
 					res = levels[i].remove(i, key, sl);
 					if((res != null) && (res[1] != null)) {
-						slvls = (SkipLevels) res[1];
+						slvls = (SkipLevels<K, V>) res[1];
 						if(levels.length >= slvls.levels.length) {
 							res[1] = null;
 						}
@@ -157,7 +164,7 @@ public class SkipLevels {
 				// if the returned SkipSpan was already copied to us
 				boolean isFirst = sl.first == bottom;
 				if (isFirst && levels[0] != null) {
-					SkipSpan ssres = (SkipSpan)res[1];
+					SkipSpan<K, V> ssres = (SkipSpan<K, V>)res[1];
 					if (bottom.firstKey().equals(ssres.firstKey())) {
 						// bottom copied the next span to itself
 						if (_log.shouldLog(Log.INFO)) {
@@ -169,7 +176,7 @@ public class SkipLevels {
 							_log.info("FIXUP TIME");
 						}
 						
-						SkipLevels replace = levels[0];
+						SkipLevels<K, V> replace = levels[0];
 						for (int i = 0; i < levels.length; i++) {
 							if (levels[i] == null)
 								break;
@@ -195,11 +202,11 @@ public class SkipLevels {
 		if((bottom.nKeys == 0) && (sl.first != bottom)) {
 			// from debugging other problems
 			if (res == null) {
-				_log.warn("WTF killing with no return value " + print());
+				_log.warn("killing with no return value " + print());
 			} else if (res[1] == null) {
-				_log.warn("WTF killing with no return value 1 " + print());
+				_log.warn("killing with no return value 1 " + print());
 			} else if (res[1] != this) {
-				_log.warn("WTF killing with return value not us " + res[1] + ' ' + print());
+				_log.warn("killing with return value not us " + res[1] + ' ' + print());
 			}
 			this.killInstance();
 		}
@@ -211,12 +218,12 @@ public class SkipLevels {
 	 *          and the new level is taller than our level;
 	 *          else null if it went in an existing level or the new level is our height or less.
 	 */
-	public SkipLevels put(int start, Comparable key, Object val, SkipList sl) {
+	public SkipLevels<K, V> put(int start, K key, V val, SkipList<K, V> sl) {
 		boolean modified = false;
 		for(int i = Math.min(start, levels.length - 1); i >= 0; i--) {
 			// is key equal to or after the start of the level?
 			if((levels[i] != null) && (levels[i].key().compareTo(key) <= 0)) {
-				SkipLevels slvls = levels[i].put(i, key, val, sl);
+				SkipLevels<K, V> slvls = levels[i].put(i, key, val, sl);
 				if(slvls != null) {
 					for (int j = i + 1; j < Math.min(slvls.levels.length, levels.length); j++) {
 						// he points to where we used to point
@@ -241,11 +248,11 @@ public class SkipLevels {
 				return null;
 			}
 		}
-		SkipSpan ss = bottom.put(key,val,sl);
+		SkipSpan<K, V> ss = bottom.put(key,val,sl);
 		if(ss!=null) {
 			int height = sl.generateColHeight();
 			if(height != 0) {
-				SkipLevels slvls = this.newInstance(height, ss, sl);
+				SkipLevels<K, V> slvls = this.newInstance(height, ss, sl);
 				for(int i=0;i<(Math.min(height,levels.length));i++) {
 					// he points to where we used to point
 					// and we now point to him
@@ -265,6 +272,6 @@ public class SkipLevels {
 	}
 
 	public boolean blvlck(boolean fix) { return false; }
-	public boolean blvlck(boolean fix, int width, SkipLevels[] prevLevels) { return false; }
+	public boolean blvlck(boolean fix, int width, SkipLevels<K, V>[] prevLevels) { return false; }
 }
 

apps/addressbook/java/src/net/metanotion/util/skiplist/SkipList.java

@@ -28,19 +28,20 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 package net.metanotion.util.skiplist;
 
+import java.io.Flushable;
 import java.util.Random;
 
 import net.i2p.util.RandomSource;
 
 //import net.metanotion.io.block.BlockFile;
 
-public class SkipList {
+public class SkipList<K extends Comparable<? super K>, V> implements Flushable, Iterable<V> {
 	/** the probability of each next higher level */
 	protected static final int P = 2;
 	private static final int MIN_SLOTS = 4;
 	// these two are really final
-	protected SkipSpan first;
-	protected SkipLevels stack;
+	protected SkipSpan<K, V> first;
+	protected SkipLevels<K, V> stack;
 	// I2P mod
 	public static final Random rng = RandomSource.getInstance();
 
@@ -56,8 +57,8 @@ public class SkipList {
 	public SkipList(int span) {
 		if(span < 1 || span > SkipSpan.MAX_SIZE)
 			throw new IllegalArgumentException("Invalid span size");
-		first = new SkipSpan(span);
-		stack = new SkipLevels(1, first);
+		first = new SkipSpan<K, V>(span);
+		stack = new SkipLevels<K, V>(1, first);
 		//rng = new Random(System.currentTimeMillis());
 	}
 
@@ -94,14 +95,15 @@ public class SkipList {
 		return max;
 	}
 
-	public void put(Comparable key, Object val)	{
+	@SuppressWarnings("unchecked")
+	public void put(K key, V val)	{
 		if(key == null) { throw new NullPointerException(); }
 		if(val == null) { throw new NullPointerException(); }
-		SkipLevels slvls = stack.put(stack.levels.length - 1, key, val, this);
+		SkipLevels<K, V> slvls = stack.put(stack.levels.length - 1, key, val, this);
 		if(slvls != null) {
 			// grow our stack
 			//BlockFile.log.info("Top level old hgt " + stack.levels.length +  " new hgt " + slvls.levels.length);
-			SkipLevels[] levels = new SkipLevels[slvls.levels.length];
+			SkipLevels<K, V>[] levels = (SkipLevels<K, V>[]) new SkipLevels[slvls.levels.length];
 			for(int i=0;i < slvls.levels.length; i++) {
 				if(i < stack.levels.length) {
 					levels[i] = stack.levels[i];
@@ -115,12 +117,13 @@ public class SkipList {
 		}
 	}
 
-	public Object remove(Comparable key) {
+	@SuppressWarnings("unchecked")
+	public V remove(K key) {
 		if(key == null) { throw new NullPointerException(); }
 		Object[] res = stack.remove(stack.levels.length - 1, key, this);
 		if(res != null) {
 			if(res[1] != null) {
-				SkipLevels slvls = (SkipLevels) res[1];
+				SkipLevels<K, V> slvls = (SkipLevels<K, V>) res[1];
 				for(int i=0;i < slvls.levels.length; i++) {
 					if(stack.levels[i] == slvls) {
 						stack.levels[i] = slvls.levels[i];
@@ -129,7 +132,7 @@ public class SkipList {
 				stack.flush();
 			}
 			flush();
-			return res[0];
+			return (V) res[0];
 		}
 		return null;
 	}
@@ -138,6 +141,7 @@ public class SkipList {
 	 * dumps all the skip levels
 	 * @deprecated goes to System.out
 	 */
+	@Deprecated
 	public void printSL() {
 		System.out.println("List size " + size);
 		System.out.println(stack.printAll());
@@ -147,34 +151,36 @@ public class SkipList {
 	 * dumps all the data
 	 * @deprecated goes to System.out
 	 */
+	@Deprecated
 	public void print() {
 		System.out.println("List size " + size);
 		System.out.println(first.print());
 	}
 
-	public Object get(Comparable key) {
+	public V get(K key) {
 		if(key == null) { throw new NullPointerException(); }
 		return stack.get(stack.levels.length - 1, key);
 	}
 
-	public SkipIterator iterator() { return new SkipIterator(first, 0); }
+	public SkipIterator<K, V> iterator() { return new SkipIterator<K, V>(first, 0); }
 
-	public SkipIterator min() { return new SkipIterator(first, 0); }
+/****
+	public SkipIterator<K, V> min() { return new SkipIterator<K, V>(first, 0); }
 
-	public SkipIterator max() {
-		SkipSpan ss = stack.getEnd();
-		return new SkipIterator(ss, ss.nKeys - 1);
+	public SkipIterator<K, V> max() {
+		SkipSpan<K, V> ss = stack.getEnd();
+		return new SkipIterator<K, V>(ss, ss.nKeys - 1);
 	}
+****/
 
 	/** @return an iterator where nextKey() is the first one greater than or equal to 'key' */
-	public SkipIterator find(Comparable key) {
+	public SkipIterator<K, V> find(K key) {
 		int[] search = new int[1];
-		SkipSpan ss = stack.getSpan(stack.levels.length - 1, key, search);
+		SkipSpan<K, V> ss = stack.getSpan(stack.levels.length - 1, key, search);
 		if(search[0] < 0) { search[0] = -1 * (search[0] + 1); }
-		return new SkipIterator(ss, search[0]);
+		return new SkipIterator<K, V>(ss, search[0]);
 	}
 
-
 	// Levels adjusted to guarantee O(log n) search
 	// This is expensive proportional to the number of spans.
 	public void balance() {

apps/addressbook/java/src/net/metanotion/util/skiplist/SkipSpan.java

@@ -28,18 +28,20 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 package net.metanotion.util.skiplist;
 
+import java.io.Flushable;
+
 //import net.metanotion.io.block.BlockFile;
 
-public class SkipSpan {
+public class SkipSpan<K extends Comparable<? super K>, V> implements Flushable {
 	/** This is actually limited by BlockFile.spanSize which is much smaller */
 	public static final int MAX_SIZE = 256;
 
 	public int nKeys = 0;
-	public Comparable[] keys;
-	public Object[] vals;
-	public SkipSpan next, prev;
+	public K[] keys;
+	public V[] vals;
+	public SkipSpan<K, V> next, prev;
 
-	public SkipSpan newInstance(SkipList sl) { return new SkipSpan(keys.length); }
+	public SkipSpan<K, V> newInstance(SkipList<K, V> sl) { return new SkipSpan<K, V>(keys.length); }
 	public void killInstance() { }
 	public void flush() { }
 
@@ -48,11 +50,12 @@ public class SkipSpan {
 	/*
 	 *  @throws IllegalArgumentException if size too big or too small
 	 */
+	@SuppressWarnings("unchecked")
 	public SkipSpan(int size) {
 		if(size < 1 || size > MAX_SIZE)
 			throw new IllegalArgumentException("Invalid span size " + size);
-		keys = new Comparable[size];
-		vals = new Object[size];
+		keys = (K[]) new Comparable[size];
+		vals = (V[]) new Object[size];
 	}
 
 	/** dumps all the data from here to the end */
@@ -68,7 +71,7 @@ public class SkipSpan {
 		return buf.toString();
 	}
 
-	private int binarySearch(Comparable key) {
+	private int binarySearch(K key) {
  		int high = nKeys - 1;
  		int low = 0;
  		int cur;
@@ -87,12 +90,12 @@ public class SkipSpan {
  		return (-1 * (low + 1));
 	}
 
-	public SkipSpan getEnd() {
+	public SkipSpan<K, V> getEnd() {
 		if(next == null) { return this; }
 		return next.getEnd();
 	}
 
-	public SkipSpan getSpan(Comparable key, int[] search) {
+	public SkipSpan<K, V> getSpan(K key, int[] search) {
 		if(nKeys == 0) {
 			search[0] = -1;
 			return this;
@@ -109,7 +112,7 @@ public class SkipSpan {
 		return this;
 	}
 
-	public Object get(Comparable key) {
+	public V get(K key) {
 		if(nKeys == 0) { return null; }
 		if(keys[nKeys - 1].compareTo(key) < 0) {
 			if(next == null) { return null; }
@@ -136,8 +139,8 @@ public class SkipSpan {
 		nKeys++;
 	}
 
-	private void split(int loc, Comparable key, Object val, SkipList sl) {
-		SkipSpan right = newInstance(sl);
+	private void split(int loc, K key, V val, SkipList<K, V> sl) {
+		SkipSpan<K, V> right = newInstance(sl);
 
 		if(this.next != null) { this.next.prev = right; }
 		right.next = this.next;
@@ -173,7 +176,7 @@ public class SkipSpan {
 	/**
 	 *  @return the new span if it caused a split, else null if it went in this span
 	 */
-	private SkipSpan insert(int loc, Comparable key, Object val, SkipList sl) {
+	private SkipSpan<K, V> insert(int loc, K key, V val, SkipList<K, V> sl) {
 		sl.addItem();
 		if(nKeys == keys.length) {
 			// split.
@@ -191,7 +194,7 @@ public class SkipSpan {
 	/**
 	 *  @return the new span if it caused a split, else null if it went in an existing span
 	 */
-	public SkipSpan put(Comparable key, Object val, SkipList sl)	{
+	public SkipSpan<K, V> put(K key, V val, SkipList<K, V> sl)	{
 		if(nKeys == 0) {
 			sl.addItem();
 			keys[0] = key;
@@ -244,7 +247,7 @@ public class SkipSpan {
 	 *          rv[1] is the deleted SkipSpan if the removed object was the last in the SkipSpan.
 	 *          rv is null if no object was removed.
 	 */
-	public Object[] remove(Comparable key, SkipList sl) {
+	public Object[] remove(K key, SkipList<K, V> sl) {
 		if(nKeys == 0) { return null; }
 		if(keys[nKeys - 1].compareTo(key) < 0) {
 			if(next == null) { return null; }
@@ -268,7 +271,7 @@ public class SkipSpan {
 				nKeys = next.nKeys;
 				//BlockFile.log.error("Killing next span " + next + ") and copying to this span " + this + " in remove of " + key);
 				// Make us point to next.next and him point back to us
-				SkipSpan nn = next.next;
+				SkipSpan<K, V> nn = next.next;
 				next.killInstance();
 				if (nn != null) {
 					nn.prev = this;
@@ -309,7 +312,7 @@ public class SkipSpan {
 	}
 
 	/** I2P */
-	public Comparable firstKey() {
+	public K firstKey() {
 		return keys[0];
 	}
 }

apps/addressbook/java/test/junit/net/i2p/router/naming/BlockfileNamingServiceTest.java

@@ -1,4 +1,4 @@
-package net.i2p.client.naming;
+package net.i2p.router.naming;
 
 import junit.framework.TestCase;
 

apps/addressbook/web.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
-    "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>
-		<init-param>
-		    <param-name>home</param-name>
-		    <param-value>./addressbook</param-value>
-		</init-param>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-    <servlet-mapping> 
-      <servlet-name>addressbook</servlet-name>
-      <url-pattern>/*</url-pattern>
-    </servlet-mapping>
-
-</web-app>

apps/admin/admin.iml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/java/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="core" />
+    <orderEntry type="module" module-name="router" />
+    <orderEntry type="module" module-name="routerconsole" />
+  </component>
+</module>

apps/admin/java/src/net/i2p/router/admin/AdminRunner.java

@@ -11,8 +11,10 @@ import java.util.Iterator;
 import java.util.Set;
 
 import net.i2p.data.Hash;
+import net.i2p.data.DataHelper;
 import net.i2p.router.Router;
 import net.i2p.router.RouterContext;
+import net.i2p.router.web.StatsGenerator;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
 
@@ -47,8 +49,8 @@ class AdminRunner implements Runnable {
             reply(out, "this is not a website");
         } else if ( (command.indexOf("routerStats.html") >= 0) || (command.indexOf("oldstats.jsp") >= 0) ) {
             try {
-                out.write("HTTP/1.1 200 OK\nConnection: close\nCache-control: no-cache\nContent-type: text/html\n\n".getBytes());
-                _generator.generateStatsPage(new OutputStreamWriter(out));
+                out.write(DataHelper.getASCII("HTTP/1.1 200 OK\nConnection: close\nCache-control: no-cache\nContent-type: text/html\n\n"));
+                _generator.generateStatsPage(new OutputStreamWriter(out), true);
                 out.close();
             } catch (IOException ioe) {
                 if (_log.shouldLog(Log.WARN))
@@ -61,8 +63,9 @@ class AdminRunner implements Runnable {
             reply(out, shutdown(command));
         } else if (true || command.indexOf("routerConsole.html") > 0) {
             try {
-                out.write("HTTP/1.1 200 OK\nConnection: close\nCache-control: no-cache\nContent-type: text/html\n\n".getBytes());
-                _context.router().renderStatusHTML(new OutputStreamWriter(out));
+                out.write(DataHelper.getASCII("HTTP/1.1 200 OK\nConnection: close\nCache-control: no-cache\nContent-type: text/html\n\n"));
+                // TODO Not technically the same as router().renderStatusHTML() was
+                _context.routerAppManager().renderStatusHTML(new OutputStreamWriter(out));
                 out.close();
             } catch (IOException ioe) {
                 if (_log.shouldLog(Log.WARN))
@@ -80,7 +83,7 @@ class AdminRunner implements Runnable {
         reply.append("Content-type: text/html\n\n");
         reply.append(content);
         try {
-            out.write(reply.toString().getBytes());
+            out.write(DataHelper.getASCII(reply.toString()));
             out.close();
         } catch (IOException ioe) {
             if (_log.shouldLog(Log.WARN))
@@ -97,7 +100,7 @@ class AdminRunner implements Runnable {
         reply.append("Content-type: text/plain\n\n");
         reply.append(content);
         try {
-            out.write(reply.toString().getBytes());
+            out.write(DataHelper.getASCII(reply.toString()));
             out.close();
         } catch (IOException ioe) {
             if (_log.shouldLog(Log.WARN))

apps/desktopgui/.classpath

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/i2p_router"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/i2p_sdk"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/installer"/>
-	<classpathentry kind="output" path="build"/>
-</classpath>

apps/desktopgui/.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>desktopgui</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>

apps/desktopgui/build.gradle

@@ -0,0 +1,14 @@
+sourceSets {
+    main {
+        java {
+            srcDir 'src'
+        }
+    }
+}
+
+dependencies {
+    compile project(':core')
+    compile project(':router')
+    compile project(':installer')
+    compile project(':apps:systray')
+}

apps/desktopgui/build.xml

@@ -5,10 +5,9 @@
 	<property name="build" value="build"/>
 	<property name="dist"  location="dist"/>
 	<property name="jar" value="desktopgui.jar"/>
-	<property name="resources" value="resources"/>
-    <property name="javadoc" value="javadoc"/>
+	<property name="javadoc" value="javadoc"/>
 	<property name="javac.compilerargs" value=""/>
-	<property name="javac.version" value="1.6" />
+	<property name="javac.version" value="1.7" />
 	<property name="require.gettext" value="true" />
 
     <condition property="no.bundle">
@@ -17,9 +16,8 @@
 
 	<target name="init">
 	<mkdir dir="${build}"/>
-	<mkdir dir="${build}/${resources}"/>
-        <mkdir dir="${build}/${javadoc}"/>
-		<mkdir dir="${dist}"/>
+	<mkdir dir="${build}/messages-src"/>
+	<mkdir dir="${dist}"/>
 	</target>
 
 	<target name="clean">
@@ -27,35 +25,37 @@
 		<delete dir="${dist}"/>
 	</target>
 
-	<target name="compile" depends="init">
+        <target name="compile" depends="init">
             <javac debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
                        includeAntRuntime="false"
                        srcdir="${src}" destdir="${build}">
-            <compilerarg line="${javac.compilerargs}" />
-            <classpath>
-                <pathelement location="../../core/java/build/i2p.jar" />
-                <pathelement location="../../installer/lib/wrapper/all/wrapper.jar" />
-            	<pathelement location="../../router/java/build/router.jar" />
-            </classpath>
-		</javac>
-        <copy todir="${build}/desktopgui/${resources}">
-            <fileset dir="${resources}" />
-        </copy>
-	</target>
+                <compilerarg line="${javac.compilerargs}" />
+                <classpath>
+                    <pathelement location="../../core/java/build/i2p.jar" />
+                    <pathelement location="../../installer/lib/wrapper/all/wrapper.jar" />
+                    <pathelement location="../../router/java/build/router.jar" />
+                    <pathelement location="../systray/java/build/systray.jar" />
+                </classpath>
+            </javac>
+        </target>
 
-	<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}" >
-            <arg value="./bundle-messages.sh" />
-        </exec>
-		<!-- multi-lang is optional -->
-        <exec executable="sh" osfamily="windows" failifexecutionfails="false" >
-            <arg value="./bundle-messages.sh" />
-        </exec>
-	</target>
+        <target name="bundle" unless="no.bundle" depends="init">
+            <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}" >
+                <arg value="./bundle-messages.sh" />
+            </exec>
+            <exec executable="sh" osfamily="windows" failifexecutionfails="false" >
+                <arg value="./bundle-messages.sh" />
+            </exec>
+            <javac source="${javac.version}" target="${javac.version}" 
+                   includeAntRuntime="false"
+                   srcdir="${build}/messages-src" destdir="${build}">
+                <compilerarg line="${javac.compilerargs}" />
+            </javac>
+        </target>
 
         <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
         <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
@@ -74,12 +74,18 @@
 	<target name="jar" depends="compile, bundle, listChangedFiles" unless="jar.uptodate" >
 		<!-- set if unset -->
 		<property name="workspace.changes.tr" value="" />
-		<jar basedir="${build}" destfile="${dist}/${jar}">
+                <!-- ideal for linux: 24x24, but transparency doesn't work -->
+                <copy tofile="${build}/desktopgui/resources/images/logo.png" file="../../installer/resources/themes/console/images/itoopie_xsm.png" />
+                <copy todir="${build}/desktopgui/resources/images" file="images/itoopie_black_24.png" />
+                <copy todir="${build}/desktopgui/resources/images" file="images/itoopie_white_24.png" />
+		<jar basedir="${build}" excludes="messages-src/**" destfile="${dist}/${jar}">
 			<manifest>
 				<attribute name="Main-Class" value="net.i2p.desktopgui.Main"/>
 				<attribute name="Build-Date" value="${build.timestamp}" />
 				<attribute name="Base-Revision" value="${workspace.version}" />
 				<attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
+				<attribute name="X-Compile-Source-JDK" value="${javac.version}" />
+				<attribute name="X-Compile-Target-JDK" value="${javac.version}" />
 			</manifest>
 		</jar>
 	</target>
@@ -115,15 +121,20 @@
     </target>
 
     <target name="poupdate">
+        <!-- set if unset -->
+        <property name="lg2" value="" />
         <exec executable="sh" osfamily="unix" failifexecutionfails="true" failonerror="true" >
+            <env key="LG2" value="${lg2}" />
             <arg value="./bundle-messages.sh" />
             <arg value="-p" />
         </exec>
         <exec executable="sh" osfamily="mac" failifexecutionfails="true" failonerror="true" >
+            <env key="LG2" value="${lg2}" />
             <arg value="./bundle-messages.sh" />
             <arg value="-p" />
         </exec>
         <exec executable="sh" osfamily="windows" failifexecutionfails="true" failonerror="true" >
+            <env key="LG2" value="${lg2}" />
             <arg value="./bundle-messages.sh" />
             <arg value="-p" />
         </exec>

apps/desktopgui/bundle-messages.sh

@@ -26,12 +26,12 @@ then
 fi
 
 # on windows, one must specify the path of commnad find
-# since windows has its own retarded version of find.
+# since windows has its own version of find.
 if which find|grep -q -i windows ; then
 	export PATH=.:/bin:/usr/local/bin:$PATH
 fi
 # Fast mode - update ondemond
-# set LG2 to the language you need in envrionment varibales to enable this
+# set LG2 to the language you need in environment variables to enable this
 
 # add ../java/ so the refs will work in the po file
 JPATHS="src"
@@ -64,19 +64,19 @@ do
 	 	echo "Updating the $i file from the tags..."
 		# extract strings from java and jsp files, and update messages.po files
 		# translate calls must be one of the forms:
-		# _("foo")
+		# _t("foo")
 		# _x("foo")
-		# intl._("foo")
+		# intl._t("foo")
 		# intl.title("foo")
-		# handler._("foo")
-		# formhandler._("foo")
+		# handler._t("foo")
+		# formhandler._t("foo")
 		# net.i2p.router.web.Messages.getString("foo")
 		# In a jsp, you must use a helper or handler that has the context set.
 		# To start a new translation, copy the header from an old translation to the new .po file,
 		# then ant distclean updater.
 		find $JPATHS -name *.java > $TMPFILE
 		xgettext -f $TMPFILE -F -L java --from-code=UTF-8 --add-comments\
-	                 --keyword=_ --keyword=_x --keyword=intl._ --keyword=intl.title \
+	                 --keyword=_t --keyword=_x --keyword=intl._ --keyword=intl.title \
 	                 --keyword=handler._ --keyword=formhandler._ \
 	                 --keyword=net.i2p.router.web.Messages.getString \
 		         -o ${i}t
@@ -105,15 +105,40 @@ do
         # only generate for non-source language
         echo "Generating ${CLASS}_$LG ResourceBundle..."
 
-        # convert to class files in build
-        msgfmt --java --statistics -r $CLASS -l $LG -d build $i
+        msgfmt -V | grep -q '0\.19'
         if [ $? -ne 0 ]
         then
-            echo "ERROR - msgfmt failed on ${i}, not updating translations"
-            # msgfmt leaves the class file there so the build would work the next time
-            find build -name messages_${LG}.class -exec rm -f {} \;
-            RC=1
-            break
+            # slow way
+            # convert to class files in build
+            msgfmt --java --statistics -r $CLASS -l $LG -d build $i
+            if [ $? -ne 0 ]
+            then
+                echo "ERROR - msgfmt failed on ${i}, not updating translations"
+                # msgfmt leaves the class file there so the build would work the next time
+                find build -name messages_${LG}.class -exec rm -f {} \;
+                RC=1
+                break
+            fi
+        else
+            # fast way
+            # convert to java files in build/messages-src
+            TD=build/messages-src-tmp
+            TDX=$TD/net/i2p/desktopgui
+            TD2=build/messages-src
+            TDY=$TD2/net/i2p/desktopgui
+            rm -rf $TD
+            mkdir -p $TD $TDY
+            msgfmt --java --statistics --source -r $CLASS -l $LG -d $TD $i
+            if [ $? -ne 0 ]
+            then
+                echo "ERROR - msgfmt failed on ${i}, not updating translations"
+                # msgfmt leaves the class file there so the build would work the next time
+                find build -name messages_${LG}.class -exec rm -f {} \;
+                RC=1
+                break
+            fi
+            mv $TDX/messages_$LG.java $TDY
+            rm -rf $TD
         fi
     fi
 done

apps/desktopgui/locale/messages_ar.po

@@ -2,55 +2,95 @@
 # 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:
+# Ali <aboshanab_@hotmail.com>, 2018
+# ducki2p <ducki2p@gmail.com>, 2011
+# foo <foo@bar>, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: I2P desktopgui\n"
+"Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"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"
+"POT-Creation-Date: 2016-05-25 12:29+0000\n"
+"PO-Revision-Date: 2018-05-14 15:25+0000\n"
+"Last-Translator: Ali <aboshanab_@hotmail.com>\n"
+"Language-Team: Arabic (http://www.transifex.com/otf/I2P/language/ar/)\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: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:31
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:59
 msgid "Start I2P"
 msgstr "ابدأ I2P"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
 msgid "I2P is starting!"
 msgstr "جاري تشغيل I2P"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
 msgid "Starting"
 msgstr "جاري البدأ"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
+#: src/net/i2p/desktopgui/InternalTrayManager.java:207
 msgid "Launch I2P Browser"
 msgstr " تشغيل متصفح I2P"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:50
-msgid "Configure desktopgui"
-msgstr "اعدادات"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:76
+#: src/net/i2p/desktopgui/InternalTrayManager.java:228
+msgid "Configure I2P System Tray"
+msgstr "تكوين أيقونة I2P المصغرة "
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+#: src/net/i2p/desktopgui/InternalTrayManager.java:77
+#: src/net/i2p/desktopgui/InternalTrayManager.java:229
+msgid "Disable"
+msgstr "ألغي"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:93
+#: src/net/i2p/desktopgui/InternalTrayManager.java:245
 msgid "Restart I2P"
 msgstr "اعادة تشغيل"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+#: src/net/i2p/desktopgui/InternalTrayManager.java:110
+#: src/net/i2p/desktopgui/InternalTrayManager.java:262
 msgid "Stop I2P"
 msgstr "توقيف I2P"
 
-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
-msgid "Tray icon configuration"
-msgstr "اعدادات الأيقونة"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:126
+#: src/net/i2p/desktopgui/InternalTrayManager.java:278
+msgid "Restart I2P Immediately"
+msgstr "إعادة تشغيل I2P على الفور"
 
-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
-msgid "Should tray icon be enabled?"
-msgstr "هل ترغب في تفعيل الأيقونة؟"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:143
+#: src/net/i2p/desktopgui/InternalTrayManager.java:295
+msgid "Stop I2P Immediately"
+msgstr "إيقاف تشغيل I2P على الفور"
 
+#: src/net/i2p/desktopgui/InternalTrayManager.java:157
+#: src/net/i2p/desktopgui/InternalTrayManager.java:309
+msgid "Cancel I2P Shutdown"
+msgstr "إلغاء إيقاف تشغيل I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:363
+#, java-format
+msgid "Shutdown in {0}"
+msgstr "توقف في مدة {0}"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:365
+msgid "Shutdown imminent"
+msgstr "إغلاق وشيك"
+
+#. status translations are in the console bundle
+#: src/net/i2p/desktopgui/InternalTrayManager.java:370
+msgid "Network"
+msgstr "الشبكة"
+
+#. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
+#: src/net/i2p/desktopgui/TrayManager.java:63
+msgid "I2P: Right-click for menu"
+msgstr "I2P: أنقر بالزر الأيمن للقائمة"

apps/desktopgui/locale/messages_az.po

@@ -0,0 +1,94 @@
+# 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:
+# Nikafn <appone6@gmail.com>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-05-25 12:29+0000\n"
+"PO-Revision-Date: 2018-02-25 16:35+0000\n"
+"Last-Translator: Nikafn <appone6@gmail.com>\n"
+"Language-Team: Azerbaijani (http://www.transifex.com/otf/I2P/language/az/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: az\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:31
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:59
+msgid "Start I2P"
+msgstr "I2P Başla"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+msgid "I2P is starting!"
+msgstr "I2P başlayır!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+msgid "Starting"
+msgstr "Başlanğıc"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
+#: src/net/i2p/desktopgui/InternalTrayManager.java:207
+msgid "Launch I2P Browser"
+msgstr "I2P Brauzerini başla"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:76
+#: src/net/i2p/desktopgui/InternalTrayManager.java:228
+msgid "Configure I2P System Tray"
+msgstr "I2P Sistem Zolağını quraşdır"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:77
+#: src/net/i2p/desktopgui/InternalTrayManager.java:229
+msgid "Disable"
+msgstr "Söndür"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:93
+#: src/net/i2p/desktopgui/InternalTrayManager.java:245
+msgid "Restart I2P"
+msgstr "I2P yenidən başlat"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:110
+#: src/net/i2p/desktopgui/InternalTrayManager.java:262
+msgid "Stop I2P"
+msgstr "I2P-ni durdur"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:126
+#: src/net/i2p/desktopgui/InternalTrayManager.java:278
+msgid "Restart I2P Immediately"
+msgstr " I2P-ni dərhal yenidən başlat"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:143
+#: src/net/i2p/desktopgui/InternalTrayManager.java:295
+msgid "Stop I2P Immediately"
+msgstr "I2P-ni dərhal durdur"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:157
+#: src/net/i2p/desktopgui/InternalTrayManager.java:309
+msgid "Cancel I2P Shutdown"
+msgstr "I2P-ni söndürməyi ləğv et"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:363
+#, java-format
+msgid "Shutdown in {0}"
+msgstr "{0}-da sönmə"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:365
+msgid "Shutdown imminent"
+msgstr "Sönmə yaxınlaşır"
+
+#. status translations are in the console bundle
+#: src/net/i2p/desktopgui/InternalTrayManager.java:370
+msgid "Network"
+msgstr "Şəbəkə"
+
+#. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
+#: src/net/i2p/desktopgui/TrayManager.java:63
+msgid "I2P: Right-click for menu"
+msgstr "I2P: Menyu üçün sağ düyməni klikləyin"

apps/desktopgui/locale/messages_bg.po

@@ -0,0 +1,95 @@
+# 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:
+# Gabriel Radev <gabosss@gmail.com>, 2015
+# Vitaly Zdorovenko <stenliterziev@gmail.com>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-05-25 12:29+0000\n"
+"PO-Revision-Date: 2017-09-20 20:31+0000\n"
+"Last-Translator: Vitaly Zdorovenko <stenliterziev@gmail.com>\n"
+"Language-Team: Bulgarian (http://www.transifex.com/otf/I2P/language/bg/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:31
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:59
+msgid "Start I2P"
+msgstr "Стартиране на I2P"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+msgid "I2P is starting!"
+msgstr "I2P е стартиран!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+msgid "Starting"
+msgstr "Стартиране"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
+#: src/net/i2p/desktopgui/InternalTrayManager.java:207
+msgid "Launch I2P Browser"
+msgstr "Стартиране на I2P Браузер"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:76
+#: src/net/i2p/desktopgui/InternalTrayManager.java:228
+msgid "Configure I2P System Tray"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:77
+#: src/net/i2p/desktopgui/InternalTrayManager.java:229
+msgid "Disable"
+msgstr "Деактивиране"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:93
+#: src/net/i2p/desktopgui/InternalTrayManager.java:245
+msgid "Restart I2P"
+msgstr "Рестартиране на I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:110
+#: src/net/i2p/desktopgui/InternalTrayManager.java:262
+msgid "Stop I2P"
+msgstr "Спиране на I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:126
+#: src/net/i2p/desktopgui/InternalTrayManager.java:278
+msgid "Restart I2P Immediately"
+msgstr "Рестартирайте Незабавно"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:143
+#: src/net/i2p/desktopgui/InternalTrayManager.java:295
+msgid "Stop I2P Immediately"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:157
+#: src/net/i2p/desktopgui/InternalTrayManager.java:309
+msgid "Cancel I2P Shutdown"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:363
+#, java-format
+msgid "Shutdown in {0}"
+msgstr "Изключване в {0}"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:365
+msgid "Shutdown imminent"
+msgstr ""
+
+#. status translations are in the console bundle
+#: src/net/i2p/desktopgui/InternalTrayManager.java:370
+msgid "Network"
+msgstr ""
+
+#. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
+#: src/net/i2p/desktopgui/TrayManager.java:63
+msgid "I2P: Right-click for menu"
+msgstr ""

apps/desktopgui/locale/messages_ca.po

@@ -0,0 +1,93 @@
+# 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: 2016-05-25 12:29+0000\n"
+"PO-Revision-Date: 2017-06-30 21:32+0000\n"
+"Last-Translator: zzzi2p\n"
+"Language-Team: Catalan (http://www.transifex.com/otf/I2P/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:31
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:59
+msgid "Start I2P"
+msgstr "Iniciar I2P"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+msgid "I2P is starting!"
+msgstr "I2P s'està iniciant."
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+msgid "Starting"
+msgstr "Iniciant"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
+#: src/net/i2p/desktopgui/InternalTrayManager.java:207
+msgid "Launch I2P Browser"
+msgstr "Iniciar navegador I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:76
+#: src/net/i2p/desktopgui/InternalTrayManager.java:228
+msgid "Configure I2P System Tray"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:77
+#: src/net/i2p/desktopgui/InternalTrayManager.java:229
+msgid "Disable"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:93
+#: src/net/i2p/desktopgui/InternalTrayManager.java:245
+msgid "Restart I2P"
+msgstr "Reiniciar I2P "
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:110
+#: src/net/i2p/desktopgui/InternalTrayManager.java:262
+msgid "Stop I2P"
+msgstr "Aturar I2P "
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:126
+#: src/net/i2p/desktopgui/InternalTrayManager.java:278
+msgid "Restart I2P Immediately"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:143
+#: src/net/i2p/desktopgui/InternalTrayManager.java:295
+msgid "Stop I2P Immediately"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:157
+#: src/net/i2p/desktopgui/InternalTrayManager.java:309
+msgid "Cancel I2P Shutdown"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:363
+#, java-format
+msgid "Shutdown in {0}"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:365
+msgid "Shutdown imminent"
+msgstr ""
+
+#. status translations are in the console bundle
+#: src/net/i2p/desktopgui/InternalTrayManager.java:370
+msgid "Network"
+msgstr "Xarxa"
+
+#. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
+#: src/net/i2p/desktopgui/TrayManager.java:63
+msgid "I2P: Right-click for menu"
+msgstr ""

apps/desktopgui/locale/messages_cs.po

@@ -7,49 +7,87 @@
 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: 2012-02-12 19:44+0000\n"
-"Last-Translator: Waseihou Watashi <waseihou@gmail.com>\n"
-"Language-Team: Czech (http://www.transifex.net/projects/p/I2P/language/cs/)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-05-25 12:29+0000\n"
+"PO-Revision-Date: 2017-06-30 21:32+0000\n"
+"Last-Translator: zzzi2p\n"
+"Language-Team: Czech (http://www.transifex.com/otf/I2P/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:31
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:59
 msgid "Start I2P"
 msgstr "Spustit I2P"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
 msgid "I2P is starting!"
 msgstr "I2P startuje!"
 
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
 msgid "Starting"
 msgstr "Startuji"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
+#: src/net/i2p/desktopgui/InternalTrayManager.java:207
 msgid "Launch I2P Browser"
 msgstr "Spouštím I2P Browser"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:50
-msgid "Configure desktopgui"
-msgstr "Nastavuji desktopgui"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:76
+#: src/net/i2p/desktopgui/InternalTrayManager.java:228
+msgid "Configure I2P System Tray"
+msgstr ""
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+#: src/net/i2p/desktopgui/InternalTrayManager.java:77
+#: src/net/i2p/desktopgui/InternalTrayManager.java:229
+msgid "Disable"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:93
+#: src/net/i2p/desktopgui/InternalTrayManager.java:245
 msgid "Restart I2P"
 msgstr "Restart I2P"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+#: src/net/i2p/desktopgui/InternalTrayManager.java:110
+#: src/net/i2p/desktopgui/InternalTrayManager.java:262
 msgid "Stop I2P"
 msgstr "Zastavit I2P"
 
-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
-msgid "Tray icon configuration"
-msgstr "Nastavení ikony na liště (tray icon)"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:126
+#: src/net/i2p/desktopgui/InternalTrayManager.java:278
+msgid "Restart I2P Immediately"
+msgstr ""
 
-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
-msgid "Should tray icon be enabled?"
-msgstr "Zapnout ikonu na liště?"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:143
+#: src/net/i2p/desktopgui/InternalTrayManager.java:295
+msgid "Stop I2P Immediately"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:157
+#: src/net/i2p/desktopgui/InternalTrayManager.java:309
+msgid "Cancel I2P Shutdown"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:363
+#, java-format
+msgid "Shutdown in {0}"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:365
+msgid "Shutdown imminent"
+msgstr ""
+
+#. status translations are in the console bundle
+#: src/net/i2p/desktopgui/InternalTrayManager.java:370
+msgid "Network"
+msgstr "Síť"
+
+#. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
+#: src/net/i2p/desktopgui/TrayManager.java:63
+msgid "I2P: Right-click for menu"
+msgstr ""