Failed attempt to build debian package in docker

Keep running into

    debian-binary:
         [exec] dh patch --with systemd,bash-completion
         [exec] dpkg: warning: --compare-versions used with obsolete relation operator '>'
         [exec] dh: Unknown sequence patch (choose from: binary binary-arch binary-indep build build-arch build-indep clean install install-arch install-indep)
         [exec] make: *** [debian/rules:54: patch] Error 255

.dockerignore

@@ -0,0 +1,31 @@
+.idea
+.git
+Dockerfile
+
+
+# Gradle
+.gradle
+build
+apps/BOB/build
+apps/addressbook/build
+apps/desktopgui/build
+apps/i2pcontrol/build
+apps/i2psnark/build
+apps/i2ptunnel/build
+apps/imagegen/build
+apps/jetty/build
+apps/jrobin/build
+apps/ministreaming/java/build
+apps/ministreaming/build
+apps/routerconsole/build
+apps/sam/build
+apps/streaming/build
+apps/susidns/build
+apps/susimail/build
+apps/systray/build
+core/java/build
+core/build
+installer/build
+router/java/build
+router/build
+

.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

@@ -0,0 +1,63 @@
+# Just to try and prevent some noob disasters.
+# Use git add -f foo.jar to ignore this ignore list
+
+# generated release files
+*.exe
+*.[gx]z
+*.bz2
+*.[rwjt]ar
+*.sig
+*.su[d23]
+*.deb
+*.zip
+*.torrent
+
+*~
+web-fragment.xml
+web-out.xml
+*.out
+
+# Temporary/build dirs
+build/
+pkg-temp/
+classes/
+dist/
+/installer/resources/locale/mo
+/tmp
+/apps/jetty/jettylib
+*_jsp.java
+*.class
+
+# Debian-related
+/debian/copyright
+/debian/changelog
+.pc/
+
+# Build property overrides
+/override.properties
+
+# Reporting
+*.fba
+sloccount.sc
+/reports/
+
+# Don't allow patches
+*.(diff|patch)
+
+# but allow debian/patches
+!/debian/patches/*.(patch|diff)
+
+# IDE project files
+# Eclipse
+.classpath
+.project
+.settings/
+# IDEA
+*.iml
+.idea
+
+# Gradle
+.gradle
+
+# TODO: why does this file appear?
+apps/routerconsole/jsp/favicon.ico

.gitlab-ci.yml

@@ -0,0 +1,66 @@
+image: openjdk:8-alpine
+
+stages:
+    - test
+
+cache:
+    key: ${CI_COMMIT_REF_SLUG}
+    paths:
+        - $HOME/.gradle/caches/
+        - $HOME/.gradle/wrapper/
+        - .gradle
+
+test:
+    stage: test
+    coverage: '/Total.*?([0-9]{1,3})%/'
+    before_script:
+        - apk add --no-cache grep
+    script:
+        - ./gradlew codeCoverageReport
+        # The actual output that will be parsed by the code coverage
+        - grep -oP "Total.*?%" build/reports/jacoco/html/index.html
+    only:
+        - merge_requests
+        - tags
+
+# Make sure we can build a docker image
+# It's cached for later jobs
+build_docker:
+    stage: test
+    image: docker:19.03.12
+    services:
+        - docker:19.03.12-dind
+    script:
+        # Try to load latest branch image from local tar or from registry
+        - docker load -i ci-exports/$CI_COMMIT_REF_SLUG.tar || docker pull $CI_REGISTRY_IMAGE:latest || true
+        - docker build --cache-from $CI_REGISTRY_IMAGE:latest --tag $CI_REGISTRY_IMAGE:latest .
+        - mkdir -p ci-exports/
+        - docker save $CI_REGISTRY_IMAGE:latest > ci-exports/$CI_COMMIT_REF_SLUG.tar
+    variables:
+        # When using dind service, we need to instruct docker to talk with
+        # the daemon started inside of the service. The daemon is available
+        # with a network connection instead of the default
+        # /var/run/docker.sock socket. Docker 19.03 does this automatically
+        # by setting the DOCKER_HOST in
+        # https://github.com/docker-library/docker/blob/d45051476babc297257df490d22cbd806f1b11e4/19.03/docker-entrypoint.sh#L23-L29
+        #
+        # The 'docker' hostname is the alias of the service container as described at
+        # https://docs.gitlab.com/ee/ci/docker/using_docker_images.html#accessing-the-services.
+        #
+        # Specify to Docker where to create the certificates, Docker will
+        # create them automatically on boot, and will create
+        # `/certs/client` that will be shared between the service and job
+        # container, thanks to volume mount from config.toml
+        DOCKER_TLS_CERTDIR: "/certs"
+        # Use TLS https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#tls-enabled
+        DOCKER_HOST: tcp://docker:2376
+    cache:
+        # The same key should be used across branches
+        key: "$CI_COMMIT_REF_SLUG"
+        paths:
+            - ci-exports/*.tar
+    only:
+        - master
+        - merge_requests
+        - tags
+

.mtn-ignore

@@ -1,5 +1,7 @@
 # Just to try and prevent some noob disasters.
 # Use mtn add --no-respect-ignore foo.jar to ignore this ignore list
+
+# Temporary/build files
 _jsp\.java$
 \.bz2$
 \.tar$
@@ -14,18 +16,75 @@ _jsp\.java$
 \.sig$
 \.sud$
 \.su2$
+.\su3$
 \.tar$
 \.war$
 .\deb$
 \.zip$
+\.torrent$
 ^\.
-^build
-^pkg-temp/
 ~$
-/build
-/classes/
+web-fragment.xml
+web-out.xml
+
+# Temporary/build dirs
+^build$
+^pkg-temp
+/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,41 @@
+language: java
+dist: bionic
+
+jdk:
+  - oraclejdk11
+
+matrix:
+  include:
+    - jdk: oraclejdk11
+      addons:
+        sonarcloud:
+          organization: "i2p"
+      before_install:
+        - sed -i "1iplugins {\n    id 'org.sonarqube' version '3.0'\n}\n" build.gradle
+    - jdk: openjdk8
+
+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
+
+env:
+  - SONAR_SCANNER_OPTS="-Xmx2048m" 
+
+script:
+  - travis_wait 45 ./tests/scripts/travis.sh
+
+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

@@ -1,3 +1,6 @@
+;; warning - conversions for all Java bundles:
+;; id->in, he->iw, iy, yi->ji
+
 [I2P.i2ptunnel]
 source_file = apps/i2ptunnel/locale/messages_en.po
 source_lang = en
@@ -6,43 +9,257 @@ 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
 trans.pl = apps/i2ptunnel/locale/messages_pl.po
 trans.pt = apps/i2ptunnel/locale/messages_pt.po
+trans.pt_BR = apps/i2ptunnel/locale/messages_pt_BR.po
+trans.ro = apps/i2ptunnel/locale/messages_ro.po
 trans.ru_RU = apps/i2ptunnel/locale/messages_ru.po
+trans.sk = apps/i2ptunnel/locale/messages_sk.po
+trans.sq = apps/i2ptunnel/locale/messages_sq.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
+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.fa = apps/i2ptunnel/locale-proxy/messages_fa.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
+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
+
+[I2P.core]
+type = PO
+source_file = core/locale/messages_en.po
+source_lang = en
+trans.ar = core/locale/messages_ar.po
+trans.az = core/locale/messages_az.po
+trans.cs = core/locale/messages_cs.po
+trans.da = core/locale/messages_da.po
+trans.de = core/locale/messages_de.po
+trans.el = core/locale/messages_el.po
+trans.es = core/locale/messages_es.po
+trans.et_EE = core/locale/messages_et.po
+trans.fa = core/locale/messages_fa.po
+trans.fi = core/locale/messages_fi.po
+trans.fr = core/locale/messages_fr.po
+trans.hu = core/locale/messages_hu.po
+;; Java converts id to in
+trans.id = core/locale/messages_in.po
+trans.it = core/locale/messages_it.po
+trans.ja = core/locale/messages_ja.po
+trans.ko = core/locale/messages_ko.po
+trans.ku = core/locale/messages_ku.po
+trans.nb = core/locale/messages_nb.po
+trans.nl = core/locale/messages_nl.po
+trans.pl = core/locale/messages_pl.po
+trans.pt = core/locale/messages_pt.po
+trans.pt_BR = core/locale/messages_pt_BR.po
+trans.ro = core/locale/messages_ro.po
+trans.ru_RU = core/locale/messages_ru.po
+trans.sv_SE = core/locale/messages_sv.po
+trans.tk = core/locale/messages_tk.po
+trans.tr_TR = core/locale/messages_tr.po
+trans.uk_UA = core/locale/messages_uk.po
+trans.vi = core/locale/messages_vi.po
+trans.zh_CN = core/locale/messages_zh.po
+trans.zh_TW = core/locale/messages_zh_TW.po
+
+[I2P.router]
+type = PO
+source_file = router/locale/messages_en.po
+source_lang = en
+trans.ar = router/locale/messages_ar.po
+trans.az = router/locale/messages_az.po
+trans.cs = router/locale/messages_cs.po
+trans.da = router/locale/messages_da.po
+trans.de = router/locale/messages_de.po
+trans.el = router/locale/messages_el.po
+trans.es = router/locale/messages_es.po
+trans.et_EE = router/locale/messages_et.po
+trans.fa = router/locale/messages_fa.po
+trans.fi = router/locale/messages_fi.po
+trans.fr = router/locale/messages_fr.po
+trans.hu = router/locale/messages_hu.po
+;; Java converts id to in
+trans.id = router/locale/messages_in.po
+trans.it = router/locale/messages_it.po
+trans.ja = router/locale/messages_ja.po
+trans.ko = router/locale/messages_ko.po
+trans.ku = router/locale/messages_ku.po
+trans.nb = router/locale/messages_nb.po
+trans.nl = router/locale/messages_nl.po
+trans.pl = router/locale/messages_pl.po
+trans.pt = router/locale/messages_pt.po
+trans.pt_BR = router/locale/messages_pt_BR.po
+trans.ro = router/locale/messages_ro.po
+trans.ru_RU = router/locale/messages_ru.po
+trans.sv_SE = router/locale/messages_sv.po
+trans.tk = router/locale/messages_tk.po
+trans.tr_TR = router/locale/messages_tr.po
+trans.uk_UA = router/locale/messages_uk.po
+trans.vi = router/locale/messages_vi.po
+trans.zh_CN = router/locale/messages_zh.po
+trans.zh_TW = router/locale/messages_zh_TW.po
 
 [I2P.routerconsole]
 source_file = apps/routerconsole/locale/messages_en.po
 source_lang = en
 trans.ar = apps/routerconsole/locale/messages_ar.po
+trans.az = apps/routerconsole/locale/messages_az.po
 trans.cs = apps/routerconsole/locale/messages_cs.po
 trans.da = apps/routerconsole/locale/messages_da.po
 trans.de = apps/routerconsole/locale/messages_de.po
 trans.el = apps/routerconsole/locale/messages_el.po
 trans.es = apps/routerconsole/locale/messages_es.po
 trans.et_EE = apps/routerconsole/locale/messages_et.po
+trans.fa = apps/routerconsole/locale/messages_fa.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
 trans.pt = apps/routerconsole/locale/messages_pt.po
+trans.pt_BR = apps/routerconsole/locale/messages_pt_BR.po
+trans.ro = apps/routerconsole/locale/messages_ro.po
 trans.ru_RU = apps/routerconsole/locale/messages_ru.po
 trans.sv_SE = apps/routerconsole/locale/messages_sv.po
 trans.tr_TR = apps/routerconsole/locale/messages_tr.po
 trans.uk_UA = apps/routerconsole/locale/messages_uk.po
 trans.vi = apps/routerconsole/locale/messages_vi.po
 trans.zh_CN = apps/routerconsole/locale/messages_zh.po
+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.fa = apps/routerconsole/locale-news/messages_fa.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
+;; Java converts he to iw
+trans.he = apps/routerconsole/locale-news/messages_iw.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.ku = apps/routerconsole/locale-news/messages_ku.po
+trans.mg = apps/routerconsole/locale-news/messages_mg.po
+trans.nb = apps/routerconsole/locale-news/messages_nb.po
+trans.nl = apps/routerconsole/locale-news/messages_nl.po
+trans.pl = apps/routerconsole/locale-news/messages_pl.po
+trans.pt = apps/routerconsole/locale-news/messages_pt.po
+trans.pt_BR = apps/routerconsole/locale-news/messages_pt_BR.po
+trans.ro = apps/routerconsole/locale-news/messages_ro.po
+trans.ru_RU = apps/routerconsole/locale-news/messages_ru.po
+trans.sk = apps/routerconsole/locale-news/messages_sk.po
+trans.sq = apps/routerconsole/locale-news/messages_sq.po
+trans.sr = apps/routerconsole/locale-news/messages_sr.po
+trans.sv_SE = apps/routerconsole/locale-news/messages_sv.po
+trans.tk = apps/routerconsole/locale-news/messages_tk.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.bg = apps/routerconsole/locale-countries/messages_bg.po
+trans.ca = apps/routerconsole/locale-countries/messages_ca.po
+trans.cs = apps/routerconsole/locale-countries/messages_cs.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.hi = apps/routerconsole/locale-countries/messages_hi.po
+trans.hr = apps/routerconsole/locale-countries/messages_hr.po
+trans.hu = apps/routerconsole/locale-countries/messages_hu.po
+;; Java converts he to iw
+trans.he = apps/routerconsole/locale-countries/messages_iw.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.ku = apps/routerconsole/locale-countries/messages_ku.po
+trans.mg = apps/routerconsole/locale-countries/messages_mg.po
+trans.nb = apps/routerconsole/locale-countries/messages_nb.po
+trans.nl = apps/routerconsole/locale-countries/messages_nl.po
+trans.pl = apps/routerconsole/locale-countries/messages_pl.po
+trans.pt = apps/routerconsole/locale-countries/messages_pt.po
+trans.pt_BR = apps/routerconsole/locale-countries/messages_pt_BR.po
+trans.ro = apps/routerconsole/locale-countries/messages_ro.po
+trans.ru_RU = apps/routerconsole/locale-countries/messages_ru.po
+trans.sk = apps/routerconsole/locale-countries/messages_sk.po
+trans.sq = apps/routerconsole/locale-countries/messages_sq.po
+trans.sr = apps/routerconsole/locale-countries/messages_sr.po
+trans.sv_SE = apps/routerconsole/locale-countries/messages_sv.po
+trans.tk = apps/routerconsole/locale-countries/messages_tk.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
@@ -50,18 +267,32 @@ 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.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
+trans.zh_TW = apps/i2psnark/locale/messages_zh_TW.po
 
 [I2P.susidns]
 source_file = apps/susidns/locale/messages_en.po
@@ -72,86 +303,338 @@ 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.fa = apps/susidns/locale/messages_fa.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
+trans.pt_BR = apps/susidns/locale/messages_pt_BR.po
+trans.ro = apps/susidns/locale/messages_ro.po
 trans.ru_RU = apps/susidns/locale/messages_ru.po
 trans.sv_SE = apps/susidns/locale/messages_sv.po
+trans.tr_TR = apps/susidns/locale/messages_tr.po
 trans.uk_UA = apps/susidns/locale/messages_uk.po
 trans.vi = apps/susidns/locale/messages_vi.po
 trans.zh_CN = apps/susidns/locale/messages_zh.po
+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.es_AR = apps/desktopgui/locale/messages_es_AR.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.ku = apps/desktopgui/locale/messages_ku.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.sr = apps/desktopgui/locale/messages_sr.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.tk = apps/desktopgui/locale/messages_tk.po
 trans.tr_TR = apps/desktopgui/locale/messages_tr.po
 trans.vi = apps/desktopgui/locale/messages_vi.po
 trans.zh_CN = apps/desktopgui/locale/messages_zh.po
+trans.zh_TW = apps/desktopgui/locale/messages_zh_TW.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.bg = apps/susimail/locale/messages_bg.po
+trans.ca = apps/susimail/locale/messages_ca.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.hr = apps/susimail/locale/messages_hr.po
 trans.hu = apps/susimail/locale/messages_hu.po
+;; Java converts he to iw
+trans.he = apps/susimail/locale/messages_iw.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.sr = apps/susimail/locale/messages_sr.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.tk = debian/po/tk.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.sv_SE = installer/resources/locale/po/messages_sv.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
+trans.ro = installer/resources/locale/po/messages_ro.po
 trans.ru_RU = installer/resources/locale/po/messages_ru.po
+trans.sk = installer/resources/locale/po/messages_sk.po
+trans.sv_SE = installer/resources/locale/po/messages_sv.po
 trans.tr_TR = installer/resources/locale/po/messages_tr.po
+trans.uk_UA = installer/resources/locale/po/messages_uk.po
 trans.zh_CN = installer/resources/locale/po/messages_zh.po
 
-[main]
-host = http://www.transifex.net
+[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.ko = core/java/src/gnu/getopt/MessagesBundle_ko.properties
+trans.ku = core/java/src/gnu/getopt/MessagesBundle_ku.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.fa = apps/ministreaming/locale/messages_fa.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
+trans.hu = apps/ministreaming/locale/messages_hu.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.tk = apps/ministreaming/locale/messages_tk.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
+;; You must run installer/resources/poupdate-man.sh first.
+;;
+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.ro = installer/resources/locale-man/man_ro.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
+;; File contains local changes to fix RTL issues.
+;; Merge locally or make changes on TX side before re-enabling
+;;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.ro = installer/resources/eepsite/docroot/help/index_ro.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 = apps/routerconsole/resources/docs/readme.html
+source_lang = en
+trans.ar = apps/routerconsole/resources/docs/readme_ar.html
+trans.de = apps/routerconsole/resources/docs/readme_de.html
+trans.fr = apps/routerconsole/resources/docs/readme_fr.html
+;; Java converts id to in
+trans.id = apps/routerconsole/resources/docs/readme_in.html
+trans.it = apps/routerconsole/resources/docs/readme_it.html
+trans.ja = apps/routerconsole/resources/docs/readme_ja.html
+trans.pl = apps/routerconsole/resources/docs/readme_pl.html
+trans.pt = apps/routerconsole/resources/docs/readme_pt.html
+trans.ro = apps/routerconsole/resources/docs/readme_ro.html
+trans.ru_RU = apps/routerconsole/resources/docs/readme_ru.html
+trans.tr_TR = apps/routerconsole/resources/docs/readme_tr.html
+trans.zh_CN = apps/routerconsole/resources/docs/readme_zh.html
+
+[main]
+host = https://www.transifex.com
 

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,40 @@
+# Use a multi-stage build to reduce the size of the resulting image
+# We need alpine >v3 in order to install an apache-ant > 1.9
+FROM debian:buster-slim as builder
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+# Build installer
+RUN apt-get update \
+    # Workaround for installing openjdk-11-jre-headless
+    && mkdir -p /usr/share/man/man1 \
+    && apt-get -qqqy install debhelper ant debconf gettext libgmp-dev po-debconf fakeroot \
+     build-essential quilt dh-apparmor dh-systemd libservice-wrapper-java libjson-simple-java \
+     devscripts libjetty9-java libtomcat9-java libtaglibs-standard-jstlel-java libgetopt-java \
+     bash-completion
+
+WORKDIR /tmp/build
+COPY . ./
+
+RUN ant debian
+
+# Second stage only using the installer from the last stage
+# ---------------------------------------------------------
+# We can't use alpine here as the java service wrapper is built with glibc
+# alpine uses musl
+FROM openjdk:11.0-jre-slim
+
+# "install" i2p by copying over installed files
+COPY --from=builder /tmp/*.deb /tmp/
+
+# Install and configure
+RUN apt-get update -qqq \
+    && apt-get -qqqy install geoip-database famfamfam-flag-png \
+    && dpkb -i /tmp/*
+
+EXPOSE 7654 7656 7657 7658 4444 6668 8998 7659 7660 4445 15000-20000
+
+USER i2psvc
+ENTRYPOINT [ "/usr/bin/i2prouter" ]
+CMD start
+

INSTALL-headless.txt

@@ -11,11 +11,11 @@ you may use:
   lynx http://localhost:7657/
 to configure the router.
 
-If you're having trouble, swing by http://forum.i2p/, check the
-website at http://www.i2p2.de/, or get on irc://irc.freenode.net/#i2p
+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
-~/.i2p/ on Linux and %APPDATA%\I2P\ on Windows. This directory is created
+~/.i2p/ on Linux and %LOCALAPPDATA%\I2P\ on Windows. This directory is created
 when I2P is run for the first time. It also creates files in the system
 temporary directory specified by the Java Virtual Machine.
 To change the location of these directories, or to configure I2P to
@@ -25,21 +25,25 @@ 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:
-  Windows: Latest available from http://java.com/download (1.5+ supported)
-  Linux:   Latest available from http://java.com/download (1.5+ supported)
-  FreeBSD: 1.5-compatible (NIO required)
-  Other operating systems and JVMs: See http://trac.i2p2.de/wiki/java
+  All platforms: Java 1.8 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
+  Raspberry Pi: Oracle 8 Early Access https://jdk8.java.net/download.html
+  PowerPC: IBM SDK 7 http://www.ibm.com/developerworks/java/jdk/linux/download.html
+  Other operating systems and JVMs: See https://trac.i2p2.de/wiki/java or https://geti2p.net/download

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
-          Non-linux operating systems and JVMs: See http://trac.i2p2.de/wiki/java
-	Apache Ant 1.7.0 or higher
+	Java SDK (preferably Oracle or OpenJDK) 8 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.9.8 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,15 +29,15 @@ 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-SHA256:
-   Copyright (c) 2000 - 2004 The Legion Of The Bouncy Castle
+   ElGamal:
+   Copyright (c) 2000 - 2013 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
    See licenses/LICENSE-SHA256.txt
 
    AES code:
@@ -54,13 +54,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,31 +69,75 @@ 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
+
+   EdDSA-Java:
+   See licenses/LICENSE-CC0-1.0-Universal.txt
+
+   HostnameVerifier:
+   From Apache HttpClient 4.4.1 and HttpCore 4.4.1
+   See licenses/LICENSE-Apache2.0.txt
+
+   json-simple 2.3.0
+   (not included in most distribution packages)
+   Copyright 2016 Clifton Labs
+   See licenses/LICENSE-Apache2.0.txt
+
+   Noise library:
+   Copyright (C) 2016 Southern Storm Software, Pty Ltd.
+   See licenses/LICENSE-Noise.txt
+
+   MiniDNS library 1.0.0
+   This software may be used under the terms of (at your choice)
+   - LGPL version 2 (or later) (see licenses/LICENSE-LGPL2.1.txt)
+   - Apache Software licence (see licenses/LICENSE-Apache2.0.txt)
+   - DWTFYWTPL
+
+
 Router (router.jar):
 Public domain except as listed below:
    UPnP.java:
    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
+
+   SparseArray:
+   Copyright (C) 2006 The Android Open Source Project
+   See licenses/LICENSE-Apache2.0.txt
+
+   SSU HMAC:
+   Copyright (c) 2000 - 2004 The Legion Of The Bouncy Castle
+   See licenses/LICENSE-SHA256.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)
@@ -105,7 +150,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
 
@@ -131,120 +176,172 @@ Installer:
    See licenses/LICENSE-Apache2.0.txt
 
 
+GeoIP Data:
+   (not included in most distribution packages)
+   IP Geolocation by DB-IP https://db-ip.com/
+   See https://creativecommons.org/licenses/by/4.0/
 
-Java Service Wrapper Community Edition 32-bit 3.5.19:
-   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 3.5.44:
+   (Windows: 3.5.25)
+   (not included in most distribution packages)
+   Copyright (C) 1999-2020 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 / 6.1.2 / 6.2.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.4.1:
+       See licenses/LICENSE-Apache2.0.txt
 
-   I2PTunnel UDP and Streamr:
-   By welterde.
-   See licenses/LICENSE-GPLv2.txt
-
-   Jetty 7.6.11.v20130520:
+   Jetty 9.3.29.v20201019 (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:
+   RRD4J 3.6 (jrobin.jar):
+   Copyright (c) 2001-2005 Sasa Markovic and Ciaran Treanor.
+   Copyright (c) 2011 The OpenNMS Group, Inc.
+   Copyright 2011 The RRD4J Authors.
+   See licenses/LICENSE-Apache2.0.txt
    See licenses/LICENSE-LGPLv2.1.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
+       Fontawesome icons: Copyright (c) 2018 @fontawesome(company) see licenses/LICENSE-fontawesome.txt
 
-       GeoIP Data:
-       Copyright (c) 2008 MaxMind, Inc.  All Rights Reserved.
-       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.37:
-   Copyright 1999-2013 The Apache Software Foundation
+   Tomcat 9.0.40 (jasper-runtime.jar):
+   (not included in most distribution packages)
+   Copyright 1999-2020 The Apache Software Foundation
    See licenses/LICENSE-Apache2.0.txt
    See licenses/NOTICE-Tomcat.txt
 
@@ -262,9 +359,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](https://geti2p.net/download) 
+
+## Installing
+
+See [INSTALL.txt](INSTALL.txt) or [https://geti2p.net/download](https://geti2p.net/download) for installation instructions.
+
+## Documentation
+
+[https://geti2p.net/how](https://geti2p.net/how)
+
+FAQ: [https://geti2p.net/faq](https://geti2p.net/faq) 
+
+API: [http://docs.i2p-projekt.de/javadoc/](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](https://geti2p.net/newdevelopers) 
+
+### Prerequisites
+
+- Java SDK (preferably Oracle or OpenJDK) 8 or higher
+  - Non-linux operating systems and JVMs: See [https://trac.i2p2.de/wiki/java](https://trac.i2p2.de/wiki/java) 
+  - Certain subsystems for embedded (core, router, mstreaming, streaming, i2ptunnel)
+    require only Java 6
+- Apache Ant 1.9.8 or higher
+- The xgettext, msgfmt, and msgmerge tools installed from the GNU gettext package
+ [http://www.gnu.org/software/gettext/](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](https://trac.i2p2.de/report/1) 
+
+Contact information, security issues, press inquiries: [https://geti2p.net/en/contact](https://geti2p.net/en/contact) 
+
+Twitter: [@i2p](https://twitter.com/i2p), [@geti2p](https://twitter.com/GetI2P)
+
+## Licenses
+
+See [LICENSE.txt](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
-          Non-linux operating systems and JVMs: See http://trac.i2p2.de/wiki/java
-	Apache Ant 1.7.0 or higher
+	Java SDK (preferably Oracle or OpenJDK) 8 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 6
+	Apache Ant 1.9.8 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:
@@ -15,24 +17,43 @@ To build:
 		ant installer-osx
 
 	Run 'ant' with no arguments to see other build options.
-	See INSTALL.txt or http://www.i2p2.de/download.html for installation instructions.
+	See INSTALL.txt or https://geti2p.net/download for installation instructions.
+
+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:
-	http://www.i2p2.de/how
-	API: run 'ant javadoc' then start at build/javadoc/index.html
+	https://geti2p.net/how
+	API: http://docs.i2p-projekt.de/javadoc/
+	     or run 'ant javadoc' then start at build/javadoc/index.html
 
 Latest release:
-	http://www.i2p2.de/download.html
+	https://geti2p.net/download
 
 To get development branch from source control:
-	http://www.i2p2.de/newdevelopers.html
+	https://geti2p.net/newdevelopers
 
 FAQ:
-	http://www.i2p2.de/faq.html
+	https://geti2p.net/faq
 
 Need help?
 	IRC irc.freenode.net #i2p
-	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/README

@@ -1,30 +1,70 @@
-ou will need atleast monotone > = 0.41 to get the most recent build source
-and connect it to an already running i2p router.
+Getting the sources
+===================
 
-OR:
+Monotone
+--------
 
-You may download the actual "stable" source from
-http://code.google.com/p/i2p/downloads/list
+The bleeding-edge source code is available both within and outside of I2P. The
+I2P project uses Monotone to maintain the codebase.
 
-You will need to follwing tools to build the i2p and i2p-base packages:
+Information on retrieving the source with monotone is available within I2P at
+http://i2p-projekt.i2p/monotone and from the internet at https://geti2p.net/monotone.
 
-bash >= 3.1.017
-requiredbuilder >= 0.16.3 ( http://www.stabellini.net/requiredbuilder.html )
-jre >= 6u11
-jdk >= 6u11
-apache-ant >= 1.7.1
-perl >= 5.10.0
-python >= 2.5.2
+Monotone 1.0 Slackbuilds are available at http://slackbuilds.org/.
 
-Reccomended:
-monotone >= 0.41 ( http://pkgs.dr.ea.ms )
+Git
+---
 
-See also:
+Git is also an option to retrieve the I2P source code. That said, the I2P
+Monotone servers are *the* authoritative source.
 
-i2p/readme.txt
+Public Git repositories hosting the I2P source and managed by I2P project team members include
 
-AND
+- https://github.com/i2p/i2p.i2p
+- http://git.repo.i2p/w/i2p.i2p.git (mirrored from Github)
+- http://sourceforge.net/p/i2p/code/
 
-i2p-base/readme.txt
 
-for information and handy tips.
+Tarball
+-------
+
+The latest stable release is always available from the I2P homepage at
+https://geti2p.net/get/.
+
+
+This SlackBuild
+===============
+
+Requirements
+-------------
+
+The following are needed to build the i2p package:
+
+* jre >= 6
+* jdk >= 6
+* gettext
+* apache-ant >= 1.7.1
+
+If you don't care about bundling the translations, the gettext requirement can
+be avoided by adding -Drequire.gettext=false to the ant lines in
+i2p/i2p.SlackBuild
+
+A JRE >= v6 is the only requirement to run I2P.
+
+Building
+--------
+
+As the root user, run either $I2PSRC/Slackware/i2p/i2p.SlackBuild or `ant slackpkg` to create a package
+in $I2PSRC/Slackware/i2p which can be installed using the Slackware packaging tools.
+
+See also
+========
+
+Please also take a look at
+
+* i2p/README
+* eepget(1)
+* i2prouter(1)
+* http://i2p-projekt.i2p / https://geti2p.net
+
+for additional information and tips.

Slackware/i2p-base/build.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project basedir="." default="slackpkg">
-    <target name="slackpkg">
-        <echo message="Building Slackware package." />
-        <exec executable="./i2p-base.SlackBuild">
-        </exec>
-    </target>
-</project>

Slackware/i2p-base/doinst.sh

@@ -1,157 +0,0 @@
-#!/bin/sh
-#
-#
-# Now in the future we only need to look for '#I2P' and '#/I2P' 
-# for modifications to rc.local and rc.local_shutdown. 
-# I was a moron for not doing it this way in the first place :-) -- Sponge
-#
-#
-
-touch /etc/rc.d/rc.local
-touch /etc/rc.d/rc.local_shutdown
-
-echo
-echo -n "Check 1: /etc/rc.d/rc.local "
-I2PRCA=`grep -c /etc/rc.d/rc.local -e '/etc/rc.d/rc.i2p'`
-
-if [ $I2PRCA -eq 0 ] ; then
-	echo '#I2P' >> /etc/rc.d/rc.local
-	echo '( cd /tmp ; rm -Rf i2p-*.tmp )' >> /etc/rc.d/rc.local
-	echo "if [ -x /etc/rc.d/rc.i2p ] ; then" >> /etc/rc.d/rc.local
-	echo "        sh /etc/rc.d/rc.i2p start" >> /etc/rc.d/rc.local
-	echo "fi" >> /etc/rc.d/rc.local
-	echo '#/I2P' >> /etc/rc.d/rc.local
-	echo "modified."
-else
-	echo -n "looks OK so far,"
-	# Fix old installs, or where people have modified.
-
-	echo -n " Check 1A: "
-	I2PRCC=`grep -c /etc/rc.d/rc.local -e 'i2p-\*\.tmp'`
-
-	if [ $I2PRCC -eq 0 ] ; then
-		DATA=$(cat /etc/rc.d/rc.local | sed -re 's/if \[ -x \/etc\/rc\.d\/rc\.i2p \] ; then/#I2P\n\( cd \/tmp ; rm -Rf i2p-*.tmp \)\nif \[ -x \/etc\/rc.d\/rc.i2p \] ; then/')
-		echo "${DATA}" > /etc/rc.d/rc.local
-		echo -n "additional modifications applied,"
-	else
-		echo -n "looks OK so far,"
-	fi
-
-	echo -n " Check 1B: "
-	I2PRCE=`grep -c /etc/rc.d/rc.local -e 'i2p-\*\.tmp'`
-	if [ $I2PRCE -eq 0 ] ; then
-		DATATOP=$(cat /etc/rc.d/rc.local | sed -n '0,/i2p-\*\.tmp/p' | sed '$d' )
-		DATABOT=$(cat /etc/rc.d/rc.local | sed -n '/i2p-\*\.tmp/,$p' | sed -n '/^fi/,$p' | sed "1d")
-		echo "${DATATOP}" > /etc/rc.d/rc.local
-		echo '#I2P' >> /etc/rc.d/rc.local
-		echo '( cd /tmp ; rm -Rf i2p-*.tmp )' >> /etc/rc.d/rc.local
-		echo "if [ -x /etc/rc.d/rc.i2p ] ; then" >> /etc/rc.d/rc.local
-		echo "        sh /etc/rc.d/rc.i2p start" >> /etc/rc.d/rc.local
-		echo "fi" >> /etc/rc.d/rc.local
-		echo '#/I2P' >> /etc/rc.d/rc.local
-		echo "${DATABOT}" >> /etc/rc.d/rc.local
-		
-		echo -n "additional modifications applied,"
-	else
-		echo -n "looks ok so far,"
-	fi
-	echo -n " Check 1C: "
-	I2PRCF=`grep -c /etc/rc.d/rc.local -e '#/I2P'`
-	if [ $I2PRCF -eq 0 ] ; then
-		DATATOP=$(cat /etc/rc.d/rc.local | sed -n '0,/^#I2P/p' | sed '$d' )
-		DATABOT=$(cat /etc/rc.d/rc.local | sed -n '/^#I2P/,$p' | sed -n '/^fi/,$p' | sed "1d")
-		echo "${DATATOP}" > /etc/rc.d/rc.local
-		echo '#I2P' >> /etc/rc.d/rc.local
-		echo '( cd /tmp ; rm -Rf i2p-*.tmp )' >> /etc/rc.d/rc.local
-		echo "if [ -x /etc/rc.d/rc.i2p ] ; then" >> /etc/rc.d/rc.local
-		echo "        sh /etc/rc.d/rc.i2p start" >> /etc/rc.d/rc.local
-		echo "fi" >> /etc/rc.d/rc.local
-		echo '#/I2P' >> /etc/rc.d/rc.local
-		echo "${DATABOT}" >> /etc/rc.d/rc.local
-
-		echo -n "additional modifications applied,"
-	else
-		echo -n "looks ok so far,"
-	fi
-	echo " Done."
-fi
-
-echo -n "Check 2: /etc/rc.d/rc.local_shutdown "
-I2PRCB=`grep -c /etc/rc.d/rc.local_shutdown -e '/etc/rc.d/rc.i2p'`
-if [ $I2PRCB -eq 0 ] ; then
-	echo "#I2P" >> /etc/rc.d/rc.local_shutdown
-	echo "if [ -x /etc/rc.d/rc.i2p ] ; then" >> /etc/rc.d/rc.local_shutdown
-	echo "        sh /etc/rc.d/rc.i2p stop" >> /etc/rc.d/rc.local_shutdown
-	echo "fi" >> /etc/rc.d/rc.local_shutdown
-	echo "#/I2P" >> /etc/rc.d/rc.local_shutdown
-	echo "modified."
-else
-	echo -n "looks OK so far,"
-	# Fix old installs
-
-	echo -n " Check 1A: "
-	I2PRCG=`grep -c /etc/rc.d/rc.local_shutdown -e '#I2P'`
-	if [ $I2PRCG -eq 0 ] ; then
-		DATATOP=$(cat /etc/rc.d/rc.local_shutdown | sed -n '0,/^if \[ -x \/etc\/rc\.d\/rc\.i2p \] ; then/p' | sed '$d' )
-		DATABOT=$(cat /etc/rc.d/rc.local_shutdown | sed -n '/^if \[ -x \/etc\/rc\.d\/rc\.i2p \] ; then/,$p' | sed -n '/^fi/,$p' | sed "1d")
-		echo "${DATATOP}" > /etc/rc.d/rc.local_shutdown
-		echo '#I2P' >> /etc/rc.d/rc.local_shutdown
-		echo "if [ -x /etc/rc.d/rc.i2p ] ; then" >> /etc/rc.d/rc.local_shutdown
-		echo "        sh /etc/rc.d/rc.i2p stop" >> /etc/rc.d/rc.local_shutdown
-		echo "fi" >> /etc/rc.d/rc.local_shutdown
-		echo "#/I2P" >> /etc/rc.d/rc.local_shutdown
-		echo "${DATABOT}" >> /etc/rc.d/rc.local_shutdown
-		echo -n "additional modifications applied,"
-	else
-		echo -n "looks OK so far,"
-	fi
-	echo -n " Check 1B: "
-	I2PRCH=`grep -c /etc/rc.d/rc.local_shutdown -e '#/I2P'`
-	if [ $I2PRCH -eq 0 ] ; then
-		DATATOP=$(cat /etc/rc.d/rc.local_shutdown | sed -n '0,/^#I2P/p' | sed '$d' )
-		DATABOT=$(cat /etc/rc.d/rc.local_shutdown | sed -n '/^#I2P/,$p' | sed -n '/^fi/,$p' | sed "1d")
-		echo "${DATATOP}" > /etc/rc.d/rc.local_shutdown
-		echo '#I2P' >> /etc/rc.d/rc.local_shutdown
-		echo "if [ -x /etc/rc.d/rc.i2p ] ; then" >> /etc/rc.d/rc.local_shutdown
-		echo "        sh /etc/rc.d/rc.i2p stop" >> /etc/rc.d/rc.local_shutdown
-		echo "fi" >> /etc/rc.d/rc.local_shutdown
-		echo "#/I2P" >> /etc/rc.d/rc.local_shutdown
-		echo "${DATABOT}" >> /etc/rc.d/rc.local_shutdown
-		echo -n "additional modifications applied,"
-	else
-		echo -n "looks OK so far,"
-	fi
-	echo " Done."
-fi
-
-if [ -f /etc/rc.d/rc.i2p ] ; then
-	if [ -x /etc/rc.d/rc.i2p ] ; then
-		chmod +x /etc/rc.d/rc.i2p.new
-	fi
-	# Hopefully get admin's attention.
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -e "\007" ; sleep 0.3
-	echo "It apears that you already have /etc/rc.d/rc.i2p"
-	echo "You should replace it with /etc/rc.d/rc.i2p.new as soon as possible"
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -e "\007" ; sleep 0.3
-else
-	mv /etc/rc.d/rc.i2p.new /etc/rc.d/rc.i2p
-	echo
-	echo "Installation finished. The i2p start/stop script has been"
-	echo "installed in /etc/rc.d . You should chmod +x"
-	echo '/etc/rc.d/rc.i2p to start it on boot.'
-	echo
-fi
-
-exit

Slackware/i2p-base/i2p-base.SlackBuild

@@ -1,57 +0,0 @@
-#!/bin/sh
-#
-# Heavily based on the Slackware 12.2 SlackBuild
-# Slackware build script for I2P
-#
-# PLEASE READ THIS:
-# How to start I2P:
-# After installpkg command, doinst.sh will execute a post-installation script
-# needed by I2P. After that you have to chmod +x /etc/rc.d/rc.i2p and start
-# I2P service with /etc/rc.d/rc.i2p start.
-#
-# Now tell your browser to user this proxy: localhost on port 4444 and open
-# this page: http://localhost:7657/index.jsp
-#
-# Here you can configure I2P, watch network status and navigate anonimously.
-# It's suggested to subscribe to various dns host, like i2host.i2p
-# For any additional information, visit i2host.i2p and forum.i2p
-#
-
-CWD=$(pwd)
-TMP=/tmp
-PKG=/$TMP/package-base-i2p
-NAME=i2p-base
-VERSION=0.0.4
-BUILD=1sponge
-ARCH=noarch
-INSTALL_DIR=opt
-
-# Less than slackware 13?
-SLKPLT=$(cat /etc/slackware-version | sed -re "s/(Slackware )([0-9]*)(.*)/\2/")
-if [ $SLKPLT -lt 13 ] ; then
-	EXT=tgz
-else
-	EXT=txz
-fi
-
-rm -rf $PKG
-mkdir -p $PKG
-cd $PKG
-chown -R root:root .
-
-mkdir -p $PKG/etc/rc.d
-mkdir -p $PKG/install
-sed "s|directory|/$INSTALL_DIR/i2p/i2prouter|g" "$CWD/rc.i2p_def" > $PKG/etc/rc.d/rc.i2p.new
-chmod 644 $PKG/etc/rc.d/rc.i2p.new
-cat "$CWD/doinst.sh" > $PKG/install/doinst.sh
-cat "$CWD/slack-desc" > $PKG/install/slack-desc
-
-cd $PKG
-#
-# Not really that important to exec this 
-# as there aren't any deps we don't know.
-#
-# requiredbuilder -v -y -s $CWD $PKG
-#
-cat "$CWD/slack-required" > $PKG/install/slack-required
-makepkg -l y -c n $CWD/${NAME}-$VERSION-$ARCH-$BUILD.$EXT

Slackware/i2p-base/rc.i2p_def

@@ -1,68 +0,0 @@
-#!/bin/sh
-# Start/stop i2p service.
-
-i2p_start() {
- # Check if router is up first!
- /bin/su - -c "/bin/bash -l -c '( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\" ; directory status )'" > /dev/null
- if [ $? -eq 0 ] ; then {
-  # I2p is already running, so tell the user.
-  echo "I2P is already running..."
-  i2p_status
- } 
- else
- {
-  # Just in-case there are leftover junk in /tmp...
-  rm -Rf `grep /tmp/hsperfdata_root/* -le i2p` /tmp/i2p-*.tmp /tmp/router.ping
-  # Now that all junk is cleaned up, start.
-  /bin/su - -c "/bin/bash -l -c '( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\" ; directory start )'"
- }
- fi
-}
-
-i2p_stop() {
- /bin/su - -c "/bin/bash -l -c '( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\" ; directory stop )'"
- rm -Rf `grep /tmp/hsperfdata_root/* -le i2p` /tmp/i2p-*.tmp /tmp/router.ping
-}
-
-i2p_restart() {
- # We want a FULL cycle here, not the wrappers idea of this!
- i2p_stop
- i2p_start
-}
-
-i2p_status() {
- /bin/su - -c "/bin/bash -l -c '( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\" ; directory status )'"
-}
-
-i2p_console() {
- /bin/su - -c "/bin/bash -l -c '( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\" ; directory console )'"
-}
-
-i2p_dump() {
- /bin/su - -c "/bin/bash -l -c '( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\" ; directory dump )'"
-}
-
-case "$1" in
-'start')
-  i2p_start
-  ;;
-'stop')
-  i2p_stop
-  ;;
-'restart')
-  i2p_restart
-  ;;
-'status')
-  i2p_status
-  ;;
-'console')
-  i2p_console
-  ;;
-'dump')
-  i2p_dump
-  ;;
-*)
-  echo "usage $0 start|stop|restart|status|console|dump"
-  ;;
-esac
-

Slackware/i2p-base/readme.txt

@@ -1,10 +0,0 @@
-An rc file called rc.i2p has been placed into the /etc/rc.d directory.
-If you want to change installation dir, change the variable INSTALL_DIR
-on base-i2p.SlackBuild and rebuild the package. You also will need to do the
-same for the i2p package.
-
-The install script will insert everything needed into /etc/rc.d/rc.local and
-into /etc/rc.d/rc.local_shutdown automatically.
-
-If you want to start I2P at boot you have to chmod +x /etc/rc.d/rc.i2p
-

Slackware/i2p-base/slack-desc

@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-base-i2p: base-i2p (I2P anonymizing network base config files)
-base-i2p:
-base-i2p: I2P is an anonymizing network, offering a simple layer that
-base-i2p: identity-sensitive applications can use to securely communicate. All
-base-i2p: data is wrapped with several layers of encryption, and the network is
-base-i2p: both distributed and dynamic, with no trusted parties.
-base-i2p: Many applications are available that interface with I2P, including 
-base-i2p: mail, peer-peer file sharing, IRC chat, and others.
-base-i2p:
-base-i2p: This package provides the startup files.
-base-i2p:

Slackware/i2p-base/slack-required

@@ -1 +0,0 @@
-bash >= 3.1.017

Slackware/i2p/README

@@ -0,0 +1,89 @@
+The I2P package will be installed to /opt/i2p.
+
+To install to another location, set the variable INSTALL_DIR in i2p.SlackBuild
+and rebuild the package.
+
+
+Installing and Upgrading:
+=========================
+
+I2P has an auto-update function but generally speaking packages are managed by
+packaging systems. Changing a package's files outside of the package system can
+cause problems. To upgrade when there's a new I2P release, retrieve the new
+source, re-run the SlackBuild, then use upgradepkg to update.
+
+To ignore all this and upgrade "in-network", simply change the permissions of the installation
+directory (/opt/i2p by default). Something like the following would suffice:
+
+    chown -R USERNAME /opt/i2p
+
+
+Starting and using I2P
+======================
+
+Using the initscript
+--------------------
+
+To start I2P at boot, set the executable bit on /etc/rc.d/rc.i2p, add this
+script to rc.local*, and set the variable "RUN_AS_USER" in /etc/rc.d/rc.i2p.
+
+Optionally, create a new user/group with limited rights to run I2P.
+
+Something like the following would work to start I2P at system boot, running under the
+"i2p" account:
+
+     echo '[ -x /etc/rc.d/rc.i2p ] && /etc/rc.d/rc.i2p start' >> /etc/rc.d/rc.local
+     echo '[ -x /etc/rc.d/rc.i2p ] && /etc/rc.d/rc.i2p stop' >> /etc/.rc.d/rc.local_shutdown
+     sed -i .bak 's/^.*\(RUN_AS_USER\)=.*/\1=i2p/' /etc/rc.d/rc.i2p
+     chmod 755 /etc/rc.d/rc.i2p
+
+Unless running as a user named "i2psvc", I2P's config directory defaults to
+$HOME/.i2p. In the case of the "i2psvc" user, the default config directory is
+/var/lib/i2p/i2p-config.
+
+It should not need to be said that using the "root" account is not recommended.
+
+When running using the initscript, I2P will write its logs to /var/log/i2p.
+
+Starting I2P "on-demand"
+------------------------
+
+As with a normal installation, I2P can be started with "i2prouter start". The
+i2prouter and eepget scripts hve been installed to /usr/bin so they'll be
+accessible in the default system PATH.
+
+When running using the i2prouter script, I2P will write its logs to $HOME/.i2p.
+
+
+Configuring your browser
+------------------------
+
+In order to access eepSites (I2P-internal web sites) your web browser needs to
+be configured. Set the HTTP Proxy to 127.0.0.1 and port 4444. For more information, see
+https://geti2p.net/en/about/browser-config
+
+The I2P router console is reachable at http://127.0.0.1:7657.
+
+
+Addressbook subscriptions
+-------------------------
+
+Please see the FAQs at http://i2p-projekt.i2p/faq or https://geti2p.net/faq for information about
+the various addressbook services.
+
+
+Chatting on IRC
+---------------
+
+I2P comes preconfigured with a tunnel pointing to the I2P-only IRC network,
+Irc2P.  Signing on is easy, just connect to 127.0.0.1 on port 6668. Do not
+configure a proxy in your IRC client.
+
+
+Additional information
+======================
+
+Within I2P: http://i2p-projekt.i2p/, http://forum.i2p/, http://zzz.i2p/, http://trac.i2p2.i2p/
+On the Internet:  https://geti2p.net/, https://trac.i2p2.de
+Manpages: i2prouter(1), eepget(1)
+

Slackware/i2p/build.xml

@@ -2,7 +2,7 @@
 <project basedir="." default="slackpkg">
     <target name="slackpkg">
         <echo message="Building Slackware package." />
-        <exec executable="./i2p.SlackBuild">
-        </exec>
+        <chmod file="./i2p.Slackbuild" perm="755" />
+        <exec executable="./i2p.SlackBuild" failifexecutionfails="true" />
     </target>
 </project>

Slackware/i2p/doinst.sh

@@ -1,72 +1,60 @@
 #!/bin/sh
 
+# Abort on error or unset variables
+set -e
+set -u
+
+# This is changed by i2p.SlackBuild
 INST_DIR=directory
+PKGNAME="%pkg"
 
-( cd install
+config() {
+    NEW="$1"
+    OLD="$(dirname $NEW)/$(basename $NEW .new)"
+    if [ ! -r $NEW ]; then
+        # If we get here there's a flaw in the packaging. We'll just return so that
+        # we don't emit a spurious error for the user. (It's not the user's problem).
+        return
+    fi
 
-echo
-for i in *.config ; {
-	if [ -f $INST_DIR/$i ] ; then
-		echo "Please check ${INST_DIR}${i}, as there is a new version."
-		cp $i $INST_DIR/$i.new
-	else
-		cp $i $INST_DIR/$i
-	fi
+    # If this file doesn't exist yet, drop the .new extension.
+    if [ ! -r $OLD ]; then
+        mv $NEW $OLD
+        return
+    elif [ "$(md5sum $OLD | cut -d' ' -f1)" = "$(md5sum $NEW | cut -d' ' -f1)" ]; then
+        # If there are no differences in the files, remove the file with the .new extension.
+        rm $NEW
+        return
+    fi
+    # Alert the admin if they differ, but let's not be terribly obnoxious about it.
+    echo "WARNING: The files $OLD and $NEW differ." >&2
 }
 
-)
+# Unlike previous versions of the package, we install i2prouter and eepget to /usr/bin
+# to make them available within the system PATH.
 
-( cd $INST_DIR
-	if [ -f blocklist.txt ] ; then
-		echo "Please check ${INST_DIR}blocklist.txt, as there is a new version."
-	else
-		mv blocklist.txt.new blocklist.txt
-	fi
-)
+# Users might still want to /opt/i2p/i2prouter or /opt/i2p/eepget so we'll create symlinks
+# in the installation directory.
+ln -sf /usr/bin/eepget $INST_DIR
+ln -sf /usr/bin/i2prouter $INST_DIR
+(cd /usr/doc/$PKGNAME; ln -sf $INST_DIR/history.txt changelog)
 
-( cd $INST_DIR/eepsite
-	if [ -f jetty.xml ] ; then
-		echo "Please check ${INST_DIR}/eepsite, as there are new files."
-	else
-		find $PKG/$INSTALL_DIR/i2p -name "*.xml.new" -exec sh -c 'mv "$0" "${0/.new}"' {} \;
-	fi
-)
-
-( cd $INST_DIR/eepsite/docroot
-	if [ -f index.html ] ; then
-		rm index.html.new
-	else
-		mv index.html.new index.html
-	fi
-	if [ -f favicon.ico ] ; then
-		rm favicon.ico.new
-	else
-		mv favicon.ico.new favicon.ico
-	fi
-)
-
-echo
-echo "FINISHING I2P INSTALLATION. PLEASE WAIT."
-
-cd $INST_DIR
-
-
-
-OS_ARCH=`uname -m`
-X86_64=`echo "$OS_ARCH" | grep x86_64`
-if [ "X$X86_64" = "X" ]; then
-        wrapperpath="./lib/wrapper/linux"
+if $(uname -m | grep -q '64'); then
+    (cd $INST_DIR; ln -sf i2psvc-linux-x86-64 i2psvc)
 else
-        wrapperpath="./lib/wrapper/linux64"
+    (cd $INST_DIR; ln -sf i2psvc-linux-x86-32 i2psvc)
 fi
-cp $wrapperpath/libwrapper.so ./lib/
-cp $wrapperpath/wrapper.jar ./lib/
-cp $wrapperpath/i2psvc .
-rm -rf ./lib/wrapper
-chmod 744 ./i2psvc
 
-echo
-echo "Installation finished."
-echo
+config /etc/rc.d/rc.i2p.new
+config $INST_DIR/wrapper.config.new
 
-exit
+if [ -e /var/log/packages/i2p-base* ]; then
+    echo "Warning: This package 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
+    echo "for correctness" >&2
+fi
+
+# Remove extraneous 'sh' from sponge's set-up
+sed -i 's|sh /etc/rc\.d/rc\.i2p|/etc/rc.d/rc.i2p|g' /etc/rc.d/rc.local*

Slackware/i2p/i2p.SlackBuild

@@ -3,135 +3,124 @@
 # Heavily based on the Slackware 12.2 SlackBuild
 # Slackware build script for I2P
 #
-# PLEASE READ THIS:
-# Probably you will never have to update I2P packages with upgradepkg,
-# just because I2P has an auto-update function.
-# Really you should not ever use any "upgrade" method.
-#
-# The correct way to upgrade is to: 
-# 1: install the upgrade
-# 2: remove the old package
-#
-# It is a terrible shame that upgradepkg doesn't do this, infact, 
-# it would actually be the correct way for *any* package!
+# Packages are generally prohibited from being updated outside
+# of the package manager; this I2P SlackBuild is no different.
 #
+# If you'd like to use the I2P "in-network" updates anyway, you'll need to
+# grant the user that I2P will run as write permission to the installation directory
+# (/opt/i2p by default).
 #
+# For safety's sake, a user's I2P config files will *never* be overwritten by any upgrade method.
+# In the future this SlackBuild may alert when a default config file is updated.
+##
 
-BUILD=1sponge
+# Make sure makepkg and friends can be found
+PATH=$PATH:/sbin
+
+# abort on error and unset variables (same as set -e and set -u, respectively)
+set -o errexit
+set -o nounset
+
+if [ $(id -ur) -ne 0 ]; then
+    echo "ERROR: SlackBuilds require root access." >&2
+    exit 1
+fi
+
+BUILD=1kytv
 # INSTALL_DIR is referenced from /, don't prefix it with a '/'
 INSTALL_DIR=opt
 NAME=i2p
 ARCH=noarch
 
-# Less than slackware 13?
-SLKPLT=$(cat /etc/slackware-version | sed -re "s/(Slackware )([0-9]*)(.*)/\2/")
-if [ $SLKPLT -lt 13 ] ; then
-	EXT=tgz
-else
-	EXT=txz
-fi
-
-
-#
-# This mess is here due to the totally moronic way i2p does versioning.
-# We correct it here.
-#
-ROUTER=$(echo -ne "_")$(cat ../../router/java/src/net/i2p/router/RouterVersion.java | grep -e "public final static long BUILD" | cut -f2 -d"=" | cut -f1 -d";" | sed -re "s/ //g")
-if [ "$ROUTER" == "_" ] ;  then
-	ROUTER="_0"
-fi
-
-#
-# That was the easy one, now for the tough one.
-#
-
-CORE=$(cat ../../core/java/src/net/i2p/CoreVersion.java | grep -e "public final static String VERSION" | cut -f2 -d'"' | sed -re "s/ //g")
-CORE1=$(echo -n $CORE.x.x | sed -re "s/(.*)\.(.*)\.(.*)\.(.*)/\1/")
-CORE2=$(echo -n $CORE.x | sed -re "s/(.*)\.(.*)\.(.*)\.(.*)/\1/")
-
-if [ "$CORE.x.x" == "$CORE1" ] ; then
-	CORE=$(echo -ne $CORE".0.0")
-fi
-if [ "$CORE.x" == "$CORE2" ] ; then
-	CORE=$(echo -ne $CORE".0")
-fi
-
-VERSION=$(echo $CORE$ROUTER)
-#
-# Whew!
-# OK, let's build i2p
-#
-
-CWD=$(pwd)
+CWD=$(readlink -m $(dirname $0))
+I2PSRC=$(readlink -m $CWD/../../)
 TMP=/tmp
-
 PKG=$TMP/package-i2p
-rm -rf $PKG
-mkdir -p $PKG
 
-cd $CWD/../../
+if [ -e "/etc/slackware-version" ]; then
+    # Older than Slackware 13?
+    SLACKVER=$(sed -e "s/Slackware\s\+\([0-9]\+\)\.\?\([0-9]\+\)\?/\1/" /etc/slackware-version)
+    if [ $SLACKVER -lt 13 ] ; then
+        EXT=tgz
+    else
+        EXT=txz
+    fi
+else
+    echo "ERROR: This script is only intended for use on Slackware systems.">&2
+    exit 1
+fi
 
+# Extract version strings
+I2PBUILD=$(sed -e '/^.\+long\s\+BUILD/!d' -e 's/^.\+long\s\+BUILD\s\+=\s\+\([0-9]\+\);/\1/' $I2PSRC/router/java/src/net/i2p/router/RouterVersion.java)
+# Thanks to user "ihavei2p" for the second awk statement
+# If the version is x.y, it'll be set to x.y.0. Otherwise the version string will be unchanged
+CORE=$(awk -F'"' '/static\s+String\s+VERSION/{print $2}' $I2PSRC/core/java/src/net/i2p/CoreVersion.java | \
+        awk -F. '{ if (NF > 3) { print; exit } else if ($3 == "") { $3=0; print $1"."$2"."$3 } else print }')
+VERSION="${CORE}_${I2PBUILD}"
+
+[ -d $PKG ] && rm -rf $PKG
+mkdir -p $PKG/$INSTALL_DIR $PKG/install
+
+cd "$I2PSRC"
 ant distclean
-#ant dist
-ant tarball
+ant jbigi-linux-x86-only preppkg-unix
 
-tar xjvf i2p.tar.bz2 -C $TMP
+chown -R root:root $I2PSRC/pkg-temp
+cp -a $I2PSRC/pkg-temp $PKG/$INSTALL_DIR/i2p
 
-cd $TMP/i2p
-chown -R root:root .
-
-mkdir -p $PKG/$INSTALL_DIR/
-cp -a ../i2p $PKG/$INSTALL_DIR/
-
-mkdir -p $PKG/install
-
-#############################################################################
-# Preconfigureation to make package smaller, and...
-# we keep as much as reasonable in the installation directory.
-# This makes the install map fairly well to the standard installation.
-# It also makes it easier to find the log and pid files!
-#############################################################################
+# $INSTALL_DIR is used by this SlackBuild.
+# [%$]INSTALL_PATH , [%$]SYSTEM_java_io_tmpdir, and [%$]USER_HOME have the correct paths set
+# by the IzPack installer.
 cd $PKG/$INSTALL_DIR/i2p
+for file in wrapper.config eepget i2prouter runplain.sh; do
+    sed -i "s|[%$]INSTALL_PATH|/$INSTALL_DIR/i2p|g;s|[$%]SYSTEM_java_io_tmpdir|$TMP|g;s/[%$]USER_HOME/\$HOME/g" $file
+done
+mv wrapper.config wrapper.config.new
 
-# wrapper.config $INSTALL_PATH and $SYSTEM_java_io_tmpdir
-sed "s|\$INSTALL_PATH|/$INSTALL_DIR/i2p|g" wrapper.config > a
-sed "s|\$SYSTEM_java_io_tmpdir|/$INSTALL_DIR/i2p|g" a > wrapper.config
-# eepget %INSTALL_PATH
-sed "s|\$INSTALL_PATH|/$INSTALL_DIR/i2p|g" eepget > a
-rm eepget
-mv a eepget
-# runplain.sh %INSTALL_PATH and %SYSTEM_java_io_tmpdir
-sed "s|%INSTALL_PATH|/$INSTALL_DIR/i2p|g" runplain.sh > a
-sed "s|%SYSTEM_java_io_tmpdir|/$INSTALL_DIR/i2p|g" a > runplain.sh
-# i2prouter %INSTALL_PATH and %SYSTEM_java_io_tmpdir
-sed "s|%INSTALL_PATH|/$INSTALL_DIR/i2p|g" i2prouter > a
-rm i2prouter
-mv a i2prouter
-sed "s|%SYSTEM_java_io_tmpdir|/$INSTALL_DIR/i2p|g" i2prouter > a
-sed "s|#ALLOW_ROOT=true|ALLOW_ROOT=true|g" a > i2prouter
+install -d $PKG/usr/bin
+install -d $PKG/usr/doc/$NAME-$VERSION
+install -d $PKG/etc/rc.d
+mv licenses LICENSE.txt -t $PKG/usr/doc/$NAME-$VERSION
 
-chmod 744 ./i2prouter
-chmod 744 ./osid
-chmod 744 ./runplain.sh
-chmod 744 ./eepget
-chmod 744 ./scripts/i2pbench.sh
-chmod 744 ./scripts/i2ptest.sh
-rm -Rf ./lib/*.dll ./*.bat ./*.exe ./installer ./icons ./a postinstall.sh
+# runplain.sh will live in the installation directory. eepget and i2prouter will go to /usr/bin
+# with symlinks in INST_DIR (created in doinst.sh)
+install -m755 i2prouter $PKG/usr/bin
+install -m755 eepget $PKG/usr/bin
+chmod 755  ./runplain.sh
 
-mv $PKG/$INSTALL_DIR/i2p/*.config $PKG/install
-mv $PKG/$INSTALL_DIR/i2p/blocklist.txt $PKG/$INSTALL_DIR/i2p/blocklist.txt.new
-find $PKG/$INSTALL_DIR/i2p -name "*.xml" -exec mv {} {}.new \;
-mv $PKG/$INSTALL_DIR/i2p/eepsite/docroot/index.html $PKG/$INSTALL_DIR/i2p/eepsite/docroot/index.html.new
-mv $PKG/$INSTALL_DIR/i2p/eepsite/docroot/favicon.ico $PKG/$INSTALL_DIR/i2p/eepsite/docroot/favicon.ico.new
-sed "s|directory|/$INSTALL_DIR/i2p/|g" $CWD/doinst.sh > $PKG/install/doinst.sh
-cat $CWD/slack-desc > $PKG/install/slack-desc
+if [ $INSTALL_DIR != 'opt' ]; then
+    sed "s|\(The I2P package\)\s\+will be\s\+\(installed to\).+|\1 has been \2 $INSTALL_DIR/i2p|g" $CWD/README > $PKG/usr/doc/$NAME-$VERSION/README
+else
+    sed "s|will be installed|has been installed|" $CWD/README > $PKG/usr/doc/$NAME-$VERSION/README
+fi
+
+install -d $PKG/usr/man/man1
+gzip -9 man/*.1
+install -m644 man/*.1.gz $PKG/usr/man/man1
+rm -rf ./man
+
+# We install all x86 wrapper binaries.
+# The i2prouter script will try to determine the OS (linux), the bits (32 VS 64) and should be able
+# to figure out the correct wrapper binary to use.
+
+# However: In case the i2prouter script's detection fails, "$INST_DIR/i2psvc" will point to
+# what 'we' think the correct binary is.
+#
+# A good reason for installing all binaries: in case the user, for whatever reason, switches from an
+# x64 JRE to an x86 JRE, I2P should continue to work without needing to be reinstalled.
+install -m755 $I2PSRC/installer/lib/wrapper/linux/i2psvc ./i2psvc-linux-x86-32
+install -m644 $I2PSRC/installer/lib/wrapper/linux/libwrapper.so ./lib/libwrapper-linux-x86-32.so
+install -m755 $I2PSRC/installer/lib/wrapper/linux64/i2psvc ./i2psvc-linux-x86-64
+install -m644 $I2PSRC/installer/lib/wrapper/linux64/libwrapper.so ./lib/libwrapper-linux-x86-64.so
+install -m644 $I2PSRC/installer/lib/wrapper/all/wrapper.jar ./lib/wrapper.jar
+install -m644 $I2PSRC/build/jbigi.jar $PKG/$INSTALL_DIR/i2p/lib/jbigi.jar
+
+rm -f ./postinstall.sh ./osid ./INSTALL-*.txt
+sed "s|directory|/$INSTALL_DIR/i2p|" $CWD/doinst.sh > $PKG/install/doinst.sh
+sed -i "s|%pkg|$NAME-$VERSION|" $PKG/install/doinst.sh
+sed "s|%INST_DIR|/$INSTALL_DIR/i2p|" $CWD/rc.i2p> $PKG/etc/rc.d/rc.i2p.new
+cp $CWD/slack-desc $PKG/install/slack-desc
 
 cd $PKG
-#
-# requiredbuilder messes up REALLY bad, and thinks java is perl?!
-# It also did not catch the shell requirements! BOOOOOOOOOOO! HISSSSSSSS!
-#
-# requiredbuilder -v -y -s $CWD $PKG
-#
-cat $CWD/slack-required > $PKG/install/slack-required
+cp $CWD/slack-required $PKG/install/slack-required
 makepkg -l y -c n $CWD/${NAME}-$VERSION-$ARCH-$BUILD.$EXT

Slackware/i2p/rc.i2p

@@ -0,0 +1,185 @@
+#!/bin/sh
+
+# Abort on errors
+set -e
+
+##
+# This *must* be configured. Set this to the user that will run I2P.
+# Note: If you don't want I2P to start automatically at boot,
+# use "i2prouter start" as a non-root user to start I2P.
+#RUN_AS_USER=
+##
+
+##
+# Set the locale as desired.
+# Note: this is not the same as the language shown in the I2P router console.
+# This affects the locale used in wrapper.log. For best results, use a
+# unicode enabled locale. This is especially important for foreign language torrents.
+#
+# If not set the user's configured locale will be used.
+#RCLOCALE=
+##
+
+#####################################################
+# Nothing below this point should need to be edited #
+#####################################################
+# %INST_DIR is set by i2p.SlackBuild
+INSTALL_DIR="%INST_DIR"
+# Make sure the package is installed and that the wrapper can be found
+[ -d $INSTALL_DIR ] && [ -x $INSTALL_DIR/i2psvc ] || (echo "The I2P package is not installed" >&2 ; exit 1)
+
+if [ -z $RUN_AS_USER ]; then
+    echo "ERROR: RUN_AS_USER not configured in $0" >&2
+    exit 1
+fi
+
+if [ $(id -ur) -ne 0 ]; then
+    echo 'ERROR: You must be root to start this service.' >&2
+    echo
+    exit 1
+fi
+
+if [ -z $RCLOCALE ]; then
+    if [ ! $(locale -a |grep -q "en_US\.utf8") ]; then
+        RCLOCALE="en_US.utf8"
+    fi
+fi
+
+# Abort this script if any referenced variables haven't been set
+set -u
+
+if $(uname -m |grep -q '64'); then
+    BITS='64'
+else
+    BITS=''
+fi
+
+PATH="$PATH:/usr/lib$BITS/java/bin:/usr/lib$BITS/java/jre/bin"
+RUN=/var/run/i2p
+PIDFILE="$RUN/i2p.pid"
+WRAPPER_CONF="$INSTALL_DIR/wrapper.config"
+WRAPPERLOG=/var/log/i2p/wrapper.log
+I2PTEMP="/tmp/i2p-daemon"
+DESC="The I2P daemon"
+JAVABINARY=$(awk -F'=' '/^ *wrapper\.java\.command/{print $2}' "$WRAPPER_CONF")
+
+if [ ! $(which $JAVABINARY 2>/dev/null) ]; then
+    for rc in /etc/profile.d/*jdk*.sh /etc/profile.d/*java*.sh; do
+        [ -r $rc ] && . $rc
+    done
+    if [ ! $(which $JAVABINARY 2>/dev/null) ]; then
+        echo "ERROR: Cannot find java. Please set the path to java in $WRAPPER_CONF" >&2
+        exit 1
+    fi
+fi
+
+JAVA=$(which $JAVABINARY 2>/dev/null)
+
+I2P_ARGS="$WRAPPER_CONF \
+ wrapper.java.additional.1=-DloggerFilenameOverride=/var/log/i2p/log-router-@.txt \
+ wrapper.java.additional.10=-Dwrapper.logfile=$WRAPPERLOG \
+ wrapper.java.additional.11=-Di2p.dir.pid=$RUN \
+ wrapper.java.additional.12=-Di2p.dir.temp=$I2PTEMP \
+ wrapper.java.command=$JAVA \
+ wrapper.logfile=$WRAPPERLOG \
+ wrapper.pidfile=$PIDFILE \
+ wrapper.daemonize=TRUE"
+
+LC_ALL=$RCLOCALE
+LANG=$RCLOCALE
+export LC_ALL LANG
+
+is_running() {
+    if [ -r $PIDFILE ]; then
+        PID="$(cat ${PIDFILE})" 2>/dev/null 2>&1
+        if ! kill -0 $PID >/dev/null 2>&1; then
+            rm "$PIDFILE"
+            return 1
+        else
+            return 0
+        fi
+    else
+        return 1
+    fi
+}
+
+start() {
+    if is_running; then
+        echo "ERROR: $DESC is already running." >&2
+    fi
+
+    for DIR in $RUN $I2PTEMP; do
+        test -d $DIR && rm -rf $DIR
+        mkdir -p $DIR
+        chown -R $RUN_AS_USER $DIR
+    done
+    [ -d /var/log/i2p ] || mkdir /var/log/i2p
+    chown -R $RUN_AS_USER /var/log/i2p
+
+    echo -n "Starting $DESC..."
+    TZ=UTC su $RUN_AS_USER -c "$INSTALL_DIR/i2psvc $I2P_ARGS"
+    is_running
+    echo "[pid: $PID]"
+}
+
+stop(){
+    if is_running; then
+        echo -n "Stopping $DESC [pid: $PID] (this could take a while)."
+        kill "$PID" >/dev/null 2>&1
+        while kill -0 "$PID" > /dev/null 2>&1; do
+            echo -n .
+            sleep 1
+        done
+        rm -rf "$RUN" "$I2PTEMP"
+        echo done.
+        return 0
+    else
+        echo "$DESC is not running." >&2
+        return 1
+    fi
+}
+
+
+# Unset +u to allow the 'usage' text to be displayed
+set +u
+case "$1" in
+    start)
+        start
+        ;;
+    status)
+        if is_running; then
+            echo "$DESC is running [pid: $PID]" >&2
+        else
+            echo "$DESC is not running." >&2
+        fi
+        ;;
+    stop)
+        stop
+        ;;
+    graceful)
+        if is_running; then
+            kill -HUP $PID
+            echo "Graceful shutdown of $DESC initiated." >&2
+            echo "This may take up to 11 minutes." >&2
+        fi
+        ;;
+    dump)
+        if is_running; then
+            kill -3 $PID
+            echo "Threads dumped to $WRAPPERLOG" >&2
+        else
+            echo "$DESC is not running." >&2
+        fi
+        ;;
+    restart)
+        if is_running; then
+            stop
+            start
+        else
+            echo "$DESC is not running." >&2
+        fi
+        ;;
+    *)
+        echo "usage: $0 start|stop|status|restart|graceful|dump"
+        ;;
+esac

Slackware/i2p/readme.txt

@@ -1,47 +0,0 @@
-Building:
-The i2p package will be installed in /opt/i2p 
-
-If you want to change installation dir, change the variable INSTALL_DIR
-on i2p.SlackBuild and rebuild the package. You will also need to do the same
-in the base-i2p package.
-
-Installation and Upgrade:
-Probably you will never have to update i2p packages. However if you do,
-be sure to installpkg first, then removepkg or custom config files can
-be lost with upgradepkg. I2P has an auto-update function. However using
-installpkg then removepkg lowers the demand on the I2P network as a 
-whole, and is by far faster.
-
-After installpkg command, doinst.sh will execute a postinstallation script
-needed by I2P.  Be sure to also install the base-i2p package.
-
-Optional:
-
-chmod +x /etc/rc.d/rc.i2p only if you want it to start on boot and stop on
-shutdown.
-
-How to start I2P:
-
-Start I2P service with-
-sh /etc/rc.d/rc.i2p start
-
-Now tell your browser to user this proxy: localhost on port 4444 and open
-this page: http://localhost:7657/index.jsp
-Here you can configure I2P, watch network status and navigate anonimously.
-It's suggested to subscribe to various addressbook hosts so that you can
-get to the many available eepsites and other service on I2P. These are not
-set up by default for security reasons. 
-
-Please see the faqs on http://www.i2p2.i2p/ or http://www.i2p2.de/ on how
-to subscribe to the various addressbook services.
-
-To stop I2P:
- /etc/rc.d/rc.i2p stop
-
-
-For any additional information:
-
-Within I2P- http://www.i2p2.i2p/, http://forum.i2p/, http://zzz.i2p
-
-Internet (not reccomended!) - http://www.i2p2.de/, http://forum.i2p2.de/
-

Slackware/i2p/slack-desc

@@ -6,7 +6,7 @@
 # leave one space after the ':'.
 
    |-----handy-ruler----------------------------------------------------------|
-i2p: i2p (an anonymizing network)
+i2p: I2P (an anonymizing network)
 i2p:
 i2p: I2P is an anonymizing network, offering a simple layer that
 i2p: identity-sensitive applications can use to securely communicate. All
@@ -14,6 +14,6 @@ i2p: data is wrapped with several layers of encryption, and the network is
 i2p: both distributed and dynamic, with no trusted parties.
 i2p: Many applications are available that interface with I2P, including 
 i2p: mail, peer-peer file sharing, IRC chat, and others.
-i2p: WARNING: To upgrade installpkg FIRST _THEN_ removepkg.
-i2p: For more information, see:  http://www.i2p2.de/
+i2p: 
+i2p: For more information, see:  https://geti2p.net/
 i2p:

Slackware/i2p/slack-required

@@ -1,4 +1 @@
-jre >= 5
-i2p-base >= 0.0.1
-bash >= 3.1.017
-
+jre >= 6

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/build-impl.xml

@@ -39,8 +39,9 @@ is divided into following sections:
         <property file="${user.properties.file}"/>
         <!-- The two properties below are usually overridden -->
         <!-- by the active platform. Just a fallback. -->
-        <property name="default.javac.source" value="1.4"/>
-        <property name="default.javac.target" value="1.4"/>
+        <property name="default.javac.source" value="1.8"/>
+        <property name="default.javac.target" value="1.8"/>
+        <property name="javac.release" value="8"/>
     </target>
     <target depends="-pre-init,-init-private,-init-user" name="-init-project">
         <property file="nbproject/configs/${config}.properties"/>
@@ -155,7 +156,7 @@ is divided into following sections:
             <attribute default="/does/not/exist" name="sourcepath"/>
             <element name="customize" optional="true"/>
             <sequential>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}">
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" release="${javac.release}">
                     <classpath>
                         <path path="@{classpath}"/>
                     </classpath>

apps/BOB/nbproject/project.properties

@@ -29,27 +29,19 @@ endorsed.classpath=
 excludes=**/*.html,**/*.txt
 file.reference.build-javadoc=../../i2p.i2p/build/javadoc
 file.reference.i2p.jar=../../core/java/build/i2p.jar
-file.reference.i2ptunnel.jar=../i2ptunnel/java/build/i2ptunnel.jar
-file.reference.jbigi.jar=../../build/jbigi.jar
 file.reference.mstreaming.jar=../ministreaming/java/build/mstreaming.jar
-file.reference.router.jar=../../router/java/build/router.jar
-file.reference.streaming.jar=../streaming/java/build/streaming.jar
-file.reference.wrapper.jar=../../installer/lib/wrapper/all/wrapper.jar
 includes=**
 jar.compress=true
 javac.classpath=\
-    ${file.reference.router.jar}:\
-    ${file.reference.i2ptunnel.jar}:\
     ${file.reference.mstreaming.jar}:\
-    ${file.reference.streaming.jar}:\
-    ${file.reference.wrapper.jar}:\
-    ${file.reference.i2p.jar}:\
-    ${file.reference.router.jar}
+    ${file.reference.i2p.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
-javac.source=1.5
-javac.target=1.5
+javac.version=1.8
+javac.source=${javac.version}
+javac.target=${javac.version}
+javac.release=8
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\

apps/BOB/nbproject/project.xml

@@ -4,7 +4,7 @@
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
             <name>BOB</name>
-            <minimum-ant-version>1.6.5</minimum-ant-version>
+            <minimum-ant-version>1.9.8</minimum-ant-version>
             <source-roots>
                 <root id="src.dir"/>
             </source-roots>

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

@@ -15,6 +15,8 @@
  */
 package net.i2p.BOB;
 
+import static net.i2p.app.ClientAppState.*;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -25,13 +27,19 @@ import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketTimeoutException;
+import java.net.URL;
+import java.util.Arrays;
 import java.util.Properties;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
 
 import net.i2p.I2PAppContext;
+import net.i2p.app.*;
 import net.i2p.client.I2PClient;
+import net.i2p.util.I2PAppThread;
 import net.i2p.util.Log;
-import net.i2p.util.SimpleScheduler;
+import net.i2p.util.PortMapper;
 import net.i2p.util.SimpleTimer2;
 
 /**
@@ -104,58 +112,84 @@ import net.i2p.util.SimpleTimer2;
  * BOB, main command socket listener, launches the command parser engine.
  *
  * @author sponge
+ * @deprecated Please port applications to SAMv3
  */
-public class BOB {
+@Deprecated
+public class BOB implements Runnable, ClientApp {
 
 	public final static String PROP_CONFIG_LOCATION = "BOB.config";
 	public final static String PROP_BOB_PORT = "BOB.port";
 	public final static String PROP_BOB_HOST = "BOB.host";
 	public final static String PROP_CFG_VER = "BOB.CFG.VER";
-	private static NamedDB database;
-	private static Properties props = new Properties();
-	private static AtomicBoolean spin = new AtomicBoolean(true);
+
+	/** unused when started via the ClientApp interface */
+	private static BOB _bob;
+
+	private final NamedDB database;
+	private final Properties props = new Properties();
+	private final AtomicBoolean spin = new AtomicBoolean(true);
 	private static final String P_RUNNING = "RUNNING";
 	private static final String P_STARTING = "STARTING";
 	private static final String P_STOPPING = "STOPPING";
-	private static AtomicBoolean lock = new AtomicBoolean(false);
+	private final AtomicBoolean lock = new AtomicBoolean(false);
 	// no longer used.
 	// private static int maxConnections = 0;
 
-	/**
-	 * Log a warning
-	 *
-	 * @param arg
-	 */
-	public static void info(String arg) {
-		System.out.println("INFO:" + arg);
-		(new Log(BOB.class)).info(arg);
-	}
+	private final I2PAppContext _context;
+	private final Logger _log;
+	private final ClientAppManager _mgr;
+	private final String[] _args;
+	private volatile ClientAppState _state = UNINITIALIZED;
 
-	/**
-	 * Log a warning
-	 *
-	 * @param arg
-	 */
-	public static void warn(String arg) {
-		System.out.println("WARNING:" + arg);
-		(new Log(BOB.class)).warn(arg);
-	}
-
-	/**
-	 * Log an error
-	 *
-	 * @param arg
-	 */
-	public static void error(String arg) {
-		System.out.println("ERROR: " + arg);
-		(new Log(BOB.class)).error(arg);
-	}
+	private volatile ServerSocket listener;
+	private volatile Thread _runner;
+	private volatile boolean _warned;
 
 	/**
 	 * Stop BOB gracefully
+	 * @deprecated unused
 	 */
-	public static void stop() {
-		spin.set(false);
+	@Deprecated
+	public synchronized static void stop() {
+		if (_bob != null)
+			_bob.shutdown(null);
+	}
+
+	/**
+	 *  For ClientApp interface.
+	 *  Does NOT open the listener socket or start threads; caller must call startup()
+	 *
+	 *  @param mgr may be null
+	 *  @param args non-null
+	 *  @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) +
+		                "/META-INF/MANIFEST.MF";
+		        try {
+		            Manifest manifest = new Manifest(new URL(manifestPath).openStream());
+		            Attributes attrs = manifest.getMainAttributes();
+		            String mainClass = attrs.getValue("Main-Class");
+		            if ("net.i2p.BOB.Main".equals(mainClass))
+		                logToStdout = true;
+		        } catch (IOException ioe) {}
+		    }
+		}
+
+		_log = new Logger(context.logManager().getLog(BOB.class), logToStdout);
+
+		_mgr = mgr;
+		_args = args;
+		_state = INITIALIZED;
+		database = new NamedDB();
+		loadConfig();
 	}
 
 	/**
@@ -163,129 +197,178 @@ public class BOB {
 	 *
 	 * @param args
 	 */
-	public static void main(String[] args) {
-		database = new NamedDB();
-		ServerSocket listener = null;
+	public synchronized static void main(String[] args) {
+		try {
+			_bob = new BOB(I2PAppContext.getGlobalContext(), null, args);
+			_bob.startup();
+		} catch (RuntimeException e) {
+			e.printStackTrace();
+			throw e;
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw new RuntimeException(e);
+		}
+	}
+
+	/**
+	 * @since 0.9.10
+	 */
+	private void loadConfig() {
 		int i = 0;
 		boolean save = false;
 		// Set up all defaults to be passed forward to other threads.
 		// 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();
-		Log _log = new Log(BOB.class);
-		try {
-			{
-				File cfg = new File(configLocation);
-				if (!cfg.isAbsolute()) {
-					cfg = new File(I2PAppContext.getGlobalContext().getConfigDir(), configLocation);
-				}
-				try {
-					FileInputStream fi = new FileInputStream(cfg);
-					props.load(fi);
-					fi.close();
-				} catch (FileNotFoundException fnfe) {
-					warn("Unable to load up the BOB config file " + cfg.getAbsolutePath() + ", Using defaults.");
-					warn(fnfe.toString());
-					save = true;
-				} catch (IOException ioe) {
-					warn("IOException on BOB config file " + cfg.getAbsolutePath() + ", using defaults.");
-					warn(ioe.toString());
-				}
+		{
+			File cfg = new File(configLocation);
+			if (!cfg.isAbsolute()) {
+				cfg = new File(_context.getConfigDir(), configLocation);
 			}
-			// Global router and client API configurations that are missing are set to defaults here.
-			if (!props.containsKey(I2PClient.PROP_TCP_HOST)) {
-				props.setProperty(I2PClient.PROP_TCP_HOST, "localhost");
-				save = true;
-			}
-			if (!props.containsKey(I2PClient.PROP_TCP_PORT)) {
-				props.setProperty(I2PClient.PROP_TCP_PORT, "7654");
-				save = true;
-			}
-			if (!props.containsKey(PROP_BOB_PORT)) {
-				props.setProperty(PROP_BOB_PORT, "2827"); // 0xB0B
-				save = true;
-			}
-			if (!props.containsKey("inbound.length")) {
-				props.setProperty("inbound.length", "1");
-				save = true;
-			}
-			if (!props.containsKey("outbound.length")) {
-				props.setProperty("outbound.length", "1");
-				save = true;
-			}
-			if (!props.containsKey("inbound.lengthVariance")) {
-				props.setProperty("inbound.lengthVariance", "0");
-				save = true;
-			}
-			if (!props.containsKey("outbound.lengthVariance")) {
-				props.setProperty("outbound.lengthVariance", "0");
-				save = true;
-			}
-			if (!props.containsKey(PROP_BOB_HOST)) {
-				props.setProperty(PROP_BOB_HOST, "localhost");
-				save = true;
-			}
-			// PROP_RELIABILITY_NONE, PROP_RELIABILITY_BEST_EFFORT, PROP_RELIABILITY_GUARANTEED
-			if (!props.containsKey(PROP_CFG_VER)) {
-				props.setProperty(I2PClient.PROP_RELIABILITY, I2PClient.PROP_RELIABILITY_NONE);
-				props.setProperty(PROP_CFG_VER,"1");
-				save = true;
-			}
-			if (save) {
-				File cfg = new File(configLocation);
-				if (!cfg.isAbsolute()) {
-					cfg = new File(I2PAppContext.getGlobalContext().getConfigDir(), configLocation);
-				}
-				try {
-					warn("Writing new defaults file " + cfg.getAbsolutePath());
-					FileOutputStream fo = new FileOutputStream(cfg);
-					props.store(fo, cfg.getAbsolutePath());
-					fo.close();
-				} catch (IOException ioe) {
-					error("IOException on BOB config file " + cfg.getAbsolutePath() + ", " + ioe);
-				}
-			}
-
-			i = 0;
-			boolean g = false;
-			spin.set(true);
+			FileInputStream fi = null;
 			try {
-				info("BOB is now running.");
-				listener = new ServerSocket(Integer.parseInt(props.getProperty(PROP_BOB_PORT)), 10, InetAddress.getByName(props.getProperty(PROP_BOB_HOST)));
-				Socket server = null;
-				listener.setSoTimeout(500); // .5 sec
-				
-				while (spin.get()) {
-					//DoCMDS connection;
-
-					try {
-						server = listener.accept();
-						server.setKeepAlive(true);
-						g = true;
-					} catch (ConnectException ce) {
-						g = false;
-					} catch (SocketTimeoutException ste) {
-						g = false;
-					}
-
-					if (g) {
-						DoCMDS conn_c = new DoCMDS(spin, lock, server, props, database, _log);
-						Thread t = new Thread(conn_c);
-						t.setName("BOB.DoCMDS " + i);
-						t.start();
-						i++;
-					}
-				}
+				fi = new FileInputStream(cfg);
+				props.load(fi);
+			} catch (FileNotFoundException fnfe) {
+				_log.warn("Unable to load up the BOB config file " + cfg.getAbsolutePath() + ", Using defaults.", fnfe);
+				save = true;
 			} catch (IOException ioe) {
-				error("IOException on socket listen: " + ioe);
-				ioe.printStackTrace();
+				_log.warn("IOException on BOB config file " + cfg.getAbsolutePath() + ", using defaults.", ioe);
+			} finally {
+				if (fi != null) try { fi.close(); } catch (IOException ioe) {}
 			}
+		}
+		// Global router and client API configurations that are missing are set to defaults here.
+		if (!props.containsKey(I2PClient.PROP_TCP_HOST)) {
+			props.setProperty(I2PClient.PROP_TCP_HOST, "localhost");
+			save = true;
+		}
+		if (!props.containsKey(I2PClient.PROP_TCP_PORT)) {
+			props.setProperty(I2PClient.PROP_TCP_PORT, Integer.toString(I2PClient.DEFAULT_LISTEN_PORT));
+			save = true;
+		}
+		if (!props.containsKey(PROP_BOB_PORT)) {
+			props.setProperty(PROP_BOB_PORT, "2827"); // 0xB0B
+			save = true;
+		}
+		if (!props.containsKey("inbound.length")) {
+			props.setProperty("inbound.length", "3");
+			save = true;
+		}
+		if (!props.containsKey("outbound.length")) {
+			props.setProperty("outbound.length", "3");
+			save = true;
+		}
+		if (!props.containsKey("inbound.lengthVariance")) {
+			props.setProperty("inbound.lengthVariance", "0");
+			save = true;
+		}
+		if (!props.containsKey("outbound.lengthVariance")) {
+			props.setProperty("outbound.lengthVariance", "0");
+			save = true;
+		}
+		if (!props.containsKey(PROP_BOB_HOST)) {
+			props.setProperty(PROP_BOB_HOST, "localhost");
+			save = true;
+		}
+		// PROP_RELIABILITY_NONE, PROP_RELIABILITY_BEST_EFFORT, PROP_RELIABILITY_GUARANTEED
+		if (!props.containsKey(PROP_CFG_VER)) {
+			props.setProperty(I2PClient.PROP_RELIABILITY, I2PClient.PROP_RELIABILITY_NONE);
+			props.setProperty(PROP_CFG_VER,"1");
+			save = true;
+		}
+		if (save) {
+			File cfg = new File(configLocation);
+			if (!cfg.isAbsolute()) {
+				cfg = new File(_context.getConfigDir(), configLocation);
+			}
+			FileOutputStream fo = null;
+			try {
+				_log.warn("Writing new defaults file " + cfg.getAbsolutePath());
+				fo = new FileOutputStream(cfg);
+				props.store(fo, cfg.getAbsolutePath());
+			} catch (IOException ioe) {
+				_log.error("IOException on BOB config file " + cfg.getAbsolutePath(), ioe);
+			} finally {
+				if (fo != null) try { fo.close(); } catch (IOException ioe) {}
+			}
+		}
+	}
+
+	/**
+	 * @since 0.9.10
+	 */
+	private void startListener() throws IOException {
+		listener = new ServerSocket(Integer.parseInt(props.getProperty(PROP_BOB_PORT)), 10, InetAddress.getByName(props.getProperty(PROP_BOB_HOST)));
+		listener.setSoTimeout(500); // .5 sec
+	}
+
+	/**
+	 * @since 0.9.10
+	 */
+	private void startThread() {
+		I2PAppThread t = new I2PAppThread(this, "BOBListener");
+		t.start();
+		_runner = t;
+	}
+
+	/**
+	 * @since 0.9.10
+	 */
+	public void run() {
+		if (listener == null) return;
+		changeState(RUNNING);
+		_log.info("BOB is now running.");
+		if (_mgr != null)
+			_mgr.register(this);
+		_context.portMapper().register(PortMapper.SVC_BOB, props.getProperty(PROP_BOB_HOST),
+		                               Integer.parseInt(props.getProperty(PROP_BOB_PORT)));
+
+		int i = 0;
+		boolean g = false;
+		spin.set(true);
+		try {
+			Socket server = null;
+
+			while (spin.get()) {
+				//DoCMDS connection;
+
+				try {
+					server = listener.accept();
+					server.setKeepAlive(true);
+					g = true;
+				} catch (ConnectException ce) {
+					g = false;
+				} catch (SocketTimeoutException ste) {
+					g = false;
+				}
+
+				if (g) {
+					if (!_warned) {
+						_warned = true;
+						String s = "BOB is deprecated. Please port applications to SAMv3.";
+						_context.logManager().getLog(BOB.class).logAlways(Log.WARN, s);
+						_log.warn(s);
+					}
+					DoCMDS conn_c = new DoCMDS(spin, lock, server, props, database, _log);
+					Thread t = new I2PAppThread(conn_c);
+					t.setName("BOB.DoCMDS " + i);
+					t.start();
+					i++;
+				}
+			}
+			changeState(STOPPING);
+		} catch (Exception e) {
+			if (spin.get())
+				_log.error("Unexpected error while listening for connections", e);
+			else
+				e = null;
+			changeState(STOPPING, e);
 		} finally {
-			info("BOB is now shutting down...");
+			_log.info("BOB is now shutting down...");
+			_context.portMapper().unregister(PortMapper.SVC_BOB);
 			// Clean up everything.
 			try {
 				listener.close();
@@ -296,28 +379,33 @@ public class BOB {
 			// 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, new Boolean(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();
 			}
-			info("BOB is now stopped.");
-
+			changeState(STOPPED);
+			_log.info("BOB is now stopped.");
 		}
 	}
 
@@ -369,4 +457,86 @@ public class BOB {
 			waitjoin(groups[i], level + 1, groups[i].getName());
 		}
 	}
+
+	////// begin ClientApp interface
+
+	/**
+	 * @since 0.9.10
+	 */
+	@Override
+	public void startup() throws IOException {
+		if (_state != INITIALIZED)
+			return;
+		changeState(STARTING);
+		try {
+			startListener();
+		} catch (IOException e) {
+			_log.error("Error starting BOB on"
+					+ props.getProperty(PROP_BOB_HOST)
+					+ ":" + props.getProperty(PROP_BOB_PORT), e);
+			changeState(START_FAILED, e);
+			throw e;
+		}
+		startThread();
+	}
+
+	/**
+	 * @since 0.9.10
+	 */
+	@Override
+	public void shutdown(String[] args) {
+		if (_state != RUNNING)
+			return;
+		changeState(STOPPING);
+		spin.set(false);
+		if (_runner != null)
+			_runner.interrupt();
+		else
+			changeState(STOPPED);
+	}
+
+	/**
+	 * @since 0.9.10
+	 */
+	@Override
+	public ClientAppState getState() {
+		return _state;
+	}
+
+	/**
+	 * @since 0.9.10
+	 */
+	@Override
+	public String getName() {
+		return "BOB";
+	}
+
+	/**
+	 * @since 0.9.10
+	 */
+	@Override
+	public String getDisplayName() {
+		return "BOB " + Arrays.toString(_args);
+	}
+
+	////// end ClientApp interface
+	////// begin ClientApp helpers
+
+	/**
+	 *  @since 0.9.10
+	 */
+	private void changeState(ClientAppState state) {
+		changeState(state, null);
+	}
+
+	/**
+	 *  @since 0.9.10
+	 */
+	private synchronized void changeState(ClientAppState state, Exception e) {
+		_state = state;
+		if (_mgr != null)
+			_mgr.notify(this, state, null, e);
+	}
+
+	////// end ClientApp helpers
 }

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

@@ -18,11 +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.Log;
+import net.i2p.util.I2PAppThread;
 
 /**
  * Listen on I2P and connect to TCP
@@ -31,25 +32,23 @@ import net.i2p.util.Log;
  */
 public class I2Plistener implements Runnable {
 
-	private NamedDB info,  database;
-	private Log _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
 	 */
-	I2Plistener(I2PServerSocket SS, I2PSocketManager S, NamedDB info, NamedDB database, Log _log, AtomicBoolean lives) {
+	I2Plistener(I2PServerSocket SS, I2PSocketManager S, NamedDB info, NamedDB database, Logger _log, AtomicBoolean lives) {
 		this.database = database;
 		this.info = info;
 		this._log = _log;
-		this.socketManager = S;
 		this.serverSocket = SS;
 		this.lives = lives;
 	}
@@ -80,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/Lifted.java

@@ -15,7 +15,7 @@
  */
 package net.i2p.BOB;
 
-import java.util.Enumeration;
+import java.util.Map;
 import java.util.Properties;
 
 /**
@@ -39,10 +39,8 @@ public class Lifted {
 	 *
 	 **/
 	public static void copyProperties(Properties src_prop, Properties dest_prop) {
-		for (Enumeration propertyNames = src_prop.propertyNames();
-			propertyNames.hasMoreElements();) {
-			Object key = propertyNames.nextElement();
-			dest_prop.put(key, src_prop.get(key));
+		for (Map.Entry<Object, Object> e : src_prop.entrySet()) {
+			dest_prop.put((String)e.getKey(), (String)e.getValue());
 		}
 	}
 }

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

@@ -0,0 +1,44 @@
+package net.i2p.BOB;
+
+import net.i2p.util.Log;
+
+public class Logger {
+	public Log log;
+	private boolean logToStdout;
+
+	public Logger(Log log, boolean logToStdout) {
+		this.log = log;
+		this.logToStdout = logToStdout;
+	}
+
+	public void info(String msg) {
+		if (logToStdout)
+			System.out.println("INFO: " + msg);
+		if (log.shouldLog(Log.INFO))
+			log.info(msg);
+	}
+
+	public void warn(String msg) {
+		warn(msg, null);
+	}
+
+	public void warn(String msg, Throwable e) {
+		if (logToStdout) {
+			System.out.println("WARNING: " + msg);
+			if (e != null)
+				e.printStackTrace();
+		}
+		if (log.shouldLog(Log.WARN))
+			log.warn(msg, e);
+	}
+
+	public void error(String msg, Throwable e) {
+		if (logToStdout) {
+			System.out.println("ERROR: " + msg);
+			if (e != null)
+				e.printStackTrace();
+		}
+		if (log.shouldLog(Log.ERROR))
+			log.error(msg, e);
+	}
+}

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

@@ -21,10 +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;
 
 /**
@@ -35,18 +38,18 @@ import net.i2p.util.Log;
  */
 public class MUXlisten implements Runnable {
 
-	private NamedDB database,  info;
-	private Log _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.
@@ -57,93 +60,104 @@ public class MUXlisten implements Runnable {
 	 * @throws net.i2p.I2PException
 	 * @throws java.io.IOException
 	 */
-	MUXlisten(AtomicBoolean lock, NamedDB database, NamedDB info, Log _log) throws I2PException, IOException, RuntimeException {
+	MUXlisten(AtomicBoolean lock, NamedDB database, NamedDB info, Logger _log) throws I2PException, IOException, RuntimeException {
+		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", new Boolean(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();
+			}
+
+			String i2cpHost = Q.getProperty(I2PClient.PROP_TCP_HOST, "127.0.0.1");
+			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 + "]");
+				}
 			}
-			this.database.releaseReadLock();
-			this.info.releaseReadLock();
 
 			if (this.come_in) {
 				this.listener = new ServerSocket(port, backlog, host);
 			}
-			socketManager = I2PSocketManagerFactory.createManager(prikey, Q);
+			socketManager = I2PSocketManagerFactory.createManager(
+					prikey, i2cpHost, i2cpPort, Q);
 		} catch (IOException e) {
 			// Something went bad.
-			this.database.getWriteLock();
-			this.info.getWriteLock();
-			this.info.add("STARTING", new Boolean(false));
-			this.info.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", new Boolean(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", new Boolean(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();
 	}
@@ -157,24 +171,19 @@ public class MUXlisten implements Runnable {
 		Thread t = null;
 		Thread q = null;
 		try {
+			wlock();
 			try {
-				wlock();
 				try {
-					info.add("RUNNING", new Boolean(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);
@@ -190,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", new Boolean(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()) {
@@ -224,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
@@ -258,16 +259,16 @@ public class MUXlisten implements Runnable {
 			try {
 				wlock();
 				try {
-					info.add("STARTING", new Boolean(false));
-					info.add("STOPPING", new Boolean(true));
-					info.add("RUNNING", new Boolean(false));
+					info.add("STARTING", Boolean.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)) {
@@ -309,15 +310,15 @@ public class MUXlisten implements Runnable {
 			try {
 				wlock();
 				try {
-					info.add("STARTING", new Boolean(false));
-					info.add("STOPPING", new Boolean(false));
-					info.add("RUNNING", new Boolean(false));
+					info.add("STARTING", Boolean.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,130 +28,62 @@ package net.i2p.BOB;
  */
 public class NamedDB {
 
-	private volatile Object[][] data;
-	private volatile 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.index = this.writersWaiting = this.readers = 0;
+		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");
 	}
 
@@ -155,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
@@ -116,7 +116,6 @@ public class TCPio implements Runnable {
 				Aout.close();
 			} catch (IOException ex) {
 			}
-			return;
 		}
 	}
 }

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

@@ -20,9 +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.Log;
+import net.i2p.util.I2PAppThread;
 
 /**
  * Listen on TCP port and connect to I2P
@@ -31,12 +32,11 @@ import net.i2p.util.Log;
  */
 public class TCPlistener implements Runnable {
 
-	private NamedDB info,  database;
-	private Log _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
@@ -45,7 +45,7 @@ public class TCPlistener implements Runnable {
 	 * @param database
 	 * @param _log
 	 */
-	TCPlistener(ServerSocket listener, I2PSocketManager S, NamedDB info, NamedDB database, Log _log, AtomicBoolean lives) {
+	TCPlistener(ServerSocket listener, I2PSocketManager S, NamedDB info, NamedDB database, Logger _log, AtomicBoolean lives) {
 		this.database = database;
 		this.info = info;
 		this._log = _log;
@@ -77,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;
 	}
@@ -70,12 +68,10 @@ public class TCPtoI2P implements Runnable {
 	 * @throws IOException
 	 */
 	private static String lnRead(InputStream in) throws IOException {
-		String S;
+		StringBuilder builder = new StringBuilder();
 		int b;
 		char c;
 
-		S = new String();
-
 		while (true) {
 			b = in.read();
 			if (b == 13) {
@@ -87,9 +83,9 @@ public class TCPtoI2P implements Runnable {
 				break;
 			}
 			c = (char) (b & 0x7f); // We only care about ASCII
-			S = new String(S + c);
+			builder.append(c);
 		}
-		return S;
+		return builder.toString();
 	}
 
 	/**
@@ -101,22 +97,12 @@ public class TCPtoI2P implements Runnable {
 	 */
 	private void Emsg(String e, OutputStream out) throws IOException {
 		// Debugging		System.out.println("ERROR TCPtoI2P: " + e);
-		out.write("ERROR ".concat(e).getBytes());
+		out.write("ERROR ".concat(e).getBytes("UTF-8"));
 		out.write(13);
 		out.write(10);
 		out.flush();
 	}
 
-	private void rlock() {
-		database.getReadLock();
-		info.getReadLock();
-	}
-
-	private void runlock() {
-		info.releaseReadLock();
-		database.releaseReadLock();
-	}
-
 	/**
 	 * TCP stream to I2P stream thread starter
 	 *
@@ -160,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;
-
 	}
 
 	/**
@@ -106,8 +108,10 @@ public class UDPIOthread implements I2PSessionListener, Runnable {
 		//		_log.debug("Message available: id = " + msgId + " size = " + size);
 		try {
 			byte msg[] = session.receiveMessage(msgId);
-			out.write(msg);
-			out.flush();
+			if (msg != null) {
+				out.write(msg);
+				out.flush();
+			}
 		} catch (I2PSessionException ise) {
 			up = false;
 		} catch (IOException ioe) {

apps/BOB/src/net/i2p/BOB/package.html

@@ -1,5 +1,5 @@
 <html>
   <body>
-	  <p>BOB, the Basic Open Bridge, allows TCP applications to talk over I2P.</p>  
+	  <p>BOB, the Basic Open Bridge, allows TCP applications to talk over I2P - DEPRECATED - Please port applications to SAMv3.</p>
   </body>
 </html>

apps/addressbook/README.txt

@@ -1,43 +0,0 @@
-addressbook v2.0.2 - A simple name resolution mechanism for I2P
-
-addressbook is a simple implementation of subscribable address books for I2P.  
-Addresses are stored in userhosts.txt and a second copy of the address book is 
-placed on your eepsite as hosts.txt. 
-
-subscriptions.txt contains a list of urls to check for new addresses.
-Since the urls are checked in order, and conflicting addresses are not added,
-addressbook.subscriptions can be considered to be ranked in order of trust.
-
-The system created by addressbook is similar to the early days of DNS,
-when everyone ran a local name server.  The major difference is the lack of
-authority.  Name cannot be guaranteed to be globally unique, but in practise 
-they probably will be, for a variety of social reasons.
-
-Requirements
-************
-
-i2p with a running http proxy
-
-Installation and Usage
-**********************
-
-1. Unzip addressbook-%ver.zip into your i2p directory. 
-2. Restart your router.
-
-The addressbook daemon will automatically run while the router is up.
-
-Aside from the daemon itself, the other elements of the addressbook interface
-are the config.txt, myhosts.txt, and subscriptions.txt files found in the addressbook 
-directory. 
-
-config.txt is the configuration file for addressbook.
-
-myhosts.txt is the addressbook master address book.  Addresses placed in this file 
-take precidence over those in the router address book and in remote address books.  
-If changes are made to this file, they will be reflected in the router address book 
-and published address book after the next update. Do not make changes directly to the 
-router address book, as they could be lost during an update.
-
-subscriptions.txt is the subscription list for addressbook.  Each entry is an absolute 
-url to a file in hosts.txt format. Since the list is checked in order, url's should be 
-listed in order of trust.

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,6 +7,10 @@
 	<property name="jar" value="addressbook.jar"/>
 	<property name="war" value="addressbook.war"/>
 	<property name="javac.compilerargs" value="" />
+	<property name="javac.version" value="1.8" />
+	<property name="javac.release" value="8" />
+
+	<target name="all" depends="jar, emptyWar"/> 
 	
 	<target name="init">
 		<mkdir dir="${build}"/>
@@ -31,59 +35,47 @@
                 <!-- 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">
-		<javac debug="true" deprecation="on" source="1.5" target="1.5" 
+	<target name="compile" depends="init, depend, warUpToDate">
+            <javac debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
+                       release="${javac.release}"
                        includeAntRuntime="false"
+                       encoding="UTF-8"
                        srcdir="${src}" destdir="${build}">
             <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, as we oddly ship addressbook as a .war -->
 	<target name="jar" depends="compile, changes">
-		<jar basedir="${build}" destfile="${dist}/${jar}">
-		<!-- set if unset -->
-		<property name="workspace.changes" value="" />
-			<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="compile, 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}">
+		<jar basedir="${build}" destfile="${dist}/${jar}">
 			<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/config.txt

@@ -1,48 +0,0 @@
-# This is the configuration file for addressbook.
-#
-# Options
-# *******
-# All paths are realitive to i2p/addressbook.  Default value for
-# each option is given in parentheses.
-#
-# proxy_host                 The hostname of your I2P http proxy. 
-#                            (localhost)
-#
-# proxy_port                 The port of your I2P http proxy. (4444)
-#
-# master_addressbook         The path to your master address book, used for local
-#                            changes only. (myhosts.txt)
-#
-# router_addressbook         The path to the address book used by the router.  
-#                            Contains the addresses from your master address book
-#                            and your subscribed address books. (../userhosts.txt)
-#
-# private_addressbook        The path to the private address book used by the router.  
-#                            This is used only by the router and SusiDNS.
-#                            It is not published by addressbook. (../privatehosts.txt)
-#
-# published_addressbook      The path to the copy of your address book made 
-#                            available on i2p. (../eepsite/docroot/hosts.txt)
-#
-# log                        The path to your addressbook log. (log.txt)
-#
-# subscriptions              The path to your subscription file. (subscriptions.txt)
-#
-# etags                      The path to the etags header storage file. (etags)
-#
-# last_modified              The path to the last-modified header storage file. 
-#                            (last_modified)
-#
-# update_delay               The time (in hours) between each update. (1)
-
-proxy_host=localhost
-proxy_port=4444
-master_addressbook=myhosts.txt
-router_addressbook=../userhosts.txt
-private_addressbook=../privatehosts.txt
-published_addressbook=../eepsite/docroot/hosts.txt
-log=log.txt
-subscriptions=subscriptions.txt
-etags=etags
-last_modified=last_modified
-update_delay=1

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);
@@ -120,11 +145,13 @@ class AddressBook {
                 subscription.setLastFetched(I2PAppContext.getGlobalContext().clock().now());
                 subf = tmp;
             } else {
-                a = Collections.EMPTY_MAP;
+                a = Collections.emptyMap();
                 tmp.delete();
             }
         } catch (IOException ioe) {
-            a = Collections.EMPTY_MAP;
+            if (tmp != null)
+                tmp.delete();
+            a = Collections.emptyMap();
         }
         this.addresses = a;
         this.subFile = subf;
@@ -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();
+            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()
                 ;	
     }
 
@@ -260,22 +302,32 @@ class AddressBook {
      *            An AddressBook to merge with.
      * @param overwrite True to overwrite
      * @param log
-     *            The log to write messages about new addresses or conflicts to.
+     *            The log to write messages about new addresses or conflicts to. May be null.
      *
      * @throws IllegalStateException if this was created with the Subscription constructor.
      */
     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/ConfigIterator.java

@@ -1,145 +0,0 @@
-/*
- * Copyright (c) 2004 Ragnarok
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-package net.i2p.addressbook;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Map;
-import java.util.NoSuchElementException;
-
-/**
- *  A class to iterate through a hosts.txt or config file without
- *  reading the whole thing into memory.
- *  Keys are always converted to lower case.
- *
- *  Callers should iterate all the way through or call close()
- *  to ensure the underlying stream is closed.
- *
- *  @since 0.8.7
- */
-class ConfigIterator implements Iterator<Map.Entry<String, String>> {
-
-    private BufferedReader input;
-    private ConfigEntry next;
-
-    /**
-     *  A dummy iterator in which hasNext() is always false.
-     */
-    public ConfigIterator() {}
-
-    /**
-     *  An iterator over the key/value pairs in the file.
-     */
-    public ConfigIterator(File file) {
-        try {
-            FileInputStream fileStream = new FileInputStream(file);
-            input = new BufferedReader(new InputStreamReader(fileStream));
-        } catch (IOException ioe) {}
-    }
-
-    public boolean hasNext() {
-        if (input == null)
-            return false;
-        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();
-            }
-        } catch (IOException ioe) {}
-        try { input.close(); } catch (IOException ioe) {}
-        input = null;
-        next = null;
-        return false;
-    }
-
-    public Map.Entry<String, String> next() {
-        if (!hasNext())
-            throw new NoSuchElementException();
-        Map.Entry<String, String> rv = next;
-        next = null;
-        return rv;
-    }
-
-    public void remove() {
-        throw new UnsupportedOperationException();
-    }
-
-    public void close() {
-        if (input != null) {
-            try { input.close(); } catch (IOException ioe) {}
-        }
-    }
-
-    @Override
-    protected void finalize() {
-        close();
-    }
-
-    /**
-     *  The object returned by the iterator.
-     */
-    private static class ConfigEntry implements Map.Entry<String, String> {
-        private final String key;
-        private final String value;
-
-        public ConfigEntry(String k, String v) {
-            key = k;
-            value = v;
-        }
-
-        public String getKey() {
-            return key;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        public String setValue(String v) {
-            throw new UnsupportedOperationException();
-        }
-
-        public int hashCode() {
-            return key.hashCode() ^ value.hashCode();
-        }
-
-        public boolean equals(Object o) {
-            if (!(o instanceof Map.Entry))
-                return false;
-            Map.Entry e = (Map.Entry) o;
-            return key.equals(e.getKey()) && value.equals(e.getValue());
-        }
-    }
-}

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
  */
@@ -64,10 +64,11 @@ class ConfigParser {
         if (inputLine.startsWith(";")) {
             return "";
         }
-        if (inputLine.split("#").length > 0) {
-            return inputLine.split("#")[0];
+        int hash = inputLine.indexOf('#');
+        if (hash >= 0) {
+            return inputLine.substring(0, hash);
         } else {
-            return "";
+            return inputLine;
         }
     }
 
@@ -86,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 inputLine;
-        inputLine = input.readLine();
-        while (inputLine != null) {
-            inputLine = ConfigParser.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;
     }
 
     /**
@@ -112,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 = ConfigParser.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) {}
+            }
+        }
     }
 
     /**
@@ -133,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 ConfigParser.parse(input);
+        return parse(input);
     }
+****/
     
     /**
      * Return a Map using the contents of the File file. If file cannot be read,
@@ -150,10 +162,14 @@ 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 = ConfigParser.parse(file);
+            result = parse(file);
+            // migrate
+            String local = result.remove("master_addressbook");
+            if (local != null)
+                result.put("local_addressbook", local);
             for (Map.Entry<String, String> entry : map.entrySet()) {
                 if (!result.containsKey(entry.getKey()))
                     result.put(entry.getKey(), entry.getValue());
@@ -161,7 +177,7 @@ class ConfigParser {
         } catch (IOException exp) {
             result = map;
             try {
-                ConfigParser.write(result, file);
+                write(result, file);
             } catch (IOException exp2) {
             }
         }
@@ -177,19 +193,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 inputLine = input.readLine();
-        while (inputLine != null) {
-            inputLine = ConfigParser.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;
     }
 
     /**
@@ -201,15 +219,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 = ConfigParser.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) {}
+            }
+        }
     }
 
     /**
@@ -221,11 +245,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 ConfigParser.parseSubscriptions(input);
+        return parseSubscriptions(input);
     }
+****/
     
     /**
      * Return a List using the contents of the File file. If file cannot be
@@ -234,18 +260,30 @@ class ConfigParser {
      * 
      * @param file
      *            A File to attempt to parse.
-     * @param list list of files to parse
+     * @param list The default subscriptions to be saved and returned if the file cannot be read
      * @return A List consisting of one element for each line in file, or if
      *         file cannot be read, list.
      */
     public static List<String> parseSubscriptions(File file, List<String> list) {
         List<String> result;
         try {
-            result = ConfigParser.parseSubscriptions(file);
+            result = parseSubscriptions(file);
+            // Fix up files that contain the old default
+            // which was changed in 0.9.11
+            if (result.remove(Daemon.OLD_DEFAULT_SUB)) {
+                for (String sub : list) {
+                    if (!result.contains(sub))
+                        result.add(sub);
+                }
+                try {
+                    writeSubscriptions(result, file);
+                    // TODO log
+                } catch (IOException ioe) {}
+            }
         } catch (IOException exp) {
             result = list;
             try {
-                ConfigParser.writeSubscriptions(result, file);
+                writeSubscriptions(result, file);
             } catch (IOException exp2) {
             }
         }
@@ -263,12 +301,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();
     }
 
     /**
@@ -285,12 +326,11 @@ 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());
-            ConfigParser
-                .write(map, new BufferedWriter(new OutputStreamWriter(new SecureFileOutputStream(tmp), "UTF-8")));
+            write(map, new BufferedWriter(new OutputStreamWriter(new SecureFileOutputStream(tmp), "UTF-8")));
             success = tmp.renameTo(file);
             if (!success) {
                 tmp.delete();
@@ -299,8 +339,7 @@ class ConfigParser {
         }
         if (!success) {
             // hmm, that didn't work, try it the old way
-            ConfigParser
-                .write(map, new BufferedWriter(new OutputStreamWriter(new SecureFileOutputStream(file), "UTF-8")));
+            write(map, new BufferedWriter(new OutputStreamWriter(new SecureFileOutputStream(file), "UTF-8")));
         }
     }
 
@@ -315,13 +354,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();
     }
     
     /**
@@ -335,9 +377,9 @@ 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 {
-        ConfigParser.writeSubscriptions(list, new BufferedWriter(
+        writeSubscriptions(list, new BufferedWriter(
                 new OutputStreamWriter(new SecureFileOutputStream(file), "UTF-8")));
     }
 

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

@@ -23,39 +23,52 @@ 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
      * subscribed address books listed in subscriptions.
      * 
-     * @param master
-     *            The master AddressBook. This address book is never
+     * @param local
+     *            The local AddressBook. This address book is never
      *            overwritten, so it is safe for the user to write to.
      *            It is only merged to the published addressbook.
      *            May be null.
@@ -64,7 +77,7 @@ public class Daemon {
      *            client applications.
      * @param published
      *            The published AddressBook. This address book is published on
-     *            the user's eepsite so that others may subscribe to it.
+     *            the user's I2P Site so that others may subscribe to it.
      *            May be null.
      *            If non-null, overwrite with the new addressbook.
      * @param subscriptions
@@ -74,17 +87,16 @@ public class Daemon {
      *            The log to write changes and conflicts to.
      *            May be null.
      */
-    public static void update(AddressBook master, AddressBook router,
+    public static void update(AddressBook local, 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) {
-            if (master != null)
-                router.merge(master, true, null);
+            if (local != null)
+                router.merge(local, true, null);
             router.write(published);
         }
         subscriptions.write();
@@ -93,13 +105,13 @@ public class Daemon {
     /**
      * Update the router and published address books using remote data from the
      * subscribed address books listed in subscriptions.
-     * Merging of the "master" addressbook is NOT supported.
+     * Merging of the "local" addressbook is NOT supported.
      * 
      * @param router
      *            The NamingService to update, generally the root NamingService from the context.
      * @param published
      *            The published AddressBook. This address book is published on
-     *            the user's eepsite so that others may subscribe to it.
+     *            the user's I2P Site so that others may subscribe to it.
      *            May be null.
      *            If non-null, overwrite with the new addressbook.
      * @param subscriptions
@@ -118,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 (!success) {
-                                    try {
-                                        log.append("Save to published address book " + published.getCanonicalPath() + " failed for new key " + key);
-                                    } catch (IOException ioe) {}
+                            if (publishedNS != null) {
+                                if (allowExistingKeyInPublished)
+                                    success = publishedNS.put(key, dest, props);
+                                else
+                                    success = publishedNS.putIfAbsent(key, dest, props);
+                                if (log != null && !success) {
+                                    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();
     }
 
     /**
@@ -232,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"));
@@ -250,31 +736,32 @@ public class Daemon {
         }
         delay *= 60 * 60 * 1000;
         
-        List<String> defaultSubs = new LinkedList();
+        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("http://www.i2p2.i2p/hosts.txt");
+        defaultSubs.add(DEFAULT_SUB);
         
         SubscriptionList subscriptions = new SubscriptionList(subscriptionFile,
-                etagsFile, lastModifiedFile, lastFetchedFile, delay, defaultSubs, settings
-                .get("proxy_host"), Integer.parseInt(settings.get("proxy_port")));
-        Log log = new Log(logFile);
+                                                              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
         // Default false
         if (Boolean.parseBoolean(settings.get("update_direct"))) {
             // Direct hosts.txt access
             File routerFile = new File(home, settings.get("router_addressbook"));
-            AddressBook master;
+            AddressBook local;
             if (should_publish) {
-                File masterFile = new File(home, settings.get("master_addressbook"));
-                master = new AddressBook(masterFile);
+                File localFile = new File(home, settings.get("local_addressbook"));
+                local = new AddressBook(localFile);
             } else {
-                master = null;
+                local = null;
             }
             AddressBook router = new AddressBook(routerFile);
-            update(master, router, published, subscriptions, log);
+            update(local, router, published, subscriptions, log);
         } else {
-            // Naming service - no merging of master to router and published is supported.
+            // Naming service - no merging of local to router and published is supported.
             update(getNamingService(settings.get("naming_service")), published, subscriptions, log);
         }
     }
@@ -315,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]);
@@ -330,10 +838,10 @@ public class Daemon {
             homeFile = new SecureDirectory(System.getProperty("user.dir"));
         }
         
-        Map<String, String> defaultSettings = new HashMap();
+        Map<String, String> defaultSettings = new HashMap<String, String>();
         defaultSettings.put("proxy_host", "127.0.0.1");
         defaultSettings.put("proxy_port", "4444");
-        defaultSettings.put("master_addressbook", "../userhosts.txt");
+        defaultSettings.put("local_addressbook", "../userhosts.txt");
         defaultSettings.put("router_addressbook", "../hosts.txt");
         defaultSettings.put("published_addressbook", "../eepsite/docroot/hosts.txt");
         defaultSettings.put("should_publish", "false");
@@ -348,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);
@@ -360,7 +868,7 @@ public class Daemon {
         // wait
         try {
             Thread.sleep(5*60*1000 + I2PAppContext.getGlobalContext().random().nextLong(5*60*1000));
-	    // Static method, and redundent Thread.currentThread().sleep(5*60*1000);
+	    // Static method, and redundant Thread.currentThread().sleep(5*60*1000);
         } catch (InterruptedException ie) {}
         
         while (_running) {
@@ -386,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

@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2004 Ragnarok
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package net.i2p.addressbook;
+
+import java.io.BufferedReader;
+import java.io.Closeable;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Iterator;
+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.
+ *  Keys are always converted to lower case.
+ *
+ *  Callers should iterate all the way through or call close()
+ *  to ensure the underlying stream is closed.
+ *
+ *  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 HostTxtIterator implements Iterator<Map.Entry<String, HostTxtEntry>>, Closeable {
+
+    private BufferedReader input;
+    private MapEntry next;
+
+    /**
+     *  A dummy iterator in which hasNext() is always false.
+     */
+    public HostTxtIterator() {}
+
+    /**
+     *  An iterator over the key/value pairs in the file.
+     */
+    public HostTxtIterator(File file) throws IOException {
+            FileInputStream fileStream = new FileInputStream(file);
+            input = new BufferedReader(new InputStreamReader(fileStream, "UTF-8"));
+    }
+
+    public boolean hasNext() {
+        if (input == null)
+            return false;
+        if (next != null)
+            return true;
+        try {
+            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) {}
+        input = null;
+        next = null;
+        return false;
+    }
+
+    /**
+     *  '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, HostTxtEntry> rv = next;
+        next = null;
+        return rv;
+    }
+
+    public void remove() {
+        throw new UnsupportedOperationException();
+    }
+
+    public void close() {
+        if (input != null) {
+            try { input.close(); } catch (IOException ioe) {}
+        }
+    }
+
+    /**
+     *  The object returned by the iterator.
+     */
+    private static class MapEntry implements Map.Entry<String, HostTxtEntry> {
+        private final String key;
+        private final HostTxtEntry value;
+
+        public MapEntry(String k, HostTxtEntry v) {
+            key = k;
+            value = v;
+        }
+
+        public String getKey() {
+            return key;
+        }
+
+        public HostTxtEntry getValue() {
+            return value;
+        }
+
+        public HostTxtEntry setValue(HostTxtEntry v) {
+            throw new UnsupportedOperationException();
+        }
+
+        public int hashCode() {
+            return key.hashCode() ^ value.hashCode();
+        }
+
+        public boolean equals(Object o) {
+            if (!(o instanceof Map.Entry))
+                return false;
+            @SuppressWarnings("unchecked")
+            Map.Entry<Object, Object> e = (Map.Entry<Object, Object>) o;
+            return key.equals(e.getKey()) && value.equals(e.getValue());
+        }
+    }
+}

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/Servlet.java

@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2004 Ragnarok
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-package net.i2p.addressbook;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Random;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * A wrapper for addressbook to allow it to be started as a web application.
- * 
- * This was a GenericServlet, we make it an HttpServlet solely to provide a hook
- * for SusiDNS to wake us up when the subscription list changes.
- * 
- * @author Ragnarok
- *
- */
-public class Servlet extends HttpServlet {
-    private DaemonThread thread;
-    //private String nonce;
-    //private static final String PROP_NONCE = "addressbook.nonce";
-
-    /**
-     * Hack to allow susidns to kick the daemon when the subscription list changes.
-     * URL must be /addressbook/ with wakeup param set, and nonce param set from system property.
-     *
-     * (non-Javadoc)
-     * see javax.servlet.Servlet#service(javax.servlet.ServletRequest, javax.servlet.ServletResponse)
-     */
-    public void service(HttpServletRequest request, HttpServletResponse response) throws IOException {
-        //System.err.println("Got request nonce = " + request.getParameter("nonce"));
-        //if (this.thread != null && request.getParameter("wakeup") != null &&
-        //    this.nonce != null && this.nonce.equals(request.getParameter("nonce"))) {
-        //    //System.err.println("Sending interrupt");
-        //    this.thread.interrupt();
-        //    // no output
-        //} else {
-            PrintWriter out = response.getWriter();
-            out.write("I2P addressbook OK");
-        //}
-    }
-
-    /* (non-Javadoc)
-     * @see javax.servlet.Servlet#init(javax.servlet.ServletConfig)
-     */
-    @Override
-    public void init(ServletConfig config) {
-        try {
-            super.init(config);
-        } catch (ServletException exp) {
-            System.err.println("Addressbook init exception: " + exp);
-        }
-        //this.nonce = "" + Math.abs((new Random()).nextLong());
-        // put the nonce where susidns can get it
-        //System.setProperty(PROP_NONCE, this.nonce);
-        String[] args = new String[1];
-        args[0] = config.getInitParameter("home");
-        this.thread = new DaemonThread(args);
-        this.thread.setDaemon(true);
-        this.thread.setName("Addressbook");
-        this.thread.start();
-        //System.out.println("INFO: Starting Addressbook " + Daemon.VERSION);
-        //System.out.println("INFO: config root under " + args[0]);
-    }
-
-    @Override
-    public void destroy() {
-        this.thread.halt();
-        super.destroy();
-    }
-}

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.EMPTY_MAP);
+            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();
+        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();
+            etags = Collections.<String, String>emptyMap();
         }
         try {
             lastModified = ConfigParser.parse(lastModifiedFile);
         } catch (IOException exp) {
-            lastModified = new HashMap();
+            lastModified = Collections.<String, String>emptyMap();
         }
         try {
             lastFetched = ConfigParser.parse(lastFetchedFile);
         } catch (IOException exp) {
-            lastFetched = new HashMap();
+            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();
-        Map<String, String>  lastModified = new HashMap();
-        Map<String, String>  lastFetched = new HashMap();
+        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

@@ -0,0 +1,669 @@
+/*
+Copyright (c) 2006, Matthew Estes
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+	* Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+	* Neither the name of Metanotion Software nor the names of its
+contributors may be used to endorse or promote products derived from this
+software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+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;
+import net.metanotion.io.RandomAccessInterface;
+import net.metanotion.io.Serializer;
+import net.metanotion.io.data.IdentityBytes;
+import net.metanotion.io.data.IntBytes;
+import net.metanotion.io.data.StringBytes;
+import net.metanotion.io.data.UTF8StringBytes;
+import net.metanotion.io.block.index.BSkipList;
+import net.metanotion.io.block.index.BSkipSpan;
+import net.metanotion.util.skiplist.SkipIterator;
+
+import net.i2p.I2PAppContext;
+import net.i2p.util.Log;
+
+/**
+ * On-disk format:
+ *    Magic number (6 bytes)
+ *    Version major/minor (2 bytes)
+ *    file length (long)
+ *    free list start (unsigned int)
+ *    is mounted (unsigned short) 0 = no, 1 = yes
+ *    span size (unsigned short)
+ *    block size (unsigned int)
+ *
+ * Metaindex skiplist is on page 2
+ *
+ * Pages are 1 KB and are numbered starting from 1.
+ * e.g. the Metaindex skiplist is at offset 1024 bytes
+ */
+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);
+
+	public final RandomAccessInterface file;
+
+	private static final int MAJOR = 0x01;
+	private static final int MINOR = 0x02;
+	private static final int MIN_MAJOR = 0x01;
+	private static final int MIN_MINOR = 0x01;
+	// I2P changed magic number, format changed, magic numbers now on all pages
+	private static final long MAGIC_BASE = 0x3141de4932500000L;   // 0x3141de I 2 P 00 00
+	private static final long MAGIC = MAGIC_BASE | (MAJOR << 8) | MINOR;
+	private long magicBytes = MAGIC;
+	public static final int MAGIC_CONT = 0x434f4e54;   // "CONT"
+	public static final int METAINDEX_PAGE = 2;
+	/** 2**32 pages of 1024 bytes each, more or less */
+	private static final long MAX_LEN = (2l << (32 + 10)) - 1;
+
+	/** new BlockFile length, containing a superblock page and a metaindex page. */
+	private long fileLen = PAGESIZE * 2;
+	private int freeListStart = 0;
+	private int mounted = 0;
+	public int spanSize = 16;
+
+	/** I2P was the file locked when we opened it? */
+	private final boolean _wasMounted;
+
+	private final BSkipList<String, Integer> metaIndex;
+	private boolean _isClosed;
+	/** cached list of free pages, only valid if freListStart > 0 */
+	private FreeListBlock flb;
+	private final HashMap<String, BSkipList> openIndices = new HashMap<String, BSkipList>();
+
+	private void mount() throws IOException {
+		file.seek(BlockFile.OFFSET_MOUNTED);
+		mounted = 1;
+		file.writeShort(mounted);
+	}
+
+	private void writeSuperBlock() throws IOException {
+		file.seek(0);
+		file.writeLong(	magicBytes);
+		file.writeLong(	fileLen);
+		file.writeInt(	freeListStart);
+		file.writeShort(mounted);
+		file.writeShort(spanSize);
+		// added in version 1.2
+		file.writeInt(PAGESIZE);
+	}
+
+	private void readSuperBlock() throws IOException {
+		file.seek(0);
+		magicBytes		= file.readLong();
+		fileLen			= file.readLong();
+		freeListStart	= file.readUnsignedInt();
+		mounted			= file.readUnsignedShort();
+		spanSize		= file.readUnsignedShort();
+		// assume 1024 page size
+	}
+
+	/**
+	 *  Run an integrity check on the blockfile and all the skiplists in it.
+	 *
+	 *  WARNING:
+	 *  This only works on skiplists using UTF8StringBytes as a key
+	 *  serializer, unless the exception has been coded in bfck below.
+	 *  Will CORRUPT other skiplists.
+	 */
+	public static void main(String args[]) {
+		if (args.length != 1) {
+			System.err.println("Usage: BlockFile file");
+			return;
+		}
+		boolean init = !(new File(args[0])).exists();
+		RAIFile raif = null;
+		BlockFile bf = null;
+		try {
+			raif = new RAIFile(new File(args[0]), true, true);
+			bf = new BlockFile(raif, init);
+			bf.bfck(true);
+		} catch (IOException e) {
+			e.printStackTrace();
+		} finally {
+			if (bf != null) try { bf.close(); } catch (IOException ioe) {}
+			if (raif != null) try { raif.close(); } catch (IOException ioe) {}
+		}
+	}
+
+	/**
+	 *  Write bytes
+	 *  This will allocate additional continuation pages as necessary.
+	 *
+	 *  @param data data to write
+	 *  @param page current page
+	 *  @param curPageOff in (current) and out (new) parameter at index 0
+	 *  @param nextPage in (current) and out (new) parameter at index 0
+	 *  @return current page
+	 */
+	public int writeMultiPageData(byte[] data, int page, int[] curPageOff, int[] nextPage) throws IOException {
+		int pageCounter = curPageOff[0];
+		int curNextPage = nextPage[0];
+		int curPage = page;
+		int dct = 0;
+		while(dct < data.length) {
+			int len = PAGESIZE - pageCounter;
+			if(len <= 0) {
+				if(curNextPage==0) {
+					curNextPage = this.allocPage();
+					BlockFile.pageSeek(this.file, curNextPage);
+					this.file.writeInt(MAGIC_CONT);
+					this.file.writeInt(0);
+					BlockFile.pageSeek(this.file, curPage);
+					this.file.skipBytes(4);   // skip magic
+					this.file.writeInt(curNextPage);
+				}
+				BlockFile.pageSeek(this.file, curNextPage);
+				curPage = curNextPage;
+				int magic = this.file.readInt();
+				if (magic != MAGIC_CONT)
+					throw new IOException("Bad SkipSpan continuation magic number 0x" + Integer.toHexString(magic) + " on page " + curNextPage);
+				curNextPage = this.file.readUnsignedInt();
+				pageCounter = BSkipSpan.CONT_HEADER_LEN;
+				len = PAGESIZE - pageCounter;
+			}
+			this.file.write(data, dct, Math.min(len, data.length - dct));
+			pageCounter += Math.min(len, data.length - dct);
+			dct += Math.min(len, data.length - dct);
+		}
+		nextPage[0] = curNextPage;
+		curPageOff[0] = pageCounter;
+		return curPage;
+	}
+
+	/**
+	 *  Read bytes
+	 *
+	 *  @param arr fill this array fully with data
+	 *  @param page current page
+	 *  @param curPageOff in (current) and out (new) parameter at index 0
+	 *  @param nextPage in (current) and out (new) parameter at index 0
+	 *  @return current page
+	 */
+	public int readMultiPageData(byte[] arr, int page, int[] curPageOff, int[] nextPage) throws IOException {
+		int pageCounter = curPageOff[0];
+		int curNextPage = nextPage[0];
+		int curPage = page;
+		int dct = 0;
+		while(dct < arr.length) {
+			int len = PAGESIZE - pageCounter;
+			if(len <= 0) {
+				if (curNextPage <= 0)
+					throw new IOException("not enough pages to read data still need " + (arr.length - dct));
+				BlockFile.pageSeek(this.file, curNextPage);
+				int magic = this.file.readInt();
+				if (magic != MAGIC_CONT)
+					throw new IOException("Bad SkipSpan continuation magic number 0x" + Integer.toHexString(magic) + " on page " + curNextPage);
+				curPage = curNextPage;
+				curNextPage = this.file.readUnsignedInt();
+				pageCounter = BSkipSpan.CONT_HEADER_LEN;
+				len = PAGESIZE - pageCounter;
+			}
+			int res = this.file.read(arr, dct, Math.min(len, arr.length - dct));
+			if(res == -1) { throw new IOException(); }
+			pageCounter += Math.min(len, arr.length - dct);
+			dct += res;
+		}
+		nextPage[0] = curNextPage;
+		curPageOff[0] = pageCounter;
+		return curPage;
+	}
+
+	/**
+	 *  Skip length bytes
+	 *  The same as readMultiPageData() without returning a result
+	 *
+	 *  @param length number of bytes to skip
+	 *  @param page current page
+	 *  @param curPageOff in (current) and out (new) parameter at index 0
+	 *  @param nextPage in (current) and out (new) parameter at index 0
+	 *  @return current page
+	 */
+	public int skipMultiPageBytes(int length, int page, int[] curPageOff, int[] nextPage) throws IOException {
+		int pageCounter = curPageOff[0];
+		int curNextPage = nextPage[0];
+		int curPage = page;
+		int dct = 0;
+		while(dct < length) {
+			int len = PAGESIZE - pageCounter;
+			if(len <= 0) {
+				if (curNextPage <= 0)
+					throw new IOException("not enough pages to skip");
+				BlockFile.pageSeek(this.file, curNextPage);
+				int magic = this.file.readInt();
+				if (magic != MAGIC_CONT)
+					throw new IOException("Bad SkipSpan continuation magic number 0x" + Integer.toHexString(magic) + " on page " + curNextPage);
+				curPage = curNextPage;
+				curNextPage = this.file.readUnsignedInt();
+				pageCounter = BSkipSpan.CONT_HEADER_LEN;
+				len = PAGESIZE - pageCounter;
+			}
+			int res = Math.min(len, length - dct);
+			this.file.skipBytes(res);
+			pageCounter += res;
+			dct += res;
+		}
+		nextPage[0] = curNextPage;
+		curPageOff[0] = pageCounter;
+		return curPage;
+	}
+
+	/** Use this constructor with a readonly RAI for a readonly blockfile */
+	public BlockFile(RandomAccessInterface rai) throws IOException { this(rai, false); }
+
+	/** RAF must be writable */
+	public BlockFile(RandomAccessFile raf) throws IOException { this(new RAIFile(raf), false); }
+
+	/** RAF must be writable */
+	public BlockFile(RandomAccessFile raf, boolean init) throws IOException { this(new RAIFile(raf), init); }
+
+	/** File must be writable */
+	public BlockFile(File f, boolean init) throws IOException { this(new RAIFile(f, true, true), init); }
+
+	/** Use this constructor with a readonly RAI and init = false for a readonly blockfile */
+	public BlockFile(RandomAccessInterface rai, boolean init) throws IOException {
+		if(rai==null) { throw new NullPointerException(); }
+		
+		file = rai;
+
+		if(init) {
+			file.setLength(fileLen);
+			writeSuperBlock();
+			BSkipList.init(this, METAINDEX_PAGE, spanSize);
+		}
+
+		readSuperBlock();
+		if(magicBytes != MAGIC) {
+			if ((magicBytes & MAGIC_BASE) == MAGIC_BASE) {
+				long major = (magicBytes >> 8) & 0xff;
+				long minor = magicBytes & 0xff;
+				if (major < MIN_MAJOR ||
+				    (major == MIN_MAJOR && minor < MIN_MINOR))
+				    throw new IOException("Expected " + MAJOR + '.' + MINOR +
+				                          " but got " + major + '.' + minor);
+			} else {
+				throw new IOException("Bad magic number");
+			}
+		}
+		_wasMounted = mounted != 0;
+		if (_wasMounted)
+			log.warn("Warning - file was not previously closed");
+		if(fileLen != file.length())
+			throw new IOException("Expected file length " + fileLen +
+		                              " but actually " + file.length());
+		if (rai.canWrite())
+			mount();
+
+		metaIndex = new BSkipList<String, Integer>(spanSize, this, METAINDEX_PAGE, new StringBytes(), new IntBytes());
+	}
+
+	/**
+	 *  I2P was the file locked when we opened it?
+	 *  @since 0.8.8
+	 */
+	public boolean wasMounted() {
+		return _wasMounted;
+	}
+
+	/**
+	 *  Go to any page but the superblock.
+	 *  Page 1 is the superblock, must use file.seek(0) to get there.
+	 *  @param page &gt;= 2
+	 */
+	public static void pageSeek(RandomAccessInterface file, int page) throws IOException {
+		if (page < METAINDEX_PAGE)
+			throw new IOException("Negative page or superblock access attempt: " + page);
+		file.seek((page - 1L) * PAGESIZE );
+	}
+
+	public int allocPage() throws IOException {
+		if(freeListStart != 0) {
+			try {
+				if (flb == null)
+					flb = new FreeListBlock(file, freeListStart);
+				if(!flb.isEmpty()) {
+					if (log.shouldLog(Log.DEBUG))
+						log.debug("Alloc from " + flb);
+					return flb.takePage();
+				} else {
+					if (log.shouldLog(Log.DEBUG))
+						log.debug("Alloc returning empty " + flb);
+					freeListStart = flb.getNextPage();
+					writeSuperBlock();
+					int rv = flb.page;
+					flb = null;
+					return rv;
+				}
+			} catch (IOException ioe) {
+				log.error("Discarding corrupt free list block page " + freeListStart, ioe);
+				freeListStart = 0;
+			}
+		}
+		long offset = file.length();
+		fileLen = offset + PAGESIZE;
+		file.setLength(fileLen);
+		writeSuperBlock();
+		return (int) ((offset / PAGESIZE) + 1);
+	}
+
+	/**
+	 *  Add the page to the free list. The file is never shrunk.
+	 *  TODO: Reclaim free pages at end of file, or even do a full compaction.
+	 *  Does not throw exceptions; logs on failure.
+	 */
+	public void freePage(int page) {
+		if (page <= METAINDEX_PAGE) {
+			log.error("Bad page free attempt: " + page);
+			return;
+		}
+		try {
+			if(freeListStart == 0) {
+				freeListStart = page;
+				FreeListBlock.initPage(file, page);
+				writeSuperBlock();
+				if (log.shouldLog(Log.DEBUG))
+					log.debug("Freed page " + page + " as new FLB");
+				return;
+			}
+			try {
+				if (flb == null)
+					flb = new FreeListBlock(file, freeListStart);
+				if(flb.isFull()) {
+					// Make the free page a new FLB
+					if (log.shouldLog(Log.DEBUG))
+						log.debug("Full: " + flb);
+					FreeListBlock.initPage(file, page);
+					if(flb.getNextPage() == 0) {
+						// Put it at the tail.
+						// Next free will make a new FLB at the head,
+						// so we have one more FLB than we need.
+						flb.setNextPage(page);
+					} else {
+						// Put it at the head
+						flb = new FreeListBlock(file, page);
+						flb.setNextPage(freeListStart);
+						freeListStart = page;
+						writeSuperBlock();
+					}
+					if (log.shouldLog(Log.DEBUG))
+						log.debug("Freed page " + page + " to full " + flb);
+					return;
+				}
+				flb.addPage(page);
+				if (log.shouldLog(Log.DEBUG))
+					log.debug("Freed page " + page + " to " + flb);
+			} catch (IOException ioe) {
+				log.error("Discarding corrupt free list block page " + freeListStart, ioe);
+				freeListStart = page;
+				FreeListBlock.initPage(file, page);
+				writeSuperBlock();
+				flb = null;
+			}
+		} catch (IOException ioe) {
+			log.error("Error freeing page: " + page, ioe);
+		}
+	}
+
+	/**
+	 *  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
+	 */
+	@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<K, V> bsl = (BSkipList<K, V>) openIndices.get(name);
+		if (bsl != null)
+			return bsl;
+
+		Integer page = metaIndex.get(name);
+		if (page == null) { return null; }
+		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))
+				log.logAlways(Log.WARN, "Repaired skiplist " + name + " in blockfile " + file);
+			else
+				log.info("No errors in skiplist " + name + " in blockfile " + file);
+		}
+		openIndices.put(name, bsl);
+		return bsl;
+	}
+
+	/**
+	 *  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<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 {
+		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) {
+		BSkipList bsl = openIndices.remove(name);
+		if (bsl != null)
+			bsl.flush();
+	}
+
+	/**
+	 *  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.
+	 */
+	public void close() throws IOException {
+		// added I2P
+		if (_isClosed)
+			return;
+		_isClosed = true;
+		metaIndex.close();
+
+		for (BSkipList bsl : openIndices.values()) {
+			bsl.close();
+		}
+
+		// Unmount.
+		if (file.canWrite()) {
+			file.seek(BlockFile.OFFSET_MOUNTED);
+			file.writeShort(0);
+		}
+	}
+
+	/**
+	 *  Run an integrity check on the blockfile and all the skiplists in it
+	 *  @return true if the levels were modified.
+	 */
+	public boolean bfck(boolean fix) {
+		if (log.shouldLog(Log.INFO)) {
+			log.info("magic bytes " + magicBytes);
+			log.info("fileLen " + fileLen);
+			log.info("freeListStart " + freeListStart);
+			log.info("mounted " + mounted);
+			log.info("spanSize " + spanSize);
+			log.info("Metaindex");
+			log.info("Checking meta index in blockfile " + file);
+		}
+		boolean rv = metaIndex.bslck(fix, true);
+		if (rv) {
+			if (log.shouldLog(Log.WARN))
+				log.warn("Repaired meta index in blockfile " + file);
+		} else {
+			if (log.shouldLog(Log.INFO))
+				log.info("No errors in meta index in blockfile " + file);
+		}
+		int items = 0;
+		for (SkipIterator iter = metaIndex.iterator(); iter.hasNext(); ) {
+			String slname = (String) iter.nextKey();
+			Integer page = (Integer) iter.next();
+			if (log.shouldLog(Log.INFO))
+				log.info("List " + slname + " page " + page);
+			try {
+				// This uses IdentityBytes, so the value class won't be right, but at least
+				// it won't fail the out-of-order check
+				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;
+				}
+				// The check is now done in getIndex(), no need to do here...
+				// but we can't get the return value of the check here.
+				items++;
+			} catch (IOException ioe) {
+				log.error("Error with list " + slname, ioe);
+			}
+		}
+		log.info("Checked meta index and " + items + " skiplists");
+		if(freeListStart != 0) {
+			try {
+			       if (flb == null)
+					flb = new FreeListBlock(file, freeListStart);
+				flb.flbck(true);
+			} catch (IOException ioe) {
+				log.error("Free list error", ioe);
+			}
+		} else {
+			if (log.shouldLog(Log.INFO))
+				log.info("No freelist");
+		}
+		return rv;
+	}
+}

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

@@ -0,0 +1,439 @@
+/*
+Copyright (c) 2006, Matthew Estes
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+	* Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+	* Neither the name of Metanotion Software nor the names of its
+contributors may be used to endorse or promote products derived from this
+software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+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;
+
+import net.metanotion.io.block.BlockFile;
+import net.metanotion.util.skiplist.SkipList;
+import net.metanotion.util.skiplist.SkipLevels;
+import net.metanotion.util.skiplist.SkipSpan;
+
+import net.i2p.util.Log;
+
+/**
+ * On-disk format:
+ *<pre>
+ *    Magic number (long)
+ *    max height (unsigned short)
+ *    non-null height (unsigned short)
+ *    span page (unsigned int)
+ *    height number of level pages (unsigned ints)
+ *</pre>
+ *
+ * Always fits on one page.
+ */
+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<K, V> bsl;
+	private boolean isKilled;
+	// the level pages, passed from the constructor to initializeLevels(),
+	// NOT kept up to date
+	private final int[] lps;
+
+	/**
+	 *  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;
+
+		BlockFile.pageSeek(bf.file, levelPage);
+		long magic = bf.file.readLong();
+		if (magic != MAGIC)
+			throw new IOException("Bad SkipLevels magic number 0x" + Long.toHexString(magic) + " on page " + levelPage);
+
+		bsl.levelHash.put(Integer.valueOf(this.levelPage), this);
+
+		int maxLen = bf.file.readUnsignedShort();
+		int nonNull = bf.file.readUnsignedShort();
+		if(maxLen < 1 || maxLen > MAX_SIZE || nonNull > maxLen)
+			throw new IOException("Invalid Level Skip size " + nonNull + " / " + maxLen);
+		spanPage = bf.file.readUnsignedInt();
+		bottom = bsl.spanHash.get(Integer.valueOf(spanPage));
+		if (bottom == null) {
+			// FIXME recover better?
+			bf.log.error("No span found in cache???");
+			throw new IOException("No span found in cache???");
+		}
+
+		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 +
+				     " in skiplist " + bsl);
+		// We have to read now because new BSkipLevels() will move the file pointer
+		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 < lps.length; i++) {
+			int lp = lps[i];
+			if(lp != 0) {
+				levels[i] = bsl.levelHash.get(Integer.valueOf(lp));
+				if(levels[i] == null) {
+					try {
+						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);
+						levels[i] = null;
+						fail = true;
+						continue;
+					}
+				}
+				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 +
+					                    ' ' + print() +
+					                    " i = " + i + ' ' + levels[i]);
+					// This will be fixed in blvlfix() via BlockFile.getIndex()
+					//levels[i] = null;
+					//fail = true;
+				}
+				// TODO also check that the level[] array is not out-of-order
+			} else {
+				if (bf.log.shouldLog(Log.WARN))
+					bf.log.warn(this + " i = " + i + " of " +
+						    lps.length + " / " + levels.length +
+						    " valid levels but page is zero");
+				levels[i] = null;
+				fail = true;
+			}
+		}
+		if (fail && bf.file.canWrite()) {
+			// corruption is actually fixed in blvlfix() via BlockFile.getIndex()
+			// after instantiation is complete
+			bf.log.error("Repairing corruption of " + this +
+			                    ' ' + print());
+			flush();
+			// if the removed levels have no other links to them, they and their data
+			// are lost forever, but the alternative is infinite loops / stack overflows
+			// in SkipSpan.
+		}
+	}
+
+	public static void init(BlockFile bf, int page, int spanPage, int maxHeight) throws IOException {
+		BlockFile.pageSeek(bf.file, page);
+		bf.file.writeLong(MAGIC);
+		bf.file.writeShort((short) maxHeight);
+		bf.file.writeShort(0);
+		bf.file.writeInt(spanPage);
+	}
+
+	@Override
+	public void flush() {
+		if (isKilled) {
+			bf.log.error("Already killed!! " + this, new Exception());
+			return;
+		}
+		try {
+			BlockFile.pageSeek(bf.file, levelPage);
+			bf.file.writeLong(MAGIC);
+			bf.file.writeShort((short) levels.length);
+			int i = 0;
+			for( ; i < levels.length; i++) {
+				 if(levels[i] == null)
+					break;
+			}
+			bf.file.writeShort(i);
+			bf.file.writeInt(((BSkipSpan<K, V>) bottom).page);
+			for(int j = 0; j < i; j++) {
+				bf.file.writeInt(((BSkipLevels<K, V>) levels[j]).levelPage);
+			}
+		} catch (IOException ioe) { throw new RuntimeException("Error writing to database", ioe); }
+	}
+
+	@Override
+	public void killInstance() {
+		if (isKilled) {
+			bf.log.error("Already killed!! " + this, new Exception());
+			return;
+		}
+		if (bf.log.shouldLog(Log.DEBUG))
+			bf.log.debug("Killing " + this + ' ' + print() /* , new Exception() */ );
+		isKilled = true;
+		bsl.levelHash.remove(Integer.valueOf(levelPage));
+		bf.freePage(levelPage);
+	}
+
+	@Override
+	public SkipLevels<K, V> newInstance(int levels, SkipSpan<K, V> ss, SkipList<K, V> sl) {
+		try {
+			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<K, V>(bf, page, bsl);
+			// do not need to call initLevels() here
+		} catch (IOException ioe) { throw new RuntimeException("Error creating database page", ioe); }
+	}
+
+	/**
+	 *  Run an integrity check on the skiplevels from the first,
+	 *  or just fix it if fix == true.
+	 *  Only call from the first level.
+	 *  @return true if the levels were modified.
+	 */
+	@Override
+	public boolean blvlck(boolean fix) {
+		if (fix)
+			return blvlfix();
+		return blvlck(fix, 0, null);
+	}
+
+	/**
+	 *  Fix the levels.
+	 *  Only call from the first level.
+	 *  Primarily to fix nulls in levels caused by previous SkipLevels bug.
+	 *  This should handle dups and loops and out-of-order levels too,
+	 *  but those may cause problems before this in the constructor.
+	 *  This is fast enough to call every time the skiplist is opened.
+	 *  @return true if the levels were modified.
+	 *  @since 0.8.8
+	 */
+	private boolean blvlfix() {
+		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);
+		if (bf.log.shouldLog(Log.DEBUG))
+			bf.log.debug("Finished level search, found " + lvls.size() + " levels");
+		if (!this.equals(lvls.last())) {
+			bf.log.error("First level is out of order! " + print());
+			// TODO switch stack and other fields for the skiplist - hard to test
+		}
+		// traverse the levels, back-to-front
+		boolean rv = false;
+		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<K, V> cur = lv.levels[i];
+					if (cur != after) {
+						if (cur != null)
+							bf.log.warn("Level " + i + " was wrong, fixing for " + lv.print());
+						else
+							bf.log.warn("Level " + i + " was null, fixing for " + lv.print());
+						lv.levels[i] = after;
+						modified = true;
+					}
+				}
+			} else {
+				// last one
+				for (int i = 0; i < lv.levels.length; i++) {
+					if (lv.levels[i] != null) {
+						lv.levels[i] = null;
+						bf.log.warn("Last level " + i + " was non-null, fixing for " + lv.print());
+						modified = true;
+					}
+				}
+			}
+			if (modified) {
+				lv.flush();
+				rv = true;
+			}
+			after = lv;
+		}
+		if (bf.log.shouldLog(Log.INFO))
+			bf.log.info("Checked " + lvls.size() + " levels");
+		return rv;
+	}
+
+	/**
+	 *  Breadth-first, sortof
+	 *  We assume everything is findable from the root level
+	 *  @param l non-null
+	 *  @param lvlSet out parameter, the result
+	 *  @since 0.8.8
+	 */
+	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<K, V> cur = l;
+		while (cur != null && lvlSet.add(cur)) {
+			if (bf.log.shouldLog(Log.DEBUG))
+				bf.log.debug("Adding " + cur.print());
+			if (!cur.equals(this) && cur.key() == null && bf.log.shouldLog(Log.WARN))
+				bf.log.debug("Null KEY!!! " + cur.print());
+			cur = cur.levels[0];
+		}
+		// 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<K, V> lv = l.levels[i];
+			if (lv != null && !lvlSet.contains(lv))
+				getAllLevels(lv, lvlSet);
+		}
+	}
+
+	/**
+	 *  For sorting levels in blvlfix()
+         *  Sorts in REVERSE order.
+	 *  @since 0.8.8
+	 */
+	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)
+				return 1;
+			if (rk == null)
+				return -1;
+			// reverse!
+			return rk.compareTo(lk);
+		}
+	}
+
+	/*
+	 *  Recursively walk through the levels at level 0
+	 *  This needs work.
+	 */
+	@Override
+	@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<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() + " ");
+				if (higher != null) {
+					if (higher.key().compareTo(key()) < 0)
+						bf.log.warn("                Higher level has lower key " + higher.key());
+				}
+			} else {
+				bf.log.info("                level " + i + " empty");
+				if (higher != null)
+					bf.log.warn("                Higher level is not empty, key is " + higher.key());
+			}
+		}
+		if (prevLevels != null) {
+			int min = Math.min(prevLevels.length, levels.length);
+			for (int i = 0; i < min; i++) {
+				if (prevLevels[i] == this) {
+					prevLevels[i] = levels[i];
+				} else if (prevLevels[i] != null) {
+					// skipping over us
+					bf.log.warn("                Previous levels is non-null " + prevLevels[i].key() + " but not pointing to us at level " + i);
+					// replace so we only get one error
+					prevLevels[i] = levels[i];
+				} else {
+					// dead end in the middle
+					if (levels[i] != null) {
+						bf.log.warn("                Previous levels is null but we are non-null " + levels[i].key() + " at level " + i);
+						// replace so we only get one error
+						prevLevels[i] = levels[i];
+					}
+				}
+			}
+		} else {
+			prevLevels = (SkipLevels<K, V>[]) new SkipLevels[levels.length];
+			System.arraycopy(levels, 0, prevLevels, 0, levels.length);
+		}
+		if (levels[0] != null)
+			levels[0].blvlck(fix, width + 1, prevLevels);
+		return false;
+	}
+
+	@Override
+	public String toString() {
+		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();
-	final HashMap<Integer, SkipLevels> levelHash = new HashMap();
+	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;
@@ -82,14 +83,18 @@ public class BSkipList extends SkipList {
 		size = bf.file.readUnsignedInt();
 		int spans = bf.file.readInt();
 		int levelCount = bf.file.readInt();
+                // two byte spansize as of version 1.2, ignore for now
+                // int ss = bf.file.readUnsignedShort(); if (ss > 0) ...
 		//System.out.println(size + " " + spans); 
 
 		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;
@@ -99,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();
 		}
@@ -146,7 +152,6 @@ public class BSkipList extends SkipList {
 			curLevel.killInstance();
 			curLevel = nextLevel;
 		}
-		stack.killInstance();
 
 		SkipSpan curSpan = first;
 		while(curSpan != null) {
@@ -171,6 +176,8 @@ public class BSkipList extends SkipList {
 		bf.file.writeInt(0);
 		bf.file.writeInt(1);
 		bf.file.writeInt(1);
+                // added in version 1.2
+		bf.file.writeShort(spanSize);
 		BSkipSpan.init(bf, firstSpan, spanSize);
 		BSkipLevels.init(bf, firstLevel, firstSpan, 4);
 	}
@@ -193,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,30 +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;
@@ -410,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,11 +41,11 @@ 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) |
 				 (b[3] & 0xff));
-		return new Integer(v);
+		return Integer.valueOf(v);
 	}
 }

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/package.html

@@ -0,0 +1,165 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<link rel="home" title="Home" href="http://www.metanotion.net/software/sandbox/" />
+
+		<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+		<meta name="robots" content="all" />
+
+		<title>BlockFile</title>
+	</head>
+	<body>
+<p>
+I2P Notes:
+This is the database used by the BlockfileNamingService class.
+It is heavily modified from the original 0.1.1 version.
+Not for direct use by apps, clients, or plugins.
+This package is not currently intended for general use, as
+the API may be subject to change.
+Contact I2P developers if you are considering use in another application.
+Following is the original documentation copied from metanotion website.
+</p>
+		<h2>Metanotion BlockFile Database</h2>
+		<p>A 100% Java 1.3, BSD Licensed, embeddable single file database engine in 32KB. This database was designed for PDA based and J2ME applications.</p>
+
+		<h2>Table of Contents</h2>
+		<ul>
+			<li><a href="#features">Features</a></li>
+			<li><a href="#unfeatures">Unfeatures</a></li>
+			<li><a href="#future">Future Plans</a></li>
+			<li><a href="#design">What kind of database is this?</a></li>
+			<li><a href="#examples">Examples and API</a></li>
+			<li><a href="#download">Download</a></li>
+		</ul>
+		
+		<h2 id="features">Features</h2>
+		<ul>
+			<li>100% Java 1.3. No JNI.</li>
+			<li>Will work with any "file" as long as you can approximate something like <a href="http://java.sun.com/j2se/1.3/docs/api/java/io/RandomAccessFile.html">java.io.RandomAccessFile</a>, you can use this.</li>
+			<li>BSD Licensed. Yes, this means you can use it for free in a commercial project. However, if you base some really cool mobile technology startup on this code we'll gladly accept stock options...</li>
+			<li>No dependence on file API's(useful for mobile apps)</li>
+			<li>Small. 32KB in a JAR file. &lt;2000 lines of code.</li>
+			<li>Reasonably fast. This is used in an app running on a sub 200MHz StrongARM PocketPC, and quite handily deals with 70,000 records. The load time is a little slow, but its been tested with a <a href="http://java.sun.com/javame/reference/apis.jsp">CDC 1.0/Personal Profile</a> device.
+			</li>
+		</ul>
+
+		<h2 id="unfeatures">Unfeatures</h2>
+		<p>A good, ACID database is a nice thing to work with. Unfortunately, in the goal to make this small, fast, and work with minimal dependencies, something had to give. So I list things which this database will likely never have. Of course, since it is BSD Licensed, patches welcome...</p>
+		
+		<ul>
+			<li>No transactions.</li>
+			<li>No SQL.</li>
+			<li>No JDBC.</li>
+			<li>No use of reflection or automagical serialization tricks.</li>
+		</ul>
+
+		<h2 id="future">Future Plans</h2>
+		<p>There are still bugs(none known...). The app that this was written for is still in testing, but we should most of the issues sorted by the time we deploy it in a few weeks(early November, 2006). Some loading speed issues on large record sets, and memory usage could still be improved. All this and feedback from other uses will direct this products evolution.</p>
+		<p>What is currently up here is not "1.0" code, but we will release a labeled "1.0" version once we feel happy with the state of the codebase.</p>
+	
+		<h2 id="design">What KIND of database is this?</h2>
+		<p>You probably store at least part of your application data in memory in a class from the <a href="http://java.sun.com/j2se/1.4.2/docs/guide/collections/">Java Collections Framework</a>. The BlockFile database stores data in a <a href="http://en.wikipedia.org/wiki/Skip_list">Skip</a> <a href="http://eternallyconfuzzled.com/tuts/skip.html">List</a> that almost implements <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/SortedMap.html">java.util.SortedMap</a>. You can create and store as many named(with a string) SkipList in the database as you want.</p>
+		<p>To serialize your data, you have to either extend our SerialStreams class or implement our Serializer interface. We could have done something cool and fancy with reflection(and other cool stuff with Java 1.5), but that would probably not do the Right Thing&trade; most of the time.  As you can see, there's not a lot to it anyway:</p>
+		<h3>net.metanotion.io.SerialStreams</h3>
+<pre>
+public abstract class SerialStreams implements Serializer {
+// ...
+	abstract public void writeOut(DataOutputStream dos, Object o) throws IOException;
+	abstract public Object readIn(DataInputStream dis) throws IOException;
+}
+</pre>
+		<h3>net.metanotion.io.Serializer</h3>
+<pre>
+public interface Serializer {
+	public byte[] getBytes(Object o);
+	public Object construct(byte[] b);
+}
+</pre>
+
+		<p>Now, about those skip lists. They implement a <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/ListIterator.html">java.util.ListIterator</a> so you can get "nearby" values, and you can use anything for a key that implements <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/Comparable.html">java.lang.Comparable</a>. So, here's the interface to a SkipList:
+<pre>
+public class SkipList {
+	...
+	public void put(Comparable key, Object val) ...
+	public Object remove(Comparable key) ...
+	public Object get(Comparable key) ...
+	public ListIterator iterator() ...
+	public ListIterator min() ...
+	public ListIterator max() ...
+	// Find the first key bigger than or equal to key,
+	// or the biggest key less than key if there is no bigger or equal.
+	public ListIterator find(Comparable key) ...
+}
+</pre>
+
+		<h2 id="examples">Examples</h2>
+		<p>Better documentation is forthcoming, but there really isn't much to know. The entire public interface to the library is on this page. Where possible, it sticks to idiomatic Java and standard interfaces.</p>
+		<ul>
+			<li>Open a database:
+<pre>
+import net.metanotion.io.block.BlockFile;
+...
+	try {
+		BlockFile db = new BlockFile(new File("my.db"), false); // true will create
+	} catch (IOException ioe) {
+		System.out.println("Bummer");
+	}
+</pre>
+			<li>
+			<li>Load or Create a SkipList:
+<pre>
+import net.metanotion.util.skiplist.SkipList;
+import net.metanotion.io.Serializer;
+...
+class KeySerializer implements Serializer ...
+class ValueSerializer implements Serializer ...
+...
+// Open preexisting
+SkipList index = db.getIndex("My Index", new KeySerializer(), new ValueSerializer());
+// Create
+SkipList index = db.makeIndex("My Index", new KeySerializer(), new ValueSerializer());
+</pre>
+			</li>
+		</ul>
+
+		<h3>net.metanotion.io.block.BlockFile</h3>
+All the public interface methods:
+<pre>
+public class BlockFile implements Closeable {
+	public BlockFile(RandomAccessInterface rai) ...
+	public BlockFile(RandomAccessFile raf) ...
+	public BlockFile(RandomAccessFile raf, boolean init) ...
+	public BlockFile(File f, boolean init) ...
+	public BlockFile(RandomAccessInterface rai, boolean init) ...
+
+	public SkipList getIndex(String name, Serializer key, Serializer val) ...
+	public SkipList makeIndex(String name, Serializer key, Serializer val) ...
+	public void delIndex(String name) ...
+
+	public void close() ...
+}
+</pre>
+
+		<h3>What's this "net.metanotion.io.RandomAccessInterface"?</h3>
+		<p>Basically, its an interface version of <a href="http://java.sun.com/j2se/1.3/docs/api/java/io/RandomAccessFile.html">java.io.RandomAccessFile</a>(which itself implements <a href="http://java.sun.com/j2se/1.3/docs/api/java/io/DataInput.html">DataInput</a>, <a href="http://java.sun.com/j2se/1.3/docs/api/java/io/DataOutput.html">DataOutput</a> and a few methods for getting/setting the file pointer).</p>
+		
+		<p>So, in other words, if you can provide an implementation of this interface, you can use the BlockFile database. This frees it from dependence on the RandomAccessFile class. If you don't see why this is useful and you're going to be using "files" on PDA's and phone's, well, you'll understand soon enough...</p>
+
+		<h2 id="download">Download</h2>
+		<h3>Bugfix and cleanup Release 10/6/2006</h3>
+		<p>An unnecessary class was removed, some junk methods removed, and a couple of JDK compatability issues were fixed. The StringBytes class was switched to ASCII(from UTF-8) for better compatibility.</p>
+		<ul>
+			<li><a href="http://www.metanotion.net/software/sandbox/BlockFile.2006.10.06.jar">BlockFile binary JAR, version 0.1.1</a></li>
+			<li><a href="http://www.metanotion.net/software/sandbox/BlockFile.src.2006.10.06.zip">BlockFile source code</a></li>
+		</ul>
+		
+		<h3>Initial Release 9/28/2006</h3>
+		<ul>
+			<li><a href="http://www.metanotion.net/software/sandbox/BlockFile.2006.09.28.jar">BlockFile binary JAR, version 0.1</a></li>
+			<li><a href="http://www.metanotion.net/software/sandbox/BlockFile.src.2006.09.28.zip">BlockFile source code</a></li>
+		</ul>
+
+		<hr>
+		<p>&copy; 2006 <a href="http://www.metanotion.net/">Metanotion Software</a></p>
+	</body>
+</html>

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,17 +1,17 @@
-package net.i2p.client.naming;
+package net.i2p.router.naming;
 
 import junit.framework.TestCase;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Properties;
+import java.util.Set;
 
 import net.i2p.I2PAppContext;
 import net.i2p.data.DataHelper;
@@ -23,7 +23,8 @@ public class BlockfileNamingServiceTest extends TestCase {
     List<String> _names;
     File hostsTxt, routerDir;
 
-    public void setUp() throws Exception {
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+	public void setUp() throws Exception {
         I2PAppContext ctx = new I2PAppContext();
         routerDir = ctx.getRouterDir();
         
@@ -32,7 +33,7 @@ public class BlockfileNamingServiceTest extends TestCase {
         Properties props = new Properties();
         assertNotNull("test classpath not set correctly",is);
         DataHelper.loadProps(props, is, true);
-        _names = new ArrayList(props.keySet());
+        _names = new ArrayList<String>((Set<String>) (Set) props.keySet());  // TODO-Java6: s/keySet()/stringPropertyNames()/
         Collections.shuffle(_names);
         is.close();
         

apps/addressbook/myhosts.txt

@@ -1,10 +0,0 @@
-# addressbook master address book.  Addresses placed in this file take precidence
-# over those in the router address book and in remote address books.  If changes
-# are made to this file, they will be reflected in the router address book and 
-# published address book after the next update.
-#
-# Do not make changes directly to the router address book, as they could be lost
-# during an update.
-#
-# This file takes addresses in the hosts.txt format, i.e.
-# example.i2p=somereallylongbase64thingAAAA

apps/addressbook/subscriptions.txt

@@ -1,7 +0,0 @@
-# Subscription list for addressbook
-#
-# Each entry is an absolute url to a file in hosts.txt format.
-# Since the list is checked in order, url's should be listed in order of trust.
-#
-http://dev.i2p/i2p/hosts.txt
-http://duck.i2p/hosts.txt

apps/addressbook/web.xml

@@ -1,22 +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>
-	<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="lib" path="/lib/wrapper/all/wrapper.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<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,26 @@
+sourceSets {
+    main {
+        java {
+            srcDir 'src'
+            srcDir 'build/messages-src'
+        }
+    }
+}
+
+dependencies {
+    compile project(':core')
+    compile project(':router')
+    compile project(':installer')
+    compile project(':apps:systray')
+}
+
+// Create the java files from the po files. The jar task will compile them.
+// This requires gettext 0.19 or higher.
+// We don't support the "slow way"
+task bundle {
+    doLast {
+        if (!(new File("$buildDir/classes/java/main/net/i2p/desktopgui/messages_de.class")).exists())
+            println "apps/desktopgui/bundle-messages.sh".execute().text
+    }
+}
+jar.dependsOn bundle

apps/desktopgui/build.xml

@@ -5,20 +5,20 @@
 	<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.8" />
+	<property name="javac.release" value="8" />
+	<property name="require.gettext" value="true" />
 
     <condition property="no.bundle">
         <isfalse value="${require.gettext}" />
     </condition>
-	<property name="javac.compilerargs" value=""/>
-	<property name="require.gettext" value="true" />
 
 	<target name="init">
 	<mkdir dir="${build}"/>
-	<mkdir dir="${build}/${resources}"/>
-        <mkdir dir="${build}/${javadoc}"/>
-		<mkdir dir="${dist}"/>
+	<mkdir dir="${build}/messages-src"/>
+	<mkdir dir="${dist}"/>
 	</target>
 
 	<target name="clean">
@@ -26,34 +26,41 @@
 		<delete dir="${dist}"/>
 	</target>
 
-	<target name="compile" depends="init">
-		<javac debug="true" deprecation="on" source="1.5" target="1.5" 
+        <target name="compile" depends="init">
+            <javac debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
+                       release="${javac.release}"
                        includeAntRuntime="false"
+                       encoding="UTF-8"
                        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}" >
-            <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}" 
+                   release="${javac.release}"
+                   includeAntRuntime="false"
+                   encoding="UTF-8"
+                   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" >
@@ -72,12 +79,20 @@
 	<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="../../apps/routerconsole/jsp/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="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>
 		</jar>
 	</target>
@@ -113,15 +128,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

@@ -11,23 +11,28 @@
 # zzz - public domain
 # Mathiasdm - modifications for desktopgui
 #
+cd `dirname $0`
 CLASS=net.i2p.desktopgui.messages
 TMPFILE=build/javafiles.txt
 export TZ=UTC
 RC=0
 
+if ! $(which javac > /dev/null 2>&1); then
+    export JAVAC=${JAVA_HOME}/../bin/javac
+fi
+
 if [ "$1" = "-p" ]
 then
 	POUPDATE=1
 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"
@@ -60,19 +65,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
@@ -101,15 +106,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 -E ' 0\.((19)|[2-9])'
         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 --java2 --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 --java2 --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