- Handle 4-digit core version

- Set API in version string to min version

.classpath

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/i2p_sdk"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/i2p_router"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/i2ptunnel"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/BOB"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/addressbook"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>

.mtn-ignore

@@ -0,0 +1,32 @@
+# Just to try and prevent some noob disasters.
+# Use mtn add --no-respect-ignore foo.jar to ignore this ignore list
+_jsp\.java$
+\.bz2$
+\.class$
+\.diff$
+\.exe$
+\.fba$
+\.gz$
+\.jar$
+\.out$
+\.patch$
+\.sig$
+\.sud$
+\.su2$
+\.tar$
+\.war$
+\.zip$
+^\.
+^build/
+^pkg-temp/
+~$
+/build/
+/classes/
+
+# Android-specific ignores
+^bin
+^gen
+^routerjars/bin
+^routerjars/gen
+AndroidManifest.xml
+local.properties

.project

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>I2P_Android</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

.tx/config

@@ -0,0 +1,11 @@
+[main]
+host = https://www.transifex.com
+lang_map = tr_TR: tr
+
+[I2P.android]
+file_filter = res/values-<lang>/strings.xml
+source_file = res/values/strings.xml
+source_lang = en
+type = ANDROID
+minimum_perc = 50
+

AndroidManifest.xml.in

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="net.i2p.android.router"
+      android.versionCode="0"
+      android.versionName="0.0.0-0_b0-API8"
+      android:installLocation="auto"
+      >
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
+    <uses-sdk android:minSdkVersion="8"
+              android:targetSdkVersion="18" />
+
+    <application android:label="@string/app_name"
+               android:theme="@style/Theme.AppCompat"
+               android:icon="@drawable/ic_launcher_itoopie" >
+        <service android:name=".service.RouterService"
+                  android:label="@string/app_name"
+                  android:icon="@drawable/ic_launcher_itoopie" />
+        <provider android:name=".provider.CacheProvider"
+                  android:authorities="net.i2p.android.router" />
+        <activity android:name=".activity.MainActivity"
+                  android:label="@string/app_name"
+                  android:icon="@drawable/ic_launcher_itoopie"
+                  android:launchMode="singleTop" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity android:name=".activity.NewsActivity"
+                  android:label="I2P News"
+                  android:configChanges="orientation|keyboardHidden" >
+        </activity>
+        <activity android:name=".activity.TextResourceActivity"
+                  android:label="I2P Information" >
+        </activity>
+        <activity android:name=".activity.LicenseActivity"
+                  android:label="I2P License Information" >
+        </activity>
+        <activity android:name=".activity.WebActivity"
+                  android:label="I2P Web Browser"
+                  android:configChanges="orientation|keyboardHidden" >
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:host="*.i2p" android:scheme="http" />
+            </intent-filter>
+        </activity>
+        <activity android:name=".activity.SettingsActivity"
+                  android:label="I2P Settings"
+                  android:launchMode="singleTop" >
+        </activity>
+        <activity android:name=".activity.AddressbookSettingsActivity"
+                  android:label="I2P Addressbook Settings"
+                  android:launchMode="singleTop" >
+        </activity>
+        <activity android:name=".activity.AddressbookActivity"
+                  android:label="Addressbook"
+                  android:launchMode="singleTop" >
+        </activity>
+        <activity android:name=".activity.LogActivity"
+                  android:label="I2P Logs" >
+        </activity>
+        <activity android:name=".activity.PeersActivity"
+                  android:label="I2P Peers and Transport Status"
+                  android:configChanges="orientation|keyboardHidden"
+                  android:launchMode="singleTop" >
+        </activity>
+    </application>
+</manifest>

LICENSE.txt

@@ -0,0 +1,50 @@
+This product includes both public domain code and licensed code as described below.
+For all code, unless otherwise stated in the appropriate license, the following applies:
+
+
+			    NO WARRANTY
+
+  BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+
+===================================
+
+License for the Android App:
+
+   Copyright 2011 The I2P Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use these files except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+===================================
+
+
+See the file licenses/LICENSE-Apache2.0.txt

Makefile.gcj

@@ -1,101 +0,0 @@
-# Makefile for building native I2P binaries and libraries with GCJ
-#
-# WARNING: Do not use this yet, as it may explode (etc).
-#
-GCJ=gcj #/usr/local/gcc-4.0.2/bin/gcj
-EXTRA_LD_PATH= #/usr/local/gcc-4.0.2/lib
-ANT=ant #/opt/apache-ant-1.6.5/bin/ant
-ANT_TARGET=buildclean
-NATIVE_DIR=native
-
-## 
-# Define what jar files get into libi2p.so.  The current setup is
-# *incredibly* lazy, throwing everything in the .so, rather than
-# give each .jar file its own .so.
-#  i2p.jar: base SDK
-#  mstreaming.jar: streaming API
-#  streaming.jar: full streaming lib implementation
-#  i2ptunnel.jar: I2PTunnel proxy
-#  sam.jar: SAM bridge and API
-#  i2psnark.jar: bittorrent client
-#  router.jar: full I2P router
-#  jbigi.jar: collection of native optimized GMP routines for crypto
-JAR_BASE=i2p.jar mstreaming.jar streaming.jar
-JAR_CLIENTS=i2ptunnel.jar sam.jar
-JAR_ROUTER=router.jar
-JAR_JBIGI=jbigi.jar
-JAR_XML=xml-apis.jar resolver.jar xercesImpl.jar
-JAR_CONSOLE=\
-            i2psnark.jar \
-            javax.servlet.jar \
-            commons-el.jar \
-            commons-logging.jar \
-	    jasper-runtime.jar \
-            ant-apache-bcel.jar \
-            ant.jar \
-            jasper-compiler.jar \
-            org.mortbay.jetty.jar \
-	    routerconsole.jar
-JAR_SUCKER=jdom.jar rome-0.7.jar sucker.jar
-LIBI2P_JARS=${JAR_BASE} ${JAR_CLIENTS} ${JAR_ROUTER} ${JAR_JBIGI}
-# unfortunately, its not quite ready for most end users, as the
-# ${JAR_CONSOLE} fails to compile with: 
-# org/apache/commons/logging/impl/LogKitLogger.java: In class 'org.apache.commons.logging.impl.LogKitLogger':
-# .../LogKitLogger.java: In constructor '(java.lang.String)':
-# .../LogKitLogger.java:91: error: cannot find file for class org.apache.log.Hierarchy
-# .../LogKitLogger.java:91: error: cannot find file for class org.apache.log.Hierarchy
-# .../LogKitLogger.java:104: error: cannot find file for class org.apache.log.Hierarchy
-# .../LogKitLogger.java:104: confused by earlier errors, bailing out
-
-#${JAR_CONSOLE}\
-#${JAR_XML} \
-#${JAR_SUCKER}
-#${JAR_CONSOLE}
-
-SYSTEM_PROPS=-DloggerFilenameOverride=logs/log-router-@.txt \
-             -Dorg.mortbay.http.Version.paranoid=true \
-	     -Dorg.mortbay.util.FileResource.checkAliases=false \
-	     -Dorg.mortbay.xml.XmlParser.NotValidating=true
-#SYSTEM_PROPS=-Di2p.weakPRNG=true
-OPTIMIZE=-O2
-#OPTIMIZE=-O3
-
-LD_LIBRARY_PATH=${EXTRA_LD_PATH}:.
-
-all: jars native
-	@echo "* Build complete"
-
-jars:
-	@${ANT} ${ANT_TARGET}
-
-clean: native_clean
-
-native: native_clean native_shared
-	@echo "* Native code build in ${NATIVE}"
-
-native_clean:
-	@rm -rf ${NATIVE_DIR}
-	@mkdir ${NATIVE_DIR}
-
-native_shared: libi2p.so
-	@cd build ; ${GCJ} ${OPTIMIZE} -fjni -L../${NATIVE_DIR} -li2p ${SYSTEM_PROPS} -o ../${NATIVE_DIR}/i2p_dsa --main=net.i2p.crypto.DSAEngine 
-	@echo "* i2p_dsa is a simple test app with the DSA engine and Fortuna PRNG to make sure crypto is working"
-	@cd build ; ${GCJ} ${OPTIMIZE} -fjni -L../${NATIVE_DIR} -li2p ${SYSTEM_PROPS} -o ../${NATIVE_DIR}/prng --main=gnu.crypto.prng.FortunaStandalone
-	@cd build ; ${GCJ} ${OPTIMIZE} -fjni -L../${NATIVE_DIR} -li2p ${SYSTEM_PROPS} -o ../${NATIVE_DIR}/i2ptunnel --main=net.i2p.i2ptunnel.I2PTunnel 
-	@echo "* i2ptunnel is mihi's I2PTunnel CLI"
-	@echo "  run it as ./i2ptunnel -cli to avoid awt complaints"
-	@cd build ; ${GCJ} ${OPTIMIZE} -fjni -L../${NATIVE_DIR} -li2p ${SYSTEM_PROPS} -o ../${NATIVE_DIR}/i2ptunnelctl --main=net.i2p.i2ptunnel.TunnelControllerGroup 
-	@echo "* i2ptunnelctl is a controller for I2PTunnel, reading i2ptunnel.config"
-	@echo "  and launching the appropriate proxies"
-	#@cd build ; ${GCJ} ${OPTIMIZE} -fjni -L../${NATIVE_DIR} -li2p ${SYSTEM_PROPS} -o ../${NATIVE_DIR}/i2psnark --main=org.klomp.snark.Snark
-	#@echo "* i2psnark is an anonymous bittorrent client"
-	@cd build ; ${GCJ} ${OPTIMIZE} -fjni -L../${NATIVE_DIR} -li2p ${SYSTEM_PROPS} -o ../${NATIVE_DIR}/i2prouter --main=net.i2p.router.Router 
-	@echo "* i2prouter is the main I2P router"
-	@echo "  it can be used, and while the router console won't load,"
-	@echo "  i2ptunnel will, so it will start all the proxies defined in i2ptunnel.config"
-
-libi2p.so:
-	@echo "* Building libi2p.so"
-	@(cd build ; time ${GCJ} ${OPTIMIZE} -fPIC -fjni -shared -o ../${NATIVE_DIR}/libi2p.so ${LIBI2P_JARS} ; cd .. )
-	@ls -l ${NATIVE_DIR}/libi2p.so
-	@echo "* libi2p.so built"

README.txt

@@ -0,0 +1,113 @@
+These instructions are for a recent Android SDK (Rev 20 or better) on Linux.
+Windows building is not currently supported.
+
+These instructions were last updated for SDK Tools Version 20 with
+SDK Platform-tools Version 12 from updates.
+
+The i2p source must be installed in ../i2p.i2p,
+or else add i2psrc=/path/to/source in the local.properties file.
+
+=====================
+
+Dependencies:
+
+- Java SDK (preferably Oracle/Sun or OpenJDK) 1.6.0 or higher
+- Apache Ant 1.8.0 or higher
+- I2P source in ../i2p.i2p
+- Android SDK (tested with Rev 20 and platform-tools version 12)
+
+=====================
+
+Instructions:
+
+# Download the SDK from http://developer.android.com/sdk/index.html
+# Unzip the android SDK in ../
+# So then the android tools will be in ../android-sdk-linux/tools/
+#
+# Run the GUI updater, which you must do to get an SDK Platform:
+../android-sdk-linux/tools/android &
+
+# now go to the available packages tab, check the box and click refresh,
+# and download an SDK Platform
+# Since I2P is targeted at 4.3 (API 18)
+# download at least that one. Otherwise you must change the
+# target in project.properties from android-18 to andriod-x
+# where x is the API version.
+
+# I2P is configured to run on 2.2 (API 8) or higher using the
+# Android Support Library, so download that as well
+# (it's under "Extras"). 
+
+# To run the debugger (ddms) you also need to download the
+# "Android SDK Platform-Tools" package from the GUI updater.
+
+# create a file local.properties with the following line (without the leading # of course),
+# do NOT use a relative path
+# sdk.dir=/path/to/your/android-sdk-linux
+# Copy this file to the routerjars/ directory, it is needed in both places.
+
+# If your SDK is not in ../android-sdk-linux/ then you must
+# override the location of the Android Support Library. Add
+# the following line to local.properties
+# do NOT use an absolute path
+# android.library.reference.2=path/to/your/android-sdk-linux/extras/android/support/v7/appcompat
+# Don't add it to the local.properties in the routerjars/ directory.
+
+# DO NOT create a new project or anything. It's all set up right here for you.
+
+# Create the android 4.3 (API 18) virtual device
+# (don't make a custom hardware profile)
+../android-sdk-linux/tools/android create avd --name i2p --target 18
+
+# then run the emulator:
+#  This may take a LONG time the first time (half an hour or more)...
+#  Run the debugger to ensure it is making progress
+#   -no-boot-anim for faster boot
+#   -dns-server 8.8.8.8 if the router can't reseed
+#     ../android-sdk-linux/tools/emulator -avd i2p -no-boot-anim -dns-server 8.8.8.8 &
+../android-sdk-linux/tools/emulator -avd i2p &
+
+# or to talk to a real device in debug mode:
+# You have to do this if you get a permission error -
+# Stop ddms, unplug the device, do the following,
+# then plug in the device, then start ddms
+adb kill-server
+sudo adb start-server
+adb devices
+
+# then wait a couple minutes until the emulator or device is up
+# compile and install for a release
+ant release
+ant installr
+
+# or compile and install for a debug version
+ant debug
+ant installd
+
+# then run the debugger
+../android-sdk-linux/tools/ddms &
+
+# to rebuild and reinstall to emulator or device:
+ant clean
+# then do which ever from the above compile and install choices.
+
+
+# to uninstall
+ant uninstall
+# or use your device's menu.
+
+# Other ant tagets are available, just type
+ant
+
+# Anyway, with I2P installed, click on the I2P icon on your device and enjoy!
+
+#other helpful commands
+../android-sdk-linux/platform-tools/adb shell
+../android-sdk-linux/platform-tools/adb pull /some/file/on/emulator some-local-dir/
+
+# copy the Dev Tools app from the emulator to your device
+adb -e pull /system/app/Development.apk ./Development.apk
+adb -d install Development.apk
+
+# reinstall an existing apk onto the emulator
+adb -e install -r bin/I2PAndroid-debug.apk

ant.properties

@@ -0,0 +1,4 @@
+application-package=net.i2p.router
+key.store=${user.home}/.android/${application-package}.keystore
+key.alias=${application-package}
+key.store.password=android

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.xml

@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<project name="addressbook" default="war" basedir=".">
-
-	<property name="src" value="java/src/addressbook"/>
-	<property name="build" value="build"/>
-	<property name="dist"  location="dist"/>
-	<property name="jar" value="addressbook.jar"/>
-	<property name="war" value="addressbook.war"/>
-	
-	<target name="init">
-		<mkdir dir="${build}"/>
-		<mkdir dir="${dist}"/>
-	</target>
-
-	<target name="clean">
-		<delete dir="${build}"/>
-		<delete dir="${dist}"/>
-	</target>
-
-	<target name="distclean" depends="clean" />
-
-	<target name="compile" depends="init">
-		<javac debug="true" deprecation="on" source="1.3" target="1.3" 
-                       srcdir="${src}" destdir="${build}">
-            <classpath>
-                <pathelement location="../../core/java/build/i2p.jar" />
-                <pathelement location="../jetty/jettylib/javax.servlet.jar" />
-            </classpath>
-		</javac>
-	</target>
-
-	<target name="jar" depends="compile">
-		<jar basedir="${build}" destfile="${dist}/${jar}">
-			<manifest>
-				<attribute name="Main-Class" value="addressbook.Daemon"/>
-			</manifest>
-		</jar>
-	</target>
-	
-	<target name="war" depends="compile">
-		<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>
-		<war basedir="${dist}/tmp" webxml="web.xml" destfile="${dist}/${war}"/>
-		<delete dir="${dist}/tmp"/>
-	</target>
-	
-</project>

apps/addressbook/config.txt

@@ -1,43 +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)
-#
-# 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
-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/addressbook/AddressBook.java

@@ -1,218 +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 addressbook;
-
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.io.File;
-import java.io.IOException;
-
-import net.i2p.I2PAppContext;
-import net.i2p.util.EepGet;
-
-/**
- * An address book for storing human readable names mapped to base64 i2p
- * destinations. AddressBooks can be created from local and remote files, merged
- * together, and written out to local files.
- * 
- * @author Ragnarok
- *  
- */
-public class AddressBook {
-
-    private String location;
-
-    private Map addresses;
-
-    private boolean modified;
-
-    /**
-     * Construct an AddressBook from the contents of the Map addresses.
-     * 
-     * @param addresses
-     *            A Map containing human readable addresses as keys, mapped to
-     *            base64 i2p destinations.
-     */
-    public AddressBook(Map addresses) {
-        this.addresses = addresses;
-    }
-
-    /**
-     * Construct an AddressBook from the contents of the file at url. If the
-     * remote file cannot be read, construct an empty AddressBook
-     * 
-     * @param url
-     *            A URL pointing at a file with lines in the format "key=value",
-     *            where key is a human readable name, and value is a base64 i2p
-     *            destination.
-     */
-    public AddressBook(String url, String proxyHost, int proxyPort) {
-        this.location = url;
-        EepGet get = new EepGet(I2PAppContext.getGlobalContext(), true,
-                proxyHost, proxyPort, 0, "addressbook.tmp", url, true, 
-                null);
-        get.fetch();
-        try {
-            this.addresses = ConfigParser.parse(new File("addressbook.tmp"));
-        } catch (IOException exp) {
-            this.addresses = new HashMap();
-        }
-        new File("addressbook.tmp").delete();
-    }
-
-    /**
-     * Construct an AddressBook from the Subscription subscription. If the
-     * address book at subscription has not changed since the last time it was
-     * read or cannot be read, return an empty AddressBook.
-     * 
-     * @param subscription
-     *            A Subscription instance pointing at a remote address book.
-     */
-    public AddressBook(Subscription subscription, String proxyHost, int proxyPort) {
-        this.location = subscription.getLocation();
-        EepGet get = new EepGet(I2PAppContext.getGlobalContext(), true,
-                proxyHost, proxyPort, 0, "addressbook.tmp", 
-                subscription.getLocation(), true, subscription.getEtag());
-        get.fetch();
-        subscription.setEtag(get.getETag());
-        try {            
-            this.addresses = ConfigParser.parse(new File("addressbook.tmp"));
-        } catch (IOException exp) {
-            this.addresses = new HashMap();
-        }
-        new File("addressbook.tmp").delete();
-    }
-
-    /**
-     * Construct an AddressBook from the contents of the file at file. If the
-     * file cannot be read, construct an empty AddressBook
-     * 
-     * @param file
-     *            A File pointing at a file with lines in the format
-     *            "key=value", where key is a human readable name, and value is
-     *            a base64 i2p destination.
-     */
-    public AddressBook(File file) {
-        this.location = file.toString();
-        try {
-            this.addresses = ConfigParser.parse(file);
-        } catch (IOException exp) {
-            this.addresses = new HashMap();
-        }
-    }
-
-    /**
-     * Return a Map containing the addresses in the AddressBook.
-     * 
-     * @return A Map containing the addresses in the AddressBook, where the key
-     *         is a human readable name, and the value is a base64 i2p
-     *         destination.
-     */
-    public Map getAddresses() {
-        return this.addresses;
-    }
-
-    /**
-     * Return the location of the file this AddressBook was constructed from.
-     * 
-     * @return A String representing either an abstract path, or a url,
-     *         depending on how the instance was constructed.
-     */
-    public String getLocation() {
-        return this.location;
-    }
-
-    /**
-     * Return a string representation of the contents of the AddressBook.
-     * 
-     * @return A String representing the contents of the AddressBook.
-     */
-    public String toString() {
-        return this.addresses.toString();
-    }
-
-    /**
-     * Merge this AddressBook with AddressBook other, writing messages about new
-     * addresses or conflicts to log. Addresses in AddressBook other that are
-     * not in this AddressBook are added to this AddressBook. In case of a
-     * conflict, addresses in this AddressBook take precedence
-     * 
-     * @param other
-     *            An AddressBook to merge with.
-     * @param log
-     *            The log to write messages about new addresses or conflicts to.
-     */
-    public void merge(AddressBook other, boolean overwrite, Log log) {
-        Iterator otherIter = other.addresses.keySet().iterator();
-
-        while (otherIter.hasNext()) {
-            String otherKey = (String) otherIter.next();
-            String otherValue = (String) other.addresses.get(otherKey);
-
-            if (otherKey.endsWith(".i2p") && otherValue.length() >= 516) {
-                if (this.addresses.containsKey(otherKey) && !overwrite) {
-                    if (!this.addresses.get(otherKey).equals(otherValue)
-                            && log != null) {
-                        log.append("Conflict for " + otherKey + " from "
-                                + other.location
-                                + ". Destination in remote address book is "
-                                + otherValue);
-                    }
-                } else if (!this.addresses.containsKey(otherKey)
-                            || !this.addresses.get(otherKey).equals(otherValue)) {
-                    this.addresses.put(otherKey, otherValue);
-                    this.modified = true;
-                    if (log != null) {
-                        log.append("New address " + otherKey
-                            + " added to address book.");
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Write the contents of this AddressBook out to the File file. If the file
-     * cannot be writen to, this method will silently fail.
-     * 
-     * @param file
-     *            The file to write the contents of this AddressBook too.
-     */
-    public void write(File file) {
-        if (this.modified) {
-            try {
-                ConfigParser.write(this.addresses, file);
-            } catch (IOException exp) {
-            }
-        }
-    }
-
-    /**
-     * Write this AddressBook out to the file it was read from. Requires that
-     * AddressBook was constructed from a file on the local filesystem. If the
-     * file cannot be writen to, this method will silently fail.
-     */
-    public void write() {
-        this.write(new File(this.location));
-    }
-}

apps/addressbook/java/src/addressbook/ConfigParser.java

@@ -1,304 +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 addressbook;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.List;
-import java.util.LinkedList;
-import java.util.Iterator;
-import java.io.*;
-
-/**
- * Utility class providing methods to parse and write files in config file
- * format, and subscription file format.
- * 
- * @author Ragnarok
- */
-public class ConfigParser {
-
-    /**
-     * Strip the comments from a String. Lines that begin with '#' and ';' are
-     * considered comments, as well as any part of a line after a '#'.
-     * 
-     * @param inputLine
-     *            A String to strip comments from.
-     * @return A String without comments, but otherwise identical to inputLine.
-     */
-    public static String stripComments(String inputLine) {
-        if (inputLine.startsWith(";")) {
-            return "";
-        }
-        if (inputLine.split("#").length > 0) {
-            return inputLine.split("#")[0];
-        } else {
-            return "";
-        }
-    }
-
-    /**
-     * 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.
-     * 
-     * @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.
-     *  
-     */
-    public static Map parse(BufferedReader input) throws IOException {
-        Map 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(), splitLine[1].trim());
-            }
-            inputLine = input.readLine();
-        }
-        input.close();
-        return result;
-    }
-
-    /**
-     * Return a Map using the contents of the File file. See parseBufferedReader
-     * for details of the input format.
-     * 
-     * @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 parse(File file) throws IOException {
-        FileInputStream fileStream = new FileInputStream(file);
-        BufferedReader input = new BufferedReader(new InputStreamReader(
-                fileStream));
-        return ConfigParser.parse(input);
-    }
-
-    /**
-     * Return a Map using the contents of the String string. See
-     * parseBufferedReader for details of the input format.
-     * 
-     * @param string
-     *            A String to parse.
-     * @return A Map containing the key, value pairs from string.
-     * @throws IOException
-     *             if file cannot be read.
-     */
-    public static Map parse(String string) throws IOException {
-        StringReader stringReader = new StringReader(string);
-        BufferedReader input = new BufferedReader(stringReader);
-        return ConfigParser.parse(input);
-    }
-    
-    /**
-     * 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.
-     * 
-     * @param file
-     *            A File to attempt to parse.
-     * @param map
-     *            A Map to use as the default, if file fails.
-     * @return A Map containing the key, value pairs from file, or if file
-     *         cannot be read, map.
-     */
-    public static Map parse(File file, Map map) {
-        Map result = new HashMap();
-        try {
-            result = ConfigParser.parse(file);
-        } catch (IOException exp) {
-            result = map;
-            try {
-                ConfigParser.write(result, file);
-            } catch (IOException exp2) {
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Return a List where each element is a line from the BufferedReader input.
-     * 
-     * @param input
-     *            A BufferedReader to parse.
-     * @return A List consisting of one element for each line in input.
-     * @throws IOException
-     *             if input cannot be read.
-     */
-    public static List parseSubscriptions(BufferedReader input)
-            throws IOException {
-        List result = new LinkedList();
-        String inputLine = input.readLine();
-        while (inputLine != null) {
-            inputLine = ConfigParser.stripComments(inputLine).trim();
-            if (inputLine.length() > 0) {
-                result.add(inputLine);
-            }
-            inputLine = input.readLine();
-        }
-        input.close();
-        return result;
-    }
-
-    /**
-     * Return a List where each element is a line from the File file.
-     * 
-     * @param file
-     *            A File to parse.
-     * @return A List consisting of one element for each line in file.
-     * @throws IOException
-     *             if file cannot be read.
-     */
-    public static List parseSubscriptions(File file) throws IOException {
-        FileInputStream fileStream = new FileInputStream(file);
-        BufferedReader input = new BufferedReader(new InputStreamReader(
-                fileStream));
-        return ConfigParser.parseSubscriptions(input);
-    }
-
-    /**
-     * Return a List where each element is a line from the String string.
-     * 
-     * @param string
-     *            A String to parse.
-     * @return A List consisting of one element for each line in string.
-     * @throws IOException
-     *             if string cannot be read.
-     */
-    public static List parseSubscriptions(String string) throws IOException {
-        StringReader stringReader = new StringReader(string);
-        BufferedReader input = new BufferedReader(stringReader);
-        return ConfigParser.parseSubscriptions(input);
-    }
-    
-    /**
-     * Return a List using the contents of the File file. If file cannot be
-     * read, use list instead, and write the result to where file should have
-     * been.
-     * 
-     * @param file
-     *            A File to attempt to parse.
-     * @param string
-     *            A List to use as the default, if file fails.
-     * @return A List consisting of one element for each line in file, or if
-     *         file cannot be read, list.
-     */
-    public static List parseSubscriptions(File file, List list) {
-        List result = new LinkedList();
-        try {
-            result = ConfigParser.parseSubscriptions(file);
-        } catch (IOException exp) {
-            result = list;
-            try {
-                ConfigParser.writeSubscriptions(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.
-     */
-    public static void write(Map map, BufferedWriter output) throws IOException {
-        Iterator keyIter = map.keySet().iterator();
-
-        while (keyIter.hasNext()) {
-            String key = (String) keyIter.next();
-            output.write(key + "=" + (String) map.get(key));
-            output.newLine();
-        }
-        output.close();
-    }
-
-    /**
-     * 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.
-     * 
-     * @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 map, File file) throws IOException {
-        ConfigParser
-                .write(map, new BufferedWriter(new FileWriter(file, false)));
-    }
-
-    /**
-     * Write contents of List list to BufferedReader output. Output is written
-     * with each element of list on a new line.
-     * 
-     * @param list
-     *            A List to write to file.
-     * @param output
-     *            A BufferedReader to write list to.
-     * @throws IOException
-     *             if output cannot be written to.
-     */
-    public static void writeSubscriptions(List list, BufferedWriter output)
-            throws IOException {
-        Iterator iter = list.iterator();
-
-        while (iter.hasNext()) {
-            output.write((String) iter.next());
-            output.newLine();
-        }
-        output.close();
-    }
-    
-    /**
-     * Write contents of List list to File file. Output is written with each
-     * element of list on a new line.
-     * 
-     * @param list
-     *            A List to write to file.
-     * @param file
-     *            A File to write list to.
-     * @throws IOException
-     *             if output cannot be written to.
-     */
-    public static void writeSubscriptions(List list, File file)
-            throws IOException {
-        ConfigParser.writeSubscriptions(list, new BufferedWriter(
-                new FileWriter(file, false)));
-    }
-
-}

apps/addressbook/java/src/addressbook/Daemon.java

@@ -1,191 +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 addressbook;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.List;
-import java.util.LinkedList;
-import java.io.File;
-
-/**
- * Main class of addressbook.  Performs updates, and runs the main loop.
- * 
- * @author Ragnarok
- *
- */
-public class Daemon {
-    public static final String VERSION = "2.0.3";
-    private static final Daemon _instance = new Daemon();
-    
-    /**
-     * 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
-     *            overwritten, so it is safe for the user to write to.
-     * @param router
-     *            The router AddressBook. This is the address book read by
-     *            client applications.
-     * @param published
-     *            The published AddressBook. This address book is published on
-     *            the user's eepsite so that others may subscribe to it.
-     * @param subscriptions
-     *            A SubscriptionList listing the remote address books to update
-     *            from.
-     * @param log
-     *            The log to write changes and conflicts to.
-     */
-    public void update(AddressBook master, AddressBook router,
-            File published, SubscriptionList subscriptions, Log log) {
-        router.merge(master, true, null);
-        Iterator iter = subscriptions.iterator();
-        while (iter.hasNext()) {
-            router.merge((AddressBook) iter.next(), false, log);
-        }
-        router.write();
-        if (published != null)
-            router.write(published);
-        subscriptions.write();
-    }
-
-    /**
-     * Run an update, using the Map settings to provide the parameters.
-     * 
-     * @param settings
-     *            A Map containg the parameters needed by update.
-     * @param home
-     *            The directory containing addressbook's configuration files.
-     */
-    public void update(Map settings, String home) {
-        File masterFile = new File(home, (String) settings
-                .get("master_addressbook"));
-        File routerFile = new File(home, (String) settings
-                .get("router_addressbook"));
-        File published = null;
-        if ("true".equals(settings.get("should_publish"))) 
-            published = new File(home, (String) settings
-                .get("published_addressbook"));
-        File subscriptionFile = new File(home, (String) settings
-                .get("subscriptions"));
-        File logFile = new File(home, (String) settings.get("log"));
-        File etagsFile = new File(home, (String) settings.get("etags"));
-        File lastModifiedFile = new File(home, (String) settings
-                .get("last_modified"));
-
-        AddressBook master = new AddressBook(masterFile);
-        AddressBook router = new AddressBook(routerFile);
-        
-        List defaultSubs = new LinkedList();
-        defaultSubs.add("http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/i2p/hosts.txt");
-        
-        SubscriptionList subscriptions = new SubscriptionList(subscriptionFile,
-                etagsFile, lastModifiedFile, defaultSubs, (String) settings
-                .get("proxy_host"), Integer.parseInt((String) settings.get("proxy_port")));
-        Log log = new Log(logFile);
-
-        update(master, router, published, subscriptions, log);
-    }
-
-    /**
-     * Load the settings, set the proxy, then enter into the main loop. The main
-     * loop performs an immediate update, and then an update every number of
-     * hours, as configured in the settings file.
-     * 
-     * @param args
-     *            Command line arguments. If there are any arguments provided,
-     *            the first is taken as addressbook's home directory, and the
-     *            others are ignored.
-     */
-    public static void main(String[] args) {
-        _instance.run(args);
-    }
-    
-    public void run(String[] args) {
-        String settingsLocation = "config.txt";
-        Map settings = new HashMap();
-        String home;
-        if (args.length > 0) {
-            home = args[0];
-        } else {
-            home = ".";
-        }
-        
-        Map defaultSettings = new HashMap();
-        defaultSettings.put("proxy_host", "localhost");
-        defaultSettings.put("proxy_port", "4444");
-        defaultSettings.put("master_addressbook", "../userhosts.txt");
-        defaultSettings.put("router_addressbook", "../hosts.txt");
-        defaultSettings.put("published_addressbook", "../eepsite/docroot/hosts.txt");
-        defaultSettings.put("should_publish", "false");
-        defaultSettings.put("log", "log.txt");
-        defaultSettings.put("subscriptions", "subscriptions.txt");
-        defaultSettings.put("etags", "etags");
-        defaultSettings.put("last_modified", "last_modified");
-        defaultSettings.put("update_delay", "12");
-        
-        File homeFile = new File(home);
-        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");
-        }
-        
-        File settingsFile = new File(homeFile, settingsLocation);
-        
-        settings = ConfigParser.parse(settingsFile, defaultSettings);
-        // wait
-        try {
-            Thread.currentThread().sleep(5*60*1000);
-        } catch (InterruptedException ie) {}
-        
-        while (true) {
-            long delay = Long.parseLong((String) settings.get("update_delay"));
-            if (delay < 1) {
-                delay = 1;
-            }
-            
-            update(settings, home);
-            try {
-                synchronized (this) {
-                    wait(delay * 60 * 60 * 1000);
-                }
-            } catch (InterruptedException exp) {
-            }
-            settings = ConfigParser.parse(settingsFile, defaultSettings);
-        }
-    }
- 
-    /**
-     * Call this to get the addressbook to reread its config and 
-     * refetch its subscriptions.
-     */
-    public static void wakeup() {
-        synchronized (_instance) {
-            _instance.notifyAll();
-        }
-    }
-}

apps/addressbook/java/src/addressbook/Log.java

@@ -1,76 +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 addressbook;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.Date;
-
-/**
- * A simple log with automatic time stamping.
- * 
- * @author Ragnarok
- *  
- */
-public class Log {
-
-    private File file;
-
-    /**
-     * Construct a Log instance that writes to the File file.
-     * 
-     * @param file
-     *            A File for the log to write to.
-     */
-    public Log(File file) {
-        this.file = file;
-    }
-
-    /**
-     * Write entry to a new line in the log, with appropriate time stamp.
-     * 
-     * @param entry
-     *            A String containing a message to append to the log.
-     */
-    public void append(String entry) {
-        try {
-            BufferedWriter bw = new BufferedWriter(new FileWriter(this.file,
-                    true));
-            String timestamp = new Date().toString();
-            bw.write(timestamp + " -- " + entry);
-            bw.newLine();
-            bw.close();
-        } catch (IOException exp) {
-        }
-    }
-
-    /**
-     * Return the File that the Log is writing to.
-     * 
-     * @return The File that the log is writing to.
-     */
-    public File getFile() {
-        return this.file;
-    }
-}

apps/addressbook/java/src/addressbook/Servlet.java

@@ -1,61 +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 addressbook;
-
-import javax.servlet.GenericServlet;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-
-/**
- * A wrapper for addressbook to allow it to be started as a web application.
- * 
- * @author Ragnarok
- *
- */
-public class Servlet extends GenericServlet {
-
-    /* (non-Javadoc)
-     * @see javax.servlet.Servlet#service(javax.servlet.ServletRequest, javax.servlet.ServletResponse)
-     */
-    public void service(ServletRequest request, ServletResponse response) {
-    }
-
-    /* (non-Javadoc)
-     * @see javax.servlet.Servlet#init(javax.servlet.ServletConfig)
-     */
-    public void init(ServletConfig config) {
-        try {
-            super.init(config);
-        } catch (ServletException exp) {
-        }
-        String[] args = new String[1];
-        args[0] = config.getInitParameter("home");
-        DaemonThread thread = new DaemonThread(args);
-        thread.setDaemon(true);
-        thread.start();
-        System.out.println("INFO: Starting Addressbook " + Daemon.VERSION);
-        System.out.println("INFO: config root under " + args[0]);
-    }
-
-}

apps/addressbook/java/src/addressbook/Subscription.java

@@ -1,105 +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 addressbook;
-
-/**
- * A subscription to a remote address book.
- * 
- * @author Ragnarok
- *  
- */
-public class Subscription {
-
-    private String location;
-
-    private String etag;
-
-    private String lastModified;
-
-    /**
-     * Construct a Subscription pointing to the address book at location, that
-     * was last read at the time represented by etag and lastModified.
-     * 
-     * @param location
-     *            A String representing a url to a remote address book.
-     * @param etag
-     *            The etag header that we recieved the last time we read this
-     *            subscription.
-     * @param lastModified
-     *            the last-modified header we recieved the last time we read
-     *            this subscription.
-     */
-    public Subscription(String location, String etag, String lastModified) {
-        this.location = location;
-        this.etag = etag;
-        this.lastModified = lastModified;
-    }
-
-    /**
-     * Return the location this Subscription points at.
-     * 
-     * @return A String representing a url to a remote address book.
-     */
-    public String getLocation() {
-        return this.location;
-    }
-
-    /**
-     * Return the etag header that we recieved the last time we read this
-     * subscription.
-     * 
-     * @return A String containing the etag header.
-     */
-    public String getEtag() {
-        return this.etag;
-    }
-
-    /**
-     * Set the etag header.
-     * 
-     * @param etag
-     *            A String containing the etag header.
-     */
-    public void setEtag(String etag) {
-        this.etag = etag;
-    }
-
-    /**
-     * Return the last-modified header that we recieved the last time we read
-     * this subscription.
-     * 
-     * @return A String containing the last-modified header.
-     */
-    public String getLastModified() {
-        return this.lastModified;
-    }
-
-    /**
-     * Set the last-modified header.
-     * 
-     * @param lastModified
-     *            A String containing the last-modified header.
-     */
-    public void setLastModified(String lastModified) {
-        this.lastModified = lastModified;
-    }
-}

apps/addressbook/java/src/addressbook/SubscriptionIterator.java

@@ -1,73 +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 addressbook;
-
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * An iterator over the subscriptions in a SubscriptionList.  Note that this iterator
- * returns AddressBook objects, and not Subscription objects.
- * 
- * @author Ragnarok
- */
-public class SubscriptionIterator implements Iterator {
-
-    private Iterator subIterator;
-    private String proxyHost;
-    private int proxyPort;
-
-    /**
-     * Construct a SubscriptionIterator using the Subscriprions in List subscriptions.
-     * 
-     * @param subscriptions
-     *            List of Subscription objects that represent address books.
-     */
-    public SubscriptionIterator(List subscriptions, String proxyHost, int proxyPort) {
-        this.subIterator = subscriptions.iterator();
-        this.proxyHost = proxyHost;
-        this.proxyPort = proxyPort;
-    }
-
-    
-    /* (non-Javadoc)
-     * @see java.util.Iterator#hasNext()
-     */
-    public boolean hasNext() {
-        return this.subIterator.hasNext();
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.Iterator#next()
-     */
-    public Object next() {
-        Subscription sub = (Subscription) this.subIterator.next();
-        return new AddressBook(sub, this.proxyHost, this.proxyPort);
-    }
-
-    /* (non-Javadoc)
-     * @see java.util.Iterator#remove()
-     */
-    public void remove() {
-        throw new UnsupportedOperationException();
-    }
-}

apps/addressbook/java/src/addressbook/SubscriptionList.java

@@ -1,129 +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 addressbook;
-
-import java.util.List;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.io.File;
-import java.io.IOException;
-
-/**
- * A list of Subscriptions loaded from a file.
- * 
- * @author Ragnarok
- *  
- */
-public class SubscriptionList {
-
-    private List subscriptions;
-
-    private File etagsFile;
-
-    private File lastModifiedFile;
-    
-    private String proxyHost;
-    
-    private int proxyPort;
-
-    /**
-     * Construct a SubscriptionList using the urls from locationsFile and, if
-     * available, the etags and last-modified headers loaded from etagsFile and
-     * lastModifiedFile.
-     * 
-     * @param locationsFile
-     *            A file containing one url on each line.
-     * @param etagsFile
-     *            A file containg the etag headers used for conditional GET. The
-     *            file is in the format "url=etag".
-     * @param lastModifiedFile
-     *            A file containg the last-modified headers used for conditional
-     *            GET. The file is in the format "url=leastmodified".
-     */
-    public SubscriptionList(File locationsFile, File etagsFile,
-            File lastModifiedFile, List defaultSubs, String proxyHost, 
-            int proxyPort) {
-        this.subscriptions = new LinkedList();
-        this.etagsFile = etagsFile;
-        this.lastModifiedFile = lastModifiedFile;
-        this.proxyHost = proxyHost;
-        this.proxyPort = proxyPort;
-        Map etags;
-        Map lastModified;
-        String location;
-        List locations = ConfigParser.parseSubscriptions(locationsFile, 
-                defaultSubs);
-        try {
-            etags = ConfigParser.parse(etagsFile);
-        } catch (IOException exp) {
-            etags = new HashMap();
-        }
-        try {
-            lastModified = ConfigParser.parse(lastModifiedFile);
-        } catch (IOException exp) {
-            lastModified = new HashMap();
-        }
-        Iterator iter = locations.iterator();
-        while (iter.hasNext()) {
-            location = (String) iter.next();
-            this.subscriptions.add(new Subscription(location, (String) etags
-                    .get(location), (String) lastModified.get(location)));
-        }
-    }
-    
-    /**
-     * Return an iterator over the AddressBooks represented by the Subscriptions
-     * in this SubscriptionList.
-     * 
-     * @return A SubscriptionIterator.
-     */
-    public SubscriptionIterator iterator() {
-        return new SubscriptionIterator(this.subscriptions, this.proxyHost, 
-                this.proxyPort);
-    }
-
-    /**
-     * Write the etag and last-modified headers for each Subscription to files.
-     */
-    public void write() {
-        Iterator iter = this.subscriptions.iterator();
-        Subscription sub;
-        Map etags = new HashMap();
-        Map lastModified = new HashMap();
-        while (iter.hasNext()) {
-            sub = (Subscription) iter.next();
-            if (sub.getEtag() != null) {
-                etags.put(sub.getLocation(), sub.getEtag());
-            }
-            if (sub.getLastModified() != null) {
-                lastModified.put(sub.getLocation(), sub.getLastModified());
-            }
-        }
-        try {
-            ConfigParser.write(etags, this.etagsFile);
-            ConfigParser.write(lastModified, this.lastModifiedFile);
-        } catch (IOException exp) {
-        }
-    }
-}

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,16 +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>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>
-</web-app>

apps/bogobot/Bogobot.java

@@ -1,349 +0,0 @@
-/*
- * bogobot - A simple join/part stats logger bot for I2P IRC.
- * 
- * Bogobot.java
- * 2004 The I2P Project
- * http://www.i2p.net
- * This code is public domain.
- */
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.Properties;
-
-import org.apache.log4j.DailyRollingFileAppender;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PatternLayout;
-
-import org.jibble.pircbot.IrcException;
-import org.jibble.pircbot.NickAlreadyInUseException;
-import org.jibble.pircbot.PircBot;
-import org.jibble.pircbot.User;
-
-/**
- * TODO 0.5 Add multi-server capability.
- * 
- * @author hypercubus, oOo
- * @version 0.4
- */
-public class Bogobot extends PircBot {
-
-    private static final String INTERVAL_DAILY   = "daily";
-    private static final String INTERVAL_MONTHLY = "monthly";
-    private static final String INTERVAL_WEEKLY  = "weekly";
-
-    private boolean _isIntentionalDisconnect      = false;
-    private long    _lastUserlistCommandTimestamp = 0;
-    private Logger  _logger                       = Logger.getLogger(Bogobot.class);
-
-    private int     _currentAutoRoundTripTag      = 0;
-    private long    _lastAutoRoundTripSentTime    = 0;
-    private Timer   _tickTimer;
-
-    private String  _configFile;
-
-    private String  _botPrimaryNick;
-    private String  _botSecondaryNick;
-    private String  _botNickservPassword;
-    private String  _botUsername;
-    private String  _ownerPrimaryNick;
-    private String  _ownerSecondaryNick;
-    private String  _botShutdownPassword;
-    private String  _ircChannel;
-    private String  _ircServer;
-    private int     _ircServerPort;
-    private boolean _isLoggerEnabled;
-    private String  _loggedHostnamePattern;
-    private boolean _isUserlistCommandEnabled;
-    private String  _logFilePrefix;
-    private String  _logFileRotationInterval;
-    private long    _commandAntiFloodInterval;
-    private String  _userlistCommandTrigger;
-    private boolean _isRoundTripDelayEnabled;
-    private int     _roundTripDelayPeriod;
-
-    class BogobotTickTask extends TimerTask {
-        private Bogobot _caller;
-
-        public BogobotTickTask(Bogobot caller) {
-            _caller = caller;
-        }
-
-        public void run() {
-          _caller.onTick();
-        }
-    }
-
-    private void loadConfigFile(String configFileName) {
-
-        _configFile = configFileName;
-
-        Properties config = new Properties();
-        FileInputStream fis = null;
-
-        try {
-            fis = new FileInputStream(configFileName);
-            config.load(fis);
-        } catch (IOException ioe) {
-            System.err.println("Error loading configuration file");
-            System.exit(2);
-
-        } finally {
-            if (fis != null) try {
-                fis.close();
-            } catch (IOException ioe) { // nop
-            }
-        }
-
-        _botPrimaryNick = config.getProperty("botPrimaryNick", "somebot");
-        _botSecondaryNick = config.getProperty("botSecondaryNick", "somebot_");
-        _botNickservPassword = config.getProperty("botNickservPassword", "");
-        _botUsername = config.getProperty("botUsername", "somebot");
-
-        _ownerPrimaryNick = config.getProperty("ownerPrimaryNick", "somenick");
-        _ownerSecondaryNick = config.getProperty("ownerSecondaryNick", "somenick_");
-
-        _botShutdownPassword = config.getProperty("botShutdownPassword", "take off eh");
-
-        _ircChannel = config.getProperty("ircChannel", "#i2p-chat");
-        _ircServer = config.getProperty("ircServer", "irc.postman.i2p");
-        _ircServerPort = Integer.parseInt(config.getProperty("ircServerPort", "6668"));
-
-        _isLoggerEnabled = Boolean.valueOf(config.getProperty("isLoggerEnabled", "true")).booleanValue();
-        _loggedHostnamePattern = config.getProperty("loggedHostnamePattern", "");
-        _logFilePrefix = config.getProperty("logFilePrefix", "irc.postman.i2p.i2p-chat");
-        _logFileRotationInterval = config.getProperty("logFileRotationInterval", INTERVAL_DAILY);
-
-        _isRoundTripDelayEnabled = Boolean.valueOf(config.getProperty("isRoundTripDelayEnabled", "false")).booleanValue();
-        _roundTripDelayPeriod = Integer.parseInt(config.getProperty("roundTripDelayPeriod", "300"));
-
-        _isUserlistCommandEnabled = Boolean.valueOf(config.getProperty("isUserlistCommandEnabled", "true")).booleanValue();
-        _userlistCommandTrigger = config.getProperty("userlistCommandTrigger", "!who");
-        _commandAntiFloodInterval = Long.parseLong(config.getProperty("commandAntiFloodInterval", "60"));
-    }
-
-    public Bogobot(String configFileName) {
-
-        loadConfigFile(configFileName);
-
-        this.setName(_botPrimaryNick);
-        this.setLogin(_botUsername);
-        _tickTimer = new Timer();
-        _tickTimer.scheduleAtFixedRate(new BogobotTickTask(this), 1000, 10 * 1000);
-    }
-
-    public static void main(String[] args) {
-
-        Bogobot bogobot;
-
-        if (args.length > 1) {
-            System.err.println("Too many arguments, the only allowed parameter is configuration file name");
-            System.exit(3);
-        }
-        if (args.length == 1) {
-          bogobot = new Bogobot(args[0]);
-        } else {
-          bogobot = new Bogobot("bogobot.config");
-        }
-
-        bogobot.setVerbose(true);
-
-        if (bogobot._isLoggerEnabled)
-            bogobot.initLogger();
-
-        bogobot.connectToServer();
-    }
-
-    protected void onTick() {
-        // Tick about once every ten seconds
-
-        if (this.isConnected() && _isRoundTripDelayEnabled) {
-            if( ( (System.currentTimeMillis() - _lastAutoRoundTripSentTime) >= (_roundTripDelayPeriod * 1000) ) && (this.getOutgoingQueueSize() == 0) ) {
-                // Connected, sending queue is empty and last RoundTrip is more then 5 minutes old -> Send a new one
-                _currentAutoRoundTripTag ++;
-                _lastAutoRoundTripSentTime = System.currentTimeMillis();
-                sendNotice(this.getNick(),"ROUNDTRIP " + _currentAutoRoundTripTag);
-            }
-        }
-    }
-
-    protected void onDisconnect() {
-
-        if (_isIntentionalDisconnect)
-            System.exit(0);            
-
-        if (_isLoggerEnabled)
-            _logger.info(System.currentTimeMillis() + " quits *** " + this.getName() + " *** (Lost connection)");
-
-        try {
-            Thread.sleep(60000);
-        } catch (InterruptedException e) {
-            // No worries.
-        }
-        connectToServer();
-    }
-
-    protected void onJoin(String channel, String sender, String login, String hostname) {
-
-        if (_isLoggerEnabled) {
-            if (sender.equals(this.getName())) {
-
-                _logger.info(System.currentTimeMillis() + " joins *** " + _botPrimaryNick + " ***");
-
-            } else {
-
-                String prependedHostname = "@" + hostname;
-                if (prependedHostname.endsWith(_loggedHostnamePattern)) {
-                    _logger.info(System.currentTimeMillis() + " joins " + sender);
-                }
-
-            }
-        }
-    }
-
-    protected void onMessage(String channel, String sender, String login, String hostname, String message) {
-        message = message.replaceFirst("<.+?> ", "");
-        if (_isUserlistCommandEnabled && message.equals(_userlistCommandTrigger)) {
-
-            if (System.currentTimeMillis() - _lastUserlistCommandTimestamp < _commandAntiFloodInterval * 1000)
-                return;
-
-            Object[] users = getUsers(_ircChannel);
-            String output = "Userlist for " + _ircChannel + ": ";
-
-            for (int i = 0; i < users.length; i++)
-                output += "[" + ((User) users[i]).getNick() + "] ";
-
-            sendMessage(_ircChannel, output);
-            _lastUserlistCommandTimestamp = System.currentTimeMillis();
-        }
-    }
-
-    protected void onPart(String channel, String sender, String login, String hostname) {
-
-        if (_isLoggerEnabled) {
-            if (sender.equals(this.getName())) {
-                _logger.info(System.currentTimeMillis() + " parts *** " + _botPrimaryNick + " ***");
-            } else {
-                String prependedHostname = "@" + hostname;
-                if (prependedHostname.endsWith(_loggedHostnamePattern)) {
-                    _logger.info(System.currentTimeMillis() + " parts " + sender);
-                }
-            }
-        }
-
-    }
-
-    protected void onPrivateMessage(String sender, String login, String hostname, String message) {
-        /*
-         * Nobody else except the bot's owner can shut it down, unless of
-         * course the owner's nick isn't registered and someone's spoofing it.
-         */
-        if ((sender.equals(_ownerPrimaryNick) || sender.equals(_ownerSecondaryNick)) && message.equals(_botShutdownPassword)) {
-
-            if (_isLoggerEnabled)
-                _logger.info(System.currentTimeMillis() + " quits *** " + this.getName() + " ***");
-
-            _isIntentionalDisconnect = true;
-            disconnect();
-        }
-    }
-
-    protected void onQuit(String sourceNick, String sourceLogin, String sourceHostname, String reason) {
-        String prependedHostname = "@" + sourceHostname;
-
-        if (sourceNick.equals(_botPrimaryNick))
-            changeNick(_botPrimaryNick);
-
-        if (_isLoggerEnabled) {
-            if (prependedHostname.endsWith(_loggedHostnamePattern)) {
-                _logger.info(System.currentTimeMillis() + " quits " + sourceNick + " " + reason);
-            }
-        }
-
-    }
-
-    private void connectToServer() {
-
-        int loginAttempts = 0;
-
-        while (true) {
-            try {
-                connect(_ircServer, _ircServerPort);
-                break;
-            } catch (NickAlreadyInUseException e) {
-                if (loginAttempts == 1) {
-                    System.out.println("Sorry, the primary and secondary bot nicks are already taken. Exiting.");
-                    System.exit(1);
-                }
-                loginAttempts++;
-                try {
-                    Thread.sleep(5000);
-                } catch (InterruptedException e1) {
-                    // Hmph.
-                }
-
-                if (getName().equals(_botPrimaryNick))
-                    setName(_botSecondaryNick);
-                else
-                    setName(_botPrimaryNick);
-
-                continue;
-            } catch (IOException e) {
-                System.out.println("Error during login: ");
-                e.printStackTrace();
-                System.exit(1);
-            } catch (IrcException e) {
-                System.out.println("Error during login: ");
-                e.printStackTrace();
-                System.exit(1);
-            }
-        }
-        joinChannel(_ircChannel);
-    }
-
-    protected void onNotice(String sourceNick, String sourceLogin, String sourceHostname, String target, String notice) {
-
-        if (sourceNick.equals("NickServ") && (notice.indexOf("/msg NickServ IDENTIFY") >= 0) && (_botNickservPassword != "")) {
-            sendRawLineViaQueue("NICKSERV IDENTIFY " + _botNickservPassword);
-        }
-
-        if (sourceNick.equals(getNick()) && notice.equals( "ROUNDTRIP " + _currentAutoRoundTripTag)) {
-            int delay = (int)((System.currentTimeMillis() - _lastAutoRoundTripSentTime) / 100);
-//            sendMessage(_ircChannel, "Round-trip delay = " + (delay / 10.0f) + " seconds");
-            if (_isLoggerEnabled)
-                _logger.info(System.currentTimeMillis() + " roundtrip " + delay);
-        }
-    }
-
-    private void initLogger() {
-
-        String                   logFilePath         = "logs" + File.separator + _logFilePrefix;
-        DailyRollingFileAppender rollingFileAppender = null;
-
-        if (!(new File("logs").exists()))
-            (new File("logs")).mkdirs();
-
-        try {
-
-            if (_logFileRotationInterval.equals("monthly"))
-                rollingFileAppender = new DailyRollingFileAppender(new PatternLayout("%m%n"), logFilePath, "'.'yyyy-MM'.log'");
-            else if (_logFileRotationInterval.equals("weekly"))
-                rollingFileAppender = new DailyRollingFileAppender(new PatternLayout("%m%n"), logFilePath, "'.'yyyy-ww'.log'");
-            else
-                rollingFileAppender = new DailyRollingFileAppender(new PatternLayout("%m%n"), logFilePath, "'.'yyyy-MM-dd'.log'");
-
-            rollingFileAppender.setThreshold(Level.INFO);
-            _logger.addAppender(rollingFileAppender);
-        } catch (IOException ex) {
-            System.out.println("Error: Couldn't create or open an existing log file. Exiting.");
-            System.exit(1);
-        }
-    }
-
-}

apps/bogobot/Bogoparser.java

@@ -1,353 +0,0 @@
-/*
- * bogoparser - A simple logfile analyzer for bogobot.
- * 
- * Bogoparser.java
- * 2004 The I2P Project
- * http://www.i2p.net
- * This code is public domain.
- */
-
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * @author hypercubus
- * @version 0.4
- */
-public class Bogoparser {
-
-    private static void displayUsageAndExit() {
-        System.out.println("\r\nUsage:\r\n\r\n    java Bogoparser [--by-duration] <logfile>\r\n");
-        System.exit(1);
-    }
-
-    public static void main(String[] args) {
-
-        Bogoparser bogoparser;
-
-        if (args.length < 1 || args.length > 2)
-            displayUsageAndExit();
-
-        if (args.length == 2) {
-            if (!args[0].equals("--by-duration"))
-                displayUsageAndExit();
-            bogoparser = new Bogoparser(args[1], true);
-        }
-
-        if (args.length == 1)
-            bogoparser = new Bogoparser(args[0], false);
-    }
-
-    private Bogoparser(String logfile, boolean sortByDuration) {
-
-        ArrayList sortedSessions;
-
-        if (sortByDuration) {
-            sortedSessions = sortSessionsByDuration(calculateSessionDurations(sortSessionsByTime(readLogfile(logfile))));
-            formatAndOutputByDuration(sortedSessions);
-        } else {
-            sortedSessions = calculateSessionDurations(sortSessionsByQuitReason(sortSessionsByNick(sortSessionsByTime(readLogfile(logfile)))));
-            formatAndOutput(sortedSessions);
-        }
-    }
-
-    private ArrayList calculateSessionDurations(ArrayList sortedSessionsByQuitReasonOrDuration) {
-
-        ArrayList calculatedSessionDurations = new ArrayList();
-
-        for (int i = 0; i+1 < sortedSessionsByQuitReasonOrDuration.size(); i += 2) {
-
-            String   joinsEntry       = (String) sortedSessionsByQuitReasonOrDuration.get(i);
-            String[] joinsEntryFields = joinsEntry.split(" ");
-
-            String  quitsEntry = (String) sortedSessionsByQuitReasonOrDuration.get(i+1);
-            Pattern p          = Pattern.compile("^([^ ]+) [^ ]+ ([^ ]+) (.*)$");
-            Matcher m          = p.matcher(quitsEntry);
-
-            if (m.matches()) {
-
-                String currentJoinTime             = joinsEntryFields[0];
-                String currentNick                 = m.group(2);
-                String currentQuitReason           = m.group(3);
-                String currentQuitTime             = m.group(1);
-                long   joinsTimeInMilliseconds;
-                long   quitsTimeInMilliseconds;
-                long   sessionLengthInMilliseconds;
-                
-                joinsTimeInMilliseconds = Long.parseLong(currentJoinTime);
-                quitsTimeInMilliseconds = Long.parseLong(currentQuitTime);
-                sessionLengthInMilliseconds = quitsTimeInMilliseconds - joinsTimeInMilliseconds;
-                
-                String hours   = "" + sessionLengthInMilliseconds/1000/60/60;
-                String minutes = "" + (sessionLengthInMilliseconds/1000/60)%60;
-
-                if (hours.length() < 2)
-                    hours = "0" + hours;
-
-                if (hours.length() < 3)
-                    hours = "0" + hours;
-
-                if (minutes.length() < 2)
-                    minutes = "0" + minutes;
-
-                int    columnPadding       = 19-currentNick.length();
-                String columnPaddingString = " ";
-
-                for (int j = 0; j < columnPadding; j++)
-                    columnPaddingString = columnPaddingString + " ";
-
-                calculatedSessionDurations.add(sessionLengthInMilliseconds + " " + currentNick + columnPaddingString + " online " + hours + " hours " + minutes + " minutes " + currentQuitReason);
-            } else {
-                System.out.println("\r\nError: Unexpected entry in logfile: " + quitsEntry);
-                System.exit(1);
-            }
-        }
-        return calculatedSessionDurations;
-    }
-
-    private void formatAndOutput(ArrayList sortedSessions) {
-
-        String quitReason = null;
-
-        for (int i = 0; i < sortedSessions.size(); i++) {
-
-            String  entry = (String) sortedSessions.get(i);
-            Pattern p     = Pattern.compile("^[\\d]+ ([^ ]+ +online [\\d]+ hours [\\d]+ minutes) (.*)$");
-            Matcher m     = p.matcher(entry);
-
-            if (m.matches()) {
-
-                if (quitReason == null) {
-                    quitReason = m.group(2);
-                    System.out.println("\r\nQUIT: " + ((m.group(2).equals("")) ? "No Reason Given" : quitReason) + "\r\n");
-                }
-
-                String tempQuitReason = m.group(2);
-                String tempSession    = m.group(1);
-
-                if (tempQuitReason.equals(quitReason)) {
-                    System.out.println("    " + tempSession);
-                } else {
-                    quitReason = null;
-                    i -= 1;
-                    continue;
-                }
-            } else {
-                System.out.println("\r\nError: Unexpected entry in logfile: " + entry);
-                System.exit(1);
-            }
-        }
-        System.out.println("\r\n");
-    }
-
-    private void formatAndOutputByDuration(ArrayList sortedSessions) {
-        System.out.println("\r\n");
-
-        for (int i = 0; i < sortedSessions.size(); i++) {
-            String[] columns = ((String) sortedSessions.get(i)).split(" ", 2);
-            System.out.println(columns[1]);
-        }
-
-        System.out.println("\r\n");
-    }
-
-    private ArrayList readLogfile(String logfile) {
-
-        ArrayList log = new ArrayList();
-
-        try {
-            BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(logfile)));
-
-            for (String line; (line = in.readLine()) != null; )
-                log.add(line);
-
-            in.close();
-
-        } catch (FileNotFoundException e) {
-            System.out.println("\r\nError: Can't find logfile '" + logfile + "'.\r\n");
-            System.exit(1);
-
-        } catch (IOException e) {
-            System.out.println("\r\nError: Can't read logfile '" + logfile + "'.\r\n");
-            System.exit(1);
-        }
-        return log;
-    }
-
-    /*
-     * Performs an odd-even transposition sort.
-     */
-    private ArrayList sortSessionsByDuration(ArrayList calculatedSessionDurations) {
-
-        for (int i = 0; i < calculatedSessionDurations.size()/2; i++) {
-            for (int j = 0; j+1 < calculatedSessionDurations.size(); j += 2) {
-
-                String[] currentDurationString = ((String) calculatedSessionDurations.get(j)).split(" ", 2);
-                long     currentDuration       = Long.parseLong(currentDurationString[0]);
-                String[] nextDurationString    = ((String) calculatedSessionDurations.get(j+1)).split(" ", 2);
-                long     nextDuration          = Long.parseLong(nextDurationString[0]);
-
-                if (currentDuration > nextDuration) {
-                    calculatedSessionDurations.add(j, calculatedSessionDurations.get(j+1));
-                    calculatedSessionDurations.remove(j+2);
-                }
-            }
-
-            for (int j = 1; j+1 < calculatedSessionDurations.size(); j += 2) {
-
-                String[] currentDurationString = ((String) calculatedSessionDurations.get(j)).split(" ", 2);
-                long     currentDuration       = Long.parseLong(currentDurationString[0]);
-                String[] nextDurationString    = ((String) calculatedSessionDurations.get(j+1)).split(" ", 2);
-                long     nextDuration          = Long.parseLong(nextDurationString[0]);
-
-                if (currentDuration > nextDuration) {
-                    calculatedSessionDurations.add(j, calculatedSessionDurations.get(j+1));
-                    calculatedSessionDurations.remove(j+2);
-                }
-            }
-        }
-        return calculatedSessionDurations;
-    }
-
-    private ArrayList sortSessionsByNick(ArrayList sortedSessionsByTime) {
-
-        ArrayList sortedSessionsByNick = new ArrayList();
-
-        while (sortedSessionsByTime.size() != 0) {
-
-            String   entry       = (String) sortedSessionsByTime.get(0);
-            String[] entryFields = entry.split(" ");
-            String   currentNick = entryFields[2];
-
-            sortedSessionsByNick.add(entry);
-            sortedSessionsByNick.add(sortedSessionsByTime.get(1));
-            sortedSessionsByTime.remove(0);
-            sortedSessionsByTime.remove(0);
-            for (int i = 0; i+1 < sortedSessionsByTime.size(); i += 2) {
-
-                String   nextEntry       = (String) sortedSessionsByTime.get(i);
-                String[] nextEntryFields = nextEntry.split(" ");
-
-                if (nextEntryFields[2].equals(currentNick)) {
-                    sortedSessionsByNick.add(nextEntry);
-                    sortedSessionsByNick.add(sortedSessionsByTime.get(i+1));
-                    sortedSessionsByTime.remove(i);
-                    sortedSessionsByTime.remove(i);
-                    i -= 2;
-                }
-            }
-        }
-        return sortedSessionsByNick;
-    }
-
-    private ArrayList sortSessionsByQuitReason(ArrayList sortedSessionsByNick) {
-
-        ArrayList sortedSessionsByQuitReason = new ArrayList();
-
-        while (sortedSessionsByNick.size() != 0) {
-
-            String  entry = (String) sortedSessionsByNick.get(1);
-            Pattern p     = Pattern.compile("^[^ ]+ [^ ]+ [^ ]+ (.*)$");
-            Matcher m     = p.matcher(entry);
-
-            if (m.matches()) {
-
-                String currentQuitReason = m.group(1);
-
-                sortedSessionsByQuitReason.add(sortedSessionsByNick.get(0));
-                sortedSessionsByQuitReason.add(entry);
-                sortedSessionsByNick.remove(0);
-                sortedSessionsByNick.remove(0);
-                for (int i = 0; i+1 < sortedSessionsByNick.size(); i += 2) {
-
-                    String  nextEntry = (String) sortedSessionsByNick.get(i+1);
-                    Pattern p2        = Pattern.compile("^[^ ]+ [^ ]+ [^ ]+ (.*)$");
-                    Matcher m2        = p2.matcher(nextEntry);
-
-                    if (m2.matches()) {
-
-                        String nextQuitReason = m2.group(1);
- 
-                        if (nextQuitReason.equals(currentQuitReason)) {
-                            sortedSessionsByQuitReason.add(sortedSessionsByNick.get(i));
-                            sortedSessionsByQuitReason.add(nextEntry);
-                            sortedSessionsByNick.remove(i);
-                            sortedSessionsByNick.remove(i);
-                            i -= 2;
-                        }
-                    } else {
-                        System.out.println("\r\nError: Unexpected entry in logfile: " + nextEntry);
-                        System.exit(1);
-                    }
-                }
-            } else {
-                System.out.println("\r\nError: Unexpected entry in logfile: " + entry);
-                System.exit(1);
-            }
-        }
-        return sortedSessionsByQuitReason;
-    }
-
-    /**
-     * Sessions terminated with "parts" messages instead of "quits" are filtered
-     * out.
-     */
-    private ArrayList sortSessionsByTime(ArrayList log) {
-
-        ArrayList sortedSessionsByTime = new ArrayList();
-
-        mainLoop:
-            while (log.size() > 0) {
-                
-                String   entry       = (String) log.get(0);
-                String[] entryFields = entry.split(" ");
-                
-                if (entryFields[1].equals("quits") && !entryFields[1].equals("joins")) {
-                    /*
-                     * Discard entry. The specified log either doesn't contain
-                     * the corresponding "joins" time for this quit entry or the
-                     * entry is a "parts" or unknown message, and in both cases
-                     * the entry's data is useless.
-                     */
-                    log.remove(0);
-                    continue;
-                }
-                
-                for (int i = 1; i < log.size(); i++) {  // Find corresponding "quits" entry.
-                    
-                    String   tempEntry       = (String) log.get(i);
-                    String[] tempEntryFields = tempEntry.split(" ");
-                    
-                    if (tempEntryFields[2].equals(entryFields[2])) {  // Check if the nick fields for the two entries match.
-                        if (!tempEntryFields[1].equals("quits")) {
-                            if (tempEntryFields[1].equals("joins")) {  // Don't discard a subsequent "joins" entry.
-                                log.remove(0);
-                                continue mainLoop;
-                            }
-                            log.remove(i);
-                            continue;
-                        }
-                        sortedSessionsByTime.add(entry);
-                        sortedSessionsByTime.add(tempEntry);
-                        log.remove(i);
-                        break;
-                    }
-                }
-                /*
-                 * Discard "joins" entry. The specified log doesn't contain the
-                 * corresponding "quits" time for this entry so the entry's
-                 * data is useless.
-                 */
-                
-                log.remove(0);
-            }
-
-        return sortedSessionsByTime;
-    }
-}

apps/bogobot/LICENSE.log4j.txt

@@ -1,48 +0,0 @@
-/*
- * ============================================================================
- *                   The Apache Software License, Version 1.1
- * ============================================================================
- * 
- *    Copyright (C) 1999 The Apache Software Foundation. All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modifica-
- * tion, are permitted provided that the following conditions are met:
- * 
- * 1. Redistributions of  source code must  retain the above copyright  notice,
- *    this list of conditions and the following disclaimer.
- * 
- * 2. 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.
- * 
- * 3. The end-user documentation included with the redistribution, if any, must
- *    include  the following  acknowledgment:  "This product includes  software
- *    developed  by the  Apache Software Foundation  (http://www.apache.org/)."
- *    Alternately, this  acknowledgment may  appear in the software itself,  if
- *    and wherever such third-party acknowledgments normally appear.
- * 
- * 4. The names "log4j" and  "Apache Software Foundation"  must not be used to
- *    endorse  or promote  products derived  from this  software without  prior
- *    written permission. For written permission, please contact
- *    apache@apache.org.
- * 
- * 5. Products  derived from this software may not  be called "Apache", nor may
- *    "Apache" appear  in their name,  without prior written permission  of the
- *    Apache Software Foundation.
- * 
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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
- * APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
- * DING, 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.
- * 
- * This software  consists of voluntary contributions made  by many individuals
- * on  behalf of the Apache Software  Foundation.  For more  information on the 
- * Apache Software Foundation, please see <http://www.apache.org/>.
- *
- */

apps/bogobot/LICENSE.pircbot.txt

@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.

apps/bogobot/bogobot.bat

@@ -1 +0,0 @@
-java -cp .;log4j-1.2.8.jar;pircbot.jar Bogobot

apps/bogobot/bogobot.config

@@ -1,101 +0,0 @@
-#####
-# Bogobot user configuration
-#####
-
-###
-# The bot's nick and backup nick. You will probably want to register these with
-# the IRC server's NickServ.(a NickServ interface is forthcoming).
-#
-botPrimaryNick=somebot
-botSecondaryNick=somebot_
-
-###
-# The bot's password required by Nickserv service's identify command.
-# You have to register the nickname yourself first, the bot will not.
-#
-botNickservPassword=
-
-###
-# The bot's username. Appears in the whois replies
-#
-botUsername=somebot
-
-#####
-# The bot owner's nick and backup nick. One of these must match the owner's
-# currently-used nick or else remote shutdown will not be possible. You will
-# probably want to register these with the IRC server's NickServ.
-#
-ownerPrimaryNick=somenick
-ownerSecondaryNick=somenick_
-
-###
-# The bot will disconnect and shut down when sent this password via private
-# message (aka query) from either of the owner nicks specified above. DO NOT USE
-# THIS DEFAULT VALUE!
-#
-botShutdownPassword=take off eh
-
-###
-# The server, channel, and port the bot will connect to.
-#
-ircChannel=#i2p-chat
-ircServer=irc.duck.i2p
-ircServerPort=6668
-
-###
-# Set to "true" to enable logging, else "false" (but don't use quotation marks).
-#
-isLoggerEnabled=true
-
-###
-# Restrict logging of joins and parts on the user hostname.
-# Leave empty to log all of them
-# Prepend with a @ for a perfect match
-# Otherwise, specify the required end of the user hostname
-#
-loggedHostnamePattern=@free.duck.i2p
-
-###
-# The prefix to be used for the filenames of logs.
-#
-logFilePrefix=irc.duck.i2p.i2p-chat
-
-###
-# How often the logs should be rotated. Either "daily", "weekly", or "monthly"
-# (but don't use quotation marks).
-#
-logFileRotationInterval=daily
-
-###
-# Set to "true" to enable the regular round-trip delay computation,
-# else "false" (but don't use quotation marks).
-#
-isRoundTripDelayEnabled=false
-
-###
-# How often should the round-trip delay be recorded.
-# (in seconds)
-#
-roundTripDelayPeriod=300
-
-###
-# Set to "true" to enable the userlist command, else "false" (but don't use
-# quotation marks).
-#
-isUserlistCommandEnabled=true
-
-###
-# The userlist trigger command to listen for. It is a good idea to prefix
-# triggers with some non-alphanumeric character in order to avoid accidental
-# trigger use during normal channel conversation. In most cases you will
-# probably want to choose a unique trigger here that no other bots in the
-# channel will respond to.
-#
-userlistCommandTrigger=!who
-
-###
-# The number of seconds to rest after replying to a userlist command issued by
-# a user in the channel. The bot will ignore subsequent userlist commands during
-# this period. This helps prevent flooding.
-#
-commandAntiFloodInterval=60

apps/bogobot/bogobot.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-java -cp .:log4j-1.2.8.jar:pircbot.jar Bogobot

apps/bogobot/build-eclipse.xml

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ********************************************************** -->
-<!-- bogobot - A simple join/part stats logger bot for I2P IRC. -->
-<!--                                                            -->
-<!-- build-eclipse.xml                                          -->
-<!-- 2004 The I2P Project                                       -->
-<!-- http://www.i2p.net                                         -->
-<!-- This code is public domain.                                -->
-<!--                                                            -->
-<!-- authors: hypercubus, oOo                                   -->
-<!-- version 0.4                                                -->
-<!-- ********************************************************** -->
-
-<project basedir="." default="dist" name="Bogobot">
-
-    <!-- init:
-    Create distribution directory if missing and initialize time stamp for
-    archive naming -->
-    <target name="init">
-        <mkdir dir="dist" />
-        <tstamp>
-            <format pattern="yyyy-MM-dd" property="DSTAMP" />
-        </tstamp>
-    </target>
-
-    <!-- dist.bin:
-    Create the binary distribution archive -->
-    <target depends="init" description="Create the binary distribution archive" name="dist.bin">
-        <zip destfile="dist/Bogobot_${DSTAMP}.zip">
-            <zipfileset dir="${basedir}" includes="bogobot.bat bogobot.config Bogobot.class bogobot.sh Bogoparser.class LICENSE_log4j.txt LICENSE_pircbot.txt log4j-1.2.8.jar pircbot.jar" />
-        </zip>
-    </target>
-
-    <!-- dist.source:
-    Create the source distribution archive -->
-    <target depends="init" description="Create the source distribution archive" name="dist.source">
-        <zip destfile="dist/Bogobot_source_${DSTAMP}.zip">
-            <zipfileset dir="${basedir}" includes="bogobot.bat bogobot.config Bogobot.java bogobot.sh Bogoparser.java build.xml build_eclipse.xml LICENSE_log4j.txt LICENSE_pircbot.txt log4j-1.2.8.jar pircbot.jar" />
-        </zip>
-    </target>
-
-    <!-- dist:
-    Create both the binary and source distribution archives -->
-    <target depends="dist.bin,dist.source" description="Create both the binary and source distribution archives" name="dist">
-        <echo message="Successfully created binary and source distribution archives in directory &apos;dist&apos;." />
-    </target>
-
-    <!-- clean:
-    Delete all class files and temporary directories -->
-    <target description="Delete all class files and temporary directories" name="clean">
-        <delete>
-            <fileset dir="${basedir}" includes="**/*.class" />
-        </delete>
-        <echo message="Clean successful." />
-    </target>
-
-</project>

apps/bogobot/build.xml

@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ********************************************************** -->
-<!-- bogobot - A simple join/part stats logger bot for I2P IRC. -->
-<!--                                                            -->
-<!-- build.xml                                                  -->
-<!-- 2004 The I2P Project                                       -->
-<!-- http://www.i2p.net                                         -->
-<!-- This code is public domain.                                -->
-<!--                                                            -->
-<!-- authors: hypercubus, oOo                                   -->
-<!-- version 0.4                                                -->
-<!-- ********************************************************** -->
-
-<project basedir="." default="compile" name="Bogobot">
-
-    <!-- init:
-    Create distribution directory if missing and initialize time stamp for
-    archive naming -->
-    <target name="init">
-        <mkdir dir="dist" />
-        <tstamp>
-            <format pattern="yyyy-MM-dd" property="DSTAMP" />
-        </tstamp>
-    </target>
-
-    <!-- compile:
-    Compile source code -->
-    <target depends="init" description="Compile source code" name="compile">
-        <javac classpath="${basedir};log4j-1.2.8.jar;pircbot.jar" source="1.4" srcdir="." />
-    </target>
-
-    <!-- dist.bin:
-    Create the binary distribution archive -->
-    <target depends="init,compile" description="Create the binary distribution archive" name="dist.bin">
-        <zip destfile="dist/Bogobot_${DSTAMP}.zip">
-            <zipfileset dir="${basedir}" includes="bogobot.bat bogobot.config Bogobot.class Bogobot$BogobotTickTask.class bogobot.sh Bogoparser.class LICENSE_log4j.txt LICENSE_pircbot.txt log4j-1.2.8.jar pircbot.jar" />
-        </zip>
-    </target>
-
-    <!-- dist.source:
-    Create the source distribution archive -->
-    <target depends="init" description="Create the source distribution archive" name="dist.source">
-        <zip destfile="dist/Bogobot_source_${DSTAMP}.zip">
-            <zipfileset dir="${basedir}" includes="bogobot.bat bogobot.config Bogobot.java bogobot.sh Bogoparser.java build.xml build_eclipse.xml LICENSE_log4j.txt LICENSE_pircbot.txt log4j-1.2.8.jar pircbot.jar" />
-        </zip>
-    </target>
-
-    <!-- dist:
-    Create both the binary and source distribution archives -->
-    <target depends="dist.bin,dist.source" description="Create both the binary and source distribution archives" name="dist">
-        <echo message="Successfully created binary and source distribution archives in directory &apos;dist&apos;." />
-    </target>
-
-    <!-- clean:
-    Delete all class files and temporary directories -->
-    <target description="Delete all class files and temporary directories" name="clean">
-        <delete>
-            <fileset dir="${basedir}" includes="**/*.class" />
-        </delete>
-        <echo message="Clean successful." />
-    </target>
-
-</project>

apps/fortuna/build.xml

@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project basedir="." default="all" name="fortuna">
-
-	<property name="cvs.base.dir" value="java/gnu-crypto" />
-	<property name="cvs.etc.dir" value="${cvs.base.dir}/etc" />
-	<property name="cvs.lib.dir" value="${cvs.base.dir}/lib" />
-	<property name="cvs.object.dir" value="${cvs.base.dir}/classes" />
-	<property name="cvs.base.crypto.object.dir" value="${cvs.object.dir}/gnu/crypto" />
-	<property name="cvs.cipher.object.dir" value="${cvs.base.crypto.object.dir}/cipher" />
-	<property name="cvs.hash.object.dir" value="${cvs.base.crypto.object.dir}/hash" />
-	<property name="cvs.prng.object.dir" value="${cvs.base.crypto.object.dir}/prng" />
-
-	<patternset id="fortuna.files">
-		<include name="${cvs.base.crypto.object.dir}/Registry.class"/>
-		<include name="${cvs.prng.object.dir}/Fortuna*.class"/>
-		<include name="${cvs.prng.object.dir}/BasePRNG.class"/>
-		<include name="${cvs.prng.object.dir}/RandomEventListener.class"/>
-		<include name="${cvs.prng.object.dir}/IRandom.class"/>
-		<include name="${cvs.cipher.object.dir}/CipherFactory.class"/>
-		<include name="${cvs.cipher.object.dir}/IBlockCipher.class"/>
-		<include name="${cvs.hash.object.dir}/HashFactory.class"/>
-		<include name="${cvs.hash.object.dir}/IMessageDigest.class"/>
-	</patternset>
-
-	<target name="all" depends="build,jar" 
-		description="Create and test the custom Fortuna library" />
-
-	<target name="build" depends="-init,checkout"
-		description="Build the source and tests">
-		<ant dir="${cvs.base.dir}" target="jar" />
-	</target>
-
-	<target name="builddep" />
-
-	<target name="checkout" depends="-init" unless="cvs.source.available"
-		description="Check out GNU Crypto sources from CVS HEAD">
-		<cvs cvsRoot=":ext:anoncvs@savannah.gnu.org:/cvsroot/gnu-crypto"
-			cvsRsh="ssh"
-			dest="java"
-			package="gnu-crypto" />
-	</target>
-
-	<target name="clean"
-		description="Remove generated tests and object files">
-		<ant dir="${cvs.base.dir}" target="clean" />
-	</target>
-
-	<target name="cleandep" />
-
-	<target name="compile" />
-
-	<target name="distclean" depends="clean"
-		description="Remove all generated files">
-		<delete dir="build" />
-		<delete dir="jartemp" />
-		<!--
-			Annoyingly the GNU Crypto distclean task called here doesn't clean
-			*all* derived files from java/gnu-crypto/lib like it should.....
-		-->
-		<ant dir="${cvs.base.dir}" target="distclean" />
-		<!--
-			.....and so we mop up the rest ourselves.
-		-->
-		<delete dir="${cvs.lib.dir}" />
-	</target>
-
-	<target name="-init">
-		<available property="cvs.source.available" file="${cvs.base.dir}" />
-	</target>
-
-	<target name="jar" depends="build"
-		description="Create the custom Fortuna jar library">
-		<delete dir="build" />
-		<delete dir="jartemp" />
-		<mkdir dir="build" />
-		<mkdir dir="jartemp/${cvs.object.dir}" />
-		<copy todir="jartemp">
-			<fileset dir=".">
-				<patternset refid="fortuna.files" />
-			</fileset>
-		</copy>
-		<jar basedir="jartemp/${cvs.object.dir}" jarfile="build/fortuna.jar">
-			<manifest>
-				<section name="fortuna">
-					<attribute name="Implementation-Title" value="I2P Custom GNU Crypto Fortuna Library" />
-					<attribute name="Implementation-Version" value="CVS HEAD" /> 
-					<attribute name="Implementation-Vendor" value="Free Software Foundation" />
-					<attribute name="Implementation-Vendor-Id" value="FSF" />
-					<attribute name="Implementation-URL" value="http://www.gnu.org/software/gnu-crypto" />
-				</section>
-			</manifest>
-		</jar>
-		<delete dir="jartemp" />
-	</target>
-
-	<target name="test" depends="jar"
-		description="Perform crypto tests on custom Fortuna jar library" />
-		<!--
-			Add this when Fortuna tests are added to GNU Crypto, else write some
-		-->
-
-	<target name="update" depends="checkout"
-		description="Update GNU Crypto sources to latest CVS HEAD">
-		<cvs command="update -d" cvsRsh="ssh" dest="java/gnu-crypto" />
-	</target>
-</project>

apps/i2psnark/COPYING

@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.

apps/i2psnark/TODO

@@ -1,24 +0,0 @@
-- I2PSnark:
-  - add multitorrent support by checking the metainfo hash in the
-    PeerAcceptor and feeding it off to the appropriate coordinator
-  - add a web interface
-
-- BEncode
-  - Byte array length indicator can overflow.
-  - Support really big BigNums (only 256 chars allowed now)
-  - Better BEValue toString(). Uses stupid heuristic now for debugging.
-  - Implemented bencoding.
-  - Remove application level hack to calculate sha1 hash for metainfo
-    (But can it be done as efficiently?)
-
-- Storage
-  - Check file name filter.
-
-- TrackerClient
-  - Support undocumented &numwant= request.
-
-- PeerCoordinator
-  - Disconnect from other seeds as soon as you are a seed yourself.
-
-- Text UI
-  - Make it completely silent.

apps/i2psnark/authors.snark

@@ -1 +0,0 @@
-Mark Wielaard <mark@klomp.org>

apps/i2psnark/changelog.snark

@@ -1,487 +0,0 @@
-2003-06-27 14:24  Mark Wielaard  <mark@klomp.org>
-
-	* README: Update version number and explain new features.
-
-2003-06-27 13:51  Mark Wielaard  <mark@klomp.org>
-
-	* Makefile, org/klomp/snark/GnomeInfoWindow.java,
-	org/klomp/snark/GnomePeerList.java,
-	org/klomp/snark/PeerCoordinator.java,
-	org/klomp/snark/SnarkGnome.java: Add GnomeInfoWindow.
-
-2003-06-27 00:37  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/Snark.java: Implement 'info' and 'list' commands.
-
-2003-06-27 00:05  Mark Wielaard  <mark@klomp.org>
-
-	* Makefile, org/klomp/snark/GnomePeerList.java,
-	org/klomp/snark/SnarkGnome.java: Add GnomePeerList to show state of
-	connected peers.
-
-2003-06-27 00:04  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/: Peer.java, PeerID.java: Make Comparable.
-
-2003-06-23 23:32  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/PeerMonitorTask.java: Correctly update
-	lastDownloaded and lastUploaded.
-
-2003-06-23 23:20  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/Snark.java: When checking storage use the
-	MetaInfo from the storage.
-
-2003-06-23 21:47  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/Storage.java: Fill piece hashes, not info hashes.
-
-2003-06-23 21:42  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/MetaInfo.java: New package private
-	getPieceHashes() method.
-
-2003-06-22 19:49  Mark Wielaard  <mark@klomp.org>
-
-	* README, TODO, org/klomp/snark/Snark.java: Add new command line
-	switch --no-commands.  Don't read interactive commands or show
-	usage info.
-
-2003-06-22 19:26  Mark Wielaard  <mark@klomp.org>
-
-	* Makefile, org/klomp/snark/PeerCheckerTask.java,
-	org/klomp/snark/PeerMonitorTask.java, org/klomp/snark/Snark.java:
-	Split peer statistic reporting from PeerCheckerTask into
-	PeerMonitorTask.  Use new task in Snark text ui.
-
-2003-06-22 18:32  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/Snark.java: Only print peer id when debug level
-	is INFO or higher.
-
-2003-06-22 18:00  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/ShutdownListener.java: Add new ShutdownListener
-	interface.
-
-2003-06-22 17:18  Mark Wielaard  <mark@klomp.org>
-
-	* TODO: Text UI item to not read from stdin.
-
-2003-06-22 17:18  Mark Wielaard  <mark@klomp.org>
-
-	* snark-gnome.sh: kaffe java-gnome support (but crashes hard at the
-	moment).
-
-2003-06-22 14:04  Mark Wielaard  <mark@klomp.org>
-
-	* Makefile, org/klomp/snark/CoordinatorListener.java,
-	org/klomp/snark/PeerCoordinator.java,
-	org/klomp/snark/ProgressListener.java, org/klomp/snark/Snark.java,
-	org/klomp/snark/SnarkGnome.java,
-	org/klomp/snark/SnarkShutdown.java, org/klomp/snark/Storage.java,
-	org/klomp/snark/StorageListener.java: Split ProgressListener into
-	Storage, Coordinator and Shutdown listener.
-
-2003-06-20 19:06  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/: PeerCoordinator.java, Snark.java,
-	SnarkGnome.java, Storage.java: Progress listeners for both Storage
-	and PeerCoordinator.
-
-2003-06-20 14:50  Mark Wielaard  <mark@klomp.org>
-
-	* Makefile, org/klomp/snark/PeerCoordinator.java,
-	org/klomp/snark/ProgressListener.java,
-	org/klomp/snark/SnarkGnome.java: Add ProgressListener.
-
-2003-06-20 13:22  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/SnarkGnome.java: Add Pieces collected field.
-
-2003-06-20 12:26  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/: PeerCoordinator.java, PeerListener.java,
-	PeerState.java: Add PeerListener.downloaded() which gets called on
-	chunk updates.	Keep PeerCoordinator.downloaded up to date using
-	this remove adjusting in gotPiece() except when we receive a bad
-	piece.
-
-2003-06-16 00:27  Mark Wielaard  <mark@klomp.org>
-
-	* Makefile, snark-gnome.sh, org/klomp/snark/Snark.java,
-	org/klomp/snark/SnarkGnome.java: Start of a Gnome GUI.
-
-2003-06-05 13:19  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/PeerCoordinator.java: Don't remove a BAD piece
-	from the wantedPieces list.  Revert to synchronizing on
-	wantedPieces for all relevant sections.
-
-2003-06-03 21:09  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/Snark.java: Only call readLine() when !quit. 
-	Always print exception when fatal() is called.
-
-2003-06-01 23:12  Mark Wielaard  <mark@klomp.org>
-
-	* README: Set release version to 0.4.
-
-2003-06-01 22:59  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/PeerConnectionIn.java: Handle negative length
-	prefixes (terminates connection).
-
-2003-06-01 21:34  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/: Snark.java, SnarkShutdown.java: Implement
-	correct shutdown and read commands from stdin.
-
-2003-06-01 21:34  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/TrackerInfo.java: Check that interval and peers
-	list actually exist.
-
-2003-06-01 21:33  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/Storage.java: Implement close().
-
-2003-06-01 21:05  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/PeerState.java: Fix debug logging.
-
-2003-06-01 20:55  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/PeerCoordinator.java: Implement halt().
-
-2003-06-01 20:55  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/ConnectionAcceptor.java: Rename stop() to halt().
-
-2003-06-01 17:35  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/PeerState.java: Drop lock on this when calling
-	addRequest() from havePiece().
-
-2003-06-01 14:46  Mark Wielaard  <mark@klomp.org>
-
-	* README, org/klomp/snark/ConnectionAcceptor.java,
-	org/klomp/snark/HttpAcceptor.java, org/klomp/snark/Peer.java,
-	org/klomp/snark/PeerCheckerTask.java,
-	org/klomp/snark/PeerConnectionIn.java,
-	org/klomp/snark/PeerConnectionOut.java,
-	org/klomp/snark/PeerCoordinator.java,
-	org/klomp/snark/PeerState.java, org/klomp/snark/Snark.java,
-	org/klomp/snark/SnarkShutdown.java, org/klomp/snark/Storage.java,
-	org/klomp/snark/Tracker.java, org/klomp/snark/TrackerClient.java:
-	Add debug/log level.
-
-2003-05-31 23:04  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/: PeerCheckerTask.java, PeerCoordinator.java: Use
-	just one lock (peers) for all synchronization (even for
-	wantedPieces).	Let PeerChecker handle real disconnect and keep
-	count of uploaders.
-
-2003-05-31 22:29  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/: Peer.java, PeerConnectionIn.java: Set state to
-	null on first disconnect() call. So always check whether it might
-	already be null. Helps disconnect check.
-
-2003-05-31 22:27  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/PeerConnectionOut.java: Don't explicitly close
-	the DataOutputStream (if another thread is using it libgcj seems to
-	not like it very much).
-
-2003-05-30 21:33  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/PeerConnectionOut.java: Cancel
-	(un)interested/(un)choke when (inverse) is still in send queue. 
-	Remove pieces from send queue when choke message is actaully send.
-
-2003-05-30 19:32  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/PeerState.java: Make sure listener.wantPiece(int)
-	is never called while lock on this is held.
-
-2003-05-30 19:00  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/PeerConnectionOut.java: Indentation cleanup.
-
-2003-05-30 17:50  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/Storage.java: Only synchronize on bitfield as
-	long as necessary.
-
-2003-05-30 17:43  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/Tracker.java: Identing cleanup.
-
-2003-05-30 16:32  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/PeerState.java: Better error message.
-
-2003-05-30 15:11  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/PeerState.java: Make sure not to hold the lock on
-	this when calling the listener to prevent deadlocks. Implement
-	handling and sending of cancel messages.
-
-2003-05-30 14:50  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/PeerCoordinator.java: First check if we still
-	want a piece before trying to add it to the Storage.
-
-2003-05-30 14:49  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/PeerConnectionOut.java: Implement
-	sendCancel(Request). Add cancelRequest(int, int, int).
-
-2003-05-30 14:46  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/Request.java: Add hashCode() and equals(Object)
-	methods.
-
-2003-05-30 14:45  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/Peer.java: Fix wheter -> whether javadoc
-	comments.  Mark state null immediatly after calling
-	listener.disconnected().  Call PeerState.havePiece() not
-	PeerConnectionOut.sendHave() directly.
-
-2003-05-25 19:23  Mark Wielaard  <mark@klomp.org>
-
-	* TODO: Add PeerCoordinator TODO for connecting to seeds.
-
-2003-05-23 12:12  Mark Wielaard  <mark@klomp.org>
-
-	* Makefile: Create class files with jikes again.
-
-2003-05-18 22:01  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/: PeerCheckerTask.java, PeerCoordinator.java:
-	Prefer to (optimistically) unchoke first those peers that unchoked
-	us.  And make sure to not unchoke a peer that we just choked.
-
-2003-05-18 21:48  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/Peer.java: Fix isChoked() to not always return
-	true.
-
-2003-05-18 14:46  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/: Peer.java, PeerCheckerTask.java,
-	PeerCoordinator.java, PeerState.java: Remove separate Peer
-	downloading/uploading states. Keep choke and interest always up to
-	date. Uploading is now just when we are not choking the peer. 
-	Downloading is now defined as being unchoked and interesting. 
-	CHECK_PERIOD is now 20 seconds. MAX_CONNECTIONS is now 24. 
-	MAX_DOWNLOADERS doesn't exists anymore. We download whenever we can
-	from peers.
-
-2003-05-18 13:57  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/PeerConnectionOut.java: Remove piece messages
-	from queue when we are choking.  (They will have to be rerequested
-	when we unchoke the peer again.)
-
-2003-05-15 00:08  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/PeerState.java: Ignore missed chunk requests,
-	don't requeue them.
-
-2003-05-15 00:06  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/Request.java: Add sanity check
-
-2003-05-10 15:47  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/Snark.java: Add extra '(' to usage message.
-
-2003-05-10 15:22  Mark Wielaard  <mark@klomp.org>
-
-	* README: Set version to 0.3 (The Bakers Tale).
-
-2003-05-10 15:17  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/PeerState.java: Mention received piece in warning
-	message.
-
-2003-05-10 03:20  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/: PeerConnectionIn.java, PeerState.java,
-	Request.java: Remove currentRequest and handle all piece messages
-	from the lastRequested list.
-
-2003-05-09 20:02  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/PeerState.java: Fix nothing requested warning
-	message.
-
-2003-05-09 19:59  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/PeerConnectionOut.java: Piece messages are big.
-	So if there are other (control) messages make sure they are send
-	first. Also remove request messages from the queue if we are
-	currently being choked to prevent them from being send even if we
-	get unchoked a little later. (Since we will resent them anyway in
-	that case.)
-
-2003-05-09 18:33  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/: Peer.java, PeerCheckerTask.java,
-	PeerCoordinator.java, PeerID.java: New definition of PeerID.equals
-	(port + address + id) and new method PeerID.sameID (only id). These
-	are used to really see if we already have a connection to a certain
-	peer (active setup vs passive setup).
-
-2003-05-08 03:05  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/PeerState.java: Use Snark.debug() not
-	System.out.println().
-
-2003-05-06 20:29  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/PeerState.java: s/noting/nothing/
-
-2003-05-06 20:28  Mark Wielaard  <mark@klomp.org>
-
-	* Makefile: s/lagacy/legacy/
-
-2003-05-05 23:17  Mark Wielaard  <mark@klomp.org>
-
-	* README: Set version to 0.2, explain new functionality and add
-	examples.
-
-2003-05-05 22:42  Mark Wielaard  <mark@klomp.org>
-
-	* .cvsignore, Makefile, org/klomp/snark/StaticSnark.java: Enable
-	-static binary creation.
-
-2003-05-05 22:42  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/Tracker.java: Disable --ip support.
-
-2003-05-05 21:02  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/: HttpAcceptor.java, PeerCheckerTask.java,
-	PeerCoordinator.java, TrackerClient.java: Use Snark.debug() not
-	System.out.println().
-
-2003-05-05 21:01  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/PeerConnectionIn.java: Be prepared to handle the
-	case where currentRequest is null.
-
-2003-05-05 21:00  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/Snark.java: Improve argument parsing errors.
-
-2003-05-05 21:00  Mark Wielaard  <mark@klomp.org>
-
-	* Makefile: Use gcj -C again for creating the class files.
-
-2003-05-05 09:24  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/PeerState.java: Just clear outstandingRequests,
-	never make it null.
-
-2003-05-05 02:55  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/TrackerClient.java: Always retry both first
-	started event and every other event as long the TrackerClient is
-	not stopped.
-
-2003-05-05 02:54  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/Snark.java: Remove double assignment port.
-
-2003-05-05 02:54  Mark Wielaard  <mark@klomp.org>
-
-	* TODO: Add Tracker TODO item.
-
-2003-05-04 23:38  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/: ConnectionAcceptor.java, MetaInfo.java,
-	Snark.java, Storage.java, Tracker.java: Add info hash calcultation
-	to MetaInfo.  Add torrent creation to Storage.	Add ip parameter
-	handling to Tracker.  Make ConnectionAcceptor handle
-	null/non-existing HttpAcceptors.  Add debug output, --ip handling
-	and all the above to Snark.
-
-2003-05-04 23:36  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/TrackerClient.java: Handle all failing requests
-	the same (print a warning).
-
-2003-05-03 15:46  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/: Peer.java, PeerID.java, TrackerInfo.java: Split
-	Peer and PeerID a little more.
-
-2003-05-03 15:44  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/MetaInfo.java: Add reannounce() and
-	getTorrentData().
-
-2003-05-03 15:38  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/: PeerCheckerTask.java, PeerCoordinator.java:
-	More concise verbose/debug output.  Always use addUpDownloader() to
-	set peers upload or download state to true.
-
-2003-05-03 13:38  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/TrackerClient.java: Compile fixes.
-
-2003-05-03 13:32  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/TrackerClient.java: Only generate fatal() call on
-	first Tracker access. Otherwise just print a warning error message.
-
-2003-05-03 03:10  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/PeerState.java: Better handle resending
-	outstanding pieces and try to recover better from unrequested
-	pieces.
-
-2003-05-02 21:33  Mark Wielaard  <mark@klomp.org>
-
-	* Makefile, org/klomp/snark/HttpAcceptor.java,
-	org/klomp/snark/MetaInfo.java, org/klomp/snark/PeerID.java,
-	org/klomp/snark/Snark.java, org/klomp/snark/Tracker.java,
-	org/klomp/snark/TrackerClient.java,
-	org/klomp/snark/bencode/BEncoder.java: Add Tracker, PeerID and
-	BEncoder.
-
-2003-05-01 20:17  Mark Wielaard  <mark@klomp.org>
-
-	* Makefile, org/klomp/snark/ConnectionAcceptor.java,
-	org/klomp/snark/HttpAcceptor.java, org/klomp/snark/Peer.java,
-	org/klomp/snark/PeerAcceptor.java, org/klomp/snark/Snark.java: Add
-	ConnectionAcceptor that handles both PeerAcceptor and HttpAcceptor.
-
-2003-05-01 18:39  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/PeerCoordinator.java: connected() synchronize on
-	peers.
-
-2003-04-28 02:56  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/SnarkShutdown.java: Wait some time before
-	returning...
-
-2003-04-28 02:56  Mark Wielaard  <mark@klomp.org>
-
-	* TODO: More items.
-
-2003-04-28 02:56  Mark Wielaard  <mark@klomp.org>
-
-	* org/klomp/snark/Snark.java: Calculate real random ID.
-
-2003-04-27  Mark Wielaard  <mark@klomp.org>
-
-	* snark: Initial (0.1) version.

apps/i2psnark/java/build.xml

@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project basedir="." default="all" name="i2psnark">
-    <target name="all" depends="clean, build" />
-    <target name="build" depends="builddep, jar, war" />
-    <target name="builddep">
-        <ant dir="../../jetty/" target="build" />
-        <ant dir="../../streaming/java/" target="build" />
-	<!-- streaming will build ministreaming and core -->
-    </target>
-    <target name="compile">
-        <mkdir dir="./build" />
-        <mkdir dir="./build/obj" />
-        <javac 
-            srcdir="./src" 
-            debug="true" deprecation="on" source="1.3" target="1.3" 
-            destdir="./build/obj" 
-            classpath="../../../core/java/build/i2p.jar:../../jetty/jettylib/org.mortbay.jetty.jar:../../jetty/jettylib/javax.servlet.jar:../../ministreaming/java/build/mstreaming.jar" />
-    </target>
-    <target name="jar" depends="builddep, compile">
-        <jar destfile="./build/i2psnark.jar" basedir="./build/obj" includes="**/*.class" excludes="**/*Servlet.class">
-            <manifest>
-                <attribute name="Main-Class" value="org.klomp.snark.Snark" />
-                <attribute name="Class-Path" value="i2p.jar mstreaming.jar streaming.jar" />
-            </manifest>
-        </jar>
-    </target>    
-    <target name="war" depends="jar"> 
-        <war destfile="../i2psnark.war" webxml="../web.xml">
-          <classes dir="./build/obj" includes="**/*" />
-        </war>
-    </target>
-    
-    <target name="standalone" depends="standalone_prep">
-        <zip destfile="i2psnark-standalone.zip">
-          <zipfileset dir="./dist/" prefix="i2psnark/" />
-        </zip>
-    </target>
-    <target name="standalone_prep" depends="war">
-        <javac debug="true" deprecation="on" source="1.3" target="1.3" 
-               destdir="./build" srcdir="src/" includes="org/klomp/snark/web/RunStandalone.java" >
-            <classpath>
-                <pathelement location="../../jetty/jettylib/commons-logging.jar" />
-                <pathelement location="../../jetty/jettylib/commons-el.jar" />
-                <pathelement location="../../jetty/jettylib/org.mortbay.jetty.jar" />
-                <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
-                <pathelement location="../../../core/java/build/i2p.jar" />
-            </classpath>
-        </javac>
-    
-        <jar destfile="./build/launch-i2psnark.jar" basedir="./build/" includes="org/klomp/snark/web/RunStandalone.class">
-            <manifest>
-                <attribute name="Main-Class" value="org.klomp.snark.web.RunStandalone" />
-                <attribute name="Class-Path" value="lib/i2p.jar lib/mstreaming.jar lib/streaming.jar lib/commons-el.jar lib/commons-logging.jar lib/jasper-compiler.jar lib/jasper-runtime.jar lib/javax.servlet.jar lib/org.mortbay.jetty.jar" />
-            </manifest>
-        </jar>
-
-        <delete dir="./dist" />
-        <mkdir dir="./dist" />
-        <copy file="./build/launch-i2psnark.jar" tofile="./dist/launch-i2psnark.jar" />
-        <mkdir dir="./dist/webapps" />
-        <copy file="../i2psnark.war" tofile="./dist/webapps/i2psnark.war" />
-        <mkdir dir="./dist/lib" />
-        <copy file="../../../core/java/build/i2p.jar" tofile="./dist/lib/i2p.jar" />
-        <copy file="../../jetty/jettylib/commons-el.jar" tofile="./dist/lib/commons-el.jar" />
-        <copy file="../../jetty/jettylib/commons-logging.jar" tofile="./dist/lib/commons-logging.jar" />
-        <copy file="../../jetty/jettylib/javax.servlet.jar" tofile="./dist/lib/javax.servlet.jar" />
-        <copy file="../../jetty/jettylib/org.mortbay.jetty.jar" tofile="./dist/lib/org.mortbay.jetty.jar" />
-        <copy file="../../jetty/jettylib/jasper-compiler.jar" tofile="./dist/lib/jasper-compiler.jar" />
-        <copy file="../../jetty/jettylib/jasper-runtime.jar" tofile="./dist/lib/jasper-runtime.jar" />
-        <copy file="../../ministreaming/java/build/mstreaming.jar" tofile="./dist/lib/mstreaming.jar" />
-        <copy file="../../streaming/java/build/streaming.jar" tofile="./dist/lib/streaming.jar" />
-        <copy file="../jetty-i2psnark.xml" tofile="./dist/jetty-i2psnark.xml" />
-        <copy file="../readme-standalone.txt" tofile="./dist/readme.txt" />
-        <mkdir dir="./dist/work" />
-        <mkdir dir="./dist/logs" />
-
-        <zip destfile="i2psnark-standalone.zip">
-         <zipfileset dir="./dist/" prefix="i2psnark/" />
-        </zip>
-    </target>
-
-    <target name="clean">
-        <delete dir="./build" />
-        <delete file="../i2psnark.war" />
-        <delete file="./i2psnark-standalone.zip" />
-    </target>
-    <target name="cleandep" depends="clean">
-        <ant dir="../../ministreaming/java/" target="distclean" />
-    </target>
-    <target name="distclean" depends="clean">
-        <ant dir="../../ministreaming/java/" target="distclean" />
-    </target>
-</project>

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

@@ -1,132 +0,0 @@
-/* BitField - Container of a byte array representing set and unset bits.
-   Copyright (C) 2003 Mark J. Wielaard
-
-   This file is part of Snark.
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
- 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
- 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-package org.klomp.snark;
-
-import java.util.Iterator;
-import java.util.Set;
-import java.util.HashSet;
-
-/**
- * Container of a byte array representing set and unset bits.
- */
-public class BitField
-{
-
-  private final byte[] bitfield;
-  private final int size;
-
-  /**
-   * Creates a new BitField that represents <code>size</code> unset bits.
-   */
-  public BitField(int size)
-  {
-    this.size = size;
-    int arraysize = ((size-1)/8)+1;
-    bitfield = new byte[arraysize];
-  }
-
-  /**
-   * Creates a new BitField that represents <code>size</code> bits
-   * as set by the given byte array. This will make a copy of the array.
-   * Extra bytes will be ignored.
-   *
-   * @exception ArrayOutOfBoundsException if give byte array is not large
-   * enough.
-   */
-  public BitField(byte[] bitfield, int size)
-  {
-    this.size = size;
-    int arraysize = ((size-1)/8)+1;
-    this.bitfield = new byte[arraysize];
-    
-    // XXX - More correct would be to check that unused bits are
-    // cleared or clear them explicitly ourselves.
-    System.arraycopy(bitfield, 0, this.bitfield, 0, arraysize);
-  }
-
-  /**
-   * This returns the actual byte array used.  Changes to this array
-   * effect this BitField.  Note that some bits at the end of the byte
-   * array are supposed to be always unset if they represent bits
-   * bigger then the size of the bitfield.
-   */
-  public byte[] getFieldBytes()
-  {
-    return bitfield;
-  }
-
-  /**
-   * Return the size of the BitField. The returned value is one bigger
-   * then the last valid bit number (since bit numbers are counted
-   * from zero).
-   */
-  public int size()
-  {
-    return size;
-  }
-
-  /**
-   * Sets the given bit to true.
-   *
-   * @exception IndexOutOfBoundsException if bit is smaller then zero
-   * bigger then size (inclusive).
-   */
-  public void set(int bit)
-  {
-    if (bit < 0 || bit >= size)
-      throw new IndexOutOfBoundsException(Integer.toString(bit));
-    int index = bit/8;
-    int mask = 128 >> (bit % 8);
-    bitfield[index] |= mask;
-  }
-
-  /**
-   * Return true if the bit is set or false if it is not.
-   *
-   * @exception IndexOutOfBoundsException if bit is smaller then zero
-   * bigger then size (inclusive).
-   */
-  public boolean get(int bit)
-  {
-    if (bit < 0 || bit >= size)
-      throw new IndexOutOfBoundsException(Integer.toString(bit));
-
-    int index = bit/8;
-    int mask = 128 >> (bit % 8);
-    return (bitfield[index] & mask) != 0;
-  }
-
-  public String toString()
-  {
-    // Not very efficient
-    StringBuffer sb = new StringBuffer("BitField(");
-    sb.append(size).append(")[");
-    for (int i = 0; i < size; i++)
-      if (get(i))
-        {
-          sb.append(' ');
-          sb.append(i);
-        }
-    sb.append(" ]");
-
-    return sb.toString();
-  }
-}

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

@@ -1,187 +0,0 @@
-/* ConnectionAcceptor - Accepts connections and routes them to sub-acceptors.
-   Copyright (C) 2003 Mark J. Wielaard
-
-   This file is part of Snark.
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
- 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
- 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-package org.klomp.snark;
-
-import java.io.*;
-import java.net.*;
-
-import net.i2p.I2PException;
-import net.i2p.client.streaming.I2PServerSocket;
-import net.i2p.client.streaming.I2PSocket;
-import net.i2p.util.I2PThread;
-import net.i2p.util.Log;
-
-/**
- * Accepts connections on a TCP port and routes them to sub-acceptors.
- */
-public class ConnectionAcceptor implements Runnable
-{
-  private static final ConnectionAcceptor _instance = new ConnectionAcceptor();
-  public static final ConnectionAcceptor instance() { return _instance; }
-  private Log _log = new Log(ConnectionAcceptor.class);
-  private I2PServerSocket serverSocket;
-  private PeerAcceptor peeracceptor;
-  private Thread thread;
-
-  private boolean stop;
-  private boolean socketChanged;
-
-  private ConnectionAcceptor() {}
-  
-  public synchronized void startAccepting(PeerCoordinatorSet set, I2PServerSocket socket) {
-    if (serverSocket != socket) {
-      if ( (peeracceptor == null) || (peeracceptor.coordinators != set) )
-        peeracceptor = new PeerAcceptor(set);
-      serverSocket = socket;
-      stop = false;
-      socketChanged = true;
-      if (thread == null) {
-          thread = new I2PThread(this, "I2PSnark acceptor");
-          thread.setDaemon(true);
-          thread.start();
-      }
-    }
-  }
-  
-  public ConnectionAcceptor(I2PServerSocket serverSocket,
-                            PeerAcceptor peeracceptor)
-  {
-    this.serverSocket = serverSocket;
-    this.peeracceptor = peeracceptor;
-    
-    socketChanged = false;
-    stop = false;
-    thread = new I2PThread(this, "I2PSnark acceptor");
-    thread.setDaemon(true);
-    thread.start();
-  }
-
-  public void halt()
-  {
-    if (true) throw new RuntimeException("wtf");
-    stop = true;
-
-    I2PServerSocket ss = serverSocket;
-    if (ss != null)
-      try
-        {
-          ss.close();
-        }
-      catch(I2PException ioe) { }
-
-    Thread t = thread;
-    if (t != null)
-      t.interrupt();
-  }
-  
-  public void restart() {
-      serverSocket = I2PSnarkUtil.instance().getServerSocket();
-      socketChanged = true;
-      Thread t = thread;
-      if (t != null)
-          t.interrupt();
-  }
-
-  public int getPort()
-  {
-    return 6881; // serverSocket.getLocalPort();
-  }
-
-  public void run()
-  {
-    while(!stop)
-      {
-        if (socketChanged) {
-            // ok, already updated
-            socketChanged = false;
-        }
-        while ( (serverSocket == null) && (!stop)) {
-            serverSocket = I2PSnarkUtil.instance().getServerSocket();
-            if (serverSocket == null)
-                try { Thread.sleep(10*1000); } catch (InterruptedException ie) {}
-        }
-        try
-          {
-            I2PSocket socket = serverSocket.accept();
-            if (socket == null) {
-                if (socketChanged) {
-                    continue;
-                } else {
-                    I2PServerSocket ss = I2PSnarkUtil.instance().getServerSocket();
-                    if (ss != serverSocket) {
-                        serverSocket = ss;
-                        socketChanged = true;
-                    }
-                }
-            } else {
-                Thread t = new I2PThread(new Handler(socket), "Connection-" + socket);
-                t.start();
-            }
-          }
-        catch (I2PException ioe)
-          {
-            if (!socketChanged) {
-                Snark.debug("Error while accepting: " + ioe, Snark.ERROR);
-                stop = true;
-            }
-          }
-        catch (IOException ioe)
-          {
-            Snark.debug("Error while accepting: " + ioe, Snark.ERROR);
-            stop = true;
-          }
-      }
-
-    try
-      {
-        if (serverSocket != null)
-          serverSocket.close();
-      }
-    catch (I2PException ignored) { }
-    
-    throw new RuntimeException("wtf");
-  }
-  
-  private class Handler implements Runnable {
-      private I2PSocket _socket;
-      public Handler(I2PSocket socket) {
-          _socket = socket;
-      }
-      public void run() {
-          try {
-              InputStream in = _socket.getInputStream();
-              OutputStream out = _socket.getOutputStream();
-
-              if (true) {
-                  in = new BufferedInputStream(in);
-                  //out = new BufferedOutputStream(out);
-              }
-              if (_log.shouldLog(Log.DEBUG))
-                  _log.debug("Handling socket from " + _socket.getPeerDestination().calculateHash().toBase64());
-              peeracceptor.connection(_socket, in, out);
-          } catch (IOException ioe) {
-              if (_log.shouldLog(Log.DEBUG))
-                  _log.debug("Error handling connection from " + _socket.getPeerDestination().calculateHash().toBase64(), ioe);
-              try { _socket.close(); } catch (IOException ignored) { }
-          }
-      }
-  }
-}

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

@@ -1,33 +0,0 @@
-/* CoordinatorListener.java - Callback when a peer changes state
-
-   Copyright (C) 2003 Mark J. Wielaard
-
-   This file is part of Snark.
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
- 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
- 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-package org.klomp.snark;
-
-/**
- * Callback used when some peer changes state.
- */
-public interface CoordinatorListener
-{
-  /**
-   * Called when the PeerCoordinator notices a change in the state of a peer.
-   */
-  void peerChange(PeerCoordinator coordinator, Peer peer);
-}

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

@@ -1,256 +0,0 @@
-package org.klomp.snark;
-
-import net.i2p.I2PAppContext;
-import net.i2p.I2PException;
-import net.i2p.util.EepGet;
-import net.i2p.client.I2PSession;
-import net.i2p.data.*;
-import net.i2p.client.streaming.I2PServerSocket;
-import net.i2p.client.streaming.I2PSocket;
-import net.i2p.client.streaming.I2PSocketManager;
-import net.i2p.client.streaming.I2PSocketManagerFactory;
-import net.i2p.util.Log;
-import net.i2p.util.SimpleTimer;
-
-import java.io.*;
-import java.util.*;
-
-/**
- * I2P specific helpers for I2PSnark
- */
-public class I2PSnarkUtil {
-    private I2PAppContext _context;
-    private Log _log;
-    private static I2PSnarkUtil _instance = new I2PSnarkUtil();
-    public static I2PSnarkUtil instance() { return _instance; }
-    
-    private boolean _shouldProxy;
-    private String _proxyHost;
-    private int _proxyPort;
-    private String _i2cpHost;
-    private int _i2cpPort;
-    private Map _opts;
-    private I2PSocketManager _manager;
-    private boolean _configured;
-    private Set _shitlist;
-    
-    private I2PSnarkUtil() {
-        _context = I2PAppContext.getGlobalContext();
-        _log = _context.logManager().getLog(Snark.class);
-        _opts = new HashMap();
-        setProxy("127.0.0.1", 4444);
-        setI2CPConfig("127.0.0.1", 7654, null);
-        _shitlist = new HashSet(64);
-        _configured = false;
-    }
-    
-    /**
-     * Specify what HTTP proxy tracker requests should go through (specify a null
-     * host for no proxying)
-     *
-     */
-    public void setProxy(String host, int port) {
-        if ( (host != null) && (port > 0) ) {
-            _shouldProxy = true;
-            _proxyHost = host;
-            _proxyPort = port;
-        } else {
-            _shouldProxy = false;
-            _proxyHost = null;
-            _proxyPort = -1;
-        }
-        _configured = true;
-    }
-    
-    public boolean configured() { return _configured; }
-    
-    public void setI2CPConfig(String i2cpHost, int i2cpPort, Map opts) {
-        _i2cpHost = i2cpHost;
-        _i2cpPort = i2cpPort;
-        if (opts != null)
-            _opts.putAll(opts);
-        _configured = true;
-    }
-    
-    public String getI2CPHost() { return _i2cpHost; }
-    public int getI2CPPort() { return _i2cpPort; }
-    public Map getI2CPOptions() { return _opts; }
-    public String getEepProxyHost() { return _proxyHost; }
-    public int getEepProxyPort() { return _proxyPort; }
-    public boolean getEepProxySet() { return _shouldProxy; }
-    
-    /**
-     * Connect to the router, if we aren't already
-     */
-    public boolean connect() {
-        if (_manager == null) {
-            Properties opts = new Properties();
-            if (_opts != null) {
-                for (Iterator iter = _opts.keySet().iterator(); iter.hasNext(); ) {
-                    String key = (String)iter.next();
-                    opts.setProperty(key, _opts.get(key).toString());
-                }
-            }
-            if (opts.getProperty("inbound.nickname") == null)
-                opts.setProperty("inbound.nickname", "I2PSnark");
-            if (opts.getProperty("i2p.streaming.inactivityTimeout") == null)
-                opts.setProperty("i2p.streaming.inactivityTimeout", "90000");
-            if (opts.getProperty("i2p.streaming.inactivityAction") == null)
-                opts.setProperty("i2p.streaming.inactivityAction", "2"); // 1 == disconnect, 2 == ping
-            //if (opts.getProperty("i2p.streaming.writeTimeout") == null)
-            //    opts.setProperty("i2p.streaming.writeTimeout", "90000");
-            //if (opts.getProperty("i2p.streaming.readTimeout") == null)
-            //    opts.setProperty("i2p.streaming.readTimeout", "120000");
-            _manager = I2PSocketManagerFactory.createManager(_i2cpHost, _i2cpPort, opts);
-        }
-        return (_manager != null);
-    }
-    
-    public boolean connected() { return _manager != null; }
-    /**
-     * Destroy the destination itself
-     */
-    public void disconnect() {
-        I2PSocketManager mgr = _manager;
-        _manager = null;
-        _shitlist.clear();
-        mgr.destroySocketManager();
-    }
-    
-    /** connect to the given destination */
-    I2PSocket connect(PeerID peer) throws IOException {
-        Hash dest = peer.getAddress().calculateHash();
-        synchronized (_shitlist) {
-            if (_shitlist.contains(dest))
-                throw new IOException("Not trying to contact " + dest.toBase64() + ", as they are shitlisted");
-        }
-        try {
-            I2PSocket rv = _manager.connect(peer.getAddress());
-            if (rv != null) synchronized (_shitlist) { _shitlist.remove(dest); }
-            return rv;
-        } catch (I2PException ie) {
-            synchronized (_shitlist) {
-                _shitlist.add(dest);
-            }
-            SimpleTimer.getInstance().addEvent(new Unshitlist(dest), 10*60*1000);
-            throw new IOException("Unable to reach the peer " + peer + ": " + ie.getMessage());
-        }
-    }
-    
-    private class Unshitlist implements SimpleTimer.TimedEvent {
-        private Hash _dest;
-        public Unshitlist(Hash dest) { _dest = dest; }
-        public void timeReached() { synchronized (_shitlist) { _shitlist.remove(_dest); } }
-    }
-    
-    /**
-     * fetch the given URL, returning the file it is stored in, or null on error
-     */
-    public File get(String url) { return get(url, true); }
-    public File get(String url, boolean rewrite) {
-        _log.debug("Fetching [" + url + "] proxy=" + _proxyHost + ":" + _proxyPort + ": " + _shouldProxy);
-        File out = null;
-        try {
-            out = File.createTempFile("i2psnark", "url", new File("."));
-        } catch (IOException ioe) {
-            ioe.printStackTrace();
-            out.delete();
-            return null;
-        }
-        String fetchURL = url;
-        if (rewrite)
-            fetchURL = rewriteAnnounce(url);
-        //_log.debug("Rewritten url [" + fetchURL + "]");
-        EepGet get = new EepGet(_context, _shouldProxy, _proxyHost, _proxyPort, 1, out.getAbsolutePath(), fetchURL);
-        if (get.fetch()) {
-            _log.debug("Fetch successful [" + url + "]: size=" + out.length());
-            return out;
-        } else {
-            _log.warn("Fetch failed [" + url + "]");
-            out.delete();
-            return null;
-        }
-    }
-    
-    public I2PServerSocket getServerSocket() { 
-        I2PSocketManager mgr = _manager;
-        if (mgr != null)
-            return mgr.getServerSocket();
-        else
-            return null;
-    }
-    
-    String getOurIPString() {
-        I2PSession sess = _manager.getSession();
-        if (sess != null) {
-            Destination dest = sess.getMyDestination();
-            if (dest != null)
-                return dest.toBase64();
-        }
-        return "unknown";
-    }
-    Destination getDestination(String ip) {
-        if (ip == null) return null;
-        if (ip.endsWith(".i2p")) {
-            Destination dest = _context.namingService().lookup(ip);
-            if (dest != null) {
-                return dest;
-            } else {
-                try {
-                    return new Destination(ip.substring(0, ip.length()-4)); // sans .i2p
-                } catch (DataFormatException dfe) {
-                    return null;
-                }
-            }
-        } else {
-            try {
-                return new Destination(ip);
-            } catch (DataFormatException dfe) {
-                return null;
-            }
-        }
-    }
-
-    /**
-     * Given http://blah.i2p/foo/announce turn it into http://i2p/blah/foo/announce
-     */
-    String rewriteAnnounce(String origAnnounce) {
-        int destStart = "http://".length();
-        int destEnd = origAnnounce.indexOf(".i2p");
-        int pathStart = origAnnounce.indexOf('/', destEnd);
-        String rv = "http://i2p/" + origAnnounce.substring(destStart, destEnd) + origAnnounce.substring(pathStart);
-        //_log.debug("Rewriting [" + origAnnounce + "] as [" + rv + "]");
-        return rv;
-    }
-    
-    /** hook between snark's logger and an i2p log */
-    void debug(String msg, int snarkDebugLevel, Throwable t) {
-        if (t instanceof OutOfMemoryError) {
-            try { Thread.sleep(100); } catch (InterruptedException ie) {}
-            try {
-                t.printStackTrace();
-            } catch (Throwable tt) {}
-            try {
-                System.out.println("OOM thread: " + Thread.currentThread().getName());
-            } catch (Throwable tt) {}
-        }
-        switch (snarkDebugLevel) {
-            case 0:
-            case 1:
-                _log.error(msg, t);
-                break;
-            case 2:
-                _log.warn(msg, t);
-                break;
-            case 3:
-            case 4:
-                _log.info(msg, t);
-                break;
-            case 5:
-            case 6:
-            default:
-                _log.debug(msg, t);
-                break;
-        }
-    }
-}

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

@@ -1,141 +0,0 @@
-/* Message - A protocol message which can be send through a DataOutputStream.
-   Copyright (C) 2003 Mark J. Wielaard
-
-   This file is part of Snark.
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
- 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
- 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-package org.klomp.snark;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import net.i2p.util.SimpleTimer;
-
-// Used to queue outgoing connections
-// sendMessage() should be used to translate them to wire format.
-class Message
-{
-  final static byte KEEP_ALIVE   = -1;
-  final static byte CHOKE        = 0;
-  final static byte UNCHOKE      = 1;
-  final static byte INTERESTED   = 2;
-  final static byte UNINTERESTED = 3;
-  final static byte HAVE         = 4;
-  final static byte BITFIELD     = 5;
-  final static byte REQUEST      = 6;
-  final static byte PIECE        = 7;
-  final static byte CANCEL       = 8;
-  
-  // Not all fields are used for every message.
-  // KEEP_ALIVE doesn't have a real wire representation
-  byte type;
-
-  // Used for HAVE, REQUEST, PIECE and CANCEL messages.
-  int piece;
-
-  // Used for REQUEST, PIECE and CANCEL messages.
-  int begin;
-  int length;
-
-  // Used for PIECE and BITFIELD messages
-  byte[] data;
-  int off;
-  int len;
-
-  SimpleTimer.TimedEvent expireEvent;
-  
-  /** Utility method for sending a message through a DataStream. */
-  void sendMessage(DataOutputStream dos) throws IOException
-  {
-    // KEEP_ALIVE is special.
-    if (type == KEEP_ALIVE)
-      {
-        dos.writeInt(0);
-        return;
-      }
-
-    // Calculate the total length in bytes
-
-    // Type is one byte.
-    int datalen = 1;
-
-    // piece is 4 bytes.
-    if (type == HAVE || type == REQUEST || type == PIECE || type == CANCEL)
-      datalen += 4;
-
-    // begin/offset is 4 bytes
-    if (type == REQUEST || type == PIECE || type == CANCEL)
-      datalen += 4;
-
-    // length is 4 bytes
-    if (type == REQUEST || type == CANCEL)
-      datalen += 4;
-
-    // add length of data for piece or bitfield array.
-    if (type == BITFIELD || type == PIECE)
-      datalen += len;
-
-    // Send length
-    dos.writeInt(datalen);
-    dos.writeByte(type & 0xFF);
-
-    // Send additional info (piece number)
-    if (type == HAVE || type == REQUEST || type == PIECE || type == CANCEL)
-      dos.writeInt(piece);
-
-    // Send additional info (begin/offset)
-    if (type == REQUEST || type == PIECE || type == CANCEL)
-      dos.writeInt(begin);
-
-    // Send additional info (length); for PIECE this is implicit.
-    if (type == REQUEST || type == CANCEL)
-        dos.writeInt(length);
-
-    // Send actual data
-    if (type == BITFIELD || type == PIECE)
-      dos.write(data, off, len);
-  }
-
-  public String toString()
-  {
-    switch (type)
-      {
-      case KEEP_ALIVE:
-        return "KEEP_ALIVE";
-      case CHOKE:
-        return "CHOKE";
-      case UNCHOKE:
-        return "UNCHOKE";
-      case INTERESTED:
-        return "INTERESTED";
-      case UNINTERESTED:
-        return "UNINTERESTED";
-      case HAVE:
-        return "HAVE(" + piece + ")";
-      case BITFIELD:
-        return "BITFIELD";
-      case REQUEST:
-        return "REQUEST(" + piece + "," + begin + "," + length + ")";
-      case PIECE:
-        return "PIECE(" + piece + "," + begin + "," + length + ")";
-      case CANCEL:
-        return "CANCEL(" + piece + "," + begin + "," + length + ")";
-      default:
-        return "<UNKNOWN>";
-      }
-  }
-}

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

@@ -1,461 +0,0 @@
-/* MetaInfo - Holds all information gotten from a torrent file.
-   Copyright (C) 2003 Mark J. Wielaard
-
-   This file is part of Snark.
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
- 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
- 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-package org.klomp.snark;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.File;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-
-import org.klomp.snark.bencode.*;
-import net.i2p.data.Base64;
-import net.i2p.util.Log;
-import net.i2p.crypto.SHA1;
-
-/**
- * Note: this class is buggy, as it doesn't propogate custom meta fields into the bencoded
- * info data, and from there to the info_hash.  At the moment, though, it seems to work with
- * torrents created by I2P-BT, I2PRufus and Azureus.
- *
- */
-public class MetaInfo
-{  
-  private static final Log _log = new Log(MetaInfo.class);
-  private final String announce;
-  private final byte[] info_hash;
-  private final String name;
-  private final String name_utf8;
-  private final List files;
-  private final List files_utf8;
-  private final List lengths;
-  private final int piece_length;
-  private final byte[] piece_hashes;
-  private final long length;
-  private final Map infoMap;
-
-  private byte[] torrentdata;
-
-  MetaInfo(String announce, String name, String name_utf8, List files, List lengths,
-           int piece_length, byte[] piece_hashes, long length)
-  {
-    this.announce = announce;
-    this.name = name;
-    this.name_utf8 = name_utf8;
-    this.files = files;
-    this.files_utf8 = null;
-    this.lengths = lengths;
-    this.piece_length = piece_length;
-    this.piece_hashes = piece_hashes;
-    this.length = length;
-
-    this.info_hash = calculateInfoHash();
-    infoMap = null;
-  }
-
-  /**
-   * Creates a new MetaInfo from the given InputStream.  The
-   * InputStream must start with a correctly bencoded dictonary
-   * describing the torrent.
-   */
-  public MetaInfo(InputStream in) throws IOException
-  {
-    this(new BDecoder(in));
-  }
-  
-  /**
-   * Creates a new MetaInfo from the given BDecoder.  The BDecoder
-   * must have a complete dictionary describing the torrent.
-   */
-  public MetaInfo(BDecoder be) throws IOException
-  {
-    // Note that evaluation order matters here...
-    this(be.bdecodeMap().getMap());
-  }
-
-  /**
-   * Creates a new MetaInfo from a Map of BEValues and the SHA1 over
-   * the original bencoded info dictonary (this is a hack, we could
-   * reconstruct the bencoded stream and recalculate the hash). Will
-   * throw a InvalidBEncodingException if the given map does not
-   * contain a valid announce string or info dictonary.
-   */
-  public MetaInfo(Map m) throws InvalidBEncodingException
-  {
-    _log.debug("Creating a metaInfo: " + m, new Exception("source"));
-    BEValue val = (BEValue)m.get("announce");
-    if (val == null)
-        throw new InvalidBEncodingException("Missing announce string");
-    this.announce = val.getString();
-
-    val = (BEValue)m.get("info");
-    if (val == null)
-        throw new InvalidBEncodingException("Missing info map");
-    Map info = val.getMap();
-    infoMap = info;
-
-    val = (BEValue)info.get("name");
-    if (val == null)
-        throw new InvalidBEncodingException("Missing name string");
-    name = val.getString();
-
-    val = (BEValue)info.get("name.utf-8");
-    if (val != null)
-        name_utf8 = val.getString();
-    else
-        name_utf8 = null;
-
-    val = (BEValue)info.get("piece length");
-    if (val == null)
-        throw new InvalidBEncodingException("Missing piece length number");
-    piece_length = val.getInt();
-
-    val = (BEValue)info.get("pieces");
-    if (val == null)
-        throw new InvalidBEncodingException("Missing piece bytes");
-    piece_hashes = val.getBytes();
-
-    val = (BEValue)info.get("length");
-    if (val != null)
-      {
-        // Single file case.
-        length = val.getLong();
-        files = null;
-        files_utf8 = null;
-        lengths = null;
-      }
-    else
-      {
-        // Multi file case.
-        val = (BEValue)info.get("files");
-        if (val == null)
-          throw new InvalidBEncodingException
-            ("Missing length number and/or files list");
-
-        List list = val.getList();
-        int size = list.size();
-        if (size == 0)
-          throw new InvalidBEncodingException("zero size files list");
-
-        files = new ArrayList(size);
-        files_utf8 = new ArrayList(size);
-        lengths = new ArrayList(size);
-        long l = 0;
-        for (int i = 0; i < list.size(); i++)
-          {
-            Map desc = ((BEValue)list.get(i)).getMap();
-            val = (BEValue)desc.get("length");
-            if (val == null)
-              throw new InvalidBEncodingException("Missing length number");
-            long len = val.getLong();
-            lengths.add(new Long(len));
-            l += len;
-
-            val = (BEValue)desc.get("path");
-            if (val == null)
-              throw new InvalidBEncodingException("Missing path list");
-            List path_list = val.getList();
-            int path_length = path_list.size();
-            if (path_length == 0)
-              throw new InvalidBEncodingException("zero size file path list");
-
-            List file = new ArrayList(path_length);
-            Iterator it = path_list.iterator();
-            while (it.hasNext())
-              file.add(((BEValue)it.next()).getString());
-
-            files.add(file);
-            
-            val = (BEValue)desc.get("path.utf-8");
-            if (val != null) {
-                path_list = val.getList();
-                path_length = path_list.size();
-                if (path_length > 0) {
-                    file = new ArrayList(path_length);
-                    it = path_list.iterator();
-                    while (it.hasNext())
-                        file.add(((BEValue)it.next()).getString());
-                    files_utf8.add(file);
-                }
-            }
-          }
-        length = l;
-      }
-
-    info_hash = calculateInfoHash();
-  }
-
-  /**
-   * Returns the string representing the URL of the tracker for this torrent.
-   */
-  public String getAnnounce()
-  {
-    return announce;
-  }
-
-  /**
-   * Returns the original 20 byte SHA1 hash over the bencoded info map.
-   */
-  public byte[] getInfoHash()
-  {
-    // XXX - Should we return a clone, just to be sure?
-    return info_hash;
-  }
-
-  /**
-   * Returns the piece hashes. Only used by storage so package local.
-   */
-  byte[] getPieceHashes()
-  {
-    return piece_hashes;
-  }
-
-  /**
-   * Returns the requested name for the file or toplevel directory.
-   * If it is a toplevel directory name getFiles() will return a
-   * non-null List of file name hierarchy name.
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * Returns a list of lists of file name hierarchies or null if it is
-   * a single name. It has the same size as the list returned by
-   * getLengths().
-   */
-  public List getFiles()
-  {
-    // XXX - Immutable?
-    return files;
-  }
-
-  /**
-   * Returns a list of Longs indication the size of the individual
-   * files, or null if it is a single file. It has the same size as
-   * the list returned by getFiles().
-   */
-  public List getLengths()
-  {
-    // XXX - Immutable?
-    return lengths;
-  }
-
-  /**
-   * Returns the number of pieces.
-   */
-  public int getPieces()
-  {
-    return piece_hashes.length/20;
-  }
-
-  /**
-   * Return the length of a piece. All pieces are of equal length
-   * except for the last one (<code>getPieces()-1</code>).
-   *
-   * @exception IndexOutOfBoundsException when piece is equal to or
-   * greater then the number of pieces in the torrent.
-   */
-  public int getPieceLength(int piece)
-  {
-    int pieces = getPieces();
-    if (piece >= 0 && piece < pieces -1)
-      return piece_length;
-    else if (piece == pieces -1)
-      return (int)(length - piece * piece_length);
-    else
-      throw new IndexOutOfBoundsException("no piece: " + piece);
-  }
-        
-  /**
-   * Checks that the given piece has the same SHA1 hash as the given
-   * byte array. Returns random results or IndexOutOfBoundsExceptions
-   * when the piece number is unknown.
-   */
-  public boolean checkPiece(int piece, byte[] bs, int off, int length)
-  {
-    if (true)
-        return fast_checkPiece(piece, bs, off, length);
-    else
-        return orig_checkPiece(piece, bs, off, length);
-  }
-  private boolean orig_checkPiece(int piece, byte[] bs, int off, int length) {
-    // Check digest
-    MessageDigest sha1;
-    try
-      {
-        sha1 = MessageDigest.getInstance("SHA");
-      }
-    catch (NoSuchAlgorithmException nsae)
-      {
-        throw new InternalError("No SHA digest available: " + nsae);
-      }
-
-    sha1.update(bs, off, length);
-    byte[] hash = sha1.digest();
-    for (int i = 0; i < 20; i++)
-      if (hash[i] != piece_hashes[20 * piece + i])
-        return false;
-    return true;
-  }
-  
-  private boolean fast_checkPiece(int piece, byte[] bs, int off, int length) {
-    SHA1 sha1 = new SHA1();
-
-    sha1.update(bs, off, length);
-    byte[] hash = sha1.digest();
-    for (int i = 0; i < 20; i++)
-      if (hash[i] != piece_hashes[20 * piece + i])
-        return false;
-    return true;
-  }
-
-  /**
-   * Returns the total length of the torrent in bytes.
-   */
-  public long getTotalLength()
-  {
-    return length;
-  }
-
-  public String toString()
-  {
-    return "MetaInfo[info_hash='" + hexencode(info_hash)
-      + "', announce='" + announce
-      + "', name='" + name
-      + "', files=" + files
-      + ", #pieces='" + piece_hashes.length/20
-      + "', piece_length='" + piece_length
-      + "', length='" + length
-      + "']";
-  }
-
-  /**
-   * Encode a byte array as a hex encoded string.
-   */
-  private static String hexencode(byte[] bs)
-  {
-    StringBuffer sb = new StringBuffer(bs.length*2);
-    for (int i = 0; i < bs.length; i++)
-      {
-        int c = bs[i] & 0xFF;
-        if (c < 16)
-          sb.append('0');
-        sb.append(Integer.toHexString(c));
-      }
-
-    return sb.toString();
-  }
-
-  /**
-   * Creates a copy of this MetaInfo that shares everything except the
-   * announce URL.
-   */
-  public MetaInfo reannounce(String announce)
-  {
-    return new MetaInfo(announce, name, name_utf8, files,
-                        lengths, piece_length,
-                        piece_hashes, length);
-  }
-
-  public byte[] getTorrentData()
-  {
-    if (torrentdata == null)
-      {
-        Map m = new HashMap();
-        m.put("announce", announce);
-        Map info = createInfoMap();
-        m.put("info", info);
-        torrentdata = BEncoder.bencode(m);
-      }
-    return torrentdata;
-  }
-
-  private Map createInfoMap()
-  {
-    Map info = new HashMap();
-    if (infoMap != null) {
-        info.putAll(infoMap);
-        return info;
-    }
-    info.put("name", name);
-    if (name_utf8 != null)
-        info.put("name.utf-8", name_utf8);
-    info.put("piece length", new Integer(piece_length));
-    info.put("pieces", piece_hashes);
-    if (files == null)
-      info.put("length", new Long(length));
-    else
-      {
-        List l = new ArrayList();
-        for (int i = 0; i < files.size(); i++)
-          {
-            Map file = new HashMap();
-            file.put("path", files.get(i));
-            if ( (files_utf8 != null) && (files_utf8.size() > i) )
-                file.put("path.utf-8", files_utf8.get(i));
-            file.put("length", lengths.get(i));
-            l.add(file);
-          }
-        info.put("files", l);
-      }
-    return info;
-  }
-
-  private byte[] calculateInfoHash()
-  {
-    Map info = createInfoMap();
-    StringBuffer buf = new StringBuffer(128);
-    buf.append("info: ");
-    for (Iterator iter = info.keySet().iterator(); iter.hasNext(); ) {
-        String key = (String)iter.next();
-        Object val = info.get(key);
-        buf.append(key).append('=');
-        if (val instanceof byte[])
-            buf.append(Base64.encode((byte[])val, true));
-        else
-            buf.append(val.toString());
-    }
-    _log.debug(buf.toString());
-    byte[] infoBytes = BEncoder.bencode(info);
-    //_log.debug("info bencoded: [" + Base64.encode(infoBytes, true) + "]");
-    try
-      {
-        MessageDigest digest = MessageDigest.getInstance("SHA");
-        byte hash[] = digest.digest(infoBytes);
-        _log.debug("info hash: [" + net.i2p.data.Base64.encode(hash) + "]");
-        return hash;
-      }
-    catch(NoSuchAlgorithmException nsa)
-      {
-        throw new InternalError(nsa.toString());
-      }
-  }
-
-  
-}

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

@@ -1,461 +0,0 @@
-/* Peer - All public information concerning a peer.
-   Copyright (C) 2003 Mark J. Wielaard
-
-   This file is part of Snark.
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
- 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
- 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-package org.klomp.snark;
-
-import java.io.*;
-import java.net.*;
-import java.util.Arrays;
-import java.util.Map;
-
-import org.klomp.snark.bencode.*;
-
-import net.i2p.client.streaming.I2PSocket;
-import net.i2p.data.DataHelper;
-import net.i2p.util.Log;
-
-public class Peer implements Comparable
-{
-  private Log _log = new Log(Peer.class);
-  // Identifying property, the peer id of the other side.
-  private final PeerID peerID;
-
-  private final byte[] my_id;
-  final MetaInfo metainfo;
-
-  // The data in/output streams set during the handshake and used by
-  // the actual connections.
-  private DataInputStream din;
-  private DataOutputStream dout;
-
-  // Keeps state for in/out connections.  Non-null when the handshake
-  // was successful, the connection setup and runs
-  PeerState state;
-
-  private I2PSocket sock;
-  
-  private boolean deregister = true;
-  private static long __id;
-  private long _id;
-
-  /**
-   * Creates a disconnected peer given a PeerID, your own id and the
-   * relevant MetaInfo.
-   */
-  public Peer(PeerID peerID, byte[] my_id, MetaInfo metainfo)
-    throws IOException
-  {
-    this.peerID = peerID;
-    this.my_id = my_id;
-    this.metainfo = metainfo;
-    _id = ++__id;
-    //_log.debug("Creating a new peer with " + peerID.getAddress().calculateHash().toBase64(), new Exception("creating"));
-  }
-
-  /**
-   * Creates a unconnected peer from the input and output stream got
-   * from the socket. Note that the complete handshake (which can take
-   * some time or block indefinitely) is done in the calling Thread to
-   * get the remote peer id. To completely start the connection call
-   * the connect() method.
-   *
-   * @exception IOException when an error occurred during the handshake.
-   */
-  public Peer(final I2PSocket sock, InputStream in, OutputStream out, byte[] my_id, MetaInfo metainfo)
-    throws IOException
-  {
-    this.my_id = my_id;
-    this.metainfo = metainfo;
-    this.sock = sock;
-
-    byte[] id  = handshake(in, out);
-    this.peerID = new PeerID(id, sock.getPeerDestination());
-    _id = ++__id;
-    _log.debug("Creating a new peer with " + peerID.getAddress().calculateHash().toBase64(), new Exception("creating " + _id));
-  }
-
-  /**
-   * Returns the id of the peer.
-   */
-  public PeerID getPeerID()
-  {
-    return peerID;
-  }
-
-  /**
-   * Returns the String representation of the peerID.
-   */
-  public String toString()
-  {
-    if (peerID != null)
-      return peerID.toString() + ' ' + _id;
-    else
-      return "[unknown id] " + _id;
-  }
-
-  /**
-   * The hash code of a Peer is the hash code of the peerID.
-   */
-  public int hashCode()
-  {
-    return peerID.hashCode() ^ (2 << _id);
-  }
-
-  /**
-   * Two Peers are equal when they have the same PeerID.
-   * All other properties are ignored.
-   */
-  public boolean equals(Object o)
-  {
-    if (o instanceof Peer)
-      {
-        Peer p = (Peer)o;
-        return _id == p._id && peerID.equals(p.peerID);
-      }
-    else
-      return false;
-  }
-
-  /**
-   * Compares the PeerIDs.
-   */
-  public int compareTo(Object o)
-  {
-    Peer p = (Peer)o;
-    int rv = peerID.compareTo(p.peerID);
-    if (rv == 0) {
-        if (_id > p._id) return 1;
-        else if (_id < p._id) return -1;
-        else return 0;
-    } else {
-        return rv;
-    }
-  }
-
-  /**
-   * Runs the connection to the other peer. This method does not
-   * return until the connection is terminated.
-   *
-   * When the connection is correctly started the connected() method
-   * of the given PeerListener is called. If the connection ends or
-   * the connection could not be setup correctly the disconnected()
-   * method is called.
-   *
-   * If the given BitField is non-null it is send to the peer as first
-   * message.
-   */
-  public void runConnection(PeerListener listener, BitField bitfield)
-  {
-    if (state != null)
-      throw new IllegalStateException("Peer already started");
-
-    _log.debug("Running connection to " + peerID.getAddress().calculateHash().toBase64(), new Exception("connecting"));    
-    try
-      {
-        // Do we need to handshake?
-        if (din == null)
-          {
-            sock = I2PSnarkUtil.instance().connect(peerID);
-            _log.debug("Connected to " + peerID + ": " + sock);
-            if ((sock == null) || (sock.isClosed())) {
-                throw new IOException("Unable to reach " + peerID);
-            }
-            InputStream in = sock.getInputStream();
-            OutputStream out = sock.getOutputStream(); //new BufferedOutputStream(sock.getOutputStream());
-            if (true) {
-                // buffered output streams are internally synchronized, so we can't get through to the underlying
-                // I2PSocket's MessageOutputStream to close() it if we are blocking on a write(...).  Oh, and the
-                // buffer is unnecessary anyway, as unbuffered access lets the streaming lib do the 'right thing'.
-                //out = new BufferedOutputStream(out);
-                in = new BufferedInputStream(sock.getInputStream());
-            }
-            //BufferedInputStream bis
-            //  = new BufferedInputStream(sock.getInputStream());
-            //BufferedOutputStream bos
-            //  = new BufferedOutputStream(sock.getOutputStream());
-            byte [] id = handshake(in, out); //handshake(bis, bos);
-            byte [] expected_id = peerID.getID();
-            if (!Arrays.equals(expected_id, id))
-              throw new IOException("Unexpected peerID '"
-                                    + PeerID.idencode(id)
-                                    + "' expected '"
-                                    + PeerID.idencode(expected_id) + "'");
-            _log.debug("Handshake got matching IDs with " + toString());
-          } else {
-            _log.debug("Already have din [" + sock + "] with " + toString());
-          }
-        
-        PeerConnectionIn in = new PeerConnectionIn(this, din);
-        PeerConnectionOut out = new PeerConnectionOut(this, dout);
-        PeerState s = new PeerState(this, listener, metainfo, in, out);
-        
-        // Send our bitmap
-        if (bitfield != null)
-          s.out.sendBitfield(bitfield);
-    
-        // We are up and running!
-        state = s;
-        listener.connected(this);
-  
-        _log.debug("Start running the reader with " + toString());
-        // Use this thread for running the incomming connection.
-        // The outgoing connection creates its own Thread.
-        out.startup();
-        Thread.currentThread().setName("Snark reader from " + peerID);
-        s.in.run();
-      }
-    catch(IOException eofe)
-      {
-        // Ignore, probably just the other side closing the connection.
-        // Or refusing the connection, timing out, etc.
-        if (_log.shouldLog(Log.DEBUG))
-            _log.debug(this.toString(), eofe);
-      }
-    catch(Throwable t)
-      {
-        _log.error(this + ": " + t.getMessage(), t);
-        if (t instanceof OutOfMemoryError)
-            throw (OutOfMemoryError)t;
-      }
-    finally
-      {
-        if (deregister) listener.disconnected(this);
-        disconnect();
-      }
-  }
-
-  /**
-   * Sets DataIn/OutputStreams, does the handshake and returns the id
-   * reported by the other side.
-   */
-  private byte[] handshake(InputStream in, OutputStream out) //BufferedInputStream bis, BufferedOutputStream bos)
-    throws IOException
-  {
-    din = new DataInputStream(in);
-    dout = new DataOutputStream(out);
-    
-    // Handshake write - header
-    dout.write(19);
-    dout.write("BitTorrent protocol".getBytes("UTF-8"));
-    // Handshake write - zeros
-    byte[] zeros = new byte[8];
-    dout.write(zeros);
-    // Handshake write - metainfo hash
-    byte[] shared_hash = metainfo.getInfoHash();
-    dout.write(shared_hash);
-    // Handshake write - peer id
-    dout.write(my_id);
-    dout.flush();
-    
-    _log.debug("Wrote my shared hash and ID to " + toString());
-    
-    // Handshake read - header
-    byte b = din.readByte();
-    if (b != 19)
-      throw new IOException("Handshake failure, expected 19, got "
-                            + (b & 0xff) + " on " + sock);
-    
-    byte[] bs = new byte[19];
-    din.readFully(bs);
-    String bittorrentProtocol = new String(bs, "UTF-8");
-    if (!"BitTorrent protocol".equals(bittorrentProtocol))
-      throw new IOException("Handshake failure, expected "
-                            + "'Bittorrent protocol', got '"
-                            + bittorrentProtocol + "'");
-    
-    // Handshake read - zeros
-    din.readFully(zeros);
-    
-    // Handshake read - metainfo hash
-    bs = new byte[20];
-    din.readFully(bs);
-    if (!Arrays.equals(shared_hash, bs))
-      throw new IOException("Unexpected MetaInfo hash");
-
-    // Handshake read - peer id
-    din.readFully(bs);
-    _log.debug("Read the remote side's hash and peerID fully from " + toString());
-    return bs;
-  }
-
-  public boolean isConnected()
-  {
-    return state != null;
-  }
-
-  /**
-   * Disconnects this peer if it was connected.  If deregister is
-   * true, PeerListener.disconnected() will be called when the
-   * connection is completely terminated. Otherwise the connection is
-   * silently terminated.
-   */
-  public void disconnect(boolean deregister)
-  {
-    // Both in and out connection will call this.
-    this.deregister = deregister;
-    disconnect();
-  }
-
-  void disconnect()
-  {
-    PeerState s = state;
-    if (s != null)
-      {
-        state = null;
-
-        PeerConnectionIn in = s.in;
-        if (in != null)
-          in.disconnect();
-        PeerConnectionOut out = s.out;
-        if (out != null)
-          out.disconnect();
-        PeerListener pl = s.listener;
-        if (pl != null)
-          pl.disconnected(this);
-      }
-    I2PSocket csock = sock;
-    sock = null;
-    if ( (csock != null) && (!csock.isClosed()) ) {
-        try {
-            csock.close(); 
-        } catch (IOException ioe) { 
-            _log.warn("Error disconnecting " + toString(), ioe);
-        }
-    }
-  }
-
-  /**
-   * Tell the peer we have another piece.
-   */
-  public void have(int piece)
-  {
-    PeerState s = state;
-    if (s != null)
-      s.havePiece(piece);
-  }
-
-  /**
-   * Whether or not the peer is interested in pieces we have. Returns
-   * false if not connected.
-   */
-  public boolean isInterested()
-  {
-    PeerState s = state;
-    return (s != null) && s.interested;
-  }
-
-  /**
-   * Sets whether or not we are interested in pieces from this peer.
-   * Defaults to false. When interest is true and this peer unchokes
-   * us then we start downloading from it. Has no effect when not connected.
-   */
-  public void setInteresting(boolean interest)
-  {
-    PeerState s = state;
-    if (s != null)
-      s.setInteresting(interest);
-  }
-
-  /**
-   * Whether or not the peer has pieces we want from it. Returns false
-   * if not connected.
-   */
-  public boolean isInteresting()
-  {
-    PeerState s = state;
-    return (s != null) && s.interesting;
-  }
-
-  /**
-   * Sets whether or not we are choking the peer. Defaults to
-   * true. When choke is false and the peer requests some pieces we
-   * upload them, otherwise requests of this peer are ignored.
-   */
-  public void setChoking(boolean choke)
-  {
-    PeerState s = state;
-    if (s != null)
-      s.setChoking(choke);
-  }
-
-  /**
-   * Whether or not we are choking the peer. Returns true when not connected.
-   */
-  public boolean isChoking()
-  {
-    PeerState s = state;
-    return (s == null) || s.choking;
-  }
-
-  /**
-   * Whether or not the peer choked us. Returns true when not connected.
-   */
-  public boolean isChoked()
-  {
-    PeerState s = state;
-    return (s == null) || s.choked;
-  }
-
-  /**
-   * Returns the number of bytes that have been downloaded.
-   * Can be reset to zero with <code>resetCounters()</code>/
-   */
-  public long getDownloaded()
-  {
-    PeerState s = state;
-    return (s != null) ? s.downloaded : 0;
-  }
-
-  /**
-   * Returns the number of bytes that have been uploaded.
-   * Can be reset to zero with <code>resetCounters()</code>/
-   */
-  public long getUploaded()
-  {
-    PeerState s = state;
-    return (s != null) ? s.uploaded : 0;
-  }
-
-  /**
-   * Resets the downloaded and uploaded counters to zero.
-   */
-  public void resetCounters()
-  {
-    PeerState s = state;
-    if (s != null)
-      {
-        s.downloaded = 0;
-        s.uploaded = 0;
-      }
-  }
-  
-  public long getInactiveTime() {
-      PeerState s = state;
-      if (s != null) {
-          PeerConnectionOut out = s.out;
-          if (out != null)
-            return System.currentTimeMillis() - out.lastSent;
-          else
-            return -1; //"state, no out";
-      } else {
-          return -1; //"no state";
-      }
-  }
-}

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

@@ -1,145 +0,0 @@
-/* PeerAcceptor - Accepts incomming connections from peers.
-   Copyright (C) 2003 Mark J. Wielaard
-
-   This file is part of Snark.
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
- 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
- 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-package org.klomp.snark;
-
-import java.io.*;
-import java.net.*;
-import java.util.Iterator;
-
-import net.i2p.client.streaming.I2PSocket;
-import net.i2p.data.Base64;
-import net.i2p.data.DataHelper;
-import net.i2p.util.Log;
-
-/**
- * Accepts incomming connections from peers. The ConnectionAcceptor
- * will call the connection() method when it detects an incomming BT
- * protocol connection. The PeerAcceptor will then create a new peer
- * if the PeerCoordinator wants more peers.
- */
-public class PeerAcceptor
-{
-  private static final Log _log = new Log(PeerAcceptor.class);
-  private final PeerCoordinator coordinator;
-  final PeerCoordinatorSet coordinators;
-
-  public PeerAcceptor(PeerCoordinator coordinator)
-  {
-    this.coordinator = coordinator;
-    this.coordinators = null;
-  }
-  
-  public PeerAcceptor(PeerCoordinatorSet coordinators)
-  {
-    this.coordinators = coordinators;
-    this.coordinator = null;
-  }
-
-  public void connection(I2PSocket socket,
-                         InputStream in, OutputStream out)
-    throws IOException
-  {
-    // inside this Peer constructor's handshake is where you'd deal with the other
-    // side saying they want to communicate with another torrent - aka multitorrent
-    // support, but because of how the protocol works, we can get away with just reading
-    // ahead the first $LOOKAHEAD_SIZE bytes to figure out which infohash they want to
-    // talk about, and we can just look for that in our list of active torrents.
-    byte peerInfoHash[] = null;
-    if (in instanceof BufferedInputStream) {
-        in.mark(LOOKAHEAD_SIZE);
-        peerInfoHash = readHash(in);
-        in.reset();
-    } else {
-        // is this working right?
-        try {
-          peerInfoHash = readHash(in);
-          _log.info("infohash read from " + socket.getPeerDestination().calculateHash().toBase64() 
-                    + ": " + Base64.encode(peerInfoHash));
-        } catch (IOException ioe) {
-            _log.info("Unable to read the infohash from " + socket.getPeerDestination().calculateHash().toBase64());
-            throw ioe;
-        }
-        in = new SequenceInputStream(new ByteArrayInputStream(peerInfoHash), in);
-    }
-    if (coordinator != null) {
-        // single torrent capability
-        MetaInfo meta = coordinator.getMetaInfo();
-        if (DataHelper.eq(meta.getInfoHash(), peerInfoHash)) {
-            if (coordinator.needPeers())
-              {
-                Peer peer = new Peer(socket, in, out, coordinator.getID(),
-                                     coordinator.getMetaInfo());
-                coordinator.addPeer(peer);
-              }
-            else
-              socket.close();
-        } else {
-          // its for another infohash, but we are only single torrent capable.  b0rk.
-            throw new IOException("Peer wants another torrent (" + Base64.encode(peerInfoHash) 
-                                  + ") while we only support (" + Base64.encode(meta.getInfoHash()) + ")");
-        }
-    } else {
-        // multitorrent capable, so lets see what we can handle
-        for (Iterator iter = coordinators.iterator(); iter.hasNext(); ) {
-            PeerCoordinator cur = (PeerCoordinator)iter.next();
-            MetaInfo meta = cur.getMetaInfo();
-            
-            if (DataHelper.eq(meta.getInfoHash(), peerInfoHash)) {
-                if (cur.needPeers())
-                  {
-                    Peer peer = new Peer(socket, in, out, cur.getID(),
-                                         cur.getMetaInfo());
-                    cur.addPeer(peer);
-                    return;
-                  }
-                else 
-                  {
-                    if (_log.shouldLog(Log.DEBUG))
-                      _log.debug("Rejecting new peer for " + cur.snark.torrent);
-                    socket.close();
-                    return;
-                  }
-            }
-        }
-        // this is only reached if none of the coordinators match the infohash
-        throw new IOException("Peer wants another torrent (" + Base64.encode(peerInfoHash) 
-                              + ") while we don't support that hash");
-    }
-  }
-
-  private static final int LOOKAHEAD_SIZE = "19".length() +
-                                            "BitTorrent protocol".length() +
-                                            8 + // blank, reserved
-                                            20; // infohash
-
-  /** 
-   * Read ahead to the infohash, throwing an exception if there isn't enough data
-   */
-  private byte[] readHash(InputStream in) throws IOException {
-    byte buf[] = new byte[LOOKAHEAD_SIZE];
-    int read = DataHelper.read(in, buf);
-    if (read != buf.length)
-        throw new IOException("Unable to read the hash (read " + read + ")");
-    byte rv[] = new byte[20];
-    System.arraycopy(buf, buf.length-rv.length-1, rv, 0, rv.length);
-    return rv;
-  }
-}

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

@@ -1,204 +0,0 @@
-/* PeerCheckTasks - TimerTask that checks for good/bad up/downloaders.
-   Copyright (C) 2003 Mark J. Wielaard
-
-   This file is part of Snark.
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
- 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
- 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-package org.klomp.snark;
-
-import java.util.*;
-
-/**
- * TimerTask that checks for good/bad up/downloader. Works together
- * with the PeerCoordinator to select which Peers get (un)choked.
- */
-class PeerCheckerTask extends TimerTask
-{
-  private final long KILOPERSECOND = 1024*(PeerCoordinator.CHECK_PERIOD/1000);
-
-  private final PeerCoordinator coordinator;
-
-  PeerCheckerTask(PeerCoordinator coordinator)
-  {
-    this.coordinator = coordinator;
-  }
-
-  public void run()
-  {
-    synchronized(coordinator.peers)
-      {
-        // Calculate total uploading and worst downloader.
-        long worstdownload = Long.MAX_VALUE;
-        Peer worstDownloader = null;
-
-        int peers = 0;
-        int uploaders = 0;
-        int downloaders = 0;
-        int interested = 0;
-        int interesting = 0;
-        int choking = 0;
-        int choked = 0;
-
-        long uploaded = 0;
-        long downloaded = 0;
-
-        // Keep track of peers we remove now,
-        // we will add them back to the end of the list.
-        List removed = new ArrayList();
-
-        Iterator it = coordinator.peers.iterator();
-        while (it.hasNext())
-          {
-            Peer peer = (Peer)it.next();
-
-            // Remove dying peers
-            if (!peer.isConnected())
-              {
-                it.remove();
-                coordinator.removePeerFromPieces(peer);
-                coordinator.peerCount = coordinator.peers.size();
-                continue;
-              }
-
-            peers++;
-
-            if (!peer.isChoking())
-              uploaders++;
-            if (!peer.isChoked() && peer.isInteresting())
-              downloaders++;
-            if (peer.isInterested())
-              interested++;
-            if (peer.isInteresting())
-              interesting++;
-            if (peer.isChoking())
-              choking++;
-            if (peer.isChoked())
-              choked++;
-
-            // XXX - We should calculate the up/download rate a bit
-            // more intelligently
-            long upload = peer.getUploaded();
-            uploaded += upload;
-            long download = peer.getDownloaded();
-            downloaded += download;
-            peer.resetCounters();
-
-            if (Snark.debug >= Snark.DEBUG)
-              {
-                Snark.debug(peer + ":", Snark.DEBUG);
-                Snark.debug(" ul: " + upload/KILOPERSECOND
-                            + " dl: " + download/KILOPERSECOND
-                            + " i: " + peer.isInterested()
-                            + " I: " + peer.isInteresting()
-                            + " c: " + peer.isChoking()
-                            + " C: " + peer.isChoked(),
-                            Snark.DEBUG);
-              }
-
-            // If we are at our max uploaders and we have lots of other
-            // interested peers try to make some room.
-            // (Note use of coordinator.uploaders)
-            if (coordinator.uploaders >= PeerCoordinator.MAX_UPLOADERS
-                && interested > PeerCoordinator.MAX_UPLOADERS
-                && !peer.isChoking())
-              {
-                // Check if it still wants pieces from us.
-                if (!peer.isInterested())
-                  {
-                    if (Snark.debug >= Snark.INFO)
-                      Snark.debug("Choke uninterested peer: " + peer,
-                                  Snark.INFO);
-                    peer.setChoking(true);
-                    uploaders--;
-                    coordinator.uploaders--;
-                    
-                    // Put it at the back of the list
-                    it.remove();
-                    removed.add(peer);
-                  }
-                else if (peer.isChoked())
-                  {
-                    // If they are choking us make someone else a downloader
-                    if (Snark.debug >= Snark.DEBUG)
-                      Snark.debug("Choke choking peer: " + peer, Snark.DEBUG);
-                    peer.setChoking(true);
-                    uploaders--;
-                    coordinator.uploaders--;
-                    
-                    // Put it at the back of the list
-                    it.remove();
-                    removed.add(peer);
-                  }
-                else if (peer.isInteresting()
-                         && !peer.isChoked()
-                         && download == 0)
-                  {
-                    // We are downloading but didn't receive anything...
-                    if (Snark.debug >= Snark.DEBUG)
-                      Snark.debug("Choke downloader that doesn't deliver:"
-                                  + peer, Snark.DEBUG);
-                    peer.setChoking(true);
-                    uploaders--;
-                    coordinator.uploaders--;
-                    
-                    // Put it at the back of the list
-                    it.remove();
-                    removed.add(peer);
-                  }
-                else if (!peer.isChoking() && download < worstdownload)
-                  {
-                    // Make sure download is good if we are uploading
-                    worstdownload = download;
-                    worstDownloader = peer;
-                  }
-              }
-          }
-
-        // Resync actual uploaders value
-        // (can shift a bit by disconnecting peers)
-        coordinator.uploaders = uploaders;
-
-        // Remove the worst downloader if needed.
-        if (uploaders >= PeerCoordinator.MAX_UPLOADERS
-            && interested > PeerCoordinator.MAX_UPLOADERS
-            && worstDownloader != null)
-          {
-            if (Snark.debug >= Snark.DEBUG)
-              Snark.debug("Choke worst downloader: " + worstDownloader,
-                          Snark.DEBUG);
-
-            worstDownloader.setChoking(true);
-            coordinator.uploaders--;
-
-            // Put it at the back of the list
-            coordinator.peers.remove(worstDownloader);
-            coordinator.peerCount = coordinator.peers.size();
-            removed.add(worstDownloader);
-          }
-        
-        // Optimistically unchoke a peer
-        coordinator.unchokePeer();
-
-        // Put peers back at the end of the list that we removed earlier.
-        coordinator.peers.addAll(removed);
-        coordinator.peerCount = coordinator.peers.size();
-      }
-    if (coordinator.halted()) {
-        cancel();
-    }
-  }
-}

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

@@ -1,186 +0,0 @@
-/* PeerConnectionIn - Handles incomming messages and hands them to PeerState.
-   Copyright (C) 2003 Mark J. Wielaard
-
-   This file is part of Snark.
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
- 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
- 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-package org.klomp.snark;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import net.i2p.util.Log;
-
-class PeerConnectionIn implements Runnable
-{
-  private Log _log = new Log(PeerConnectionIn.class);
-  private final Peer peer;
-  private final DataInputStream din;
-
-  private Thread thread;
-  private boolean quit;
-
-  public PeerConnectionIn(Peer peer, DataInputStream din)
-  {
-    this.peer = peer;
-    this.din = din;
-    quit = false;
-  }
-
-  void disconnect()
-  {
-    if (quit == true)
-      return;
-
-    quit = true;
-    Thread t = thread;
-    if (t != null)
-      t.interrupt();
-  }
-
-  public void run()
-  {
-    thread = Thread.currentThread();
-    try
-      {
-        PeerState ps = peer.state;
-        while (!quit && ps != null)
-          {
-            // Common variables used for some messages.
-            int piece;
-            int begin;
-            int len;
-        
-            // Wait till we hear something...
-            // The length of a complete message in bytes.
-            int i = din.readInt();
-            if (i < 0)
-              throw new IOException("Unexpected length prefix: " + i);
-
-            if (i == 0)
-              {
-                ps.keepAliveMessage();
-                if (_log.shouldLog(Log.DEBUG)) 
-                    _log.debug("Received keepalive from " + peer + " on " + peer.metainfo.getName());
-                continue;
-              }
-            
-            byte b = din.readByte();
-            Message m = new Message();
-            m.type = b;
-            switch (b)
-              {
-              case 0:
-                ps.chokeMessage(true);
-                if (_log.shouldLog(Log.DEBUG)) 
-                    _log.debug("Received choke from " + peer + " on " + peer.metainfo.getName());
-                break;
-              case 1:
-                ps.chokeMessage(false);
-                if (_log.shouldLog(Log.DEBUG)) 
-                    _log.debug("Received unchoke from " + peer + " on " + peer.metainfo.getName());
-                break;
-              case 2:
-                ps.interestedMessage(true);
-                if (_log.shouldLog(Log.DEBUG)) 
-                    _log.debug("Received interested from " + peer + " on " + peer.metainfo.getName());
-                break;
-              case 3:
-                ps.interestedMessage(false);
-                if (_log.shouldLog(Log.DEBUG)) 
-                    _log.debug("Received not interested from " + peer + " on " + peer.metainfo.getName());
-                break;
-              case 4:
-                piece = din.readInt();
-                ps.haveMessage(piece);
-                if (_log.shouldLog(Log.DEBUG)) 
-                    _log.debug("Received havePiece(" + piece + ") from " + peer + " on " + peer.metainfo.getName());
-                break;
-              case 5:
-                byte[] bitmap = new byte[i-1];
-                din.readFully(bitmap);
-                ps.bitfieldMessage(bitmap);
-                if (_log.shouldLog(Log.DEBUG)) 
-                    _log.debug("Received bitmap from " + peer + " on " + peer.metainfo.getName() + ": size=" + (i-1) + ": " + ps.bitfield);
-                break;
-              case 6:
-                piece = din.readInt();
-                begin = din.readInt();
-                len = din.readInt();
-                ps.requestMessage(piece, begin, len);
-                if (_log.shouldLog(Log.DEBUG)) 
-                    _log.debug("Received request(" + piece + "," + begin + ") from " + peer + " on " + peer.metainfo.getName());
-                break;
-              case 7:
-                piece = din.readInt();
-                begin = din.readInt();
-                len = i-9;
-                Request req = ps.getOutstandingRequest(piece, begin, len);
-                byte[] piece_bytes;
-                if (req != null)
-                  {
-                    piece_bytes = req.bs;
-                    din.readFully(piece_bytes, begin, len);
-                    ps.pieceMessage(req);
-                    if (_log.shouldLog(Log.DEBUG)) 
-                        _log.debug("Received data(" + piece + "," + begin + ") from " + peer + " on " + peer.metainfo.getName());
-                  }
-                else
-                  {
-                    // XXX - Consume but throw away afterwards.
-                    piece_bytes = new byte[len];
-                    din.readFully(piece_bytes);
-                    if (_log.shouldLog(Log.DEBUG)) 
-                        _log.debug("Received UNWANTED data(" + piece + "," + begin + ") from " + peer + " on " + peer.metainfo.getName());
-                  }
-                break;
-              case 8:
-                piece = din.readInt();
-                begin = din.readInt();
-                len = din.readInt();
-                ps.cancelMessage(piece, begin, len);
-                if (_log.shouldLog(Log.DEBUG)) 
-                    _log.debug("Received cancel(" + piece + "," + begin + ") from " + peer + " on " + peer.metainfo.getName());
-                break;
-              default:
-                byte[] bs = new byte[i-1];
-                din.readFully(bs);
-                ps.unknownMessage(b, bs);
-                if (_log.shouldLog(Log.DEBUG)) 
-                    _log.debug("Received unknown message from " + peer + " on " + peer.metainfo.getName());
-              }
-          }
-      }
-    catch (IOException ioe)
-      {
-        // Ignore, probably the other side closed connection.
-        if (_log.shouldLog(Log.INFO))
-            _log.info("IOError talking with " + peer, ioe);
-      }
-    catch (Throwable t)
-      {
-        _log.error("Error talking with " + peer, t);
-        if (t instanceof OutOfMemoryError)
-            throw (OutOfMemoryError)t;
-      }
-    finally
-      {
-        peer.disconnect();
-      }
-  }
-}

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

@@ -1,399 +0,0 @@
-/* PeerConnectionOut - Keeps a queue of outgoing messages and delivers them.
-   Copyright (C) 2003 Mark J. Wielaard
-
-   This file is part of Snark.
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
- 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
- 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-package org.klomp.snark;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import net.i2p.util.I2PThread;
-import net.i2p.util.Log;
-import net.i2p.util.SimpleTimer;
-
-class PeerConnectionOut implements Runnable
-{
-  private Log _log = new Log(PeerConnectionOut.class);
-  private final Peer peer;
-  private final DataOutputStream dout;
-
-  private Thread thread;
-  private boolean quit;
-
-  // Contains Messages.
-  private List sendQueue = new ArrayList();
-  
-  private static long __id = 0;
-  private long _id;
-  
-  long lastSent;
-
-  public PeerConnectionOut(Peer peer, DataOutputStream dout)
-  {
-    this.peer = peer;
-    this.dout = dout;
-    _id = ++__id;
-
-    lastSent = System.currentTimeMillis();
-    quit = false;
-  }
-  
-  public void startup() {
-    thread = new I2PThread(this, "Snark sender " + _id + ": " + peer);
-    thread.start();
-  }
-
-  /**
-   * Continuesly monitors for more outgoing messages that have to be send.
-   * Stops if quit is true of an IOException occurs.
-   */
-  public void run()
-  {
-    try
-      {
-        while (!quit && peer.isConnected())
-          {
-            Message m = null;
-            PeerState state = null;
-            synchronized(sendQueue)
-              {
-                while (!quit && peer.isConnected() && sendQueue.isEmpty())
-                  {
-                    try
-                      {
-                        // Make sure everything will reach the other side.
-                        dout.flush();
-                        
-                        // Wait till more data arrives.
-                        sendQueue.wait(60*1000);
-                      }
-                    catch (InterruptedException ie)
-                      {
-                        /* ignored */
-                      }
-                  }
-                state = peer.state;
-                if (!quit && state != null && peer.isConnected())
-                  {
-                    // Piece messages are big. So if there are other
-                    // (control) messages make sure they are send first.
-                    // Also remove request messages from the queue if
-                    // we are currently being choked to prevent them from
-                    // being send even if we get unchoked a little later.
-                    // (Since we will resent them anyway in that case.)
-                    // And remove piece messages if we are choking.
-                    
-                    // this should get fixed for starvation
-                    Iterator it = sendQueue.iterator();
-                    while (m == null && it.hasNext())
-                      {
-                        Message nm = (Message)it.next();
-                        if (nm.type == Message.PIECE)
-                          {
-                            if (state.choking) {
-                              it.remove();
-                              SimpleTimer.getInstance().removeEvent(nm.expireEvent);
-                            }
-                            nm = null;
-                          }
-                        else if (nm.type == Message.REQUEST && state.choked)
-                          {
-                            it.remove();
-                            SimpleTimer.getInstance().removeEvent(nm.expireEvent);
-                            nm = null;
-                          }
-                          
-                        if (m == null && nm != null)
-                          {
-                            m = nm;
-                            SimpleTimer.getInstance().removeEvent(nm.expireEvent);
-                            it.remove();
-                          }
-                      }
-                    if (m == null && sendQueue.size() > 0) {
-                      m = (Message)sendQueue.remove(0);
-                      SimpleTimer.getInstance().removeEvent(m.expireEvent);
-                    }
-                  }
-              }
-            if (m != null)
-              {
-                if (_log.shouldLog(Log.DEBUG))
-                    _log.debug("Send " + peer + ": " + m + " on " + peer.metainfo.getName());
-                m.sendMessage(dout);
-                lastSent = System.currentTimeMillis();
-
-                // Remove all piece messages after sending a choke message.
-                if (m.type == Message.CHOKE)
-                  removeMessage(Message.PIECE);
-
-                // XXX - Should also register overhead...
-                if (m.type == Message.PIECE)
-                  state.uploaded(m.len);
-
-                m = null;
-              }
-          }
-      }
-    catch (IOException ioe)
-      {
-        // Ignore, probably other side closed connection.
-        if (_log.shouldLog(Log.INFO))
-            _log.info("IOError sending to " + peer, ioe);
-      }
-    catch (Throwable t)
-      {
-        _log.error("Error sending to " + peer, t);
-        if (t instanceof OutOfMemoryError)
-            throw (OutOfMemoryError)t;
-      }
-    finally
-      {
-        quit = true;
-        peer.disconnect();
-      }
-  }
-
-  public void disconnect()
-  {
-    synchronized(sendQueue)
-      {
-        //if (quit == true)
-        //  return;
-        
-        quit = true;
-        if (thread != null)
-            thread.interrupt();
-        
-        sendQueue.clear();
-        sendQueue.notify();
-      }
-    if (dout != null) {
-        try {
-            dout.close();
-        } catch (IOException ioe) {
-            _log.warn("Error closing the stream to " + peer, ioe);
-        }
-    }
-  }
-
-  /**
-   * Adds a message to the sendQueue and notifies the method waiting
-   * on the sendQueue to change.
-   */
-  private void addMessage(Message m)
-  {
-    SimpleTimer.getInstance().addEvent(new RemoveTooSlow(m), SEND_TIMEOUT);
-    synchronized(sendQueue)
-      {
-        sendQueue.add(m);
-        sendQueue.notifyAll();
-      }
-  }
-  
-  /** remove messages not sent in 3m */
-  private static final int SEND_TIMEOUT = 3*60*1000;
-  private class RemoveTooSlow implements SimpleTimer.TimedEvent {
-      private Message _m;
-      public RemoveTooSlow(Message m) {
-          _m = m;
-          m.expireEvent = RemoveTooSlow.this;
-      }
-      
-      public void timeReached() {
-          boolean removed = false;
-          synchronized (sendQueue) {
-              removed = sendQueue.remove(_m);
-              sendQueue.notifyAll();
-          }
-          if (removed)
-              _log.info("Took too long to send " + _m + " to " + peer);
-      }
-  }
-
-  /**
-   * Removes a particular message type from the queue.
-   *
-   * @param type the Message type to remove.
-   * @returns true when a message of the given type was removed, false
-   * otherwise.
-   */
-  private boolean removeMessage(int type)
-  {
-    boolean removed = false;
-    synchronized(sendQueue)
-      {
-        Iterator it = sendQueue.iterator();
-        while (it.hasNext())
-          {
-            Message m = (Message)it.next();
-            if (m.type == type)
-              {
-                it.remove();
-                removed = true;
-              }
-          }
-        sendQueue.notifyAll();
-      }
-    return removed;
-  }
-
-  void sendAlive()
-  {
-    Message m = new Message();
-    m.type = Message.KEEP_ALIVE;
-    addMessage(m);
-  }
-
-  void sendChoke(boolean choke)
-  {
-    // We cancel the (un)choke but keep PIECE messages.
-    // PIECE messages are purged if a choke is actually send.
-    synchronized(sendQueue)
-      {
-        int inverseType  = choke ? Message.UNCHOKE
-                                 : Message.CHOKE;
-        if (!removeMessage(inverseType))
-          {
-            Message m = new Message();
-            if (choke)
-              m.type = Message.CHOKE;
-            else
-              m.type = Message.UNCHOKE;
-            addMessage(m);
-          }
-      }
-  }
-
-  void sendInterest(boolean interest)
-  {
-    synchronized(sendQueue)
-      {
-        int inverseType  = interest ? Message.UNINTERESTED
-                                    : Message.INTERESTED;
-        if (!removeMessage(inverseType))
-          {
-            Message m = new Message();
-            if (interest)
-              m.type = Message.INTERESTED;
-            else
-              m.type = Message.UNINTERESTED;
-            addMessage(m);
-          }
-      }
-  }
-
-  void sendHave(int piece)
-  {
-    Message m = new Message();
-    m.type = Message.HAVE;
-    m.piece = piece;
-    addMessage(m);
-  }
-
-  void sendBitfield(BitField bitfield)
-  {
-    Message m = new Message();
-    m.type = Message.BITFIELD;
-    m.data = bitfield.getFieldBytes();
-    m.off = 0;
-    m.len = m.data.length;
-    addMessage(m);
-  }
-
-  void sendRequests(List requests)
-  {
-    Iterator it = requests.iterator();
-    while (it.hasNext())
-      {
-        Request req = (Request)it.next();
-        sendRequest(req);
-      }
-  }
-
-  void sendRequest(Request req)
-  {
-    Message m = new Message();
-    m.type = Message.REQUEST;
-    m.piece = req.piece;
-    m.begin = req.off;
-    m.length = req.len;
-    addMessage(m);
-  }
-
-  void sendPiece(int piece, int begin, int length, byte[] bytes)
-  {
-    Message m = new Message();
-    m.type = Message.PIECE;
-    m.piece = piece;
-    m.begin = begin;
-    m.length = length;
-    m.data = bytes;
-    m.off = begin;
-    m.len = length;
-    addMessage(m);
-  }
-
-  void sendCancel(Request req)
-  {
-    // See if it is still in our send queue
-    synchronized(sendQueue)
-      {
-        Iterator it = sendQueue.iterator();
-        while (it.hasNext())
-          {
-            Message m = (Message)it.next();
-            if (m.type == Message.REQUEST
-                && m.piece == req.piece
-                && m.begin == req.off
-                && m.length == req.len)
-              it.remove();
-          }
-      }
-
-    // Always send, just to be sure it it is really canceled.
-    Message m = new Message();
-    m.type = Message.CANCEL;
-    m.piece = req.piece;
-    m.begin = req.off;
-    m.length = req.len;
-    addMessage(m);
-  }
-
-  // Called by the PeerState when the other side doesn't want this
-  // request to be handled anymore. Removes any pending Piece Message
-  // from out send queue.
-  void cancelRequest(int piece, int begin, int length)
-  {
-    synchronized (sendQueue)
-      {
-        Iterator it = sendQueue.iterator();
-        while (it.hasNext())
-          {
-            Message m = (Message)it.next();
-            if (m.type == Message.PIECE
-                && m.piece == piece
-                && m.begin == begin
-                && m.length == length)
-              it.remove();
-          }
-      }
-  }
-}

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

@@ -1,585 +0,0 @@
-/* PeerCoordinator - Coordinates which peers do what (up and downloading).
-   Copyright (C) 2003 Mark J. Wielaard
-
-   This file is part of Snark.
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
- 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
- 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-package org.klomp.snark;
-
-import java.util.*;
-import java.io.IOException;
-
-import net.i2p.util.I2PThread;
-import net.i2p.util.Log;
-
-/**
- * Coordinates what peer does what.
- */
-public class PeerCoordinator implements PeerListener
-{
-  private final Log _log = new Log(PeerCoordinator.class);
-  final MetaInfo metainfo;
-  final Storage storage;
-  final Snark snark;
-
-  // package local for access by CheckDownLoadersTask
-  final static long CHECK_PERIOD = 20*1000; // 20 seconds
-  final static int MAX_CONNECTIONS = 24;
-  final static int MAX_UPLOADERS = 12; // i2p: might as well balance it out
-
-  // Approximation of the number of current uploaders.
-  // Resynced by PeerChecker once in a while.
-  int uploaders = 0;
-
-  // final static int MAX_DOWNLOADERS = MAX_CONNECTIONS;
-  // int downloaders = 0;
-
-  private long uploaded;
-  private long downloaded;
-
-  // synchronize on this when changing peers or downloaders
-  final List peers = new ArrayList();
-  /** estimate of the peers, without requiring any synchronization */
-  volatile int peerCount;
-
-  /** Timer to handle all periodical tasks. */
-  private final Timer timer = new Timer(true);
-
-  private final byte[] id;
-
-  // Some random wanted pieces
-  private final List wantedPieces;
-
-  private boolean halted = false;
-
-  private final CoordinatorListener listener;
-  
-  public String trackerProblems = null;
-  public int trackerSeenPeers = 0;
-
-  public PeerCoordinator(byte[] id, MetaInfo metainfo, Storage storage,
-                         CoordinatorListener listener, Snark torrent)
-  {
-    this.id = id;
-    this.metainfo = metainfo;
-    this.storage = storage;
-    this.listener = listener;
-    this.snark = torrent;
-
-    // Make a list of pieces
-    wantedPieces = new ArrayList();
-    BitField bitfield = storage.getBitField();
-    for(int i = 0; i < metainfo.getPieces(); i++)
-      if (!bitfield.get(i))
-        wantedPieces.add(new Piece(i));
-    Collections.shuffle(wantedPieces);
-
-    // Install a timer to check the uploaders.
-    timer.schedule(new PeerCheckerTask(this), CHECK_PERIOD, CHECK_PERIOD);
-  }
-  
-  public Storage getStorage() { return storage; }
-  public CoordinatorListener getListener() { return listener; }
-
-  public byte[] getID()
-  {
-    return id;
-  }
-
-  public boolean completed()
-  {
-    return storage.complete();
-  }
-
-  public int getPeerCount() { return peerCount; }
-
-  public int getPeers()
-  {
-    synchronized(peers)
-      {
-        int rv = peers.size();
-        peerCount = rv;
-        return rv;
-      }
-  }
-
-  /**
-   * Returns how many bytes are still needed to get the complete file.
-   */
-  public long getLeft()
-  {
-    // XXX - Only an approximation.
-    return storage.needed() * metainfo.getPieceLength(0);
-  }
-
-  /**
-   * Returns the total number of uploaded bytes of all peers.
-   */
-  public long getUploaded()
-  {
-    return uploaded;
-  }
-
-  /**
-   * Returns the total number of downloaded bytes of all peers.
-   */
-  public long getDownloaded()
-  {
-    return downloaded;
-  }
-
-  public MetaInfo getMetaInfo()
-  {
-    return metainfo;
-  }
-
-  public boolean needPeers()
-  {
-    synchronized(peers)
-      {
-        return !halted && peers.size() < MAX_CONNECTIONS;
-      }
-  }
-  
-  public boolean halted() { return halted; }
-
-  public void halt()
-  {
-    halted = true;
-    List removed = new ArrayList();
-    synchronized(peers)
-      {
-        // Stop peer checker task.
-        timer.cancel();
-
-        // Stop peers.
-        removed.addAll(peers);
-        peers.clear();
-        peerCount = 0;
-      }
-
-    while (removed.size() > 0) {
-        Peer peer = (Peer)removed.remove(0);
-        peer.disconnect();
-        removePeerFromPieces(peer);
-    }
-  }
-
-  public void connected(Peer peer)
-  { 
-    if (halted)
-      {
-        peer.disconnect(false);
-        return;
-      }
-
-    Peer toDisconnect = null;
-    synchronized(peers)
-      {
-        Peer old = peerIDInList(peer.getPeerID(), peers);
-        if ( (old != null) && (old.getInactiveTime() > 2*60*1000) ) {
-            // idle for 2 minutes, kill the old con
-            peers.remove(old);
-            toDisconnect = old;
-            old = null;
-        }
-        if (old != null)
-          {
-            if (_log.shouldLog(Log.WARN))
-              _log.warn("Already connected to: " + peer + ": " + old + ", inactive for " + old.getInactiveTime());
-            peer.disconnect(false); // Don't deregister this connection/peer.
-          }
-        else
-          {
-            if (_log.shouldLog(Log.INFO))
-              _log.info("New connection to peer: " + peer + " for " + metainfo.getName());
-
-            // Add it to the beginning of the list.
-            // And try to optimistically make it a uploader.
-            peers.add(0, peer);
-            peerCount = peers.size();
-            unchokePeer();
-
-            if (listener != null)
-              listener.peerChange(this, peer);
-          }
-      }
-    if (toDisconnect != null) {
-        toDisconnect.disconnect(false);
-        removePeerFromPieces(toDisconnect);
-    }
-  }
-
-  private static Peer peerIDInList(PeerID pid, List peers)
-  {
-    Iterator it = peers.iterator();
-    while (it.hasNext()) {
-      Peer cur = (Peer)it.next();
-      if (pid.sameID(cur.getPeerID()))
-        return cur;
-    }
-    return null;
-  }
-
-  public void addPeer(final Peer peer)
-  {
-    if (halted)
-      {
-        peer.disconnect(false);
-        return;
-      }
-
-    boolean need_more;
-    synchronized(peers)
-      {
-        need_more = !peer.isConnected() && peers.size() < MAX_CONNECTIONS;
-      }
-
-    if (need_more)
-      {
-        _log.debug("Adding a peer " + peer.getPeerID().getAddress().calculateHash().toBase64() + " for " + metainfo.getName(), new Exception("add/run"));
-
-        // Run the peer with us as listener and the current bitfield.
-        final PeerListener listener = this;
-        final BitField bitfield = storage.getBitField();
-        Runnable r = new Runnable()
-          {
-            public void run()
-            {
-              peer.runConnection(listener, bitfield);
-            }
-          };
-        String threadName = peer.toString();
-        new I2PThread(r, threadName).start();
-      }
-    else
-      if (_log.shouldLog(Log.DEBUG)) {
-        if (peer.isConnected())
-          _log.info("Add peer already connected: " + peer);
-        else
-          _log.info("MAX_CONNECTIONS = " + MAX_CONNECTIONS
-                    + " not accepting extra peer: " + peer);
-      }
-  }
-
-
-  // (Optimistically) unchoke. Should be called with peers synchronized
-  void unchokePeer()
-  {
-    // linked list will contain all interested peers that we choke.
-    // At the start are the peers that have us unchoked at the end the
-    // other peer that are interested, but are choking us.
-    List interested = new LinkedList();
-    synchronized (peers) {
-        Iterator it = peers.iterator();
-        while (it.hasNext())
-          {
-            Peer peer = (Peer)it.next();
-            boolean remove = false;
-            if (uploaders < MAX_UPLOADERS
-                && peer.isChoking()
-                && peer.isInterested())
-              {
-                if (!peer.isChoked())
-                  interested.add(0, peer);
-                else
-                  interested.add(peer);
-              }
-          }
-
-        while (uploaders < MAX_UPLOADERS && interested.size() > 0)
-          {
-            Peer peer = (Peer)interested.remove(0);
-            if (_log.shouldLog(Log.DEBUG))
-              _log.debug("Unchoke: " + peer);
-            peer.setChoking(false);
-            uploaders++;
-            // Put peer back at the end of the list.
-            peers.remove(peer);
-            peers.add(peer);
-            peerCount = peers.size();
-          }
-    }
-  }
-
-  public byte[] getBitMap()
-  {
-    return storage.getBitField().getFieldBytes();
-  }
-
-  /**
-   * Returns true if we don't have the given piece yet.
-   */
-  public boolean gotHave(Peer peer, int piece)
-  {
-    if (listener != null)
-      listener.peerChange(this, peer);
-
-    synchronized(wantedPieces)
-      {
-        return wantedPieces.contains(new Piece(piece));
-      }
-  }
-
-  /**
-   * Returns true if the given bitfield contains at least one piece we
-   * are interested in.
-   */
-  public boolean gotBitField(Peer peer, BitField bitfield)
-  {
-    if (listener != null)
-      listener.peerChange(this, peer);
-
-    synchronized(wantedPieces)
-      {
-        Iterator it = wantedPieces.iterator();
-        while (it.hasNext())
-          {
-            Piece p = (Piece)it.next();
-            int i = p.getId();
-            if (bitfield.get(i))
-              p.addPeer(peer);
-              return true;
-          }
-      }
-    return false;
-  }
-
-  /**
-   * Returns one of pieces in the given BitField that is still wanted or
-   * -1 if none of the given pieces are wanted.
-   */
-  public int wantPiece(Peer peer, BitField havePieces)
-  {
-    if (halted) {
-      if (_log.shouldLog(Log.WARN))
-          _log.warn("We don't want anything from the peer, as we are halted!  peer=" + peer);
-      return -1;
-    }
-
-    synchronized(wantedPieces)
-      {
-        Piece piece = null;
-        Collections.sort(wantedPieces); // Sort in order of rarest first.
-        List requested = new ArrayList(); 
-        Iterator it = wantedPieces.iterator();
-        while (piece == null && it.hasNext())
-          {
-            Piece p = (Piece)it.next();
-            if (havePieces.get(p.getId()) && !p.isRequested())
-              {
-                piece = p;
-              }
-            else if (p.isRequested()) 
-            {
-                requested.add(p);
-            }
-          }
-        
-        //Only request a piece we've requested before if there's no other choice.
-        if (piece == null) {
-            Iterator it2 = requested.iterator();
-            while (piece == null && it2.hasNext())
-              {
-                Piece p = (Piece)it2.next();
-                if (havePieces.get(p.getId()))
-                  {
-                    piece = p;
-                  }
-              }
-            if (piece == null) {
-                if (_log.shouldLog(Log.WARN))
-                    _log.warn("nothing to even rerequest from " + peer + ": requested = " + requested 
-                              + " wanted = " + wantedPieces + " peerHas = " + havePieces);
-                return -1; //If we still can't find a piece we want, so be it.
-            }
-        }
-        piece.setRequested(true);
-        return piece.getId();
-      }
-  }
-
-  /**
-   * Returns a byte array containing the requested piece or null of
-   * the piece is unknown.
-   */
-  public byte[] gotRequest(Peer peer, int piece)
-  {
-    if (halted)
-      return null;
-
-    try
-      {
-        return storage.getPiece(piece);
-      }
-    catch (IOException ioe)
-      {
-        snark.stopTorrent();
-        _log.error("Error reading the storage for " + metainfo.getName(), ioe);
-        throw new RuntimeException("B0rked");
-      }
-  }
-
-  /**
-   * Called when a peer has uploaded some bytes of a piece.
-   */
-  public void uploaded(Peer peer, int size)
-  {
-    uploaded += size;
-
-    if (listener != null)
-      listener.peerChange(this, peer);
-  }
-
-  /**
-   * Called when a peer has downloaded some bytes of a piece.
-   */
-  public void downloaded(Peer peer, int size)
-  {
-    downloaded += size;
-
-    if (listener != null)
-      listener.peerChange(this, peer);
-  }
-
-  /**
-   * Returns false if the piece is no good (according to the hash).
-   * In that case the peer that supplied the piece should probably be
-   * blacklisted.
-   */
-  public boolean gotPiece(Peer peer, int piece, byte[] bs)
-  {
-    if (halted) {
-      _log.info("Got while-halted piece " + piece + "/" + metainfo.getPieces() +" from " + peer + " for " + metainfo.getName());
-      return true; // We don't actually care anymore.
-    }
-    
-    synchronized(wantedPieces)
-      {
-        Piece p = new Piece(piece);
-        if (!wantedPieces.contains(p))
-          {
-            _log.info("Got unwanted piece " + piece + "/" + metainfo.getPieces() +" from " + peer + " for " + metainfo.getName());
-            
-            // No need to announce have piece to peers.
-            // Assume we got a good piece, we don't really care anymore.
-            return true;
-          }
-        
-        try
-          {
-            if (storage.putPiece(piece, bs))
-              {
-                _log.info("Got valid piece " + piece + "/" + metainfo.getPieces() +" from " + peer + " for " + metainfo.getName());
-              }
-            else
-              {
-                // Oops. We didn't actually download this then... :(
-                downloaded -= metainfo.getPieceLength(piece);
-                _log.warn("Got BAD piece " + piece + "/" + metainfo.getPieces() + " from " + peer + " for " + metainfo.getName());
-                return false; // No need to announce BAD piece to peers.
-              }
-          }
-        catch (IOException ioe)
-          {
-            snark.stopTorrent();
-            _log.error("Error writing storage for " + metainfo.getName(), ioe);
-            throw new RuntimeException("B0rked");
-          }
-        wantedPieces.remove(p);
-      }
-
-    // Announce to the world we have it!
-    synchronized(peers)
-      {
-        Iterator it = peers.iterator();
-        while (it.hasNext())
-          {
-            Peer p = (Peer)it.next();
-            if (p.isConnected())
-              p.have(piece);
-          }
-      }
-    
-    return true;
-  }
-
-  public void gotChoke(Peer peer, boolean choke)
-  {
-    if (_log.shouldLog(Log.INFO))
-      _log.info("Got choke(" + choke + "): " + peer);
-
-    if (listener != null)
-      listener.peerChange(this, peer);
-  }
-
-  public void gotInterest(Peer peer, boolean interest)
-  {
-    if (interest)
-      {
-        synchronized(peers)
-          {
-            if (uploaders < MAX_UPLOADERS)
-              {
-                if(peer.isChoking())
-                  {
-                    uploaders++;
-                    peer.setChoking(false);
-                    if (_log.shouldLog(Log.INFO))
-                        _log.info("Unchoke: " + peer);
-                  }
-              }
-          }
-      }
-
-    if (listener != null)
-      listener.peerChange(this, peer);
-  }
-
-  public void disconnected(Peer peer)
-  {
-    if (_log.shouldLog(Log.INFO))
-        _log.info("Disconnected " + peer, new Exception("Disconnected by"));
-    
-    synchronized(peers)
-      {
-        // Make sure it is no longer in our lists
-        if (peers.remove(peer))
-          {
-            // Unchoke some random other peer
-            unchokePeer();
-            removePeerFromPieces(peer);
-          }
-        peerCount = peers.size();
-      }
-
-    if (listener != null)
-      listener.peerChange(this, peer);
-  }
-  
-  /** Called when a peer is removed, to prevent it from being used in 
-   * rarest-first calculations.
-   */
-  public void removePeerFromPieces(Peer peer) {
-      synchronized(wantedPieces) {
-          for(Iterator iter = wantedPieces.iterator(); iter.hasNext(); ) {
-              Piece piece = (Piece)iter.next();
-              piece.removePeer(peer);
-          }
-      } 
-  }
-}

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

@@ -1,36 +0,0 @@
-package org.klomp.snark;
-
-import java.util.*;
-
-/**
- * Hmm, any guesses as to what this is?  Used by the multitorrent functionality
- * in the PeerAcceptor to pick the right PeerCoordinator to accept the con for.
- * Each PeerCoordinator is added to the set from within the Snark (and removed
- * from it there too)
- */
-public class PeerCoordinatorSet {
-    private static final PeerCoordinatorSet _instance = new PeerCoordinatorSet();
-    public static final PeerCoordinatorSet instance() { return _instance; }
-    private Set _coordinators;
-    
-    private PeerCoordinatorSet() {
-        _coordinators = new HashSet();
-    }
-    
-    public Iterator iterator() {
-        synchronized (_coordinators) {
-            return new ArrayList(_coordinators).iterator();
-        }
-    }
-    
-    public void add(PeerCoordinator coordinator) {
-        synchronized (_coordinators) {
-            _coordinators.add(coordinator);
-        }
-    }
-    public void remove(PeerCoordinator coordinator) {
-        synchronized (_coordinators) {
-            _coordinators.remove(coordinator);
-        }
-    }
-}

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

@@ -1,208 +0,0 @@
-/* PeerID - All public information concerning a peer.
-   Copyright (C) 2003 Mark J. Wielaard
-
-   This file is part of Snark.
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
- 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
- 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-package org.klomp.snark;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Map;
-
-import org.klomp.snark.bencode.*;
-
-import net.i2p.data.Base64;
-import net.i2p.data.Destination;
-import net.i2p.data.DataFormatException;
-
-public class PeerID implements Comparable
-{
-  private final byte[] id;
-  private final Destination address;
-  private final int port;
-
-  private final int hash;
-
-  public PeerID(byte[] id, Destination address)
-  {
-    this.id = id;
-    this.address = address;
-    this.port = 6881;
-
-    hash = calculateHash();
-  }
-
-  /**
-   * Creates a PeerID from a BDecoder.
-   */
-  public PeerID(BDecoder be)
-    throws IOException
-  {
-    this(be.bdecodeMap().getMap());
-  }
-
-  /**
-   * Creates a PeerID from a Map containing BEncoded peer id, ip and
-   * port.
-   */
-  public PeerID(Map m)
-    throws InvalidBEncodingException, UnknownHostException
-  {
-    BEValue bevalue = (BEValue)m.get("peer id");
-    if (bevalue == null)
-      throw new InvalidBEncodingException("peer id missing");
-    id = bevalue.getBytes();
-
-    bevalue = (BEValue)m.get("ip");
-    if (bevalue == null)
-      throw new InvalidBEncodingException("ip missing");
-    address = I2PSnarkUtil.instance().getDestination(bevalue.getString());
-    if (address == null)
-        throw new InvalidBEncodingException("Invalid destination [" + bevalue.getString() + "]");
-
-    port = 6881;
-
-    hash = calculateHash();
-  }
-
-  public byte[] getID()
-  {
-    return id;
-  }
-
-  public Destination getAddress()
-  {
-    return address;
-  }
-
-  public int getPort()
-  {
-    return port;
-  }
-
-  private int calculateHash()
-  {
-    int b = 0;
-    for (int i = 0; i < id.length; i++)
-      b ^= id[i];
-    return (b ^ address.hashCode()) ^ port;
-  }
-
-  /**
-   * The hash code of a PeerID is the exclusive or of all id bytes.
-   */
-  public int hashCode()
-  {
-    return hash;
-  }
-
-  /**
-   * Returns true if and only if this peerID and the given peerID have
-   * the same 20 bytes as ID.
-   */
-  public boolean sameID(PeerID pid)
-  {
-    boolean equal = true;
-    for (int i = 0; equal && i < id.length; i++)
-      equal = id[i] == pid.id[i];
-    return equal;
-  }
-
-  /**
-   * Two PeerIDs are equal when they have the same id, address and port.
-   */
-  public boolean equals(Object o)
-  {
-    if (o instanceof PeerID)
-      {
-        PeerID pid = (PeerID)o;
-
-        return port == pid.port
-          && address.equals(pid.address)
-          && sameID(pid);
-      }
-    else
-      return false;
-  }
-
-  /**
-   * Compares port, address and id.
-   */
-  public int compareTo(Object o)
-  {
-    PeerID pid = (PeerID)o;
-
-    int result = port - pid.port;
-    if (result != 0)
-      return result;
-
-    result = address.hashCode() - pid.address.hashCode();
-    if (result != 0)
-      return result;
-
-    for (int i = 0; i < id.length; i++)
-      {
-        result = id[i] - pid.id[i];
-        if (result != 0)
-          return result;
-      }
-
-    return 0;
-  }
-
-  /**
-   * Returns the String "id@address" where id is the base64 encoded id.
-   */
-  public String toString()
-  {
-    int nonZero = 0;
-    for (int i = 0; i < id.length; i++) {
-        if (id[i] != 0) {
-            nonZero = i;
-            break;
-        }
-    }
-    return Base64.encode(id, nonZero, id.length-nonZero).substring(0,4) + "@" + address.calculateHash().toBase64().substring(0,6);
-  }
-
-  /**
-   * Encode an id as a hex encoded string and remove leading zeros.
-   */
-  public static String idencode(byte[] bs)
-  {
-    boolean leading_zeros = true;
-
-    StringBuffer sb = new StringBuffer(bs.length*2);
-    for (int i = 0; i < bs.length; i++)
-      {
-        int c = bs[i] & 0xFF;
-        if (leading_zeros && c == 0)
-          continue;
-        else
-          leading_zeros = false;
-
-        if (c < 16)
-          sb.append('0');
-        sb.append(Integer.toHexString(c));
-      }
-
-    return sb.toString();
-  }
-
-}

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

@@ -1,145 +0,0 @@
-/* PeerListener - Interface for listening to peer events.
-   Copyright (C) 2003 Mark J. Wielaard
-
-   This file is part of Snark.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-package org.klomp.snark;
-
-/**
- * Listener for Peer events.
- */
-public interface PeerListener
-{
-  /**
-   * Called when the connection to the peer has started and the
-   * handshake was successfull.
-   *
-   * @param peer the Peer that just got connected.
-   */
-  void connected(Peer peer);
-
-  /**
-   * Called when the connection to the peer was terminated or the
-   * connection handshake failed.
-   *
-   * @param peer the Peer that just got disconnected.
-   */
-  void disconnected(Peer peer);
-
-  /**
-   * Called when a choke message is received.
-   *
-   * @param peer the Peer that got the message.
-   * @param choke true when the peer got a choke message, false when
-   * the peer got an unchoke message.
-   */
-  void gotChoke(Peer peer, boolean choke);
-
-  /**
-   * Called when an interested message is received.
-   *
-   * @param peer the Peer that got the message.
-   * @param interest true when the peer got a interested message, false when
-   * the peer got an uninterested message.
-   */
-  void gotInterest(Peer peer, boolean interest);
-
-  /**
-   * Called when a have piece message is received. If the method
-   * returns true and the peer has not yet received a interested
-   * message or we indicated earlier to be not interested then an
-   * interested message will be send.
-   *
-   * @param peer the Peer that got the message.
-   * @param piece the piece number that the per just got.
-   *
-   * @return true when it is a piece that we want, false if the piece is
-   * already known.
-   */
-  boolean gotHave(Peer peer, int piece);
-
-  /**
-   * Called when a bitmap message is received. If this method returns
-   * true a interested message will be send back to the peer.
-   *
-   * @param peer the Peer that got the message.
-   * @param bitfield a BitField containing the pieces that the other
-   * side has.
-   *
-   * @return true when the BitField contains pieces we want, false if
-   * the piece is already known.
-   */
-  boolean gotBitField(Peer peer, BitField bitfield);
-
-  /**
-   * Called when a piece is received from the peer. The piece must be
-   * requested by Peer.request() first. If this method returns false
-   * that means the Peer provided a corrupted piece and the connection
-   * will be closed.
-   *
-   * @param peer the Peer that got the piece.
-   * @param piece the piece number received.
-   * @param bs the byte array containing the piece.
-   *
-   * @return true when the bytes represent the piece, false otherwise.
-   */
-  boolean gotPiece(Peer peer, int piece, byte[] bs);
-
-  /**
-   * Called when the peer wants (part of) a piece from us. Only called
-   * when the peer is not choked by us (<code>peer.choke(false)</code>
-   * was called).
-   *
-   * @param peer the Peer that wants the piece.
-   * @param piece the piece number requested.
-   *
-   * @return a byte array containing the piece or null when the piece
-   * is not available (which is a protocol error).
-   */
-  byte[] gotRequest(Peer peer, int piece);
-
-  /**
-   * Called when a (partial) piece has been downloaded from the peer.
-   *
-   * @param peer the Peer from which size bytes where downloaded.
-   * @param size the number of bytes that where downloaded.
-   */
-  void downloaded(Peer peer, int size);
-
-  /**
-   * Called when a (partial) piece has been uploaded to the peer.
-   *
-   * @param peer the Peer to which size bytes where uploaded.
-   * @param size the number of bytes that where uploaded.
-   */
-  void uploaded(Peer peer, int size);
-
-  /**
-   * Called when we are downloading from the peer and need to ask for
-   * a new piece. Might be called multiple times before
-   * <code>gotPiece()</code> is called.
-   *
-   * @param peer the Peer that will be asked to provide the piece.
-   * @param bitfield a BitField containing the pieces that the other
-   * side has.
-   *
-   * @return one of the pieces from the bitfield that we want or -1 if
-   * we are no longer interested in the peer.
-   */
-  int wantPiece(Peer peer, BitField bitfield);
-}

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

@@ -1,128 +0,0 @@
-/* PeerMonitorTasks - TimerTask that monitors the peers and total up/down speed
-   Copyright (C) 2003 Mark J. Wielaard
-
-   This file is part of Snark.
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
- 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
- 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-package org.klomp.snark;
-
-import java.util.*;
-
-/**
- * TimerTask that monitors the peers and total up/download speeds.
- * Works together with the main Snark class to report periodical statistics.
- */
-class PeerMonitorTask extends TimerTask
-{
-  final static long MONITOR_PERIOD = 10 * 1000; // Ten seconds.
-  private final long KILOPERSECOND = 1024 * (MONITOR_PERIOD / 1000);
-
-  private final PeerCoordinator coordinator;
-
-  private long lastDownloaded = 0;
-  private long lastUploaded = 0;
-
-  PeerMonitorTask(PeerCoordinator coordinator)
-  {
-    this.coordinator = coordinator;
-  }
-
-  public void run()
-  {
-    // Get some statistics
-    int peers = 0;
-    int uploaders = 0;
-    int downloaders = 0;
-    int interested = 0;
-    int interesting = 0;
-    int choking = 0;
-    int choked = 0;
-    
-    synchronized(coordinator.peers)
-      {
-        Iterator it = coordinator.peers.iterator();
-        while (it.hasNext())
-          {
-            Peer peer = (Peer)it.next();
-            
-            // Don't list dying peers
-            if (!peer.isConnected())
-              continue;
-            
-            peers++;
-            
-            if (!peer.isChoking())
-              uploaders++;
-            if (!peer.isChoked() && peer.isInteresting())
-              downloaders++;
-            if (peer.isInterested())
-              interested++;
-            if (peer.isInteresting())
-              interesting++;
-            if (peer.isChoking())
-              choking++;
-            if (peer.isChoked())
-              choked++;
-          }
-      }
-
-    // Print some statistics
-    long downloaded = coordinator.getDownloaded();
-    String totalDown;
-    if (downloaded >= 10 * 1024 * 1024)
-      totalDown = (downloaded / (1024 * 1024)) + "MB";
-    else
-      totalDown = (downloaded / 1024 )+ "KB";
-    long uploaded = coordinator.getUploaded();
-    String totalUp;
-    if (uploaded >= 10 * 1024 * 1024)
-      totalUp = (uploaded / (1024 * 1024)) + "MB";
-    else
-      totalUp = (uploaded / 1024) + "KB";
-    
-    int needP = coordinator.storage.needed();
-    long needMB
-      = needP * coordinator.metainfo.getPieceLength(0) / (1024 * 1024);
-    int totalP = coordinator.metainfo.getPieces();
-    long totalMB = coordinator.metainfo.getTotalLength() / (1024 * 1024);
-    
-    System.out.println();
-    System.out.println("Down: "
-                       + (downloaded - lastDownloaded) / KILOPERSECOND
-                       + "KB/s"
-                       + " (" + totalDown + ")"
-                       + " Up: "
-                       + (uploaded - lastUploaded) / KILOPERSECOND
-                       + "KB/s"
-                       + " (" + totalUp + ")"
-                       + " Need " + needP
-                       + " (" + needMB + "MB)"
-                       + " of " + totalP
-                       + " (" + totalMB + "MB)"
-                       + " pieces");
-    System.out.println(peers + ": Download #" + downloaders
-                       + " Upload #" + uploaders
-                       + " Interested #" + interested
-                       + " Interesting #" + interesting
-                       + " Choking #" + choking
-                       + " Choked #" + choked);
-    System.out.println();
-
-    lastDownloaded = downloaded;
-    lastUploaded = uploaded;
-  }
-}

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

@@ -1,526 +0,0 @@
-/* PeerState - Keeps track of the Peer state through connection callbacks.
-   Copyright (C) 2003 Mark J. Wielaard
-
-   This file is part of Snark.
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
- 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
- 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-package org.klomp.snark;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.HashSet;
-
-import net.i2p.util.Log;
-
-class PeerState
-{
-  private Log _log = new Log(PeerState.class);
-  final Peer peer;
-  final PeerListener listener;
-  final MetaInfo metainfo;
-
-  // Interesting and choking describes whether we are interested in or
-  // are choking the other side.
-  boolean interesting = false;
-  boolean choking = true;
-
-  // Interested and choked describes whether the other side is
-  // interested in us or choked us.
-  boolean interested = false;
-  boolean choked = true;
-
-  // Package local for use by Peer.
-  long downloaded;
-  long uploaded;
-
-  BitField bitfield;
-
-  // Package local for use by Peer.
-  final PeerConnectionIn in;
-  final PeerConnectionOut out;
-
-  // Outstanding request
-  private final List outstandingRequests = new ArrayList();
-  private Request lastRequest = null;
-
-  // If we have te resend outstanding requests (true after we got choked).
-  private boolean resend = false;
-
-  private final static int MAX_PIPELINE = 1;
-  private final static int PARTSIZE = 64*1024; // default was 16K, i2p-bt uses 64KB
-
-  PeerState(Peer peer, PeerListener listener, MetaInfo metainfo,
-            PeerConnectionIn in, PeerConnectionOut out)
-  {
-    this.peer = peer;
-    this.listener = listener;
-    this.metainfo = metainfo;
-
-    this.in = in;
-    this.out = out;
-  }
-
-  // NOTE Methods that inspect or change the state synchronize (on this).
-
-  void keepAliveMessage()
-  {
-    if (_log.shouldLog(Log.DEBUG))
-        _log.debug(peer + " rcv alive");
-    /* XXX - ignored */
-  }
-
-  void chokeMessage(boolean choke)
-  {
-    if (_log.shouldLog(Log.DEBUG))
-        _log.debug(peer + " rcv " + (choke ? "" : "un") + "choked");
-
-    choked = choke;
-    if (choked)
-      resend = true;
-
-    listener.gotChoke(peer, choke);
-
-    if (!choked && interesting)
-      request();
-  }
-
-  void interestedMessage(boolean interest)
-  {
-    if (_log.shouldLog(Log.DEBUG))
-      _log.debug(peer + " rcv " + (interest ? "" : "un")
-                 + "interested");
-    interested = interest;
-    listener.gotInterest(peer, interest);
-  }
-
-  void haveMessage(int piece)
-  {
-    if (_log.shouldLog(Log.DEBUG))
-      _log.debug(peer + " rcv have(" + piece + ")");
-    // Sanity check
-    if (piece < 0 || piece >= metainfo.getPieces())
-      {
-        // XXX disconnect?
-        if (_log.shouldLog(Log.WARN))
-            _log.warn("Got strange 'have: " + piece + "' message from " + peer);
-        return;
-      }
-
-    synchronized(this)
-      {
-        // Can happen if the other side never send a bitfield message.
-        if (bitfield == null)
-          bitfield = new BitField(metainfo.getPieces());
-
-        bitfield.set(piece);
-      }
-
-    if (listener.gotHave(peer, piece))
-      setInteresting(true);
-  }
-
-  void bitfieldMessage(byte[] bitmap)
-  {
-    synchronized(this)
-      {
-        if (_log.shouldLog(Log.DEBUG))
-          _log.debug(peer + " rcv bitfield");
-        if (bitfield != null)
-          {
-            // XXX - Be liberal in what you except?
-            if (_log.shouldLog(Log.WARN))
-              _log.warn("Got unexpected bitfield message from " + peer);
-            return;
-          }
-        
-        // XXX - Check for weird bitfield and disconnect?
-        bitfield = new BitField(bitmap, metainfo.getPieces());
-      }
-    setInteresting(listener.gotBitField(peer, bitfield));
-  }
-
-  void requestMessage(int piece, int begin, int length)
-  {
-    if (_log.shouldLog(Log.DEBUG))
-      _log.debug(peer + " rcv request("
-                  + piece + ", " + begin + ", " + length + ") ");
-    if (choking)
-      {
-        if (_log.shouldLog(Log.INFO))
-          _log.info("Request received, but choking " + peer);
-        return;
-      }
-
-    // Sanity check
-    if (piece < 0
-        || piece >= metainfo.getPieces()
-        || begin < 0
-        || begin > metainfo.getPieceLength(piece)
-        || length <= 0
-        || length > 4*PARTSIZE)
-      {
-        // XXX - Protocol error -> disconnect?
-        if (_log.shouldLog(Log.WARN))
-          _log.warn("Got strange 'request: " + piece
-                      + ", " + begin
-                      + ", " + length
-                      + "' message from " + peer);
-        return;
-      }
-
-    byte[] pieceBytes = listener.gotRequest(peer, piece);
-    if (pieceBytes == null)
-      {
-        // XXX - Protocol error-> diconnect?
-        if (_log.shouldLog(Log.WARN))
-          _log.warn("Got request for unknown piece: " + piece);
-        return;
-      }
-
-    // More sanity checks
-    if (begin >= pieceBytes.length || begin + length > pieceBytes.length)
-      {
-        // XXX - Protocol error-> disconnect?
-        if (_log.shouldLog(Log.WARN))
-          _log.warn("Got out of range 'request: " + piece
-                      + ", " + begin
-                      + ", " + length
-                      + "' message from " + peer);
-        return;
-      }
-
-    if (_log.shouldLog(Log.INFO))
-      _log.info("Sending (" + piece + ", " + begin + ", "
-                + length + ")" + " to " + peer);
-    out.sendPiece(piece, begin, length, pieceBytes);
-  }
-
-  /**
-   * Called when some bytes have left the outgoing connection.
-   * XXX - Should indicate whether it was a real piece or overhead.
-   */
-  void uploaded(int size)
-  {
-    uploaded += size;
-    listener.uploaded(peer, size);
-  }
-
-  /**
-   * Called when a partial piece request has been handled by
-   * PeerConnectionIn.
-   */
-  void pieceMessage(Request req)
-  {
-    int size = req.len;
-    downloaded += size;
-    listener.downloaded(peer, size);
-
-    // Last chunk needed for this piece?
-    if (getFirstOutstandingRequest(req.piece) == -1)
-      {
-        if (listener.gotPiece(peer, req.piece, req.bs))
-          {
-            if (_log.shouldLog(Log.DEBUG))
-              _log.debug("Got " + req.piece + ": " + peer);
-          }
-        else
-          {
-            if (_log.shouldLog(Log.WARN))
-              _log.warn("Got BAD " + req.piece + " from " + peer);
-            // XXX ARGH What now !?!
-            downloaded = 0;
-          }
-      }
-  }
-
-  synchronized private int getFirstOutstandingRequest(int piece)
-  {
-    for (int i = 0; i < outstandingRequests.size(); i++)
-      if (((Request)outstandingRequests.get(i)).piece == piece)
-        return i;
-    return -1;
-  }
-
-  /**
-   * Called when a piece message is being processed by the incoming
-   * connection. Returns null when there was no such request. It also
-   * requeues/sends requests when it thinks that they must have been
-   * lost.
-   */
-  Request getOutstandingRequest(int piece, int begin, int length)
-  {
-    if (_log.shouldLog(Log.DEBUG))
-      _log.debug("getChunk("
-                  + piece + "," + begin + "," + length + ") "
-                  + peer);
-
-    int r = getFirstOutstandingRequest(piece);
-
-    // Unrequested piece number?
-    if (r == -1)
-      {
-        if (_log.shouldLog(Log.INFO))
-          _log.info("Unrequested 'piece: " + piece + ", "
-                      + begin + ", " + length + "' received from "
-                      + peer);
-        downloaded = 0; // XXX - punishment?
-        return null;
-      }
-
-    // Lookup the correct piece chunk request from the list.
-    Request req;
-    synchronized(this)
-      {
-        req = (Request)outstandingRequests.get(r);
-        while (req.piece == piece && req.off != begin
-               && r < outstandingRequests.size() - 1)
-          {
-            r++;
-            req = (Request)outstandingRequests.get(r);
-          }
-        
-        // Something wrong?
-        if (req.piece != piece || req.off != begin || req.len != length)
-          {
-            if (_log.shouldLog(Log.INFO))
-              _log.info("Unrequested or unneeded 'piece: "
-                          + piece + ", "
-                          + begin + ", "
-                          + length + "' received from "
-                          + peer);
-            downloaded = 0; // XXX - punishment?
-            return null;
-          }
-        
-        // Report missing requests.
-        if (r != 0)
-          {
-            if (_log.shouldLog(Log.WARN))
-              _log.warn("Some requests dropped, got " + req
-                               + ", wanted for peer: " + peer);
-            for (int i = 0; i < r; i++)
-              {
-                Request dropReq = (Request)outstandingRequests.remove(0);
-                outstandingRequests.add(dropReq);
-                // We used to rerequest the missing chunks but that mostly
-                // just confuses the other side. So now we just keep
-                // waiting for them. They will be rerequested when we get
-                // choked/unchoked again.
-                /*
-                  if (!choked)
-                  out.sendRequest(dropReq);
-                */
-                if (_log.shouldLog(Log.WARN))
-                  _log.warn("dropped " + dropReq + " with peer " + peer);
-              }
-          }
-        outstandingRequests.remove(0);
-      }
-
-    // Request more if necessary to keep the pipeline filled.
-    addRequest();
-
-    return req;
-
-  }
-
-  void cancelMessage(int piece, int begin, int length)
-  {
-    if (_log.shouldLog(Log.DEBUG))
-      _log.debug("Got cancel message ("
-                  + piece + ", " + begin + ", " + length + ")");
-    out.cancelRequest(piece, begin, length);
-  }
-
-  void unknownMessage(int type, byte[] bs)
-  {
-    if (_log.shouldLog(Log.WARN))
-      _log.warn("Warning: Ignoring unknown message type: " + type
-                  + " length: " + bs.length);
-  }
-
-  void havePiece(int piece)
-  {
-    if (_log.shouldLog(Log.DEBUG))
-      _log.debug("Tell " + peer + " havePiece(" + piece + ")");
-
-    synchronized(this)
-      {
-        // Tell the other side that we are no longer interested in any of
-        // the outstanding requests for this piece.
-        if (lastRequest != null && lastRequest.piece == piece)
-          lastRequest = null;
-        
-        Iterator it = outstandingRequests.iterator();
-        while (it.hasNext())
-          {
-            Request req = (Request)it.next();
-            if (req.piece == piece)
-              {
-                it.remove();
-                // Send cancel even when we are choked to make sure that it is
-                // really never ever send.
-                out.sendCancel(req);
-              }
-          }
-      }
-    
-    // Tell the other side that we really have this piece.
-    out.sendHave(piece);
-    
-    // Request something else if necessary.
-    addRequest();
-    
-    synchronized(this)
-      {
-        // Is the peer still interesting?
-        if (lastRequest == null)
-          setInteresting(false);
-      }
-  }
-
-  // Starts or resumes requesting pieces.
-  private void request()
-  {
-    // Are there outstanding requests that have to be resend?
-    if (resend)
-      {
-        synchronized (this) {
-            out.sendRequests(outstandingRequests);
-        }
-        resend = false;
-      }
-
-    // Add/Send some more requests if necessary.
-    addRequest();
-  }
-
-  /**
-   * Adds a new request to the outstanding requests list.
-   */
-  private void addRequest()
-  {
-    boolean more_pieces = true;
-    while (more_pieces)
-      {
-        synchronized(this)
-          {
-            more_pieces = outstandingRequests.size() < MAX_PIPELINE;
-          }
-        
-        // We want something and we don't have outstanding requests?
-        if (more_pieces && lastRequest == null)
-          more_pieces = requestNextPiece();
-        else if (more_pieces) // We want something
-          {
-            int pieceLength;
-            boolean isLastChunk;
-            synchronized(this)
-              {
-                pieceLength = metainfo.getPieceLength(lastRequest.piece);
-                isLastChunk = lastRequest.off + lastRequest.len == pieceLength;
-              }
-
-            // Last part of a piece?
-            if (isLastChunk)
-              more_pieces = requestNextPiece();
-            else
-              {
-                synchronized(this)
-                  {
-                    int nextPiece = lastRequest.piece;
-                    int nextBegin = lastRequest.off + PARTSIZE;
-                    byte[] bs = lastRequest.bs;
-                    int maxLength = pieceLength - nextBegin;
-                    int nextLength = maxLength > PARTSIZE ? PARTSIZE
-                                                          : maxLength;
-                    Request req
-                      = new Request(nextPiece, bs, nextBegin, nextLength);
-                    outstandingRequests.add(req);
-                    if (!choked)
-                      out.sendRequest(req);
-                    lastRequest = req;
-                  }
-              }
-          }
-      }
-
-    if (_log.shouldLog(Log.DEBUG))
-      _log.debug(peer + " requests " + outstandingRequests);
-  }
-
-  // Starts requesting first chunk of next piece. Returns true if
-  // something has been added to the requests, false otherwise.
-  private boolean requestNextPiece()
-  {
-    // Check that we already know what the other side has.
-    if (bitfield != null)
-      {
-        int nextPiece = listener.wantPiece(peer, bitfield);
-        if (_log.shouldLog(Log.DEBUG))
-          _log.debug(peer + " want piece " + nextPiece);
-        synchronized(this)
-          {
-            if (nextPiece != -1
-                && (lastRequest == null || lastRequest.piece != nextPiece))
-              {
-                int piece_length = metainfo.getPieceLength(nextPiece);
-                byte[] bs = new byte[piece_length];
-                
-                int length = Math.min(piece_length, PARTSIZE);
-                Request req = new Request(nextPiece, bs, 0, length);
-                outstandingRequests.add(req);
-                if (!choked)
-                  out.sendRequest(req);
-                lastRequest = req;
-                return true;
-              }
-          }
-      }
-
-    return false;
-  }
-
-  synchronized void setInteresting(boolean interest)
-  {
-    if (_log.shouldLog(Log.DEBUG))
-      _log.debug(peer + " setInteresting(" + interest + ")");
-
-    if (interest != interesting)
-      {
-        interesting = interest;
-        out.sendInterest(interest);
-
-        if (interesting && !choked)
-          request();
-      }
-  }
-
-  synchronized void setChoking(boolean choke)
-  {
-    if (_log.shouldLog(Log.DEBUG))
-      _log.debug(peer + " setChoking(" + choke + ")");
-
-    if (choking != choke)
-      {
-        choking = choke;
-        out.sendChoke(choke);
-      }
-  }
-}

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

@@ -1,42 +0,0 @@
-package org.klomp.snark;
-
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Collections;
-
-public class Piece implements Comparable {
-
-    private int id;
-    private Set peers;
-    private boolean requested;
-    
-    public Piece(int id) {
-        this.id = id;
-        this.peers = Collections.synchronizedSet(new HashSet());
-        this.requested = false;
-    }
-    
-    public int compareTo(Object o) throws ClassCastException {
-        return this.peers.size() - ((Piece)o).peers.size();
-    }
-    
-    public boolean equals(Object o) {
-        if (o == null) return false;
-        try {
-            return this.id == ((Piece)o).id;
-        } catch (ClassCastException cce) {
-            return false;
-        }
-    }
-    
-    public int getId() { return this.id; }
-    public Set getPeers() { return this.peers; }
-    public boolean addPeer(Peer peer) { return this.peers.add(peer.getPeerID()); }
-    public boolean removePeer(Peer peer) { return this.peers.remove(peer.getPeerID()); }
-    public boolean isRequested() { return this.requested; }
-    public void setRequested(boolean requested) { this.requested = requested; } 
-    
-    public String toString() {
-        return String.valueOf(id);
-    }
-}

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

@@ -1,73 +0,0 @@
-/* Request - Holds all information needed for a (partial) piece request.
-   Copyright (C) 2003 Mark J. Wielaard
-
-   This file is part of Snark.
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
- 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
- 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-package org.klomp.snark;
-
-/**
- * Holds all information needed for a partial piece request.
- */
-class Request
-{
-  final int piece;
-  final byte[] bs;
-  final int off;
-  final int len;
-
-  /**
-   * Creates a new Request.
-   *
-   * @param piece Piece number requested.
-   * @param bs byte array where response should be stored.
-   * @param off the offset in the array.
-   * @param len the number of bytes requested.
-   */
-  Request(int piece, byte[] bs, int off, int len)
-  {
-    this.piece = piece;
-    this.bs = bs;
-    this.off = off;
-    this.len = len;
-
-    // Sanity check
-    if (piece < 0 || off < 0 || len <= 0 || off + len > bs.length)
-      throw new IndexOutOfBoundsException("Illegal Request " + toString());
-  }
-
-  public int hashCode()
-  {
-    return piece ^ off ^ len;
-  }
-
-  public boolean equals(Object o)
-  {
-    if (o instanceof Request)
-      {
-        Request req = (Request)o;
-        return req.piece == piece && req.off == off && req.len == len;
-      }
-
-    return false;
-  }
-
-  public String toString()
-  {
-    return "(" + piece + "," + off + "," + len + ")";
-  }
-}

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

@@ -1,34 +0,0 @@
-/* ShutdownListener - Callback for end of shutdown sequence
-   
-   Copyright (C) 2003 Mark J. Wielaard
-
-   This file is part of Snark.
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
- 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
- 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-package org.klomp.snark;
-
-/**
- * Callback for end of shutdown sequence.
- */
-interface ShutdownListener
-{
-  /**
-   * Called when the SnarkShutdown hook has finished shutting down all
-   * subcomponents.
-   */
-  void shutdown();
-}

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

@@ -1,706 +0,0 @@
-/* Snark - Main snark program startup class.
-   Copyright (C) 2003 Mark J. Wielaard
-
-   This file is part of Snark.
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
- 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
- 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-package org.klomp.snark;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import org.klomp.snark.bencode.*;
-
-import net.i2p.data.Destination;
-import net.i2p.client.streaming.I2PSocket;
-import net.i2p.client.streaming.I2PServerSocket;
-import net.i2p.util.I2PThread;
-
-/**
- * Main Snark program startup class.
- *
- * @author Mark Wielaard (mark@klomp.org)
- */
-public class Snark
-  implements StorageListener, CoordinatorListener, ShutdownListener
-{
-  private final static int MIN_PORT = 6881;
-  private final static int MAX_PORT = 6889;
-
-  // Error messages (non-fatal)
-  public final static int ERROR   = 1;
-
-  // Warning messages
-  public final static int WARNING = 2;
-
-  // Notices (peer level)
-  public final static int NOTICE  = 3;
-
-  // Info messages (protocol policy level)
-  public final static int INFO    = 4;
-
-  // Debug info (protocol level)
-  public final static int DEBUG   = 5;
-
-  // Very low level stuff (network level)
-  public final static int ALL     = 6;
-
-  /**
-   * What level of debug info to show.
-   */
-  public static int debug = NOTICE;
-
-  // Whether or not to ask the user for commands while sharing
-  private static boolean command_interpreter = true;
-
-  private static final String newline = System.getProperty("line.separator");
-
-  private static final String copyright =
-  "The Hunting of the Snark Project - Copyright (C) 2003 Mark J. Wielaard"
-  + newline + newline
-  + "Snark comes with ABSOLUTELY NO WARRANTY.  This is free software, and"
-  + newline
-  + "you are welcome to redistribute it under certain conditions; read the"
-  + newline
-  + "COPYING file for details." + newline + newline
-  + "This is the I2P port, allowing anonymous bittorrent (http://www.i2p.net/)" + newline
-  + "It will not work with normal torrents, so don't even try ;)";
-  
-  private static final String usage =
-  "Press return for help. Type \"quit\" and return to stop.";
-  private static final String help =
-  "Commands: 'info', 'list', 'quit'.";
-
-  // String indicating main activity
-  String activity = "Not started";
-  
-  private static class OOMListener implements I2PThread.OOMEventListener {
-      public void outOfMemory(OutOfMemoryError err) {
-          try {
-              err.printStackTrace();
-              I2PSnarkUtil.instance().debug("OOM in the snark", Snark.ERROR, err);
-          } catch (Throwable t) {
-              System.out.println("OOM in the OOM");
-          }
-          System.exit(0);
-      }
-      
-  }
-  
-  public static void main(String[] args)
-  {
-    System.out.println(copyright);
-    System.out.println();
-
-    if ( (args.length > 0) && ("--config".equals(args[0])) ) {
-        I2PThread.addOOMEventListener(new OOMListener());
-        SnarkManager sm = SnarkManager.instance();
-        if (args.length > 1)
-            sm.loadConfig(args[1]);
-        System.out.println("Running in multitorrent mode");
-        while (true) {
-            try {
-                synchronized (sm) {
-                    sm.wait();
-                }
-            } catch (InterruptedException ie) {}
-        }
-    }
-    
-    // Parse debug, share/ip and torrent file options.
-    Snark snark = parseArguments(args);
-
-    SnarkShutdown snarkhook
-      = new SnarkShutdown(snark.storage,
-                          snark.coordinator,
-                          snark.acceptor,
-                          snark.trackerclient,
-                          snark);
-    //Runtime.getRuntime().addShutdownHook(snarkhook);
-
-    Timer timer = new Timer(true);
-    TimerTask monitor = new PeerMonitorTask(snark.coordinator);
-    timer.schedule(monitor,
-                   PeerMonitorTask.MONITOR_PERIOD,
-                   PeerMonitorTask.MONITOR_PERIOD);
-
-    // Start command interpreter
-    if (Snark.command_interpreter)
-      {
-        boolean quit = false;
-        
-        System.out.println();
-        System.out.println(usage);
-        System.out.println();
-        
-        try
-          {
-            BufferedReader br = new BufferedReader
-              (new InputStreamReader(System.in));
-            String line = br.readLine();
-            while(!quit && line != null)
-              {
-                line = line.toLowerCase();
-                if ("quit".equals(line))
-                  quit = true;
-                else if ("list".equals(line))
-                  {
-                    synchronized(snark.coordinator.peers)
-                      {
-                        System.out.println(snark.coordinator.peers.size()
-                                           + " peers -"
-                                           + " (i)nterested,"
-                                           + " (I)nteresting,"
-                                           + " (c)hoking,"
-                                           + " (C)hoked:");
-                        Iterator it = snark.coordinator.peers.iterator();
-                        while (it.hasNext())
-                          {
-                            Peer peer = (Peer)it.next();
-                            System.out.println(peer);
-                            System.out.println("\ti: " + peer.isInterested()
-                                               + " I: " + peer.isInteresting()
-                                               + " c: " + peer.isChoking()
-                                               + " C: " + peer.isChoked());
-                          }
-                      }
-                  }
-                else if ("info".equals(line))
-                  {
-                    System.out.println("Name: " + snark.meta.getName());
-                    System.out.println("Torrent: " + snark.torrent);
-                    System.out.println("Tracker: " + snark.meta.getAnnounce());
-                    List files = snark.meta.getFiles();
-                    System.out.println("Files: "
-                                       + ((files == null) ? 1 : files.size()));
-                    System.out.println("Pieces: " + snark.meta.getPieces());
-                    System.out.println("Piece size: "
-                                       + snark.meta.getPieceLength(0) / 1024
-                                       + " KB");
-                    System.out.println("Total size: "
-                                       + snark.meta.getTotalLength() / (1024 * 1024)
-                                       + " MB");
-                  }
-                else if ("".equals(line) || "help".equals(line))
-                  {
-                    System.out.println(usage);
-                    System.out.println(help);
-                  }
-                else
-                  {
-                    System.out.println("Unknown command: " + line);
-                    System.out.println(usage);
-                  }
-                
-                if (!quit)
-                  {
-                    System.out.println();
-                    line = br.readLine();
-                  }
-              }
-          }
-        catch(IOException ioe)
-          {
-            debug("ERROR while reading stdin: " + ioe, ERROR);
-          }
-        
-        // Explicit shutdown.
-        Runtime.getRuntime().removeShutdownHook(snarkhook);
-        snarkhook.start();
-      }
-  }
-
-  public String torrent;
-  public MetaInfo meta;
-  public Storage storage;
-  public PeerCoordinator coordinator;
-  public ConnectionAcceptor acceptor;
-  public TrackerClient trackerclient;
-  public String rootDataDir = ".";
-  public CompleteListener completeListener;
-  public boolean stopped;
-
-  Snark(String torrent, String ip, int user_port,
-        StorageListener slistener, CoordinatorListener clistener) { 
-    this(torrent, ip, user_port, slistener, clistener, true, "."); 
-  }
-  Snark(String torrent, String ip, int user_port,
-        StorageListener slistener, CoordinatorListener clistener, boolean start, String rootDir)
-  {
-    if (slistener == null)
-      slistener = this;
-
-    if (clistener == null)
-      clistener = this;
-
-    this.torrent = torrent;
-    this.rootDataDir = rootDir;
-
-    stopped = true;
-    activity = "Network setup";
-
-    // "Taking Three as the subject to reason about--
-    // A convenient number to state--
-    // We add Seven, and Ten, and then multiply out
-    // By One Thousand diminished by Eight.
-    //
-    // "The result we proceed to divide, as you see,
-    // By Nine Hundred and Ninety Two:
-    // Then subtract Seventeen, and the answer must be
-    // Exactly and perfectly true.
-
-    // Create a new ID and fill it with something random.  First nine
-    // zeros bytes, then three bytes filled with snark and then
-    // sixteen random bytes.
-    byte snark = (((3 + 7 + 10) * (1000 - 8)) / 992) - 17;
-    byte[] id = new byte[20];
-    Random random = new Random();
-    int i;
-    for (i = 0; i < 9; i++)
-      id[i] = 0;
-    id[i++] = snark;
-    id[i++] = snark;
-    id[i++] = snark;
-    while (i < 20)
-      id[i++] = (byte)random.nextInt(256);
-
-    Snark.debug("My peer id: " + PeerID.idencode(id), Snark.INFO);
-
-    int port;
-    IOException lastException = null;
-    boolean ok = I2PSnarkUtil.instance().connect();
-    if (!ok) fatal("Unable to connect to I2P");
-    I2PServerSocket serversocket = I2PSnarkUtil.instance().getServerSocket();
-    if (serversocket == null)
-        fatal("Unable to listen for I2P connections");
-    else {
-        Destination d = serversocket.getManager().getSession().getMyDestination();
-        debug("Listening on I2P destination " + d.toBase64() + " / " + d.calculateHash().toBase64(), NOTICE);
-    }
-
-    // Figure out what the torrent argument represents.
-    meta = null;
-    File f = null;
-    try
-      {
-        InputStream in = null;
-        f = new File(torrent);
-        if (f.exists())
-          in = new FileInputStream(f);
-        else
-          {
-            activity = "Getting torrent";
-            File torrentFile = I2PSnarkUtil.instance().get(torrent);
-            if (torrentFile == null) {
-                fatal("Unable to fetch " + torrent);
-                if (false) return; // never reached - fatal(..) throws
-            } else {
-                torrentFile.deleteOnExit();
-                in = new FileInputStream(torrentFile);
-            }
-          }
-        meta = new MetaInfo(new BDecoder(in));
-      }
-    catch(IOException ioe)
-      {
-        // OK, so it wasn't a torrent metainfo file.
-        if (f != null && f.exists())
-          if (ip == null)
-            fatal("'" + torrent + "' exists,"
-                  + " but is not a valid torrent metainfo file."
-                  + System.getProperty("line.separator"), ioe);
-                 else
-            fatal("I2PSnark does not support creating and tracking a torrent at the moment");
-        /*
-            {
-              // Try to create a new metainfo file
-             Snark.debug
-               ("Trying to create metainfo torrent for '" + torrent + "'",
-                NOTICE);
-             try
-               {
-                 activity = "Creating torrent";
-                 storage = new Storage
-                   (f, "http://" + ip + ":" + port + "/announce", slistener);
-                 storage.create();
-                 meta = storage.getMetaInfo();
-               }
-             catch (IOException ioe2)
-               {
-                 fatal("Could not create torrent for '" + torrent + "'", ioe2);
-               }
-            }
-         */
-        else
-          fatal("Cannot open '" + torrent + "'", ioe);
-      }
-    
-    debug(meta.toString(), INFO);
-    
-    // When the metainfo torrent was created from an existing file/dir
-    // it already exists.
-    if (storage == null)
-      {
-        try
-          {
-            activity = "Checking storage";
-            storage = new Storage(meta, slistener);
-            storage.check(rootDataDir);
-          }
-        catch (IOException ioe)
-          {
-            try { storage.close(); } catch (IOException ioee) {
-                ioee.printStackTrace();
-            }
-            fatal("Could not create storage", ioe);
-          }
-      }
-
-    activity = "Collecting pieces";
-    coordinator = new PeerCoordinator(id, meta, storage, clistener, this);
-    PeerCoordinatorSet set = PeerCoordinatorSet.instance();
-    set.add(coordinator);
-    ConnectionAcceptor acceptor = ConnectionAcceptor.instance();
-    acceptor.startAccepting(set, serversocket);
-    
-    trackerclient = new TrackerClient(meta, coordinator);
-    if (start)
-        startTorrent();
-  }
-  /**
-   * Start up contacting peers and querying the tracker
-   */
-  public void startTorrent() {
-    stopped = false;
-    boolean coordinatorChanged = false;
-    if (coordinator.halted()) {
-        // ok, we have already started and stopped, but the coordinator seems a bit annoying to
-        // restart safely, so lets build a new one to replace the old
-        PeerCoordinatorSet set = PeerCoordinatorSet.instance();
-        set.remove(coordinator);
-        PeerCoordinator newCoord = new PeerCoordinator(coordinator.getID(), coordinator.getMetaInfo(), 
-                                                       coordinator.getStorage(), coordinator.getListener(), this);
-        set.add(newCoord);
-        coordinator = newCoord;
-        coordinatorChanged = true;
-    }
-    if (!trackerclient.started() && !coordinatorChanged) {
-        trackerclient.start();
-    } else if (trackerclient.halted() || coordinatorChanged) {
-        TrackerClient newClient = new TrackerClient(coordinator.getMetaInfo(), coordinator);
-        if (!trackerclient.halted())
-            trackerclient.halt();
-        trackerclient = newClient;
-        trackerclient.start();
-    }
-  }
-  /**
-   * Stop contacting the tracker and talking with peers
-   */
-  public void stopTorrent() {
-    stopped = true;
-    TrackerClient tc = trackerclient;
-    if (tc != null)
-        tc.halt();
-    PeerCoordinator pc = coordinator;
-    if (pc != null)
-        pc.halt();
-    Storage st = storage;
-    if (st != null) {
-        try { 
-            storage.close(); 
-        } catch (IOException ioe) {
-            System.out.println("Error closing " + torrent);
-            ioe.printStackTrace();
-        }
-    }
-    if (pc != null)
-        PeerCoordinatorSet.instance().remove(pc);
-  }
-
-  static Snark parseArguments(String[] args)
-  {
-    return parseArguments(args, null, null);
-  }
-
-  /**
-   * Sets debug, ip and torrent variables then creates a Snark
-   * instance.  Calls usage(), which terminates the program, if
-   * non-valid argument list.  The given listeners will be
-   * passed to all components that take one.
-   */
-  static Snark parseArguments(String[] args,
-                              StorageListener slistener,
-                              CoordinatorListener clistener)
-  {
-    int user_port = -1;
-    String ip = null;
-    String torrent = null;
-
-    boolean configured = I2PSnarkUtil.instance().configured();
-    
-    int i = 0;
-    while (i < args.length)
-      {
-        if (args[i].equals("--debug"))
-          {
-            debug = INFO;
-            i++;
-
-            // Try if there is an level argument.
-            if (i < args.length)
-              {
-                try
-                  {
-                    int level = Integer.parseInt(args[i]);
-                    if (level >= 0)
-                      {
-                        debug = level;
-                        i++;
-                      }
-                  }
-                catch (NumberFormatException nfe) { }
-              }
-          }
-        else if (args[i].equals("--port"))
-          {
-            if (args.length - 1 < i + 1)
-              usage("--port needs port number to listen on");
-            try
-              {
-                user_port = Integer.parseInt(args[i + 1]);
-              }
-            catch (NumberFormatException nfe)
-              {
-                usage("--port argument must be a number (" + nfe + ")");
-              }
-            i += 2;
-          }
-        else if (args[i].equals("--no-commands"))
-          {
-            command_interpreter = false;
-            i++;
-          }
-        else if (args[i].equals("--eepproxy"))
-          {
-            String proxyHost = args[i+1];
-            String proxyPort = args[i+2];
-            if (!configured)
-                I2PSnarkUtil.instance().setProxy(proxyHost, Integer.parseInt(proxyPort));
-            i += 3;
-          }
-        else if (args[i].equals("--i2cp"))
-          {
-            String i2cpHost = args[i+1];
-            String i2cpPort = args[i+2];
-            Properties opts = null;
-            if (i+3 < args.length) {
-                if (!args[i+3].startsWith("--")) {
-                    opts = new Properties();
-                    StringTokenizer tok = new StringTokenizer(args[i+3], " \t");
-                    while (tok.hasMoreTokens()) {
-                        String str = tok.nextToken();
-                        int split = str.indexOf('=');
-                        if (split > 0) {
-                            opts.setProperty(str.substring(0, split), str.substring(split+1));
-                        }
-                    }
-                }
-            }
-            if (!configured)
-                I2PSnarkUtil.instance().setI2CPConfig(i2cpHost, Integer.parseInt(i2cpPort), opts);
-            i += 3 + (opts != null ? 1 : 0);
-          }
-        else
-          {
-            torrent = args[i];
-            i++;
-            break;
-          }
-      }
-
-    if (torrent == null || i != args.length)
-      if (torrent != null && torrent.startsWith("-"))
-        usage("Unknow option '" + torrent + "'.");
-      else
-        usage("Need exactly one <url>, <file> or <dir>.");
-
-    return new Snark(torrent, ip, user_port, slistener, clistener);
-  }
-  
-  private static void usage(String s)
-  {
-    System.out.println("snark: " + s);
-    usage();
-  }
-
-  private static void usage()
-  {
-    System.out.println
-      ("Usage: snark [--debug [level]] [--no-commands] [--port <port>]");
-    System.out.println
-      ("             [--eepproxy hostname portnum]");
-    System.out.println
-      ("             [--i2cp routerHost routerPort ['name=val name=val name=val']]");
-    System.out.println
-      ("             (<url>|<file>)");
-    System.out.println
-      ("  --debug\tShows some extra info and stacktraces");
-    System.out.println
-      ("    level\tHow much debug details to show");
-    System.out.println
-      ("         \t(defaults to "
-       + NOTICE + ", with --debug to "
-       + INFO + ", highest level is "
-       + ALL + ").");
-    System.out.println
-      ("  --no-commands\tDon't read interactive commands or show usage info.");
-    System.out.println
-      ("  --port\tThe port to listen on for incomming connections");
-    System.out.println
-      ("        \t(if not given defaults to first free port between "
-       + MIN_PORT + "-" + MAX_PORT + ").");
-    System.out.println
-      ("  --share\tStart torrent tracker on <ip> address or <host> name.");
-    System.out.println
-      ("  --eepproxy\thttp proxy to use (default of 127.0.0.1 port 4444)");
-    System.out.println
-      ("  --i2cp\tlocation of your I2P router (default of 127.0.0.1 port 7654)");
-    System.out.println
-      ("        \toptional settings may be included, such as");
-    System.out.println
-      ("        \tinbound.length=2 outbound.length=2 inbound.lengthVariance=-1 ");
-    System.out.println
-      ("  <url>  \tURL pointing to .torrent metainfo file to download/share.");
-    System.out.println
-      ("  <file> \tEither a local .torrent metainfo file to download");
-    System.out.println
-      ("         \tor (with --share) a file to share.");
-    System.exit(-1);
-  }
-
-  /**
-   * Aborts program abnormally.
-   */
-  public void fatal(String s)
-  {
-    fatal(s, null);
-  }
-
-  /**
-   * Aborts program abnormally.
-   */
-  public void fatal(String s, Throwable t)
-  {
-    I2PSnarkUtil.instance().debug(s, ERROR, t);
-    //System.err.println("snark: " + s + ((t == null) ? "" : (": " + t)));
-    //if (debug >= INFO && t != null)
-    //  t.printStackTrace();
-    stopTorrent();
-    throw new RuntimeException("die bart die");
-  }
-
-  /**
-   * Show debug info if debug is true.
-   */
-  public static void debug(String s, int level)
-  {
-    I2PSnarkUtil.instance().debug(s, level, null);
-    //if (debug >= level)
-    //  System.out.println(s);
-  }
-
-  public void peerChange(PeerCoordinator coordinator, Peer peer)
-  {
-    // System.out.println(peer.toString());
-  }
-  
-  boolean allocating = false;
-  public void storageCreateFile(Storage storage, String name, long length)
-  {
-    //if (allocating)
-    //  System.out.println(); // Done with last file.
-
-    //System.out.print("Creating file '" + name
-    //                 + "' of length " + length + ": ");
-    allocating = true;
-  }
-
-  // How much storage space has been allocated
-  private long allocated = 0;
-
-  public void storageAllocated(Storage storage, long length)
-  {
-    allocating = true;
-    //System.out.print(".");
-    allocated += length;
-    //if (allocated == meta.getTotalLength())
-    //  System.out.println(); // We have all the disk space we need.
-  }
-
-  boolean allChecked = false;
-  boolean checking = false;
-  boolean prechecking = true;
-  public void storageChecked(Storage storage, int num, boolean checked)
-  {
-    allocating = false;
-    if (!allChecked && !checking)
-      {
-        // Use the MetaInfo from the storage since our own might not
-        // yet be setup correctly.
-        MetaInfo meta = storage.getMetaInfo();
-        //if (meta != null)
-        //  System.out.print("Checking existing "
-        //                   + meta.getPieces()
-        //                   + " pieces: ");
-        checking = true;
-      }
-    if (!checking)
-      Snark.debug("Got " + (checked ? "" : "BAD ") + "piece: " + num,
-                  Snark.INFO);
-  }
-
-  public void storageAllChecked(Storage storage)
-  {
-    //if (checking)
-    //  System.out.println();
-
-    allChecked = true;
-    checking = false;
-  }
-  
-  public void storageCompleted(Storage storage)
-  {
-    Snark.debug("Completely received " + torrent, Snark.INFO);
-    //storage.close();
-    //System.out.println("Completely received: " + torrent);
-    if (completeListener != null)
-        completeListener.torrentComplete(this);
-  }
-
-  public void shutdown()
-  {
-    // Should not be necessary since all non-deamon threads should
-    // have died. But in reality this does not always happen.
-    System.exit(0);
-  }
-  
-  public interface CompleteListener {
-    public void torrentComplete(Snark snark);
-  }
-}

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

@@ -1,506 +0,0 @@
-package org.klomp.snark;
-
-import java.io.*;
-import java.util.*;
-import net.i2p.I2PAppContext;
-import net.i2p.data.DataHelper;
-import net.i2p.util.I2PThread;
-import net.i2p.util.Log;
-
-/**
- * Manage multiple snarks
- */
-public class SnarkManager implements Snark.CompleteListener {
-    private static SnarkManager _instance = new SnarkManager();
-    public static SnarkManager instance() { return _instance; }
-    
-    /** map of (canonical) filename to Snark instance (unsynchronized) */
-    private Map _snarks;
-    private String _configFile;
-    private Properties _config;
-    private I2PAppContext _context;
-    private Log _log;
-    private List _messages;
-    
-    public static final String PROP_I2CP_HOST = "i2psnark.i2cpHost";
-    public static final String PROP_I2CP_PORT = "i2psnark.i2cpPort";
-    public static final String PROP_I2CP_OPTS = "i2psnark.i2cpOptions";
-    public static final String PROP_EEP_HOST = "i2psnark.eepHost";
-    public static final String PROP_EEP_PORT = "i2psnark.eepPort";
-    public static final String PROP_DIR = "i2psnark.dir";
-
-    public static final String PROP_AUTO_START = "i2snark.autoStart";
-    public static final String DEFAULT_AUTO_START = "false";
-    
-    private SnarkManager() {
-        _snarks = new HashMap();
-        _context = I2PAppContext.getGlobalContext();
-        _log = _context.logManager().getLog(SnarkManager.class);
-        _messages = new ArrayList(16);
-        loadConfig("i2psnark.config");
-        int minutes = getStartupDelayMinutes();
-        _messages.add("Starting up torrents in " + minutes + (minutes == 1 ? " minute" : " minutes"));
-        I2PThread monitor = new I2PThread(new DirMonitor(), "Snark DirMonitor");
-        monitor.setDaemon(true);
-        monitor.start();
-    }
-    
-    private static final int MAX_MESSAGES = 5;
-    public void addMessage(String message) {
-        synchronized (_messages) {
-            _messages.add(message);
-            while (_messages.size() > MAX_MESSAGES)
-                _messages.remove(0);
-        }
-        if (_log.shouldLog(Log.INFO))
-            _log.info("MSG: " + message);
-    }
-    
-    /** newest last */
-    public List getMessages() {
-        synchronized (_messages) {
-            return new ArrayList(_messages);
-        }
-    }
-    
-    public boolean shouldAutoStart() {
-        return Boolean.valueOf(_config.getProperty(PROP_AUTO_START, DEFAULT_AUTO_START+"")).booleanValue();
-    }
-    private int getStartupDelayMinutes() { return 1; }
-    public File getDataDir() { 
-        String dir = _config.getProperty(PROP_DIR);
-        if ( (dir == null) || (dir.trim().length() <= 0) )
-            dir = "i2psnark";
-        return new File(dir); 
-    }
-    
-    public void loadConfig(String filename) {
-        _configFile = filename;
-        if (_config == null)
-            _config = new Properties();
-        File cfg = new File(filename);
-        if (cfg.exists()) {
-            try {
-                DataHelper.loadProps(_config, cfg);
-            } catch (IOException ioe) {
-                _log.error("Error loading I2PSnark config '" + filename + "'", ioe);
-            }
-        } 
-        // now add sane defaults
-        if (!_config.containsKey(PROP_I2CP_HOST))
-            _config.setProperty(PROP_I2CP_HOST, "localhost");
-        if (!_config.containsKey(PROP_I2CP_PORT))
-            _config.setProperty(PROP_I2CP_PORT, "7654");
-        if (!_config.containsKey(PROP_EEP_HOST))
-            _config.setProperty(PROP_EEP_HOST, "localhost");
-        if (!_config.containsKey(PROP_EEP_PORT))
-            _config.setProperty(PROP_EEP_PORT, "4444");
-        if (!_config.containsKey(PROP_DIR))
-            _config.setProperty(PROP_DIR, "i2psnark");
-        if (!_config.containsKey(PROP_AUTO_START))
-            _config.setProperty(PROP_AUTO_START, DEFAULT_AUTO_START);
-        updateConfig();
-    }
-    
-    private void updateConfig() {
-        String i2cpHost = _config.getProperty(PROP_I2CP_HOST);
-        int i2cpPort = getInt(PROP_I2CP_PORT, 7654);
-        String opts = _config.getProperty(PROP_I2CP_OPTS);
-        Map i2cpOpts = new HashMap();
-        if (opts != null) {
-            StringTokenizer tok = new StringTokenizer(opts, " ");
-            while (tok.hasMoreTokens()) {
-                String pair = tok.nextToken();
-                int split = pair.indexOf('=');
-                if (split > 0)
-                    i2cpOpts.put(pair.substring(0, split), pair.substring(split+1));
-            }
-        }
-        if (i2cpHost != null) {
-            I2PSnarkUtil.instance().setI2CPConfig(i2cpHost, i2cpPort, i2cpOpts);
-            _log.debug("Configuring with I2CP options " + i2cpOpts);
-        }
-        //I2PSnarkUtil.instance().setI2CPConfig("66.111.51.110", 7654, new Properties());
-        String eepHost = _config.getProperty(PROP_EEP_HOST);
-        int eepPort = getInt(PROP_EEP_PORT, 4444);
-        if (eepHost != null)
-            I2PSnarkUtil.instance().setProxy(eepHost, eepPort);
-        getDataDir().mkdirs();
-    }
-    
-    private int getInt(String prop, int defaultVal) {
-        String p = _config.getProperty(prop);
-        try {
-            if ( (p != null) && (p.trim().length() > 0) )
-                return  Integer.parseInt(p.trim());
-        } catch (NumberFormatException nfe) {
-            // ignore
-        }
-        return defaultVal;
-    }
-    
-    public void updateConfig(String dataDir, boolean autoStart, String seedPct, String eepHost, 
-                             String eepPort, String i2cpHost, String i2cpPort, String i2cpOpts) {
-        boolean changed = false;
-        if (eepHost != null) {
-            int port = I2PSnarkUtil.instance().getEepProxyPort();
-            try { port = Integer.parseInt(eepPort); } catch (NumberFormatException nfe) {}
-            String host = I2PSnarkUtil.instance().getEepProxyHost();
-            if ( (eepHost.trim().length() > 0) && (port > 0) &&
-                 ((!host.equals(eepHost) || (port != I2PSnarkUtil.instance().getEepProxyPort()) )) ) {
-                I2PSnarkUtil.instance().setProxy(eepHost, port);
-                changed = true;
-                _config.setProperty(PROP_EEP_HOST, eepHost);
-                _config.setProperty(PROP_EEP_PORT, eepPort+"");
-                addMessage("EepProxy location changed to " + eepHost + ":" + port);
-            }
-        }
-        if (i2cpHost != null) {
-            int oldI2CPPort = I2PSnarkUtil.instance().getI2CPPort();
-            String oldI2CPHost = I2PSnarkUtil.instance().getI2CPHost();
-            int port = oldI2CPPort;
-            try { port = Integer.parseInt(i2cpPort); } catch (NumberFormatException nfe) {}
-            String host = oldI2CPHost;
-            Map opts = new HashMap();
-            if (i2cpOpts == null) i2cpOpts = "";
-            StringTokenizer tok = new StringTokenizer(i2cpOpts, " \t\n");
-            while (tok.hasMoreTokens()) {
-                String pair = tok.nextToken();
-                int split = pair.indexOf('=');
-                if (split > 0)
-                    opts.put(pair.substring(0, split), pair.substring(split+1));
-            }
-            Map oldOpts = new HashMap();
-            String oldI2CPOpts = _config.getProperty(PROP_I2CP_OPTS);
-            if (oldI2CPOpts == null) oldI2CPOpts = "";
-            tok = new StringTokenizer(oldI2CPOpts, " \t\n");
-            while (tok.hasMoreTokens()) {
-                String pair = tok.nextToken();
-                int split = pair.indexOf('=');
-                if (split > 0)
-                    oldOpts.put(pair.substring(0, split), pair.substring(split+1));
-            }
-            
-            if ( (i2cpHost.trim().length() > 0) && (port > 0) &&
-                 ((!host.equals(i2cpHost) || 
-                  (port != I2PSnarkUtil.instance().getI2CPPort()) ||
-                  (!oldOpts.equals(opts)))) ) {
-                boolean snarksActive = false;
-                Set names = listTorrentFiles();
-                for (Iterator iter = names.iterator(); iter.hasNext(); ) {
-                    Snark snark = getTorrent((String)iter.next());
-                    if ( (snark != null) && (!snark.stopped) ) {
-                        snarksActive = true;
-                        break;
-                    }
-                }
-                if (snarksActive) {
-                    addMessage("Cannot change the I2CP settings while torrents are active");
-                    _log.debug("i2cp host [" + i2cpHost + "] i2cp port " + port + " opts [" + opts 
-                               + "] oldOpts [" + oldOpts + "]");
-                } else {
-                    if (I2PSnarkUtil.instance().connected()) {
-                        I2PSnarkUtil.instance().disconnect();
-                        addMessage("Disconnecting old I2CP destination");
-                    }
-                    Properties p = new Properties();
-                    p.putAll(opts);
-                    addMessage("I2CP settings changed to " + i2cpHost + ":" + port + " (" + i2cpOpts.trim() + ")");
-                    I2PSnarkUtil.instance().setI2CPConfig(i2cpHost, port, p);
-                    boolean ok = I2PSnarkUtil.instance().connect();
-                    if (!ok) {
-                        addMessage("Unable to connect with the new settings, reverting to the old I2CP settings");
-                        I2PSnarkUtil.instance().setI2CPConfig(oldI2CPHost, oldI2CPPort, oldOpts);
-                        ok = I2PSnarkUtil.instance().connect();
-                        if (!ok)
-                            addMessage("Unable to reconnect with the old settings!");
-                    } else {
-                        addMessage("Reconnected on the new I2CP destination");
-                        _config.setProperty(PROP_I2CP_HOST, i2cpHost.trim());
-                        _config.setProperty(PROP_I2CP_PORT, "" + port);
-                        _config.setProperty(PROP_I2CP_OPTS, i2cpOpts.trim());
-                        changed = true;
-                        // no PeerAcceptors/I2PServerSockets to deal with, since all snarks are inactive
-                        for (Iterator iter = names.iterator(); iter.hasNext(); ) {
-                            String name = (String)iter.next();
-                            Snark snark = getTorrent(name);
-                            if ( (snark != null) && (snark.acceptor != null) ) {
-                                snark.acceptor.restart();
-                                addMessage("I2CP listener restarted for " + snark.meta.getName());
-                            }
-                        }
-                    }
-                }
-                changed = true;
-            }
-        }
-        if (shouldAutoStart() != autoStart) {
-            _config.setProperty(PROP_AUTO_START, autoStart + "");
-            addMessage("Adjusted autostart to " + autoStart);
-            changed = true;
-        }
-        if (changed) {
-            saveConfig();
-        } else {
-            addMessage("Configuration unchanged");
-        }
-    }
-    
-    public void saveConfig() {
-        try {
-            DataHelper.storeProps(_config, new File(_configFile));
-        } catch (IOException ioe) {
-            addMessage("Unable to save the config to '" + _configFile + "'");
-        }
-    }
-    
-    public Properties getConfig() { return _config; }
-    
-    /** hardcoded for sanity.  perhaps this should be customizable, for people who increase their ulimit, etc. */
-    private static final int MAX_FILES_PER_TORRENT = 128;
-    
-    /** set of filenames that we are dealing with */
-    public Set listTorrentFiles() { synchronized (_snarks) { return new HashSet(_snarks.keySet()); } }
-    /**
-     * Grab the torrent given the (canonical) filename
-     */
-    public Snark getTorrent(String filename) { synchronized (_snarks) { return (Snark)_snarks.get(filename); } }
-    public void addTorrent(String filename) { addTorrent(filename, false); }
-    public void addTorrent(String filename, boolean dontAutoStart) {
-        if (!I2PSnarkUtil.instance().connected()) {
-            addMessage("Connecting to I2P");
-            boolean ok = I2PSnarkUtil.instance().connect();
-            if (!ok) {
-                addMessage("Error connecting to I2P - check your I2CP settings");
-                return;
-            }
-        }
-        File sfile = new File(filename);
-        try {
-            filename = sfile.getCanonicalPath();
-        } catch (IOException ioe) {
-            _log.error("Unable to add the torrent " + filename, ioe);
-            addMessage("ERR: Could not add the torrent '" + filename + "': " + ioe.getMessage());
-            return;
-        }
-        File dataDir = getDataDir();
-        Snark torrent = null;
-        synchronized (_snarks) {
-            torrent = (Snark)_snarks.get(filename);
-            if (torrent == null) {
-                FileInputStream fis = null;
-                try {
-                    fis = new FileInputStream(sfile);
-                    MetaInfo info = new MetaInfo(fis);
-                    fis.close();
-                    fis = null;
-                    
-                    String rejectMessage = locked_validateTorrent(info);
-                    if (rejectMessage != null) {
-                        sfile.delete();
-                        addMessage(rejectMessage);
-                        return;
-                    } else {
-                        torrent = new Snark(filename, null, -1, null, null, false, dataDir.getPath());
-                        torrent.completeListener = this;
-                        _snarks.put(filename, torrent);
-                    }
-                } catch (IOException ioe) {
-                    addMessage("Torrent in " + sfile.getName() + " is invalid: " + ioe.getMessage());
-                    if (sfile.exists())
-                        sfile.delete();
-                    return;
-                } finally {
-                    if (fis != null) try { fis.close(); } catch (IOException ioe) {}
-                }
-            } else {
-                return;
-            }
-        }
-        // ok, snark created, now lets start it up or configure it further
-        File f = new File(filename);
-        if (!dontAutoStart && shouldAutoStart()) {
-            torrent.startTorrent();
-            addMessage("Torrent added and started: '" + f.getName() + "'");
-        } else {
-            addMessage("Torrent added: '" + f.getName() + "'");
-        }
-    }
-    
-    private String locked_validateTorrent(MetaInfo info) throws IOException {
-        List files = info.getFiles();
-        if ( (files != null) && (files.size() > MAX_FILES_PER_TORRENT) ) {
-            return "Too many files in " + info.getName() + " (" + files.size() + "), deleting it";
-        } else if (info.getPieces() <= 0) {
-            return "No pieces in " + info.getName() + "?  deleting it";
-        } else if (info.getPieceLength(0) > 10*1024*1024) {
-            return "Pieces are too large in " + info.getName() + " (" + info.getPieceLength(0)/1024 + "KB, deleting it";
-        } else if (info.getTotalLength() > 10*1024*1024*1024l) {
-            System.out.println("torrent info: " + info.toString());
-            List lengths = info.getLengths();
-            if (lengths != null)
-                for (int i = 0; i < lengths.size(); i++)
-                    System.out.println("File " + i + " is " + lengths.get(i) + " long");
-            
-            return "Torrents larger than 10GB are not supported yet (because we're paranoid): " + info.getName() + ", deleting it";
-        } else {
-            // ok
-            return null;
-        }
-    }
-    
-    /**
-     * Stop the torrent, leaving it on the list of torrents unless told to remove it
-     */
-    public Snark stopTorrent(String filename, boolean shouldRemove) {
-        File sfile = new File(filename);
-        try {
-            filename = sfile.getCanonicalPath();
-        } catch (IOException ioe) {
-            _log.error("Unable to remove the torrent " + filename, ioe);
-            addMessage("ERR: Could not remove the torrent '" + filename + "': " + ioe.getMessage());
-            return null;
-        }
-        int remaining = 0;
-        Snark torrent = null;
-        synchronized (_snarks) {
-            if (shouldRemove)
-                torrent = (Snark)_snarks.remove(filename);
-            else
-                torrent = (Snark)_snarks.get(filename);
-            remaining = _snarks.size();
-        }
-        if (torrent != null) {
-            boolean wasStopped = torrent.stopped;
-            torrent.stopTorrent();
-            if (remaining == 0) {
-                // should we disconnect/reconnect here (taking care to deal with the other thread's
-                // I2PServerSocket.accept() call properly?)
-                ////I2PSnarkUtil.instance().
-            }
-            if (!wasStopped)
-                addMessage("Torrent stopped: '" + sfile.getName() + "'");
-        }
-        return torrent;
-    }
-    /**
-     * Stop the torrent and delete the torrent file itself, but leaving the data
-     * behind.
-     */
-    public void removeTorrent(String filename) {
-        Snark torrent = stopTorrent(filename, true);
-        if (torrent != null) {
-            File torrentFile = new File(filename);
-            torrentFile.delete();
-            addMessage("Torrent removed: '" + torrentFile.getName() + "'");
-        }
-    }
-    
-    private class DirMonitor implements Runnable {
-        public void run() {
-            try { Thread.sleep(60*1000*getStartupDelayMinutes()); } catch (InterruptedException ie) {}
-            // the first message was a "We are starting up in 1m" 
-            synchronized (_messages) { 
-                if (_messages.size() == 1)
-                    _messages.remove(0);
-            }
-
-            while (true) {
-                File dir = getDataDir();
-                _log.debug("Directory Monitor loop over " + dir.getAbsolutePath());
-                try {
-                    monitorTorrents(dir);
-                } catch (Exception e) {
-                    _log.error("Error in the DirectoryMonitor", e);
-                }
-                try { Thread.sleep(60*1000); } catch (InterruptedException ie) {}
-            }
-        }
-    }
-    
-    public void torrentComplete(Snark snark) {
-        File f = new File(snark.torrent);
-        long len = snark.meta.getTotalLength();
-        addMessage("Download complete of " + f.getName() 
-                   + (len < 5*1024*1024 ? " (size: " + (len/1024) + "KB)" : " (size: " + (len/(1024*1024l)) + "MB)"));
-    }
-    
-    private void monitorTorrents(File dir) {
-        String fileNames[] = dir.list(TorrentFilenameFilter.instance());
-        List foundNames = new ArrayList(0);
-        if (fileNames != null) {
-            for (int i = 0; i < fileNames.length; i++) {
-                try {
-                    foundNames.add(new File(dir, fileNames[i]).getCanonicalPath());
-                } catch (IOException ioe) {
-                    _log.error("Error resolving '" + fileNames[i] + "' in '" + dir, ioe);
-                }
-            }
-        }
-        
-        Set existingNames = listTorrentFiles();
-        // lets find new ones first...
-        for (int i = 0; i < foundNames.size(); i++) {
-            if (existingNames.contains(foundNames.get(i))) {
-                // already known.  noop
-            } else {
-                if (I2PSnarkUtil.instance().connect())
-                    addTorrent((String)foundNames.get(i));
-                else
-                    addMessage("Unable to connect to I2P");
-            }
-        }
-        // now lets see which ones have been removed...
-        for (Iterator iter = existingNames.iterator(); iter.hasNext(); ) {
-            String name = (String)iter.next();
-            if (foundNames.contains(name)) {
-                // known and still there.  noop
-            } else {
-                // known, but removed.  drop it
-                stopTorrent(name, true);
-            }
-        }
-    }
-
-    private static final String DEFAULT_TRACKERS[] = { 
-       "Postman's tracker", "http://YRgrgTLGnbTq2aZOZDJQ~o6Uk5k6TK-OZtx0St9pb0G-5EGYURZioxqYG8AQt~LgyyI~NCj6aYWpPO-150RcEvsfgXLR~CxkkZcVpgt6pns8SRc3Bi-QSAkXpJtloapRGcQfzTtwllokbdC-aMGpeDOjYLd8b5V9Im8wdCHYy7LRFxhEtGb~RL55DA8aYOgEXcTpr6RPPywbV~Qf3q5UK55el6Kex-6VCxreUnPEe4hmTAbqZNR7Fm0hpCiHKGoToRcygafpFqDw5frLXToYiqs9d4liyVB-BcOb0ihORbo0nS3CLmAwZGvdAP8BZ7cIYE3Z9IU9D1G8JCMxWarfKX1pix~6pIA-sp1gKlL1HhYhPMxwyxvuSqx34o3BqU7vdTYwWiLpGM~zU1~j9rHL7x60pVuYaXcFQDR4-QVy26b6Pt6BlAZoFmHhPcAuWfu-SFhjyZYsqzmEmHeYdAwa~HojSbofg0TMUgESRXMw6YThK1KXWeeJVeztGTz25sL8AAAA.i2p/announce.php"
-       , "Orion's tracker", "http://gKik1lMlRmuroXVGTZ~7v4Vez3L3ZSpddrGZBrxVriosCQf7iHu6CIk8t15BKsj~P0JJpxrofeuxtm7SCUAJEr0AIYSYw8XOmp35UfcRPQWyb1LsxUkMT4WqxAT3s1ClIICWlBu5An~q-Mm0VFlrYLIPBWlUFnfPR7jZ9uP5ZMSzTKSMYUWao3ejiykr~mtEmyls6g-ZbgKZawa9II4zjOy-hdxHgP-eXMDseFsrym4Gpxvy~3Fv9TuiSqhpgm~UeTo5YBfxn6~TahKtE~~sdCiSydqmKBhxAQ7uT9lda7xt96SS09OYMsIWxLeQUWhns-C~FjJPp1D~IuTrUpAFcVEGVL-BRMmdWbfOJEcWPZ~CBCQSO~VkuN1ebvIOr9JBerFMZSxZtFl8JwcrjCIBxeKPBmfh~xYh16BJm1BBBmN1fp2DKmZ2jBNkAmnUbjQOqWvUcehrykWk5lZbE7bjJMDFH48v3SXwRuDBiHZmSbsTY6zhGY~GkMQHNGxPMMSIAAAA.i2p/bt/announce.php"
-//       , "The freak's tracker", "http://mHKva9x24E5Ygfey2llR1KyQHv5f8hhMpDMwJDg1U-hABpJ2NrQJd6azirdfaR0OKt4jDlmP2o4Qx0H598~AteyD~RJU~xcWYdcOE0dmJ2e9Y8-HY51ie0B1yD9FtIV72ZI-V3TzFDcs6nkdX9b81DwrAwwFzx0EfNvK1GLVWl59Ow85muoRTBA1q8SsZImxdyZ-TApTVlMYIQbdI4iQRwU9OmmtefrCe~ZOf4UBS9-KvNIqUL0XeBSqm0OU1jq-D10Ykg6KfqvuPnBYT1BYHFDQJXW5DdPKwcaQE4MtAdSGmj1epDoaEBUa9btQlFsM2l9Cyn1hzxqNWXELmx8dRlomQLlV4b586dRzW~fLlOPIGC13ntPXogvYvHVyEyptXkv890jC7DZNHyxZd5cyrKC36r9huKvhQAmNABT2Y~pOGwVrb~RpPwT0tBuPZ3lHYhBFYmD8y~AOhhNHKMLzea1rfwTvovBMByDdFps54gMN1mX4MbCGT4w70vIopS9yAAAA.i2p/bytemonsoon/announce.php"
-    };
-    
-    /** comma delimited list of name=announceURL for the trackers to be displayed */
-    public static final String PROP_TRACKERS = "i2psnark.trackers";
-    /** unordered map of announceURL to name */
-    public Map getTrackers() { 
-        HashMap rv = new HashMap();
-        String trackers = _config.getProperty(PROP_TRACKERS);
-        if ( (trackers == null) || (trackers.trim().length() <= 0) )
-            trackers = _context.getProperty(PROP_TRACKERS);
-        if ( (trackers == null) || (trackers.trim().length() <= 0) ) {
-            for (int i = 0; i < DEFAULT_TRACKERS.length; i += 2)
-                rv.put(DEFAULT_TRACKERS[i+1], DEFAULT_TRACKERS[i]);
-        } else {
-            StringTokenizer tok = new StringTokenizer(trackers, ",");
-            while (tok.hasMoreTokens()) {
-                String pair = tok.nextToken();
-                int split = pair.indexOf('=');
-                if (split <= 0)
-                    continue;
-                String name = pair.substring(0, split).trim();
-                String url = pair.substring(split+1).trim();
-                if ( (name.length() > 0) && (url.length() > 0) )
-                    rv.put(url, name);
-            }
-        }
-        
-        return rv;
-    }
-    
-    private static class TorrentFilenameFilter implements FilenameFilter {
-        private static final TorrentFilenameFilter _filter = new TorrentFilenameFilter();
-        public static TorrentFilenameFilter instance() { return _filter; }
-        public boolean accept(File dir, String name) {
-            return (name != null) && (name.endsWith(".torrent"));
-        }
-    }
-}

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

@@ -1,92 +0,0 @@
-/* TrackerShutdown - Makes sure everything ends correctly when shutting down.
-   Copyright (C) 2003 Mark J. Wielaard
-
-   This file is part of Snark.
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
- 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
- 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-package org.klomp.snark;
-
-import java.io.IOException;
-
-import net.i2p.util.I2PThread;
-
-/**
- * Makes sure everything ends correctly when shutting down.
- */
-public class SnarkShutdown extends I2PThread
-{
-  private final Storage storage;
-  private final PeerCoordinator coordinator;
-  private final ConnectionAcceptor acceptor;
-  private final TrackerClient trackerclient;
-
-  private final ShutdownListener listener;
-
-  public SnarkShutdown(Storage storage,
-                       PeerCoordinator coordinator,
-                       ConnectionAcceptor acceptor,
-                       TrackerClient trackerclient,
-                       ShutdownListener listener)
-  {
-    this.storage = storage;
-    this.coordinator = coordinator;
-    this.acceptor = acceptor;
-    this.trackerclient = trackerclient;
-    this.listener = listener;
-  }
-
-  public void run()
-  {
-    Snark.debug("Shutting down...", Snark.NOTICE);
-
-    Snark.debug("Halting ConnectionAcceptor...", Snark.INFO);
-    if (acceptor != null)
-      acceptor.halt();
-
-    Snark.debug("Halting TrackerClient...", Snark.INFO);
-    if (trackerclient != null)
-      trackerclient.halt();
-
-    Snark.debug("Halting PeerCoordinator...", Snark.INFO);
-    if (coordinator != null)
-      coordinator.halt();
-
-    Snark.debug("Closing Storage...", Snark.INFO);
-    if (storage != null)
-      {
-        try
-          {
-            storage.close();
-          }
-        catch(IOException ioe)
-          {
-            I2PSnarkUtil.instance().debug("Couldn't properly close storage", Snark.ERROR, ioe);
-            throw new RuntimeException("b0rking");
-          }
-      }
-
-    // XXX - Should actually wait till done...
-    try
-      {
-        Snark.debug("Waiting 5 seconds...", Snark.INFO);
-        Thread.sleep(5*1000);
-      }
-    catch (InterruptedException ie) { /* ignored */ }
-
-    listener.shutdown();
-  }
-}

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

@@ -1,47 +0,0 @@
-/* StaticSnark - Main snark startup class for staticly linking with gcj.
-   Copyright (C) 2003 Mark J. Wielaard
-
-   This file is part of Snark.
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
- 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
- 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-package org.klomp.snark;
-
-import java.security.Provider;
-import java.security.Security;
-
-import org.klomp.snark.bencode.*;
-
-/**
- * Main snark startup class for staticly linking with gcj.
- * It references somee necessary classes that are normally loaded through
- * reflection.
- *
- * @author Mark Wielaard (mark@klomp.org)
- */
-public class StaticSnark
-{
-  public static void main(String[] args)
-  {
-    // The GNU security provider is needed for SHA-1 MessageDigest checking.
-    // So make sure it is available as a security provider.
-    //Provider gnu = new gnu.java.security.provider.Gnu();
-    //Security.addProvider(gnu);
-
-    // And finally call the normal starting point.
-    Snark.main(args);
-  }
-}

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

@@ -1,588 +0,0 @@
-/* Storage - Class used to store and retrieve pieces.
-   Copyright (C) 2003 Mark J. Wielaard
-
-   This file is part of Snark.
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
- 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
- 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-package org.klomp.snark;
-
-import java.io.*;
-import java.util.*;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-
-import net.i2p.crypto.SHA1;
-
-/**
- * Maintains pieces on disk. Can be used to store and retrieve pieces.
- */
-public class Storage
-{
-  private MetaInfo metainfo;
-  private long[] lengths;
-  private RandomAccessFile[] rafs;
-  private String[] names;
-
-  private final StorageListener listener;
-
-  private final BitField bitfield; // BitField to represent the pieces
-  private int needed; // Number of pieces needed
-
-  // XXX - Not always set correctly
-  int piece_size;
-  int pieces;
-
-  /** The default piece size. */
-  private static int MIN_PIECE_SIZE = 256*1024;
-  /** The maximum number of pieces in a torrent. */
-  private static long MAX_PIECES = 100*1024/20;
-
-  /**
-   * Creates a new storage based on the supplied MetaInfo.  This will
-   * try to create and/or check all needed files in the MetaInfo.
-   *
-   * @exception IOException when creating and/or checking files fails.
-   */
-  public Storage(MetaInfo metainfo, StorageListener listener)
-    throws IOException
-  {
-    this.metainfo = metainfo;
-    this.listener = listener;
-    needed = metainfo.getPieces();
-    bitfield = new BitField(needed);
-  }
-
-  /**
-   * Creates a storage from the existing file or directory together
-   * with an appropriate MetaInfo file as can be announced on the
-   * given announce String location.
-   */
-  public Storage(File baseFile, String announce, StorageListener listener)
-    throws IOException
-  {
-    this.listener = listener;
-
-    // Create names, rafs and lengths arrays.
-    getFiles(baseFile);
-    
-    long total = 0;
-    ArrayList lengthsList = new ArrayList();
-    for (int i = 0; i < lengths.length; i++)
-      {
-        long length = lengths[i];
-        total += length;
-        lengthsList.add(new Long(length));
-      }
-
-    piece_size = MIN_PIECE_SIZE;
-    pieces = (int) ((total - 1)/piece_size) + 1;
-    while (pieces > MAX_PIECES)
-      {
-        piece_size = piece_size*2;
-        pieces = (int) ((total - 1)/piece_size) +1;
-      }
-
-    // Note that piece_hashes and the bitfield will be filled after
-    // the MetaInfo is created.
-    byte[] piece_hashes = new byte[20*pieces];
-    bitfield = new BitField(pieces);
-    needed = 0;
-
-    List files = new ArrayList();
-    for (int i = 0; i < names.length; i++)
-      {
-        List file = new ArrayList();
-        StringTokenizer st = new StringTokenizer(names[i], File.separator);
-        while (st.hasMoreTokens())
-          {
-            String part = st.nextToken();
-            file.add(part);
-          }
-        files.add(file);
-      }
-
-    String name = baseFile.getName();
-    if (files.size() == 1)
-      {
-        files = null;
-        lengthsList = null;
-      }
-
-    // Note that the piece_hashes are not correctly setup yet.
-    metainfo = new MetaInfo(announce, baseFile.getName(), null, files,
-                            lengthsList, piece_size, piece_hashes, total);
-
-  }
-
-  // Creates piece hases for a new storage.
-  public void create() throws IOException
-  {
-    if (true) {
-        fast_digestCreate();
-    } else {
-        orig_digestCreate();
-    }
-  }
-  
-  private void orig_digestCreate() throws IOException {
-    // Calculate piece_hashes
-    MessageDigest digest = null;
-    try
-      {
-        digest = MessageDigest.getInstance("SHA");
-      }
-    catch(NoSuchAlgorithmException nsa)
-      {
-        throw new InternalError(nsa.toString());
-      }
-
-    byte[] piece_hashes = metainfo.getPieceHashes();
-
-    byte[] piece = new byte[piece_size];
-    for (int i = 0; i < pieces; i++)
-      {
-        int length = getUncheckedPiece(i, piece, 0);
-        digest.update(piece, 0, length);
-        byte[] hash = digest.digest();
-        for (int j = 0; j < 20; j++)
-          piece_hashes[20 * i + j] = hash[j];
-
-        bitfield.set(i);
-
-        if (listener != null)
-          listener.storageChecked(this, i, true);
-      }
-
-    if (listener != null)
-      listener.storageAllChecked(this);
-
-    // Reannounce to force recalculating the info_hash.
-    metainfo = metainfo.reannounce(metainfo.getAnnounce());
-  }
-
-  private void fast_digestCreate() throws IOException {
-    // Calculate piece_hashes
-    SHA1 digest = new SHA1();
-
-    byte[] piece_hashes = metainfo.getPieceHashes();
-
-    byte[] piece = new byte[piece_size];
-    for (int i = 0; i < pieces; i++)
-      {
-        int length = getUncheckedPiece(i, piece, 0);
-        digest.update(piece, 0, length);
-        byte[] hash = digest.digest();
-        for (int j = 0; j < 20; j++)
-          piece_hashes[20 * i + j] = hash[j];
-
-        bitfield.set(i);
-
-        if (listener != null)
-          listener.storageChecked(this, i, true);
-      }
-
-    if (listener != null)
-      listener.storageAllChecked(this);
-
-    // Reannounce to force recalculating the info_hash.
-    metainfo = metainfo.reannounce(metainfo.getAnnounce());
-  }
-
-  private void getFiles(File base) throws IOException
-  {
-    ArrayList files = new ArrayList();
-    addFiles(files, base);
-
-    int size = files.size();
-    names = new String[size];
-    lengths = new long[size];
-    rafs = new RandomAccessFile[size];
-
-    int i = 0;
-    Iterator it = files.iterator();
-    while (it.hasNext())
-      {
-        File f = (File)it.next();
-        names[i] = f.getPath();
-        lengths[i] = f.length();
-        rafs[i] = new RandomAccessFile(f, "r");
-        i++;
-      }
-  }
-
-  private static void addFiles(List l, File f)
-  {
-    if (!f.isDirectory())
-      l.add(f);
-    else
-      {
-        File[] files = f.listFiles();
-        if (files == null)
-          {
-            Snark.debug("WARNING: Skipping '" + f 
-                        + "' not a normal file.", Snark.WARNING);
-            return;
-          }
-        for (int i = 0; i < files.length; i++)
-          addFiles(l, files[i]);
-      }
-  }
-
-  /**
-   * Returns the MetaInfo associated with this Storage.
-   */
-  public MetaInfo getMetaInfo()
-  {
-    return metainfo;
-  }
-
-  /**
-   * How many pieces are still missing from this storage.
-   */
-  public int needed()
-  {
-    return needed;
-  }
-
-  /**
-   * Whether or not this storage contains all pieces if the MetaInfo.
-   */
-  public boolean complete()
-  {
-    return needed == 0;
-  }
-
-  /**
-   * The BitField that tells which pieces this storage contains.
-   * Do not change this since this is the current state of the storage.
-   */
-  public BitField getBitField()
-  {
-    return bitfield;
-  }
-
-  /**
-   * Creates (and/or checks) all files from the metainfo file list.
-   */
-  public void check(String rootDir) throws IOException
-  {
-    File base = new File(rootDir, filterName(metainfo.getName()));
-
-    List files = metainfo.getFiles();
-    if (files == null)
-      {
-        // Create base as file.
-        Snark.debug("Creating/Checking file: " + base, Snark.NOTICE);
-        if (!base.createNewFile() && !base.exists())
-          throw new IOException("Could not create file " + base);
-
-        lengths = new long[1];
-        rafs = new RandomAccessFile[1];
-        names = new String[1];
-        lengths[0] = metainfo.getTotalLength();
-        if (base.exists() && !base.canWrite())  // hope we can get away with this, if we are only seeding...
-            rafs[0] = new RandomAccessFile(base, "r");
-        else
-            rafs[0] = new RandomAccessFile(base, "rw");
-        names[0] = base.getName();
-      }
-    else
-      {
-        // Create base as dir.
-        Snark.debug("Creating/Checking directory: " + base, Snark.NOTICE);
-        if (!base.mkdir() && !base.isDirectory())
-          throw new IOException("Could not create directory " + base);
-
-        List  ls = metainfo.getLengths();
-        int size = files.size();
-        long total = 0;
-        lengths = new long[size];
-        rafs = new RandomAccessFile[size];
-        names = new String[size];
-        for (int i = 0; i < size; i++)
-          {
-            File f = createFileFromNames(base, (List)files.get(i));
-            lengths[i] = ((Long)ls.get(i)).longValue();
-            total += lengths[i];
-            if (f.exists() && !f.canWrite()) // see above re: only seeding
-                rafs[i] = new RandomAccessFile(f, "r");
-            else
-                rafs[i] = new RandomAccessFile(f, "rw");
-            names[i] = f.getName();
-          }
-
-        // Sanity check for metainfo file.
-        long metalength = metainfo.getTotalLength();
-        if (total != metalength)
-          throw new IOException("File lengths do not add up "
-                                + total + " != " + metalength);
-      }
-    checkCreateFiles();
-  }
-
-  /**
-   * Removes 'suspicious' characters from the give file name.
-   */
-  private String filterName(String name)
-  {
-    // XXX - Is this enough?
-    return name.replace(File.separatorChar, '_');
-  }
-
-  private File createFileFromNames(File base, List names) throws IOException
-  {
-    File f = null;
-    Iterator it = names.iterator();
-    while (it.hasNext())
-      {
-        String name = filterName((String)it.next());
-        if (it.hasNext())
-          {
-            // Another dir in the hierarchy.
-            f = new File(base, name);
-            if (!f.mkdir() && !f.isDirectory())
-              throw new IOException("Could not create directory " + f);
-            base = f;
-          }
-        else
-          {
-            // The final element (file) in the hierarchy.
-            f = new File(base, name);
-            if (!f.createNewFile() && !f.exists())
-              throw new IOException("Could not create file " + f);
-          }
-      }
-    return f;
-  }
-
-  private void checkCreateFiles() throws IOException
-  {
-    // Whether we are resuming or not,
-    // if any of the files already exists we assume we are resuming.
-    boolean resume = false;
-
-    // Make sure all files are available and of correct length
-    for (int i = 0; i < rafs.length; i++)
-      {
-        long length = rafs[i].length();
-        if(length == lengths[i])
-          {
-            if (listener != null)
-              listener.storageAllocated(this, length);
-            resume = true; // XXX Could dynamicly check
-          }
-        else if (length == 0)
-          allocateFile(i);
-        else
-          throw new IOException("File '" + names[i]
-                                + "' exists, but has wrong length");
-      }
-
-    // Check which pieces match and which don't
-    if (resume)
-      {
-        pieces = metainfo.getPieces();
-        byte[] piece = new byte[metainfo.getPieceLength(0)];
-        for (int i = 0; i < pieces; i++)
-          {
-            int length = getUncheckedPiece(i, piece, 0);
-            boolean correctHash = metainfo.checkPiece(i, piece, 0, length);
-            if (correctHash)
-              {
-                bitfield.set(i);
-                needed--;
-              }
-
-            if (listener != null)
-              listener.storageChecked(this, i, correctHash);
-          }
-      }
-
-    if (listener != null) {
-      listener.storageAllChecked(this);
-      if (needed <= 0)
-        listener.storageCompleted(this);
-    }
-  }
-
-  private void allocateFile(int nr) throws IOException
-  {
-    // XXX - Is this the best way to make sure we have enough space for
-    // the whole file?
-    listener.storageCreateFile(this, names[nr], lengths[nr]);
-    final int ZEROBLOCKSIZE = metainfo.getPieceLength(0);
-    byte[] zeros = new byte[ZEROBLOCKSIZE];
-    int i;
-    for (i = 0; i < lengths[nr]/ZEROBLOCKSIZE; i++)
-      {
-        rafs[nr].write(zeros);
-        if (listener != null)
-          listener.storageAllocated(this, ZEROBLOCKSIZE);
-      }
-    int size = (int)(lengths[nr] - i*ZEROBLOCKSIZE);
-    rafs[nr].write(zeros, 0, size);
-    if (listener != null)
-      listener.storageAllocated(this, size);
-  }
-
-
-  /**
-   * Closes the Storage and makes sure that all RandomAccessFiles are
-   * closed. The Storage is unusable after this.
-   */
-  public void close() throws IOException
-  {
-    if (rafs == null) return;
-    for (int i = 0; i < rafs.length; i++)
-      {
-        try {
-            synchronized(rafs[i])
-              {
-                rafs[i].close();
-              }
-        } catch (IOException ioe) {
-            I2PSnarkUtil.instance().debug("Error closing " + rafs[i], Snark.ERROR, ioe);
-            // gobble gobble
-        }
-      }
-  }
-
-  /**
-   * Returns a byte array containing the requested piece or null if
-   * the storage doesn't contain the piece yet.
-   */
-  public byte[] getPiece(int piece) throws IOException
-  {
-    if (!bitfield.get(piece))
-      return null;
-
-    byte[] bs = new byte[metainfo.getPieceLength(piece)];
-    getUncheckedPiece(piece, bs, 0);
-    return bs;
-  }
-
-  /**
-   * Put the piece in the Storage if it is correct.
-   *
-   * @return true if the piece was correct (sha metainfo hash
-   * matches), otherwise false.
-   * @exception IOException when some storage related error occurs.
-   */
-  public boolean putPiece(int piece, byte[] bs) throws IOException
-  {
-    // First check if the piece is correct.
-    // If we were paranoia we could copy the array first.
-    int length = bs.length;
-    boolean correctHash = metainfo.checkPiece(piece, bs, 0, length);
-    if (listener != null)
-      listener.storageChecked(this, piece, correctHash);
-    if (!correctHash)
-      return false;
-
-    boolean complete;
-    synchronized(bitfield)
-      {
-        if (bitfield.get(piece))
-          return true; // No need to store twice.
-        else
-          {
-            bitfield.set(piece);
-            needed--;
-            complete = needed == 0;
-          }
-      }
-
-    // Early typecast, avoid possibly overflowing a temp integer
-    long start = (long) piece * (long) metainfo.getPieceLength(0);
-    int i = 0;
-    long raflen = lengths[i];
-    while (start > raflen)
-      {
-        i++;
-        start -= raflen;
-        raflen = lengths[i];
-      }
-    
-    int written = 0;
-    int off = 0;
-    while (written < length)
-      {
-        int need = length - written;
-        int len = (start + need < raflen) ? need : (int)(raflen - start);
-        synchronized(rafs[i])
-          {
-            rafs[i].seek(start);
-            rafs[i].write(bs, off + written, len);
-          }
-        written += len;
-        if (need - len > 0)
-          {
-            i++;
-            raflen = lengths[i];
-            start = 0;
-          }
-      }
-
-    if (complete) {
-      listener.storageCompleted(this);
-      // do we also need to close all of the files and reopen
-      // them readonly?
-    }
-
-    return true;
-  }
-
-  private int getUncheckedPiece(int piece, byte[] bs, int off)
-    throws IOException
-  {
-    // XXX - copy/paste code from putPiece().
-
-    // Early typecast, avoid possibly overflowing a temp integer
-    long start = (long) piece * (long) metainfo.getPieceLength(0);
-
-    int length = metainfo.getPieceLength(piece);
-    int i = 0;
-    long raflen = lengths[i];
-    while (start > raflen)
-      {
-        i++;
-        start -= raflen;
-        raflen = lengths[i];
-      }
-
-    int read = 0;
-    while (read < length)
-      {
-        int need = length - read;
-        int len = (start + need < raflen) ? need : (int)(raflen - start);
-        synchronized(rafs[i])
-          {
-            rafs[i].seek(start);
-            rafs[i].readFully(bs, off + read, len);
-          }
-        read += len;
-        if (need - len > 0)
-          {
-            i++;
-            raflen = lengths[i];
-            start = 0;
-          }
-      }
-
-    return length;
-  }
-}

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

@@ -1,58 +0,0 @@
-/* StorageListener.java - Interface used as callback when storage changes.
-   Copyright (C) 2003 Mark J. Wielaard
-
-   This file is part of Snark.
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
- 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
- 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-package org.klomp.snark;
-
-/**
- * Callback used when Storage changes.
- */
-public interface StorageListener
-{
-  /**
-   * Called when the storage creates a new file of a given length.
-   */
-  void storageCreateFile(Storage storage, String name, long length);
-
-  /**
-   * Called to indicate that length bytes have been allocated.
-   */
-  void storageAllocated(Storage storage, long length);
-
-  /**
-   * Called when storage is being checked and the num piece of that
-   * total pieces has been checked. When the piece hash matches the
-   * expected piece hash checked will be true, otherwise it will be
-   * false.
-   */
-  void storageChecked(Storage storage, int num, boolean checked);
-
-  /**
-   * Called when all pieces in the storage have been checked. Does not
-   * mean that the storage is complete, just that the state of the
-   * storage is known.
-   */
-  void storageAllChecked(Storage storage);
-  
-  /**
-   * Called the one time when the data is completely received and checked.
-   *
-   */
-  void storageCompleted(Storage storage);
-}

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

@@ -1,317 +0,0 @@
-/* TrackerClient - Class that informs a tracker and gets new peers.
-   Copyright (C) 2003 Mark J. Wielaard
-
-   This file is part of Snark.
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
- 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
- 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-package org.klomp.snark;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import org.klomp.snark.bencode.*;
-import net.i2p.util.I2PThread;
-import net.i2p.util.Log;
-
-/**
- * Informs metainfo tracker of events and gets new peers for peer
- * coordinator.
- *
- * @author Mark Wielaard (mark@klomp.org)
- */
-public class TrackerClient extends I2PThread
-{
-  private static final Log _log = new Log(TrackerClient.class);
-  private static final String NO_EVENT = "";
-  private static final String STARTED_EVENT = "started";
-  private static final String COMPLETED_EVENT = "completed";
-  private static final String STOPPED_EVENT = "stopped";
-
-  private final static int SLEEP = 5; // 5 minutes.
-
-  private final MetaInfo meta;
-  private final PeerCoordinator coordinator;
-  private final int port;
-
-  private boolean stop;
-  private boolean started;
-
-  private long interval;
-  private long lastRequestTime;
-
-  public TrackerClient(MetaInfo meta, PeerCoordinator coordinator)
-  {
-    // Set unique name.
-    super("TrackerClient-" + urlencode(coordinator.getID()));
-    this.meta = meta;
-    this.coordinator = coordinator;
-
-    this.port = 6881; //(port == -1) ? 9 : port;
-
-    stop = false;
-    started = false;
-  }
-
-  public void start() {
-      if (stop) throw new RuntimeException("Dont rerun me, create a copy");
-      super.start();
-      started = true;
-  }
-  
-  public boolean halted() { return stop; }
-  public boolean started() { return started; }
-  
-  /**
-   * Interrupts this Thread to stop it.
-   */
-  public void halt()
-  {
-    stop = true;
-    this.interrupt();
-  }
-
-  private boolean verifyConnected() {
-    while (!stop && !I2PSnarkUtil.instance().connected()) {
-        boolean ok = I2PSnarkUtil.instance().connect();
-        if (!ok) {
-            try { Thread.sleep(30*1000); } catch (InterruptedException ie) {}
-        }
-    }
-    return !stop && I2PSnarkUtil.instance().connected();
-  }
-  
-  public void run()
-  {
-    // XXX - Support other IPs
-    String announce = meta.getAnnounce(); //I2PSnarkUtil.instance().rewriteAnnounce(meta.getAnnounce());
-    String infoHash = urlencode(meta.getInfoHash());
-    String peerID = urlencode(coordinator.getID());
-
-    _log.debug("Announce: [" + meta.getAnnounce() + "] infoHash: " + infoHash 
-               + " xmitAnnounce: [" + announce + "]");
-    
-    long uploaded = coordinator.getUploaded();
-    long downloaded = coordinator.getDownloaded();
-    long left = coordinator.getLeft();
-
-    boolean completed = (left == 0);
-
-    try
-      {
-        if (!verifyConnected()) return;
-        boolean started = false;
-        while (!started)
-          {
-            try
-              {
-                // Send start.
-                TrackerInfo info = doRequest(announce, infoHash, peerID,
-                                             uploaded, downloaded, left,
-                                             STARTED_EVENT);
-                Set peers = info.getPeers();
-                coordinator.trackerSeenPeers = peers.size();
-                if (!completed) {
-                    Iterator it = peers.iterator();
-                    while (it.hasNext()) {
-                      Peer cur = (Peer)it.next();
-                      coordinator.addPeer(cur);
-                      int delay = 3000;
-                      int c = ((int)cur.getPeerID().getAddress().calculateHash().toBase64().charAt(0)) % 10;
-                      try { Thread.sleep(delay * c); } catch (InterruptedException ie) {}
-                    }
-                }
-                started = true;
-                coordinator.trackerProblems = null;
-              }
-            catch (IOException ioe)
-              {
-                // Probably not fatal (if it doesn't last to long...)
-                Snark.debug
-                  ("WARNING: Could not contact tracker at '"
-                   + announce + "': " + ioe, Snark.WARNING);
-                coordinator.trackerProblems = ioe.getMessage();
-              }
-
-            if (!started && !stop)
-              {
-                Snark.debug("         Retrying in one minute...", Snark.DEBUG);
-                try
-                  {
-                    // Sleep one minutes...
-                    Thread.sleep(60*1000);
-                  }
-                catch(InterruptedException interrupt)
-                  {
-                    // ignore
-                  }
-              }
-          }
-
-        Random r = new Random();
-        while(!stop)
-          {
-            try
-              {
-                // Sleep some minutes...
-                int delay = SLEEP*60*1000 + r.nextInt(120*1000);
-                Thread.sleep(delay);
-              }
-            catch(InterruptedException interrupt)
-              {
-                // ignore
-              }
-
-            if (stop)
-              break;
-       
-            if (!verifyConnected()) return;
-            
-            uploaded = coordinator.getUploaded();
-            downloaded = coordinator.getDownloaded();
-            left = coordinator.getLeft();
-            
-            // First time we got a complete download?
-            String event;
-            if (!completed && left == 0)
-              {
-                completed = true;
-                event = COMPLETED_EVENT;
-              }
-            else
-              event = NO_EVENT;
-            
-            // Only do a request when necessary.
-            if (event == COMPLETED_EVENT
-                || coordinator.needPeers()
-                || System.currentTimeMillis() > lastRequestTime + interval)
-              {
-                try
-                  {
-                    TrackerInfo info = doRequest(announce, infoHash, peerID,
-                                                 uploaded, downloaded, left,
-                                                 event);
-
-                    Set peers = info.getPeers();
-                    coordinator.trackerSeenPeers = peers.size();
-                    if ( (left > 0) && (!completed) ) {
-                        // we only want to talk to new people if we need things
-                        // from them (duh)
-                        List ordered = new ArrayList(peers);
-                        Collections.shuffle(ordered);
-                        Iterator it = ordered.iterator();
-                        while (it.hasNext()) {
-                          Peer cur = (Peer)it.next();
-                          coordinator.addPeer(cur);
-                          int delay = 3000;
-                          int c = ((int)cur.getPeerID().getAddress().calculateHash().toBase64().charAt(0)) % 10;
-                          try { Thread.sleep(delay * c); } catch (InterruptedException ie) {}
-                        }
-                    }
-                  }
-                catch (IOException ioe)
-                  {
-                    // Probably not fatal (if it doesn't last to long...)
-                    Snark.debug
-                      ("WARNING: Could not contact tracker at '"
-                       + announce + "': " + ioe, Snark.WARNING);
-                  }
-              }
-          }
-      }
-    catch (Throwable t)
-      {
-        I2PSnarkUtil.instance().debug("TrackerClient: " + t, Snark.ERROR, t);
-        if (t instanceof OutOfMemoryError)
-            throw (OutOfMemoryError)t;
-      }
-    finally
-      {
-        try
-          {
-            if (!verifyConnected()) return;
-            TrackerInfo info = doRequest(announce, infoHash, peerID, uploaded,
-                                         downloaded, left, STOPPED_EVENT);
-          }
-        catch(IOException ioe) { /* ignored */ }
-      }
-    
-  }
-  
-  private TrackerInfo doRequest(String announce, String infoHash,
-                                String peerID, long uploaded,
-                                long downloaded, long left, String event)
-    throws IOException
-  {
-    String s = announce
-      + "?info_hash=" + infoHash
-      + "&peer_id=" + peerID
-      + "&port=" + port
-      + "&ip=" + I2PSnarkUtil.instance().getOurIPString() + ".i2p"
-      + "&uploaded=" + uploaded
-      + "&downloaded=" + downloaded
-      + "&left=" + left
-      + ((event != NO_EVENT) ? ("&event=" + event) : "");
-    if (Snark.debug >= Snark.INFO)
-      Snark.debug("Sending TrackerClient request: " + s, Snark.INFO);
-      
-    File fetched = I2PSnarkUtil.instance().get(s);
-    if (fetched == null) {
-        throw new IOException("Error fetching " + s);
-    }
-    
-    InputStream in = null;
-    try {
-        in = new FileInputStream(fetched);
-
-        TrackerInfo info = new TrackerInfo(in, coordinator.getID(),
-                                           coordinator.getMetaInfo());
-        if (Snark.debug >= Snark.INFO)
-          Snark.debug("TrackerClient response: " + info, Snark.INFO);
-        lastRequestTime = System.currentTimeMillis();
-
-        String failure = info.getFailureReason();
-        if (failure != null)
-          throw new IOException(failure);
-
-        interval = info.getInterval() * 1000;
-        return info;
-    } finally {
-        if (in != null) try { in.close(); } catch (IOException ioe) {}
-        fetched.delete();
-    }
-  }
-
-  /**
-   * Very lazy byte[] to URL encoder.  Just encodes everything, even
-   * "normal" chars.
-   */
-  static String urlencode(byte[] bs)
-  {
-    StringBuffer sb = new StringBuffer(bs.length*3);
-    for (int i = 0; i < bs.length; i++)
-      {
-        int c = bs[i] & 0xFF;
-        sb.append('%');
-        if (c < 16)
-          sb.append('0');
-        sb.append(Integer.toHexString(c));
-      }
-         
-    return sb.toString();
-  }
-}

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

@@ -1,128 +0,0 @@
-/* TrackerInfo - Holds information returned by a tracker, mainly the peer list.
-   Copyright (C) 2003 Mark J. Wielaard
-
-   This file is part of Snark.
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
- 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
- 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-package org.klomp.snark;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.math.BigInteger;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.HashSet;
-
-import org.klomp.snark.bencode.*;
-
-public class TrackerInfo
-{
-  private final String failure_reason;
-  private final int interval;
-  private final Set peers;
-
-  public TrackerInfo(InputStream in, byte[] my_id, MetaInfo metainfo)
-    throws IOException
-  {
-    this(new BDecoder(in), my_id, metainfo);
-  }
-
-  public TrackerInfo(BDecoder be, byte[] my_id, MetaInfo metainfo)
-    throws IOException
-  {
-    this(be.bdecodeMap().getMap(), my_id, metainfo);
-  }
-
-  public TrackerInfo(Map m, byte[] my_id, MetaInfo metainfo)
-    throws IOException
-  {
-    BEValue reason = (BEValue)m.get("failure reason");
-    if (reason != null)
-      {
-        failure_reason = reason.getString();
-        interval = -1;
-        peers = null;
-      }
-    else
-      {
-        failure_reason = null;
-        BEValue beInterval = (BEValue)m.get("interval");
-        if (beInterval == null)
-          throw new InvalidBEncodingException("No interval given");
-        else
-          interval = beInterval.getInt();
-        BEValue bePeers = (BEValue)m.get("peers");
-        if (bePeers == null)
-          throw new InvalidBEncodingException("No peer list");
-        else
-          peers = getPeers(bePeers.getList(), my_id, metainfo);
-      }
-  }
-
-  public static Set getPeers(InputStream in, byte[] my_id, MetaInfo metainfo)
-    throws IOException
-  {
-    return getPeers(new BDecoder(in), my_id, metainfo);
-  }
-
-  public static Set getPeers(BDecoder be, byte[] my_id, MetaInfo metainfo)
-    throws IOException
-  {
-    return getPeers(be.bdecodeList().getList(), my_id, metainfo);
-  }
-
-  public static Set getPeers(List l, byte[] my_id, MetaInfo metainfo)
-    throws IOException
-  {
-    Set peers = new HashSet(l.size());
-
-    Iterator it = l.iterator();
-    while (it.hasNext())
-      {
-        PeerID peerID = new PeerID(((BEValue)it.next()).getMap());
-        peers.add(new Peer(peerID, my_id, metainfo));
-      }
-
-    return peers;
-  }
-
-  public Set getPeers()
-  {
-    return peers;
-  }
-
-  public String getFailureReason()
-  {
-    return failure_reason;
-  }
-
-  public int getInterval()
-  {
-    return interval;
-  }
-
-  public String toString()
-  {
-    if (failure_reason != null)
-      return "TrackerInfo[FAILED: " + failure_reason + "]";
-    else
-      return "TrackerInfo[interval=" + interval
-        + ", peers=" + peers + "]";
-  }
-}

apps/i2psnark/java/src/org/klomp/snark/bencode/BDecoder.java

@@ -1,355 +0,0 @@
-/* BDecoder - Converts an InputStream to BEValues.
-   Copyright (C) 2003 Mark J. Wielaard
-
-   This file is part of Snark.
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
- 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
- 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-package org.klomp.snark.bencode;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.EOFException;
-import java.io.UnsupportedEncodingException;
-
-import java.math.BigInteger;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.HashMap;
-import java.util.Map;
-
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-
-/**
- * Decodes a bencoded stream to <code>BEValue</code>s.
- *
- * A bencoded byte stream can represent byte arrays, numbers, lists and
- * maps (dictionaries).
- *
- * It currently contains a hack to indicate a name of a dictionary of
- * which a SHA-1 digest hash should be calculated (the hash over the
- * original bencoded bytes).
- *
- * @author Mark Wielaard (mark@klomp.org).
- */
-public class BDecoder
-{
-  // The InputStream to BDecode.
-  private final InputStream in;
-
-  // The last indicator read.
-  // Zero if unknown.
-  // '0'..'9' indicates a byte[].
-  // 'i' indicates an Number.
-  // 'l' indicates a List.
-  // 'd' indicates a Map.
-  // 'e' indicates end of Number, List or Map (only used internally).
-  // -1 indicates end of stream.
-  // Call getNextIndicator to get the current value (will never return zero).
-  private int indicator = 0;
-
-  // Used for ugly hack to get SHA hash over the metainfo info map
-  private String special_map = "info";
-  private boolean in_special_map = false;
-  private final MessageDigest sha_digest;
-
-  // Ugly hack. Return the SHA has over bytes that make up the special map.
-  public byte[] get_special_map_digest()
-  {
-    byte[] result = sha_digest.digest();
-    return result;
-  }
-
-  // Ugly hack. Name defaults to "info".
-  public void set_special_map_name(String name)
-  {
-    special_map = name;
-  }
-
-  /**
-   * Initalizes a new BDecoder. Nothing is read from the given
-   * <code>InputStream</code> yet.
-   */
-  public BDecoder(InputStream in)
-  {
-    this.in = in;
-    // XXX - Used for ugly hack.
-    try
-      {
-        sha_digest = MessageDigest.getInstance("SHA");
-      }
-    catch(NoSuchAlgorithmException nsa)
-      {
-        throw new InternalError(nsa.toString());
-      }
-  }
-
-  /**
-   * Creates a new BDecoder and immediatly decodes the first value it
-   * sees.
-   *
-   * @return The first BEValue on the stream or null when the stream
-   * has ended.
-   *
-   * @exception InvalidBEncoding when the stream doesn't start with a
-   * bencoded value or the stream isn't a bencoded stream at all.
-   * @exception IOException when somthing bad happens with the stream
-   * to read from.
-   */
-  public static BEValue bdecode(InputStream in) throws IOException
-  {
-    return new BDecoder(in).bdecode();
-  }
-
-  /**
-   * Returns what the next bencoded object will be on the stream or -1
-   * when the end of stream has been reached. Can return something
-   * unexpected (not '0' .. '9', 'i', 'l' or 'd') when the stream
-   * isn't bencoded.
-   *
-   * This might or might not read one extra byte from the stream.
-   */
-  public int getNextIndicator() throws IOException
-  {
-    if (indicator == 0)
-      {
-        indicator = in.read();
-        // XXX - Used for ugly hack
-        if (in_special_map) sha_digest.update((byte)indicator);
-      }
-    return indicator;
-  }
-
-  /**
-   * Gets the next indicator and returns either null when the stream
-   * has ended or bdecodes the rest of the stream and returns the
-   * appropriate BEValue encoded object.
-   */
-  public BEValue bdecode() throws IOException
-  {
-    indicator = getNextIndicator();
-    if (indicator == -1)
-      return null;
-
-    if (indicator >= '0' && indicator <= '9')
-      return bdecodeBytes();
-    else if (indicator == 'i')
-      return bdecodeNumber();
-    else if (indicator == 'l')
-      return bdecodeList();
-    else if (indicator == 'd')
-      return bdecodeMap();
-    else
-      throw new InvalidBEncodingException
-        ("Unknown indicator '" + indicator + "'");
-  }
-
-  /**
-   * Returns the next bencoded value on the stream and makes sure it
-   * is a byte array. If it is not a bencoded byte array it will throw
-   * InvalidBEncodingException.
-   */
-  public BEValue bdecodeBytes() throws IOException
-  {
-    int c = getNextIndicator();
-    int num = c - '0';
-    if (num < 0 || num > 9)
-      throw new InvalidBEncodingException("Number expected, not '"
-                                          + (char)c + "'");
-    indicator = 0;
-
-    c = read();
-    int i = c - '0';
-    while (i >= 0 && i <= 9)
-      {
-        // XXX - This can overflow!
-        num = num*10 + i;
-        c = read();
-        i = c - '0';
-      }
-
-    if (c != ':')
-      throw new InvalidBEncodingException("Colon expected, not '"
-                                          + (char)c + "'");
-
-    return new BEValue(read(num));
-  }
-
-  /**
-   * Returns the next bencoded value on the stream and makes sure it
-   * is a number. If it is not a number it will throw
-   * InvalidBEncodingException.
-   */
-  public BEValue bdecodeNumber() throws IOException
-  {
-    int c = getNextIndicator();
-    if (c != 'i')
-      throw new InvalidBEncodingException("Expected 'i', not '"
-                                          + (char)c + "'");
-    indicator = 0;
-
-    c = read();
-    if (c == '0')
-      {
-        c = read();
-        if (c == 'e')
-          return new BEValue(BigInteger.ZERO);
-        else
-          throw new InvalidBEncodingException("'e' expected after zero,"
-                                              + " not '" + (char)c + "'");
-      }
-
-    // XXX - We don't support more the 255 char big integers
-    char[] chars = new char[256];
-    int off = 0;
-
-    if (c == '-')
-      {
-        c = read();
-        if (c == '0')
-          throw new InvalidBEncodingException("Negative zero not allowed");
-        chars[off] = (char)c;
-        off++;
-      }
-
-    if (c < '1' || c > '9')
-      throw new InvalidBEncodingException("Invalid Integer start '"
-                                          + (char)c + "'");
-    chars[off] = (char)c;
-    off++;
-
-    c = read();
-    int i = c - '0';
-    while(i >= 0 && i <= 9)
-      {
-        chars[off] = (char)c;
-        off++;
-        c = read();
-        i = c - '0';
-      }
-
-    if (c != 'e')
-      throw new InvalidBEncodingException("Integer should end with 'e'");
-
-    String s = new String(chars, 0, off);
-    return new BEValue(new BigInteger(s));
-  }
-
-  /**
-   * Returns the next bencoded value on the stream and makes sure it
-   * is a list. If it is not a list it will throw
-   * InvalidBEncodingException.
-   */
-  public BEValue bdecodeList() throws IOException
-  {
-    int c = getNextIndicator();
-    if (c != 'l')
-      throw new InvalidBEncodingException("Expected 'l', not '"
-                                          + (char)c + "'");
-    indicator = 0;
-
-    List result = new ArrayList();
-    c = getNextIndicator();
-    while (c != 'e')
-      {
-        result.add(bdecode());
-        c = getNextIndicator();
-      }
-    indicator = 0;
-
-    return new BEValue(result);
-  }
-
-  /**
-   * Returns the next bencoded value on the stream and makes sure it
-   * is a map (dictonary). If it is not a map it will throw
-   * InvalidBEncodingException.
-   */
-  public BEValue bdecodeMap() throws IOException
-  {
-    int c = getNextIndicator();
-    if (c != 'd')
-      throw new InvalidBEncodingException("Expected 'd', not '"
-                                          + (char)c + "'");
-    indicator = 0;
-
-    Map result = new HashMap();
-    c = getNextIndicator();
-    while (c != 'e')
-      {
-        // Dictonary keys are always strings.
-        String key = bdecode().getString();
-
-        // XXX ugly hack
-        boolean special = special_map.equals(key);
-        if (special)
-          in_special_map = true;
-
-        BEValue value = bdecode();
-        result.put(key, value);
-
-        // XXX ugly hack continued
-        if (special)
-          in_special_map = false;
-        
-        c = getNextIndicator();
-      }
-    indicator = 0;
-
-    return new BEValue(result);
-  }
-
-  /**
-   * Returns the next byte read from the InputStream (as int).
-   * Throws EOFException if InputStream.read() returned -1.
-   */
-  private int read() throws IOException
-  {
-    int c = in.read();
-    if (c == -1)
-      throw new EOFException();
-    if (in_special_map) sha_digest.update((byte)c);
-    return c;
-  }
-
-  /**
-   * Returns a byte[] containing length valid bytes starting at offset
-   * zero.  Throws EOFException if InputStream.read() returned -1
-   * before all requested bytes could be read.  Note that the byte[]
-   * returned might be bigger then requested but will only contain
-   * length valid bytes.  The returned byte[] will be reused when this
-   * method is called again.
-   */
-  private byte[] read(int length) throws IOException
-  {
-    byte[] result = new byte[length];
-    
-    int read = 0;
-    while (read < length)
-      {
-        int i = in.read(result, read, length - read);
-        if (i == -1)
-          throw new EOFException();
-        read += i;
-      }
-
-    if (in_special_map) sha_digest.update(result, 0, length);
-    return result;
-  }
-
-}

apps/i2psnark/java/src/org/klomp/snark/bencode/BEValue.java

@@ -1,193 +0,0 @@
-/* BEValue - Holds different types that a bencoded byte array can represent.
-   Copyright (C) 2003 Mark J. Wielaard
-
-   This file is part of Snark.
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
- 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
- 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-package org.klomp.snark.bencode;
-
-import java.io.UnsupportedEncodingException;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * Holds different types that a bencoded byte array can represent.
- * You need to call the correct get method to get the correct java
- * type object. If the BEValue wasn't actually of the requested type
- * you will get a InvalidBEncodingException.
- *
- * @author Mark Wielaard (mark@klomp.org)
- */
-public class BEValue
-{
-  // This is either a byte[], Number, List or Map.
-  private final Object value;
-
-  public BEValue(byte[] value)
-  {
-    this.value = value;
-  }
-
-  public BEValue(Number value)
-  {
-    this.value = value;
-  }
-
-  public BEValue(List value)
-  {
-    this.value = value;
-  }
-
-  public BEValue(Map value)
-  {
-    this.value = value;
-  }
-
-  /**
-   * Returns this BEValue as a String. This operation only succeeds
-   * when the BEValue is a byte[], otherwise it will throw a
-   * InvalidBEncodingException. The byte[] will be interpreted as
-   * UTF-8 encoded characters.
-   */
-  public String getString() throws InvalidBEncodingException
-  {
-    try
-      {
-        return new String(getBytes(), "UTF-8");
-      }
-    catch (ClassCastException cce)
-      {
-        throw new InvalidBEncodingException(cce.toString());
-      }
-    catch (UnsupportedEncodingException uee)
-      {
-        throw new InternalError(uee.toString());
-      }
-  }
-
-  /**
-   * Returns this BEValue as a byte[]. This operation only succeeds
-   * when the BEValue is actually a byte[], otherwise it will throw a
-   * InvalidBEncodingException.
-   */
-  public byte[] getBytes() throws InvalidBEncodingException
-  {
-    try
-      {
-        return (byte[])value;
-      }
-    catch (ClassCastException cce)
-      {
-        throw new InvalidBEncodingException(cce.toString());
-      }
-  }
-
-  /**
-   * Returns this BEValue as a Number. This operation only succeeds
-   * when the BEValue is actually a Number, otherwise it will throw a
-   * InvalidBEncodingException.
-   */
-  public Number getNumber() throws InvalidBEncodingException
-  {
-    try
-      {
-        return (Number)value;
-      }
-    catch (ClassCastException cce)
-      {
-        throw new InvalidBEncodingException(cce.toString());
-      }
-  }
-
-  /**
-   * Returns this BEValue as int. This operation only succeeds when
-   * the BEValue is actually a Number, otherwise it will throw a
-   * InvalidBEncodingException. The returned int is the result of
-   * <code>Number.intValue()</code>.
-   */
-  public int getInt() throws InvalidBEncodingException
-  {
-    return getNumber().intValue();
-  }
-
-  /**
-   * Returns this BEValue as long. This operation only succeeds when
-   * the BEValue is actually a Number, otherwise it will throw a
-   * InvalidBEncodingException. The returned long is the result of
-   * <code>Number.longValue()</code>.
-   */
-  public long getLong() throws InvalidBEncodingException
-  {
-    return getNumber().longValue();
-  }
-
-  /**
-   * Returns this BEValue as a List of BEValues. This operation only
-   * succeeds when the BEValue is actually a List, otherwise it will
-   * throw a InvalidBEncodingException.
-   */
-  public List getList() throws InvalidBEncodingException
-  {
-    try
-      {
-        return (List)value;
-      }
-    catch (ClassCastException cce)
-      {
-        throw new InvalidBEncodingException(cce.toString());
-      }
-  }
-
-  /**
-   * Returns this BEValue as a Map of BEValue keys and BEValue
-   * values. This operation only succeeds when the BEValue is actually
-   * a Map, otherwise it will throw a InvalidBEncodingException.
-   */
-  public Map getMap() throws InvalidBEncodingException
-  {
-    try
-      {
-        return (Map)value;
-      }
-    catch (ClassCastException cce)
-      {
-        throw new InvalidBEncodingException(cce.toString());
-      }
-  }
-
-  /** return the untyped value */
-  public Object getValue() { return value; }
-  
-  public String toString()
-  {
-    String valueString;
-    if (value instanceof byte[])
-      {
-        byte[] bs = (byte[])value;
-        // XXX - Stupid heuristic...
-        if (bs.length <= 12)
-          valueString = new String(bs);
-        else
-          valueString = "bytes:" + bs.length;
-      }
-    else
-      valueString = value.toString();
-
-    return "BEValue[" + valueString + "]";
-  }
-}

apps/i2psnark/java/src/org/klomp/snark/bencode/BEncoder.java

@@ -1,193 +0,0 @@
-/* BDecoder - Converts an InputStream to BEValues.
-   Copyright (C) 2003 Mark J. Wielaard
-
-   This file is part of Snark.
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
- 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
- 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-package org.klomp.snark.bencode;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.UnsupportedEncodingException;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-public class BEncoder
-{
-
-  public static byte[] bencode(Object o) throws IllegalArgumentException
-  {
-    try
-      {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        bencode(o, baos);
-        return baos.toByteArray();
-      }
-    catch (IOException ioe)
-      {
-        throw new InternalError(ioe.toString());
-      }
-  }
-
-  public static void bencode(Object o, OutputStream out)
-    throws IOException, IllegalArgumentException
-  {
-    if (o instanceof String)
-      bencode((String)o, out);
-    else if (o instanceof byte[])
-      bencode((byte[])o, out);
-    else if (o instanceof Number)
-      bencode((Number)o, out);
-    else if (o instanceof List)
-      bencode((List)o, out);
-    else if (o instanceof Map)
-      bencode((Map)o, out);
-    else if (o instanceof BEValue)
-      bencode(((BEValue)o).getValue(), out);
-    else
-      throw new IllegalArgumentException("Cannot bencode: " + o.getClass());
-  }
-
-  public static byte[] bencode(String s)
-  {
-    try
-      {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        bencode(s, baos);
-        return baos.toByteArray();
-      }
-    catch (IOException ioe)
-      {
-        throw new InternalError(ioe.toString());
-      }
-  }
-
-  public static void bencode(String s, OutputStream out) throws IOException
-  {
-    byte[] bs = s.getBytes("UTF-8");
-    bencode(bs, out);
-  }
-
-  public static byte[] bencode(Number n)
-  {
-    try
-      {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        bencode(n, baos);
-        return baos.toByteArray();
-      }
-    catch (IOException ioe)
-      {
-        throw new InternalError(ioe.toString());
-      }
-  }
-
-  public static void bencode(Number n, OutputStream out) throws IOException
-  {
-    out.write('i');
-    String s = n.toString();
-    out.write(s.getBytes("UTF-8"));
-    out.write('e');
-  }
-
-  public static byte[] bencode(List l)
-  {
-    try
-      {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        bencode(l, baos);
-        return baos.toByteArray();
-      }
-    catch (IOException ioe)
-      {
-        throw new InternalError(ioe.toString());
-      }
-  }
-
-  public static void bencode(List l, OutputStream out) throws IOException
-  {
-    out.write('l');
-    Iterator it = l.iterator();
-    while (it.hasNext())
-      bencode(it.next(), out);
-    out.write('e');
-  }
-
-  public static byte[] bencode(byte[] bs)
-  {
-    try
-      {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        bencode(bs, baos);
-        return baos.toByteArray();
-      }
-    catch (IOException ioe)
-      {
-        throw new InternalError(ioe.toString());
-      }
-  }
-
-  public static void bencode(byte[] bs, OutputStream out) throws IOException
-  {
-    String l = Integer.toString(bs.length);
-    out.write(l.getBytes("UTF-8"));
-    out.write(':');
-    out.write(bs);
-  }
-
-  public static byte[] bencode(Map m)
-  {
-    try
-      {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        bencode(m, baos);
-        return baos.toByteArray();
-      }
-    catch (IOException ioe)
-      {
-        throw new InternalError(ioe.toString());
-      }
-  }
-
-  public static void bencode(Map m, OutputStream out) throws IOException
-  {
-    out.write('d');
-
-    // Keys must be sorted. XXX - But is this the correct order?
-    Set s = m.keySet();
-    List l = new ArrayList(s);
-    Collections.sort(l);
-
-    Iterator it = l.iterator();
-    while(it.hasNext())
-      {
-        // Keys must be Strings.
-        String key = (String)it.next();
-        Object value = m.get(key);
-        bencode(key, out);
-        bencode(value, out);
-      }
-
-    out.write('e');
-  }
-}

apps/i2psnark/java/src/org/klomp/snark/bencode/InvalidBEncodingException.java

@@ -1,36 +0,0 @@
-/* InvalidBEncodingException - Thrown when a bencoded stream is corrupted.
-   Copyright (C) 2003 Mark J. Wielaard
-
-   This file is part of Snark.
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
- 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
- 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-package org.klomp.snark.bencode;
-
-import java.io.IOException;
-
-/**
- * Exception thrown when a bencoded stream is corrupted.
- *
- * @author Mark Wielaard (mark@klomp.org)
- */
-public class InvalidBEncodingException extends IOException
-{
-  public InvalidBEncodingException(String message)
-  {
-    super(message);
-  }
-}

apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java

@@ -1,641 +0,0 @@
-package org.klomp.snark.web;
-
-import java.io.*;
-import java.util.*;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServlet;
-
-import net.i2p.I2PAppContext;
-import net.i2p.data.Base64;
-import net.i2p.data.DataHelper;
-import net.i2p.util.FileUtil;
-import net.i2p.util.I2PThread;
-import net.i2p.util.Log;
-import org.klomp.snark.*;
-
-/**
- *
- */
-public class I2PSnarkServlet extends HttpServlet {
-    private I2PAppContext _context;
-    private Log _log;
-    private SnarkManager _manager;
-    private static long _nonce;
-    
-    public static final String PROP_CONFIG_FILE = "i2psnark.configFile";
-    
-    public void init(ServletConfig cfg) throws ServletException {
-        super.init(cfg);
-        _context = I2PAppContext.getGlobalContext();
-        _log = _context.logManager().getLog(I2PSnarkServlet.class);
-        _nonce = _context.random().nextLong();
-        _manager = SnarkManager.instance();
-        String configFile = _context.getProperty(PROP_CONFIG_FILE);
-        if ( (configFile == null) || (configFile.trim().length() <= 0) )
-            configFile = "i2psnark.config";
-        _manager.loadConfig(configFile);
-    }
-    
-    public void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-        req.setCharacterEncoding("UTF-8");
-        resp.setCharacterEncoding("UTF-8");
-        resp.setContentType("text/html; charset=UTF-8");
-        
-        String nonce = req.getParameter("nonce");
-        if ( (nonce != null) && (nonce.equals(String.valueOf(_nonce))) )
-            processRequest(req);
-        
-        PrintWriter out = resp.getWriter();
-        out.write(HEADER_BEGIN);
-        // we want it to go to the base URI so we don't refresh with some funky action= value
-        out.write("<meta http-equiv=\"refresh\" content=\"60;" + req.getRequestURI() + "\">\n");
-        out.write(HEADER);
-        
-        out.write("<table border=\"0\" width=\"100%\">\n");
-        out.write("<tr><td width=\"5%\" class=\"snarkTitle\" valign=\"top\" align=\"left\">");
-        out.write("I2PSnark<br />\n");
-        out.write("<a href=\"" + req.getRequestURI() + "\" class=\"snarkRefresh\">Refresh</a>\n");
-        out.write("</td><td width=\"95%\" class=\"snarkMessages\" valign=\"top\" align=\"left\"><pre>");
-        List msgs = _manager.getMessages();
-        for (int i = msgs.size()-1; i >= 0; i--) {
-            String msg = (String)msgs.get(i);
-            out.write(msg + "\n");
-        }
-        out.write("</pre></td></tr></table>\n");
-
-        out.write(TABLE_HEADER);
-
-        List snarks = getSortedSnarks(req);
-        String uri = req.getRequestURI();
-        for (int i = 0; i < snarks.size(); i++) {
-            Snark snark = (Snark)snarks.get(i);
-            displaySnark(out, snark, uri, i);
-        }
-        if (snarks.size() <= 0) {
-            out.write(TABLE_EMPTY);
-        }
-        
-        out.write(TABLE_FOOTER);
-        writeAddForm(out, req);
-        if (true) // seeding needs to register the torrent first, so we can't start it automatically (boo, hiss)
-            writeSeedForm(out, req);
-        writeConfigForm(out, req);
-        out.write(FOOTER);
-    }
-    
-    /**
-     * Do what they ask, adding messages to _manager.addMessage as necessary
-     */
-    private void processRequest(HttpServletRequest req) {
-        String action = req.getParameter("action");
-        if (action == null) {
-            // noop
-        } else if ("Add torrent".equals(action)) {
-            String newFile = req.getParameter("newFile");
-            String newURL = req.getParameter("newURL");
-            File f = null;
-            if ( (newFile != null) && (newFile.trim().length() > 0) )
-                f = new File(newFile.trim());
-            if ( (f != null) && (!f.exists()) ) {
-                _manager.addMessage("Torrent file " + newFile +" does not exist");
-            }
-            if ( (f != null) && (f.exists()) ) {
-                File local = new File(_manager.getDataDir(), f.getName());
-                String canonical = null;
-                try {
-                    canonical = local.getCanonicalPath();
-                    
-                    if (local.exists()) {
-                        if (_manager.getTorrent(canonical) != null)
-                            _manager.addMessage("Torrent already running: " + newFile);
-                        else
-                            _manager.addMessage("Torrent already in the queue: " + newFile);
-                    } else {
-                        boolean ok = FileUtil.copy(f.getAbsolutePath(), local.getAbsolutePath(), true);
-                        if (ok) {
-                            _manager.addMessage("Copying torrent to " + local.getAbsolutePath());
-                            _manager.addTorrent(canonical);
-                        } else {
-                            _manager.addMessage("Unable to copy the torrent to " + local.getAbsolutePath() + " from " + f.getAbsolutePath());
-                        }
-                    }
-                } catch (IOException ioe) {
-                    _log.warn("hrm: " + local, ioe);
-                }
-            } else if ( (newURL != null) && (newURL.trim().length() > "http://.i2p/".length()) ) {
-                _manager.addMessage("Fetching " + newURL);
-                I2PThread fetch = new I2PThread(new FetchAndAdd(_manager, newURL), "Fetch and add");
-                fetch.start();
-            } else {
-                // no file or URL specified
-            }
-        } else if ("Stop".equals(action)) {
-            String torrent = req.getParameter("torrent");
-            if (torrent != null) {
-                byte infoHash[] = Base64.decode(torrent);
-                if ( (infoHash != null) && (infoHash.length == 20) ) { // valid sha1
-                    for (Iterator iter = _manager.listTorrentFiles().iterator(); iter.hasNext(); ) {
-                        String name = (String)iter.next();
-                        Snark snark = _manager.getTorrent(name);
-                        if ( (snark != null) && (DataHelper.eq(infoHash, snark.meta.getInfoHash())) ) {
-                            _manager.stopTorrent(name, false);
-                            break;
-                        }
-                    }
-                }
-            }
-        } else if ("Start".equals(action)) {
-            String torrent = req.getParameter("torrent");
-            if (torrent != null) {
-                byte infoHash[] = Base64.decode(torrent);
-                if ( (infoHash != null) && (infoHash.length == 20) ) { // valid sha1
-                    for (Iterator iter = _manager.listTorrentFiles().iterator(); iter.hasNext(); ) {
-                        String name = (String)iter.next();
-                        Snark snark = _manager.getTorrent(name);
-                        if ( (snark != null) && (DataHelper.eq(infoHash, snark.meta.getInfoHash())) ) {
-                            snark.startTorrent();
-                            _manager.addMessage("Starting up torrent " + name);
-                            break;
-                        }
-                    }
-                }
-            }
-        } else if ("Remove".equals(action)) {
-            String torrent = req.getParameter("torrent");
-            if (torrent != null) {
-                byte infoHash[] = Base64.decode(torrent);
-                if ( (infoHash != null) && (infoHash.length == 20) ) { // valid sha1
-                    for (Iterator iter = _manager.listTorrentFiles().iterator(); iter.hasNext(); ) {
-                        String name = (String)iter.next();
-                        Snark snark = _manager.getTorrent(name);
-                        if ( (snark != null) && (DataHelper.eq(infoHash, snark.meta.getInfoHash())) ) {
-                            _manager.stopTorrent(name, true);
-                            // should we delete the torrent file?
-                            // yeah, need to, otherwise it'll get autoadded again (at the moment
-                            File f = new File(name);
-                            f.delete();
-                            _manager.addMessage("Torrent file deleted: " + f.getAbsolutePath());
-                            break;
-                        }
-                    }
-                }
-            }
-        } else if ("Delete".equals(action)) {
-            String torrent = req.getParameter("torrent");
-            if (torrent != null) {
-                byte infoHash[] = Base64.decode(torrent);
-                if ( (infoHash != null) && (infoHash.length == 20) ) { // valid sha1
-                    for (Iterator iter = _manager.listTorrentFiles().iterator(); iter.hasNext(); ) {
-                        String name = (String)iter.next();
-                        Snark snark = _manager.getTorrent(name);
-                        if ( (snark != null) && (DataHelper.eq(infoHash, snark.meta.getInfoHash())) ) {
-                            _manager.stopTorrent(name, true);
-                            File f = new File(name);
-                            f.delete();
-                            _manager.addMessage("Torrent file deleted: " + f.getAbsolutePath());
-                            List files = snark.meta.getFiles();
-                            String dataFile = snark.meta.getName();
-                            for (int i = 0; files != null && i < files.size(); i++) {
-                                // multifile torrents have the getFiles() return lists of lists of filenames, but
-                                // each of those lists just contain a single file afaict...
-                                File df = new File(_manager.getDataDir(), files.get(i).toString());
-                                boolean deleted = FileUtil.rmdir(df, false);
-                                if (deleted)
-                                    _manager.addMessage("Data dir deleted: " + df.getAbsolutePath());
-                                else
-                                    _manager.addMessage("Data dir could not be deleted: " + df.getAbsolutePath());
-                            }
-                            if (dataFile != null) {
-                                f = new File(_manager.getDataDir(), dataFile);
-                                boolean deleted = f.delete();
-                                if (deleted)
-                                    _manager.addMessage("Data file deleted: " + f.getAbsolutePath());
-                                else
-                                    _manager.addMessage("Data file could not be deleted: " + f.getAbsolutePath());
-                            }
-                            break;
-                        }
-                    }
-                }
-            }
-        } else if ("Save configuration".equals(action)) {
-            String dataDir = req.getParameter("dataDir");
-            boolean autoStart = req.getParameter("autoStart") != null;
-            String seedPct = req.getParameter("seedPct");
-            String eepHost = req.getParameter("eepHost");
-            String eepPort = req.getParameter("eepPort");
-            String i2cpHost = req.getParameter("i2cpHost");
-            String i2cpPort = req.getParameter("i2cpPort");
-            String i2cpOpts = req.getParameter("i2cpOpts");
-            _manager.updateConfig(dataDir, autoStart, seedPct, eepHost, eepPort, i2cpHost, i2cpPort, i2cpOpts);
-        } else if ("Create torrent".equals(action)) {
-            String baseData = req.getParameter("baseFile");
-            if (baseData != null) {
-                File baseFile = new File(_manager.getDataDir(), baseData);
-                String announceURL = req.getParameter("announceURL");
-                String announceURLOther = req.getParameter("announceURLOther");
-                if ( (announceURLOther != null) && (announceURLOther.trim().length() > "http://.i2p/announce".length()) )
-                    announceURL = announceURLOther;
-
-                if (baseFile.exists() && baseFile.isFile()) {
-                    try {
-                        Storage s = new Storage(baseFile, announceURL, null);
-                        s.create();
-                        MetaInfo info = s.getMetaInfo();
-                        File torrentFile = new File(baseFile.getParent(), baseFile.getName() + ".torrent");
-                        if (torrentFile.exists())
-                            throw new IOException("Cannot overwrite an existing .torrent file: " + torrentFile.getPath());
-                        FileOutputStream out = new FileOutputStream(torrentFile);
-                        out.write(info.getTorrentData());
-                        out.close();
-                        _manager.addMessage("Torrent created for " + baseFile.getName() + ": " + torrentFile.getAbsolutePath());
-                        // now fire it up, but don't automatically seed it
-                        _manager.addTorrent(torrentFile.getCanonicalPath(), false);
-                        _manager.addMessage("Many I2P trackers require you to register new torrents before seeding - please do so before starting " + baseFile.getName());
-                    } catch (IOException ioe) {
-                        _manager.addMessage("Error creating a torrent for " + baseFile.getAbsolutePath() + ": " + ioe.getMessage());
-                    }
-                } else if (baseFile.exists()) {
-                    _manager.addMessage("I2PSnark doesn't yet support creating multifile torrents");
-                } else {
-                    _manager.addMessage("Cannot create a torrent for the nonexistant data: " + baseFile.getAbsolutePath());
-                }
-            }
-        }
-    }
-    
-    private List getSortedSnarks(HttpServletRequest req) {
-        Set files = _manager.listTorrentFiles();
-        TreeSet fileNames = new TreeSet(files); // sorts it alphabetically
-        ArrayList rv = new ArrayList(fileNames.size());
-        for (Iterator iter = fileNames.iterator(); iter.hasNext(); ) {
-            String name = (String)iter.next();
-            Snark snark = _manager.getTorrent(name);
-            if (snark != null)
-                rv.add(snark);
-        }
-        return rv;
-    }
-    
-    private static final int MAX_DISPLAYED_FILENAME_LENGTH = 60;
-    private void displaySnark(PrintWriter out, Snark snark, String uri, int row) throws IOException {
-        String filename = snark.torrent;
-        File f = new File(filename);
-        filename = f.getName(); // the torrent may be the canonical name, so lets just grab the local name
-        if (filename.length() > MAX_DISPLAYED_FILENAME_LENGTH)
-            filename = filename.substring(0, MAX_DISPLAYED_FILENAME_LENGTH) + "...";
-        long total = snark.meta.getTotalLength();
-        // Early typecast, avoid possibly overflowing a temp integer
-        long remaining = (long) snark.storage.needed() * (long) snark.meta.getPieceLength(0); 
-        if (remaining > total)
-            remaining = total;
-        int totalBps = 4096; // should probably grab this from the snark...
-        long remainingSeconds = remaining / totalBps;
-        long uploaded = snark.coordinator.getUploaded();
-        
-        boolean isRunning = !snark.stopped;
-        boolean isValid = snark.meta != null;
-        boolean singleFile = snark.meta.getFiles() == null;
-        
-        String err = snark.coordinator.trackerProblems;
-        int curPeers = snark.coordinator.getPeerCount();
-        int knownPeers = snark.coordinator.trackerSeenPeers;
-        
-        String statusString = "Unknown";
-        if (err != null) {
-            if (isRunning)
-                statusString = "TrackerErr (" + curPeers + "/" + knownPeers + " peers)";
-            else
-                statusString = "TrackerErr (" + err + ")";
-        } else if (remaining <= 0) {
-            if (isRunning)
-                statusString = "Seeding (" + curPeers + "/" + knownPeers + " peers)";
-            else
-                statusString = "Complete";
-        } else {
-            if (isRunning)
-                statusString = "OK (" + curPeers + "/" + knownPeers + " peers)";
-            else
-                statusString = "Stopped";
-        }
-        
-        String rowClass = (row % 2 == 0 ? "snarkTorrentEven" : "snarkTorrentOdd");
-        out.write("<tr class=\"" + rowClass + "\">");
-        out.write("<td valign=\"top\" align=\"left\" class=\"snarkTorrentStatus " + rowClass + "\">");
-        out.write(statusString + "</td>\n\t");
-        out.write("<td valign=\"top\" align=\"left\" class=\"snarkTorrentName " + rowClass + "\">");
-        
-        if (remaining == 0)
-            out.write("<a href=\"file:///" + _manager.getDataDir().getAbsolutePath() + File.separatorChar + snark.meta.getName() 
-                      + "\" title=\"Download the completed file\">");
-        out.write(filename);
-        if (remaining == 0)
-            out.write("</a>");
-        out.write("</td>\n\t");
-        
-        out.write("<td valign=\"top\" align=\"left\" class=\"snarkTorrentDownloaded " + rowClass + "\">");
-        if (remaining > 0) {
-            out.write(formatSize(total-remaining) + "/" + formatSize(total)); // 18MB/3GB
-            // lets hold off on the ETA until we have rates sorted...
-            //out.write(" (eta " + DataHelper.formatDuration(remainingSeconds*1000) + ")"); // (eta 6h)
-        } else {
-            out.write(formatSize(total)); // 3GB
-        }
-        out.write("</td>\n\t");
-        out.write("<td valign=\"top\" align=\"left\" class=\"snarkTorrentUploaded " + rowClass 
-                  + "\">" + formatSize(uploaded) + "</td>\n\t");
-        //out.write("<td valign=\"top\" align=\"left\" class=\"snarkTorrentRate\">");
-        //out.write("n/a"); //2KBps/12KBps/4KBps
-        //out.write("</td>\n\t");
-        out.write("<td valign=\"top\" align=\"left\" class=\"snarkTorrentAction " + rowClass + "\">");
-        if (isRunning) {
-            out.write("<a href=\"" + uri + "?action=Stop&nonce=" + _nonce 
-                      + "&torrent=" + Base64.encode(snark.meta.getInfoHash())
-                      + "\" title=\"Stop the torrent\">Stop</a>");
-        } else {
-            if (isValid)
-                out.write("<a href=\"" + uri + "?action=Start&nonce=" + _nonce 
-                          + "&torrent=" + Base64.encode(snark.meta.getInfoHash())
-                          + "\" title=\"Start the torrent\">Start</a> ");
-            out.write("<a href=\"" + uri + "?action=Remove&nonce=" + _nonce 
-                      + "&torrent=" + Base64.encode(snark.meta.getInfoHash())
-                      + "\" title=\"Remove the torrent from the active list, deleting the .torrent file\">Remove</a><br />");
-            out.write("<a href=\"" + uri + "?action=Delete&nonce=" + _nonce 
-                      + "&torrent=" + Base64.encode(snark.meta.getInfoHash())
-                      + "\" title=\"Delete the .torrent file and the associated data file(s)\">Delete</a> ");
-        }
-        out.write("</td>\n</tr>\n");
-    }
-    
-    private void writeAddForm(PrintWriter out, HttpServletRequest req) throws IOException {
-        String uri = req.getRequestURI();
-        String newURL = req.getParameter("newURL");
-        if ( (newURL == null) || (newURL.trim().length() <= 0) ) newURL = "http://";
-        String newFile = req.getParameter("newFile");
-        if ( (newFile == null) || (newFile.trim().length() <= 0) ) newFile = "";
-        
-        out.write("<span class=\"snarkNewTorrent\">\n");
-        // *not* enctype="multipart/form-data", so that the input type=file sends the filename, not the file
-        out.write("<form action=\"" + uri + "\" method=\"POST\">\n");
-        out.write("<input type=\"hidden\" name=\"nonce\" value=\"" + _nonce + "\" />\n");
-        out.write("From URL&nbsp;: <input type=\"text\" name=\"newURL\" size=\"50\" value=\"" + newURL + "\" /> \n");
-        // not supporting from file at the moment, since the file name passed isn't always absolute (so it may not resolve)
-        //out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\" value=\"" + newFile + "\" /><br />\n");
-        out.write("<input type=\"submit\" value=\"Add torrent\" name=\"action\" /><br />\n");
-        out.write("<span class=\"snarkAddInfo\">Alternately, you can copy .torrent files to " + _manager.getDataDir().getAbsolutePath() + "<br />\n");
-        out.write("Removing that .torrent file will cause the torrent to stop.<br /></span>\n");
-        out.write("</form>\n</span>\n");  
-    }
-    
-    private void writeSeedForm(PrintWriter out, HttpServletRequest req) throws IOException {
-        String uri = req.getRequestURI();
-        String baseFile = req.getParameter("baseFile");
-        if (baseFile == null)
-            baseFile = "";
-        
-        out.write("<span class=\"snarkNewTorrent\">\n");
-        // *not* enctype="multipart/form-data", so that the input type=file sends the filename, not the file
-        out.write("<form action=\"" + uri + "\" method=\"POST\">\n");
-        out.write("<input type=\"hidden\" name=\"nonce\" value=\"" + _nonce + "\" />\n");
-        //out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\" value=\"" + newFile + "\" /><br />\n");
-        out.write("Data to seed: " + _manager.getDataDir().getAbsolutePath() + File.separatorChar 
-                  + "<input type=\"text\" name=\"baseFile\" size=\"20\" value=\"" + baseFile 
-                  + "\" title=\"File to seed (must be within the specified path)\" /><br />\n");
-        out.write("Tracker: <select name=\"announceURL\"><option value=\"\">Select a tracker</option>\n");
-        Map trackers = sort(_manager.getTrackers());
-        for (Iterator iter = trackers.keySet().iterator(); iter.hasNext(); ) {
-            String name = (String)iter.next();
-            String announceURL = (String)trackers.get(name);
-            // we inject whitespace in sort(...) to guarantee uniqueness, but we can strip it off here
-            out.write("\t<option value=\"" + announceURL + "\">" + name.trim() + "</option>\n");
-        }
-        out.write("</select>\n");
-        out.write("or <input type=\"text\" name=\"announceURLOther\" size=\"50\" value=\"http://\" " +
-                  "title=\"Custom tracker URL\" /> ");
-        out.write("<input type=\"submit\" value=\"Create torrent\" name=\"action\" />\n");
-        out.write("</form>\n</span>\n");        
-    }
-    
-    private Map sort(Map trackers) {
-        TreeMap rv = new TreeMap();
-        for (Iterator iter = trackers.keySet().iterator(); iter.hasNext(); ) {
-            String url = (String)iter.next();
-            String name = (String)trackers.get(url);
-            while (rv.containsKey(name))
-                name = name + " ";
-            rv.put(name, url);
-        }
-        return rv;
-    }
-    
-    private void writeConfigForm(PrintWriter out, HttpServletRequest req) throws IOException {
-        String uri = req.getRequestURI();
-        String dataDir = _manager.getDataDir().getAbsolutePath();
-        boolean autoStart = _manager.shouldAutoStart();
-        int seedPct = 0;
-       
-        out.write("<form action=\"" + uri + "\" method=\"POST\">\n");
-        out.write("<span class=\"snarkConfig\"><hr />\n");
-        out.write("<input type=\"hidden\" name=\"nonce\" value=\"" + _nonce + "\" />\n");
-        out.write("<span class=\"snarkConfigTitle\">Configuration:</span><br />\n");
-        out.write("Data directory: <input type=\"text\" size=\"40\" name=\"dataDir\" value=\"" + dataDir + "\" ");
-        out.write("title=\"Directory to store torrents and data\" disabled=\"true\" /><br />\n");
-        out.write("Auto start: <input type=\"checkbox\" name=\"autoStart\" value=\"true\" " 
-                  + (autoStart ? "checked " : "") 
-                  + "title=\"If true, automatically start torrents that are added\" />");
-        //Auto add: <input type="checkbox" name="autoAdd" value="true" title="If true, automatically add torrents that are found in the data directory" />
-        //Auto stop: <input type="checkbox" name="autoStop" value="true" title="If true, automatically stop torrents that are removed from the data directory" />
-        //out.write("<br />\n");
-        out.write("Seed percentage: <select name=\"seedPct\" disabled=\"true\" >\n\t");
-        if (seedPct <= 0)
-            out.write("<option value=\"0\" selected=\"true\">Unlimited</option>\n\t");
-        else
-            out.write("<option value=\"0\">Unlimited</option>\n\t");
-        if (seedPct == 100)
-            out.write("<option value=\"100\" selected=\"true\">100%</option>\n\t");
-        else
-            out.write("<option value=\"100\">100%</option>\n\t");
-        if (seedPct == 150)
-            out.write("<option value=\"150\" selected=\"true\">150%</option>\n\t");
-        else
-            out.write("<option value=\"150\">150%</option>\n\t");
-        out.write("</select><br />\n");
-        
-        //out.write("<hr />\n");
-        out.write("EepProxy host: <input type=\"text\" name=\"eepHost\" value=\""
-                  + I2PSnarkUtil.instance().getEepProxyHost() + "\" size=\"15\" /> ");
-        out.write("port: <input type=\"text\" name=\"eepPort\" value=\""
-                  + I2PSnarkUtil.instance().getEepProxyPort() + "\" size=\"5\" /><br />\n");
-        out.write("I2CP host: <input type=\"text\" name=\"i2cpHost\" value=\"" 
-                  + I2PSnarkUtil.instance().getI2CPHost() + "\" size=\"15\" /> ");
-        out.write("port: <input type=\"text\" name=\"i2cpPort\" value=\"" +
-                  + I2PSnarkUtil.instance().getI2CPPort() + "\" size=\"5\" /> <br />\n");
-        StringBuffer opts = new StringBuffer(64);
-        Map options = new TreeMap(I2PSnarkUtil.instance().getI2CPOptions());
-        for (Iterator iter = options.keySet().iterator(); iter.hasNext(); ) {
-            String key = (String)iter.next();
-            String val = (String)options.get(key);
-            opts.append(key).append('=').append(val).append(' ');
-        }
-        out.write("I2CP opts: <input type=\"text\" name=\"i2cpOpts\" size=\"40\" value=\""
-                  + opts.toString() + "\" /><br />\n");
-        out.write("<input type=\"submit\" value=\"Save configuration\" name=\"action\" />\n");
-        out.write("</span>\n");
-        out.write("</form>\n");
-    }
-    
-    private String formatSize(long bytes) {
-        if (bytes < 5*1024)
-            return bytes + "B";
-        else if (bytes < 5*1024*1024)
-            return (bytes/1024) + "KB";
-        else if (bytes < 5*1024*1024*1024l)
-            return (bytes/(1024*1024)) + "MB";
-        else
-            return (bytes/(1024*1024*1024)) + "GB";
-    }
-    
-    private static final String HEADER_BEGIN = "<html>\n" +
-                                               "<head>\n" +
-                                               "<title>I2PSnark - anonymous bittorrent</title>\n";
-                                         
-    private static final String HEADER = "<style>\n" +
-                                         "body {\n" +
-                                         "	background-color: #C7CFB4;\n" +
-                                         "}\n" +
-                                         ".snarkTitle {\n" +
-                                         "	text-align: left;\n" +
-                                         "	float: left;\n" +
-                                         "	margin: 0px 0px 5px 5px;\n" +
-                                         "	display: inline;\n" +
-                                         "	font-size: 16pt;\n" +
-                                         "	font-weight: bold;\n" +
-                                         "}\n" +
-                                         ".snarkRefresh {\n" +
-                                         "                  font-size: 10pt;\n" +
-                                         "}\n" +
-                                         ".snarkMessages {\n" +
-                                         "	border: none;\n" +
-                                         "                  background-color: #CECFC6;\n" +
-                                         "                  font-family: monospace;\n" +
-                                         "                  font-size: 10pt;\n" +
-                                         "                  font-weight: 100;\n" +
-                                         "                  width: 100%;\n" +
-                                         "                  text-align: left;\n" +
-                                         "                  margin: 0px 0px 0px 0px;\n" +
-                                         "                  border: 0px;\n" +
-                                         "                  padding: 5px;\n" +
-                                         "                  border-width: 0px;\n" +
-                                         "                  border-spacing: 0px;\n" +
-                                         "}\n" +
-                                         "table {\n" +
-                                         "	margin: 0px 0px 0px 0px;\n" +
-                                         "	border: 0px;\n" +
-                                         "	padding: 0px;\n" +
-                                         "	border-width: 0px;\n" +
-                                         "	border-spacing: 0px;\n" +
-                                         "}\n" +
-                                         "th {\n" +
-                                         "	background-color: #C7D5D5;\n" +
-                                         "	margin: 0px 0px 0px 0px;\n" +
-                                         "}\n" +
-                                         ".snarkTorrentEven {\n" +
-                                         "	background-color: #E7E7E7;\n" +
-                                         "}\n" +
-                                         ".snarkTorrentOdd {\n" +
-                                         "	background-color: #DDDDCC;\n" +
-                                         "}\n" +
-                                         ".snarkNewTorrent {\n" +
-                                         "	font-size: 10pt;\n" +
-                                         "	font-family: monospace;\n" +
-                                         "	background-color: #ADAE9;\n" +
-                                         "}\n" +
-                                         ".snarkAddInfo {\n" +
-                                         "	font-size: 10pt;\n" +
-                                         "}\n" +
-                                         ".snarkConfigTitle {\n" +
-                                         "	font-size: 12pt;\n" +
-                                         "                  font-weight: bold;\n" +
-                                         "}\n" +
-                                         ".snarkConfig {\n" +
-                                         "                  font-size: 10pt;\n" +
-                                         "}\n" +
-                                         "</style>\n" +
-                                         "</head>\n" +
-                                         "<body>\n";
-
-
-    private static final String TABLE_HEADER = "<table border=\"0\" class=\"snarkTorrents\" width=\"100%\">\n" +
-                                               "<thead>\n" +
-                                               "<tr><th align=\"left\" valign=\"top\">Status</th>\n" +
-                                               "    <th align=\"left\" valign=\"top\">Torrent</th>\n" +
-                                               "    <th align=\"left\" valign=\"top\">Downloaded</th>\n" +
-                                               "    <th align=\"left\" valign=\"top\">Uploaded</th>\n" +
-                                               //"    <th align=\"left\" valign=\"top\">Rate</th>\n" +
-                                               "    <th>&nbsp;</th></tr>\n" +
-                                               "</thead>\n";
-    
-   private static final String TABLE_EMPTY  = "<tr class=\"snarkTorrentEven\">" +
-                                              "<td class=\"snarkTorrentEven\" align=\"left\"" +
-                                              "    valign=\"top\" colspan=\"5\">No torrents</td></tr>\n";
-
-    private static final String TABLE_FOOTER = "</table>\n";
-    
-    private static final String FOOTER = "</body></html>";
-}
-
-
-class FetchAndAdd implements Runnable {
-    private SnarkManager _manager;
-    private String _url;
-    public FetchAndAdd(SnarkManager mgr, String url) {
-        _manager = mgr;
-        _url = url;
-    }
-    public void run() {
-        _url = _url.trim();
-        File file = I2PSnarkUtil.instance().get(_url, false);
-        try {
-            if ( (file != null) && (file.exists()) && (file.length() > 0) ) {
-                _manager.addMessage("Torrent fetched from " + _url);
-                FileInputStream in = null;
-                try {
-                    in = new FileInputStream(file);
-                    MetaInfo info = new MetaInfo(in);
-                    String name = info.getName();
-                    name = name.replace('/', '_');
-                    name = name.replace('\\', '_');
-                    name = name.replace('&', '+');
-                    name = name.replace('\'', '_');
-                    name = name.replace('"', '_');
-                    name = name.replace('`', '_');
-                    name = name + ".torrent";
-                    File torrentFile = new File(_manager.getDataDir(), name);
-
-                    String canonical = torrentFile.getCanonicalPath();
-
-                    if (torrentFile.exists()) {
-                        if (_manager.getTorrent(canonical) != null)
-                            _manager.addMessage("Torrent already running: " + name);
-                        else
-                            _manager.addMessage("Torrent already in the queue: " + name);
-                    } else {
-                        FileUtil.copy(file.getAbsolutePath(), canonical, true);
-                        _manager.addTorrent(canonical);
-                    }
-                } catch (IOException ioe) {
-                    _manager.addMessage("Torrent at " + _url + " was not valid: " + ioe.getMessage());
-                } finally {
-                    try { in.close(); } catch (IOException ioe) {}
-                }
-            } else {
-                _manager.addMessage("Torrent was not retrieved from " + _url);
-            }
-        } finally {
-            if (file != null) file.delete();
-        }
-    }
-}

apps/i2psnark/java/src/org/klomp/snark/web/RunStandalone.java

@@ -1,47 +0,0 @@
-package org.klomp.snark.web;
-
-import java.io.File;
-
-import net.i2p.util.FileUtil;
-import org.mortbay.jetty.Server;
-
-public class RunStandalone {
-    private Server _server;
-    
-    static {
-        System.setProperty("org.mortbay.http.Version.paranoid", "true");
-        System.setProperty("org.mortbay.xml.XmlParser.NotValidating", "true");
-    }
-    
-    private RunStandalone(String args[]) {}
-    
-    public static void main(String args[]) {
-        RunStandalone runner = new RunStandalone(args);
-        runner.start();
-    }
-    
-    public void start() {
-        File workDir = new File("work");
-        boolean workDirRemoved = FileUtil.rmdir(workDir, false);
-        if (!workDirRemoved)
-            System.err.println("ERROR: Unable to remove Jetty temporary work directory");
-        boolean workDirCreated = workDir.mkdirs();
-        if (!workDirCreated)
-            System.err.println("ERROR: Unable to create Jetty temporary work directory");
-        
-        try {
-            _server = new Server("jetty-i2psnark.xml");
-            _server.start();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    public void stop() {
-        try {
-            _server.stop();
-        } catch (InterruptedException ie) {
-            ie.printStackTrace();
-        }
-    }
-}

apps/i2psnark/jetty-i2psnark.xml

@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?> 
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure 1.2//EN" "http://jetty.mortbay.org/configure_1_2.dtd">
-
-
-<!-- =============================================================== -->
-<!-- Configure the Jetty Server                                      -->
-<!-- =============================================================== -->
-<Configure class="org.mortbay.jetty.Server">
-
-  <!-- =============================================================== -->
-  <!-- Configure the Request Listeners                                 -->
-  <!-- =============================================================== -->
-
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <!-- Add and configure a HTTP listener to port 8080                  -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <Call name="addListener">
-    <Arg>
-      <New class="org.mortbay.http.SocketListener">
-        <Arg>
-          <New class="org.mortbay.util.InetAddrPort">
-            <Set name="host">127.0.0.1</Set>
-            <Set name="port">8002</Set>
-          </New>
-        </Arg>
-        <Set name="MinThreads">3</Set>
-        <Set name="MaxThreads">10</Set>
-        <Set name="MaxIdleTimeMs">30000</Set>
-        <Set name="LowResourcePersistTimeMs">1000</Set>
-        <Set name="ConfidentialPort">8443</Set>
-        <Set name="IntegralPort">8443</Set>
-        <Set name="PoolName">main</Set>
-      </New>
-    </Arg>
-  </Call>
-
-
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <!-- Add a HTTPS SSL listener on port 8443                           -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <!-- UNCOMMENT TO ACTIVATE
-  <Call name="addListener">
-    <Arg>
-      <New class="org.mortbay.http.SunJsseListener">
-        <Set name="Port">8443</Set>
-        <Set name="PoolName">main</Set>
-        <Set name="Keystore"><SystemProperty name="jetty.home" default="."/>/etc/demokeystore</Set>
-	<Set name="Password">OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4</Set>
-	<Set name="KeyPassword">OBF:1u2u1wml1z7s1z7a1wnl1u2g</Set>
-        <Set name="NonPersistentUserAgent">MSIE 5</Set>
-      </New>
-    </Arg>
-  </Call>
-  -->
-
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <!-- Add a AJP13 listener on port 8009                               -->
-  <!-- This protocol can be used with mod_jk in apache, IIS etc.       -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <!--
-  <Call name="addListener">
-    <Arg>
-      <New class="org.mortbay.http.ajp.AJP13Listener">
-        <Set name="PoolName">ajp</Set>
-        <Set name="Port">8009</Set>
-        <Set name="MinThreads">3</Set>
-        <Set name="MaxThreads">20</Set>
-        <Set name="MaxIdleTimeMs">0</Set>
-        <Set name="confidentialPort">443</Set>
-      </New>
-    </Arg>
-  </Call>
-  -->
-
-
-  <!-- =============================================================== -->
-  <!-- Configure the Contexts                                          -->
-  <!-- =============================================================== -->
-
-
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <!-- Add a all web application within the webapps directory.         -->
-  <!-- + No virtual host specified                                     -->
-  <!-- + Look in the webapps directory relative to jetty.home or .     -->
-  <!-- + Use the default webdefault.xml in jetty's install             -->
-  <!-- + Upack the war file                                            -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <Set name="rootWebApp">i2psnark</Set>
-  <Call name="addWebApplication">
-    <Arg>/</Arg>
-    <Arg>webapps/i2psnark.war</Arg>
-  </Call>
-
-  <!-- =============================================================== -->
-  <!-- Configure the Request Log                                       -->
-  <!-- =============================================================== -->
-  <Set name="RequestLog">
-    <New class="org.mortbay.http.NCSARequestLog">
-      <Arg>./logs/yyyy_mm_dd.i2psnark-request.log</Arg>
-      <Set name="retainDays">90</Set>
-      <Set name="append">true</Set>
-      <Set name="extended">false</Set>
-      <Set name="buffered">false</Set>
-      <Set name="LogTimeZone">GMT</Set>
-    </New>
-  </Set>
-
-  <!-- =============================================================== -->
-  <!-- Configure the Other Server Options                              -->
-  <!-- =============================================================== -->
-  <Set name="requestsPerGC">2000</Set>
-  <Set name="statsOn">false</Set>
-
-</Configure>

apps/i2psnark/readme-standalone.txt

@@ -1,6 +0,0 @@
-To run I2PSnark from the command line, run "java -jar lib/i2psnark.jar", but
-to run it with the web UI, run "java -jar launch-i2psnark.jar".  I2PSnark is
-GPL'ed software, based on Snark (http://www.klomp.org/) to run on top of I2P
-(http://www.i2p.net/) within a webserver (such as the bundled Jetty from
-http://jetty.mortbay.org/).  For more information about I2PSnark, get in touch
-with the folks at http://forum.i2p.net/

apps/i2psnark/readme.txt

@@ -1,11 +0,0 @@
-This is an I2P port of snark [http://klomp.org/snark], a GPL'ed bittorrent client
-
-The build in tracker has been removed for simplicity.
-
-Example usage:
-  java -jar lib/i2psnark.jar myFile.torrent
-
-or, a more verbose setting:
-  java -jar lib/i2psnark.jar --eepproxy 127.0.0.1 4444 \
-       --i2cp 127.0.0.1 7654 "inbound.length=2 outbound.length=2" \
-       --debug 6 myFile.torrent

apps/i2psnark/readme.txt.snark

@@ -1,141 +0,0 @@
-The Hunting of the Snark Project - BitTorrent Application Suite
-0.5 - The Beaver's Lesson (27 June 2003)
-
-  "It's a Snark!" was the sound that first came to their ears,
-     And seemed almost too good to be true.
-  Then followed a torrent of laughter and cheers:
-     Then the ominous words "It's a Boo-"
-
-  -- from The Hunting Of The Snark by Lewis Carroll
-
-Snark is a client for downloading and sharing files distributed with
-the BitTorrent protocol. It is mainly used for exploring the BitTorrent
-protocol and experimenting with the the GNU Compiler for Java (gcj).
-But it can also be used as a regular BitTorrent Client.
-
-Snark can also act as a torrent creator, micro http server for delivering
-metainfo.torrent files and has an integrated Tracker for making sharing of
-files as easy as possible.
-
-When you give the option --share Snark will automatically
-create a .torrent file, start a very simple webserver to distribute
-the metainfo.torrent file and a local tracker that other BitTorrent
-clients can connect to.
-
-Distribution
-------------
-
-  Copyright (C) 2003 Mark J. Wielaard
-
-  Snark is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-Requirements/Installation
--------------------------
-
-The GNU Compiler for java (gcj) version 3.3 or later.
-(Earlier versions have a faulty SHA message digest implementation.)
-On Debian GNU/Linux based distributions just install the gcj-3.3 package.
-Edit the GCJ variable in the Makefile if your gcj binary is not gcj-3.3.
-
-Typing 'make' will create the native snark binary and a snark.jar file
-for use with traditional java byte code interpreters.
-
-It is possible to compile the sources with other java compilers
-like jikes or kjc to produce the snark.jar file.  Edit the JAVAC and
-JAVAC_FLAGS variables on top of the Makefile for this.  And type
-'make snark.jar' to create a jar file that can be used by traditional
-java bytecode interpreters like kaffe: 'kaffe -jar snark.jar'.
-You will need at least version 1.1 of kaffe for all functionality to work
-correctly ('--share' does not work with older versions).
-
-When trying out the experimental Gnome frontend you also need the java-gnome
-bindings. On Debian GNU/Linux systems install the package libgnome0-java.
-You can try it out by typing 'make snark-gnome' and then run 'snark-gnome.sh'
-like you would with the normal command line client.
-
-Running
--------
-
-To use the program start it with:
-
-snark [--debug [level]] [--no-commands] [--port <port>]
-      [--share (<ip>|<host>)] (<url>|<file>|<dir>)
-  --debug       Shows some extra info and stacktraces.
-    level       How much debug details to show
-                (defaults to 3, with --debug to 4, highest level is 6).
-  --no-commands Don't read interactive commands or show usage info.
-  --port        The port to listen on for incomming connections
-                (if not given defaults to first free port between 6881-6889).
-  --share       Start torrent tracker on <ip> address or <host> name.
-  <url>         URL pointing to .torrent metainfo file to download/share.
-  <file>        Either a local .torrent metainfo file to download
-                or (with --share) a file to share.
-  <dir>         A directory with files to share (needs --share).
-
-Since this is an early beta release there are probably still some bugs
-in the program. To help find them run the program with the --debug
-option which shows more information on what it going on. You can also give
-the level of debug output you want. Zero will give (almost) no output at all.
-Everything above debug level 4 is probably to much (only really useful to
-see what goes on on the protocol/network level).
-
-Examples
-
-- To simple start downloading/sharing a file.
-  Either download the .torrent file to disk and start snark with:
-  ./snark somefile.torrent
-
-  Or give it the complete URL:
-  ./snark http://somehost.example.com/cd-images/bbc-lnx.iso.torrent
-
-- To start seeding/sharing a local file:
-  ./snark --share my-host.example.com some-file
-
-  Snark will respond with:
-  Listening on port: 6881
-  Trying to create metainfo torrent for 'some-file'
-  Creating torrent piece hashes: ++++++++++
-  Torrent available on http://my-host.example.com:6881/metainfo.torrent
-
-  You can now point other people to the above URL so they can share
-  the file with their own BitTorrent client.
-
-Commands
-
-While the program is running in text mode you can currently give the
-following commands: 'info', 'list' and 'quit'.
-
-Interactive commands are disabled when the '--no-commands' flag is given.
-This is sometimes desireable for running snark in the background.
-
-More information
-----------------
-
-- The Evolution of Cooperation - Robert Axelrod
-  ISBN 0-465-02121-2
-
-- The BitTorrent protocol description:
-  <http://bitconjurer.org/BitTorrent/protocol.html>
-
-- The GNU Compiler for Java (gcj):
-  <http://gcc.gnu.org/java/>
-
-- java-gnome bindings : <http://java-gnome.sourceforge.net/>
-
-- The Hunting of the Snark - Lewis Carroll
-
-Comments welcome
-
-	- Mark Wielaard <mark@klomp.org>

apps/i2psnark/web.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!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>org.klomp.snark.web.I2PSnarkServlet</servlet-name>
-     <servlet-class>org.klomp.snark.web.I2PSnarkServlet</servlet-class>
-     <load-on-startup>1</load-on-startup>
-    </servlet>
-     
-    <!-- precompiled servlets -->
-    
-    <servlet-mapping> 
-      <servlet-name>org.klomp.snark.web.I2PSnarkServlet</servlet-name>
-      <url-pattern>/</url-pattern>
-    </servlet-mapping>
-    
-    <session-config>
-        <session-timeout>
-            30
-        </session-timeout>
-    </session-config>
-</web-app>

apps/i2ptunnel/doc/COPYING

@@ -1,278 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.

apps/i2ptunnel/doc/readme.license.txt

@@ -1,11 +0,0 @@
-$Id$
-
-the i2p/apps/i2ptunnel module is the root of the 
-I2PTunnel application, and everything within it 
-is released according to the terms of the I2P 
-license policy.  That means everything contained 
-within the i2p/apps/i2ptunnel module is released 
-under the GPL plus the java exception unless 
-otherwise marked.  Alternate licenses that may be 
-used include BSD, Cryptix, and MIT, as well as
-code granted into the public domain.

apps/i2ptunnel/doc/readme.txt

@@ -1,21 +0,0 @@
-I2PTunnel allows to tunnel a usual TCP connection over I2P.
-
-A server needs to have a public key; a client connects to that.
-
-Starting a client:
-
-tunnel <localport> <pubkey>
-   localport: the port where you want to connect to
-   pubkey:    the public key of the server
-
-
-Starting a server:
-
-tunnel <remotehost> <remoteport> <privkey>
-   remotehost: the host to connect to when a connection comes.
-   remoteport: the port to connect to when a connection comes.
-   privkey:    your private (secret) key
-
-To stop a client/server, hit <Return>
-
-Have fun!

apps/i2ptunnel/java/build.xml

@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project basedir="." default="all" name="i2ptunnel">
-    <target name="all" depends="clean, build" />
-    <target name="build" depends="builddep, jar" />
-    <target name="builddep">
-        <ant dir="../../ministreaming/java/" target="build" />
-        <ant dir="../../jetty/" target="build" />
-	<!-- ministreaming will build core -->
-    </target>
-    <target name="compile">
-        <mkdir dir="./build" />
-        <mkdir dir="./build/obj" />
-        <javac 
-            srcdir="./src" 
-            debug="true" deprecation="on" source="1.3" target="1.3" 
-            destdir="./build/obj" 
-            classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" />
-    </target>
-    <target name="jar" depends="builddep, compile">
-        <jar destfile="./build/i2ptunnel.jar" basedir="./build/obj" includes="**/*.class">
-            <manifest>
-                <attribute name="Main-Class" value="net.i2p.i2ptunnel.I2PTunnel" />
-                <attribute name="Class-Path" value="i2p.jar mstreaming.jar" />
-            </manifest>
-        </jar>
-        <ant target="war" />
-    </target>
-    <target name="war" depends="precompilejsp"> 
-        <war destfile="build/i2ptunnel.war" webxml="../jsp/web-out.xml"
-             basedir="../jsp/" excludes="web.xml, *.java, *.jsp">
-        </war>
-    </target>
-    <target name="precompilejsp">
-        <delete dir="../jsp/WEB-INF/" />
-        <delete file="../jsp/web-fragment.xml" />
-        <delete file="../jsp/web-out.xml" />
-        <mkdir dir="../jsp/WEB-INF/" />
-        <mkdir dir="../jsp/WEB-INF/classes" />
-        <!-- there are various jspc ant tasks, but they all seem a bit flakey -->
-        <java classname="org.apache.jasper.JspC" fork="true" >
-            <classpath>
-                <pathelement location="../../jetty/jettylib/jasper-compiler.jar" />
-                <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
-                <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
-                <pathelement location="../../jetty/jettylib/commons-logging.jar" />
-                <pathelement location="../../jetty/jettylib/commons-el.jar" />
-                <pathelement location="../../jetty/jettylib/ant.jar" />
-                <pathelement location="build/i2ptunnel.jar" />
-            </classpath>
-            <arg value="-d" />
-            <arg value="../jsp/WEB-INF/classes" />
-            <arg value="-p" />
-            <arg value="net.i2p.i2ptunnel.jsp" />
-            <arg value="-webinc" />
-            <arg value="../jsp/web-fragment.xml" />
-            <arg value="-webapp" />
-            <arg value="../jsp/" />
-        </java>
-        <javac debug="true" deprecation="on" source="1.3" target="1.3" 
-               destdir="../jsp/WEB-INF/classes/" srcdir="../jsp/WEB-INF/classes" includes="**/*.java">
-            <classpath>
-                <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
-                <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
-                <pathelement location="../../jetty/jettylib/commons-logging.jar" />
-                <pathelement location="../../jetty/jettylib/commons-el.jar" />
-                <pathelement location="build/i2ptunnel.jar" />
-            </classpath>
-        </javac>
-        <copy file="../jsp/web.xml" tofile="../jsp/web-out.xml" />
-        <loadfile property="jspc.web.fragment" srcfile="../jsp/web-fragment.xml" />
-        <replace file="../jsp/web-out.xml">
-            <replacefilter token="&lt;!-- precompiled servlets --&gt;" value="${jspc.web.fragment}" />
-        </replace>
-    </target>
-    <target name="javadoc">
-        <mkdir dir="./build" />
-        <mkdir dir="./build/javadoc" />
-        <javadoc 
-            sourcepath="./src:../../../core/java/src:../../ministreaming/java/src" destdir="./build/javadoc" 
-            packagenames="*" 
-            use="true" 
-            splitindex="true" 
-            windowtitle="I2PTunnel" />
-    </target>
-    <target name="clean">
-        <delete dir="./build" />
-    </target>
-    <target name="cleandep" depends="clean">
-	<!-- ministreaming will clean core -->
-        <ant dir="../../ministreaming/java/" target="distclean" />
-    </target>
-    <target name="distclean" depends="clean">
-	<!-- ministreaming will clean core -->
-        <ant dir="../../ministreaming/java/" target="distclean" />
-    </target>
-</project>

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/BufferLogger.java

@@ -1,72 +0,0 @@
-/* I2PTunnel is GPL'ed (with the exception mentioned in I2PTunnel.java)
- * (c) 2003 - 2004 mihi
- */
-package net.i2p.i2ptunnel;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import net.i2p.util.Log;
-
-/**
- * Read what i2ptunnel logs, and expose it in a buffer
- *
- */
-class BufferLogger implements Logging {
-    private final static Log _log = new Log(BufferLogger.class);
-    private ByteArrayOutputStream _baos;
-    private boolean _ignore;
-
-    /**
-     * Constructs a buffered logger.
-     */
-    public BufferLogger() {
-        _baos = new ByteArrayOutputStream(512);
-        _ignore = false;
-    }
-
-    private final static String EMPTY = "";
-
-    /**
-     * Retrieves the buffer
-     * @return the buffer
-     */
-    public String getBuffer() {
-        if (_ignore)
-            return EMPTY;
-
-        return new String(_baos.toByteArray());
-    }
-
-    /**
-     * We don't care about anything else the logger receives.  This is useful
-     * for loggers passed in to servers and clients, since they will continue
-     * to add info to the logger, but if we're instantiated by the tunnel manager,
-     * its likely we only care about the first few messages it sends us.
-     *
-     */
-    public void ignoreFurtherActions() {
-        _ignore = true;
-        synchronized (_baos) {
-            _baos.reset();
-        }
-        _baos = null;
-    }
-
-    /**
-     * Pass in some random data 
-     * @param s String containing what we're logging.
-     */
-    public void log(String s) {
-        if (_ignore) return;
-        if (s != null) {
-            _log.debug("logging [" + s + "]");
-            try {
-                _baos.write(s.getBytes());
-                _baos.write('\n');
-            } catch (IOException ioe) {
-                _log.error("Error logging [" + s + "]");
-            }
-        }
-    }
-}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java

@@ -1,394 +0,0 @@
-package net.i2p.i2ptunnel;
-/*
- * free (adj.): unencumbered; not under the control of others
- * Written by jrandom in 2005 and released into the public domain 
- * with no warranty of any kind, either expressed or implied.  
- * It probably won't make your computer catch on fire, or eat 
- * your children, but it might.  Use at your own risk.
- *
- */
-
-import java.io.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.zip.GZIPInputStream;
-import net.i2p.I2PAppContext;
-import net.i2p.data.ByteArray;
-import net.i2p.util.ByteCache;
-import net.i2p.util.I2PThread;
-import net.i2p.util.Log;
-
-/**
- * Simple stream for delivering an HTTP response to
- * the client, trivially filtered to make sure "Connection: close"
- * is always in the response.  Perhaps add transparent handling of the
- * Content-encoding: x-i2p-gzip, adjusting the headers to say Content-encoding: identity?
- * Content-encoding: gzip is trivial as well, but Transfer-encoding: chunked makes it
- * more work than is worthwhile at the moment.
- *
- */
-class HTTPResponseOutputStream extends FilterOutputStream {
-    private I2PAppContext _context;
-    private Log _log;
-    private ByteCache _cache;
-    protected ByteArray _headerBuffer;
-    private boolean _headerWritten;
-    private byte _buf1[];
-    protected boolean _gzip;
-    private long _dataWritten;
-    private InternalGZIPInputStream _in;
-    private static final int CACHE_SIZE = 8*1024;
-    
-    public HTTPResponseOutputStream(OutputStream raw) {
-        super(raw);
-        _context = I2PAppContext.getGlobalContext();
-        _context.statManager().createRateStat("i2ptunnel.httpCompressionRatio", "ratio of compressed size to decompressed size after transfer", "i2ptunnel", new long[] { 60*1000, 30*60*1000 });
-        _context.statManager().createRateStat("i2ptunnel.httpCompressed", "compressed size transferred", "i2ptunnel", new long[] { 60*1000, 30*60*1000 });
-        _context.statManager().createRateStat("i2ptunnel.httpExpanded", "size transferred after expansion", "i2ptunnel", new long[] { 60*1000, 30*60*1000 });
-        _log = _context.logManager().getLog(getClass());
-        _cache = ByteCache.getInstance(8, CACHE_SIZE);
-        _headerBuffer = _cache.acquire();
-        _headerWritten = false;
-        _gzip = false;
-        _dataWritten = 0;
-        _buf1 = new byte[1];
-    }
-
-    public void write(int c) throws IOException {
-        _buf1[0] = (byte)c;
-        write(_buf1, 0, 1);
-    }
-    public void write(byte buf[]) throws IOException { 
-        write(buf, 0, buf.length); 
-    }
-    public void write(byte buf[], int off, int len) throws IOException {
-        if (_headerWritten) {
-            out.write(buf, off, len);
-            _dataWritten += len;
-            //out.flush();
-            return;
-        }
-
-        for (int i = 0; i < len; i++) {
-            ensureCapacity();
-            _headerBuffer.getData()[_headerBuffer.getValid()] = buf[off+i];
-            _headerBuffer.setValid(_headerBuffer.getValid()+1);
-
-            if (headerReceived()) {
-                writeHeader();
-                _headerWritten = true;
-                if (i + 1 < len) {
-                    // write out the remaining
-                    out.write(buf, off+i+1, len-i-1);
-                    _dataWritten += len-i-1;
-                    //out.flush();
-                }
-                return;
-            }
-        }
-    }
-    
-    /** grow (and free) the buffer as necessary */
-    private void ensureCapacity() {
-        if (_headerBuffer.getValid() + 1 >= _headerBuffer.getData().length) {
-            int newSize = (int)(_headerBuffer.getData().length * 1.5);
-            ByteArray newBuf = new ByteArray(new byte[newSize]);
-            System.arraycopy(_headerBuffer.getData(), 0, newBuf.getData(), 0, _headerBuffer.getValid());
-            newBuf.setValid(_headerBuffer.getValid());
-            newBuf.setOffset(0);
-            if (_headerBuffer.getData().length == CACHE_SIZE)
-                _cache.release(_headerBuffer);
-            _headerBuffer = newBuf;
-        }
-    }
-    
-    /** are the headers finished? */
-    private boolean headerReceived() {
-        if (_headerBuffer.getValid() < 3) return false;
-        byte first = _headerBuffer.getData()[_headerBuffer.getValid()-3];
-        byte second = _headerBuffer.getData()[_headerBuffer.getValid()-2];
-        byte third = _headerBuffer.getData()[_headerBuffer.getValid()-1];
-        return (isNL(second) && isNL(third)) || //   \n\n
-               (isNL(first) && isNL(third));    // \n\r\n
-    }
-    
-    /**
-     * Tweak that first HTTP response line (HTTP 200 OK, etc)
-     *
-     */
-    protected String filterResponseLine(String line) {
-        return line;
-    }
-    
-    /** we ignore any potential \r, since we trim it on write anyway */
-    private static final byte NL = '\n';
-    private boolean isNL(byte b) { return (b == NL); }
-    
-    /** ok, received, now munge & write it */
-    private void writeHeader() throws IOException {
-        String responseLine = null;
-
-        boolean connectionSent = false;
-        boolean proxyConnectionSent = false;
-        
-        int lastEnd = -1;
-        for (int i = 0; i < _headerBuffer.getValid(); i++) {
-            if (isNL(_headerBuffer.getData()[i])) {
-                if (lastEnd == -1) {
-                    responseLine = new String(_headerBuffer.getData(), 0, i+1); // includes NL
-                    responseLine = filterResponseLine(responseLine);
-                    responseLine = (responseLine.trim() + "\r\n");
-                    out.write(responseLine.getBytes());
-                } else {
-                    for (int j = lastEnd+1; j < i; j++) {
-                        if (_headerBuffer.getData()[j] == ':') {
-                            int keyLen = j-(lastEnd+1);
-                            int valLen = i-(j+1);
-                            if ( (keyLen <= 0) || (valLen < 0) )
-                                throw new IOException("Invalid header @ " + j);
-                            String key = new String(_headerBuffer.getData(), lastEnd+1, keyLen);
-                            String val = null;
-                            if (valLen == 0)
-                                val = "";
-                            else
-                                val = new String(_headerBuffer.getData(), j+2, valLen).trim();
-                            
-                            if (_log.shouldLog(Log.INFO))
-                                _log.info("Response header [" + key + "] = [" + val + "]");
-                            
-                            if ("Connection".equalsIgnoreCase(key)) {
-                                out.write("Connection: close\r\n".getBytes());
-                                connectionSent = true;
-                            } else if ("Proxy-Connection".equalsIgnoreCase(key)) {
-                                out.write("Proxy-Connection: close\r\n".getBytes());
-                                proxyConnectionSent = true;
-                            } else if ( ("Content-encoding".equalsIgnoreCase(key)) && ("x-i2p-gzip".equalsIgnoreCase(val)) ) {
-                                _gzip = true;
-                            } else {
-                                out.write((key.trim() + ": " + val.trim() + "\r\n").getBytes());
-                            }
-                            break;
-                        }
-                    }
-                }
-                lastEnd = i;
-            }
-        }
-        
-        if (!connectionSent)
-            out.write("Connection: close\r\n".getBytes());
-        if (!proxyConnectionSent)
-            out.write("Proxy-Connection: close\r\n".getBytes());
-            
-        finishHeaders();
-
-        boolean shouldCompress = shouldCompress();
-        if (_log.shouldLog(Log.INFO))
-            _log.info("After headers: gzip? " + _gzip + " compress? " + shouldCompress);
-        
-        // done, shove off
-        if (_headerBuffer.getData().length == CACHE_SIZE)
-            _cache.release(_headerBuffer);
-        else
-            _headerBuffer = null;
-        if (shouldCompress) {
-            beginProcessing();
-        }
-    }
-    
-    protected boolean shouldCompress() { return _gzip; }
-    
-    protected void finishHeaders() throws IOException {
-        out.write("\r\n".getBytes()); // end of the headers
-    }
-    
-    public void close() throws IOException {
-        out.close();
-    }
-    
-    protected void beginProcessing() throws IOException {
-        //out.flush();
-        PipedInputStream pi = new PipedInputStream();
-        PipedOutputStream po = new PipedOutputStream(pi);
-        new I2PThread(new Pusher(pi, out), "HTTP decompresser").start();
-        out = po;
-    }
-    
-    private class Pusher implements Runnable {
-        private InputStream _inRaw;
-        private OutputStream _out;
-        public Pusher(InputStream in, OutputStream out) {
-            _inRaw = in;
-            _out = out;
-        }
-        public void run() {
-            OutputStream to = null;
-            _in = null;
-            long start = System.currentTimeMillis();
-            long written = 0;
-            try {
-                _in = new InternalGZIPInputStream(_inRaw);
-                byte buf[] = new byte[8192];
-                int read = -1;
-                while ( (read = _in.read(buf)) != -1) {
-                    if (_log.shouldLog(Log.DEBUG))
-                        _log.debug("Read " + read + " and writing it to the browser/streams");
-                    _out.write(buf, 0, read);
-                    _out.flush();
-                    written += read;
-                }
-                if (_log.shouldLog(Log.INFO))
-                    _log.info("Decompressed: " + written + ", " + _in.getTotalRead() + "/" + _in.getTotalExpanded());
-            } catch (IOException ioe) {
-                if (_log.shouldLog(Log.WARN))
-                    _log.warn("Error decompressing: " + written + ", " + (_in != null ? _in.getTotalRead() + "/" + _in.getTotalExpanded() : ""), ioe);
-            } finally {
-                if (_log.shouldLog(Log.WARN) && (_in != null))
-                    _log.warn("After decompression, written=" + written + 
-                              (_in != null ?
-                                " read=" + _in.getTotalRead() 
-                                + ", expanded=" + _in.getTotalExpanded() + ", remaining=" + _in.getRemaining() 
-                                + ", finished=" + _in.getFinished()
-                               : ""));
-                if (_out != null) try { 
-                    _out.close(); 
-                } catch (IOException ioe) {}
-            }
-            long end = System.currentTimeMillis();
-            double compressed = (_in != null ? _in.getTotalRead() : 0);
-            double expanded = (_in != null ? _in.getTotalExpanded() : 0);
-            double ratio = 0;
-            if (expanded > 0)
-                ratio = compressed/expanded;
-
-            _context.statManager().addRateData("i2ptunnel.httpCompressionRatio", (int)(100d*ratio), end-start);
-            _context.statManager().addRateData("i2ptunnel.httpCompressed", (long)compressed, end-start);
-            _context.statManager().addRateData("i2ptunnel.httpExpanded", (long)expanded, end-start);
-        }
-    }
-    private class InternalGZIPInputStream extends GZIPInputStream {
-        public InternalGZIPInputStream(InputStream in) throws IOException {
-            super(in);
-        }
-        public long getTotalRead() { 
-            try {
-                return super.inf.getTotalIn(); 
-            } catch (Exception e) { 
-                return 0; 
-            }
-        }
-        public long getTotalExpanded() { 
-            try {
-                return super.inf.getTotalOut(); 
-            } catch (Exception e) {
-                return 0;
-            }
-        }
-        public long getRemaining() { 
-            try {
-                return super.inf.getRemaining(); 
-            } catch (Exception e) {
-                return 0;
-            }
-        }
-        public boolean getFinished() { 
-            try {
-                return super.inf.finished(); 
-            } catch (Exception e) {
-                return true;
-            }
-        }
-        public String toString() { 
-            return "Read: " + getTotalRead() + " expanded: " + getTotalExpanded() + " remaining: " + getRemaining() + " finished: " + getFinished();
-        }
-    }
-    
-    public String toString() {
-        return super.toString() + ": " + _in;
-    }
-    
-    public static void main(String args[]) {
-        String simple   = "HTTP/1.1 200 OK\n" +
-                          "foo: bar\n" +
-                          "baz: bat\n" +
-                          "\n" +
-                          "hi ho, this is the body";
-        String filtered = "HTTP/1.1 200 OK\n" +
-                          "Connection: keep-alive\n" +
-                          "foo: bar\n" +
-                          "baz: bat\n" +
-                          "\n" +
-                          "hi ho, this is the body";
-        String winfilter= "HTTP/1.1 200 OK\r\n" +
-                          "Connection: keep-alive\r\n" +
-                          "foo: bar\r\n" +
-                          "baz: bat\r\n" +
-                          "\r\n" +
-                          "hi ho, this is the body";
-        String minimal  = "HTTP/1.1 200 OK\n" +
-                          "\n" +
-                          "hi ho, this is the body";
-        String winmin   = "HTTP/1.1 200 OK\r\n" +
-                          "\r\n" +
-                          "hi ho, this is the body";
-        String invalid1 = "HTTP/1.1 200 OK\n";
-        String invalid2 = "HTTP/1.1 200 OK";
-        String invalid3 = "HTTP 200 OK\r\n";
-        String invalid4 = "HTTP 200 OK\r";
-        String invalid5 = "HTTP/1.1 200 OK\r\n" +
-                          "I am broken, and I smell\r\n" +
-                          "\r\n";
-        String invalid6 = "HTTP/1.1 200 OK\r\n" +
-                          ":I am broken, and I smell\r\n" +
-                          "\r\n";
-        String invalid7 = "HTTP/1.1 200 OK\n" +
-                          "I am broken, and I smell:\n" +
-                          ":asdf\n" +
-                          ":\n" +
-                          "\n";
-        String large    = "HTTP/1.1 200 OK\n" +
-                          "Last-modified: Tue, 25 Nov 2003 12:05:38 GMT\n" +
-                          "Expires: Tue, 25 Nov 2003 12:05:38 GMT\n" +
-                          "Content-length: 32\n" +
-                          "\n" +
-                          "hi ho, this is the body";
-        String blankval = "HTTP/1.0 200 OK\n" +
-                          "A:\n" +
-                          "\n";
-        
-        /* */
-        test("Simple", simple, true);
-        test("Filtered", filtered, true);
-        test("Filtered windows", winfilter, true);
-        test("Minimal", minimal, true);
-        test("Windows", winmin, true);
-        test("Large", large, true);
-        test("Blank whitespace", blankval, true);
-        test("Invalid (short headers)", invalid1, true);
-        test("Invalid (no headers)", invalid2, true);
-        test("Invalid (windows with short headers)", invalid3, true);
-        test("Invalid (windows no headers)", invalid4, true);
-        test("Invalid (bad headers)", invalid5, true);
-        test("Invalid (bad headers2)", invalid6, false);
-        test("Invalid (bad headers3)", invalid7, false);
-        /* */
-    }
-    
-    private static void test(String name, String orig, boolean shouldPass) {
-        System.out.println("====Testing: " + name + "\n" + orig + "\n------------");
-        try {
-            ByteArrayOutputStream baos = new ByteArrayOutputStream(4096);
-            HTTPResponseOutputStream resp = new HTTPResponseOutputStream(baos);
-            resp.write(orig.getBytes());
-            resp.flush();
-            String received = new String(baos.toByteArray());
-            System.out.println(received);
-        } catch (Exception e) {
-            if (shouldPass)
-                e.printStackTrace();
-            else
-                System.out.println("Properly fails with " + e.getMessage());
-        }
-    }
-}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClient.java

@@ -1,104 +0,0 @@
-/* I2PTunnel is GPL'ed (with the exception mentioned in I2PTunnel.java)
- * (c) 2003 - 2004 mihi
- */
-package net.i2p.i2ptunnel;
-
-import java.net.Socket;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import net.i2p.I2PAppContext;
-import net.i2p.client.streaming.I2PSocket;
-import net.i2p.data.DataFormatException;
-import net.i2p.data.Destination;
-import net.i2p.util.EventDispatcher;
-import net.i2p.util.Log;
-
-public class I2PTunnelClient extends I2PTunnelClientBase {
-
-    private static final Log _log = new Log(I2PTunnelClient.class);
-
-    /** list of Destination objects that we point at */
-    protected List dests;
-    private static final long DEFAULT_READ_TIMEOUT = 5*60*1000; // -1
-    protected long readTimeout = DEFAULT_READ_TIMEOUT;
-
-    /**
-     * @param destinations comma delimited list of peers we target
-     * @throws IllegalArgumentException if the I2PTunnel does not contain
-     *                                  valid config to contact the router
-     */
-    public I2PTunnelClient(int localPort, String destinations, Logging l, 
-                           boolean ownDest, EventDispatcher notifyThis, 
-                           I2PTunnel tunnel) throws IllegalArgumentException {
-        super(localPort, ownDest, l, notifyThis, "SynSender", tunnel);
-
-        if (waitEventValue("openBaseClientResult").equals("error")) {
-            notifyEvent("openClientResult", "error");
-            return;
-        }
-
-        StringTokenizer tok = new StringTokenizer(destinations, ",");
-        dests = new ArrayList(1);
-        while (tok.hasMoreTokens()) {
-            String destination = tok.nextToken();
-            try {
-                Destination dest = I2PTunnel.destFromName(destination);
-                if (dest == null)
-                    l.log("Could not resolve " + destination);
-                else
-                    dests.add(dest);
-            } catch (DataFormatException dfe) {
-                l.log("Bad format parsing \"" + destination + "\"");
-            }
-        }
-
-        if (dests.size() <= 0) {
-            l.log("No target destinations found");
-            notifyEvent("openClientResult", "error");
-            return;
-        }
-
-        setName(getLocalPort() + " -> " + destinations);
-
-        startRunning();
-
-        notifyEvent("openClientResult", "ok");
-    }
-
-    public void setReadTimeout(long ms) { readTimeout = ms; }
-    public long getReadTimeout() { return readTimeout; }
-    
-    protected void clientConnectionRun(Socket s) {
-        Destination dest = pickDestination();
-        I2PSocket i2ps = null;
-        try {
-            i2ps = createI2PSocket(dest);
-            i2ps.setReadTimeout(readTimeout);
-            new I2PTunnelRunner(s, i2ps, sockLock, null, mySockets);
-        } catch (Exception ex) {
-            _log.info("Error connecting", ex);
-            l.log(ex.getMessage());
-            closeSocket(s);
-            if (i2ps != null) {
-                synchronized (sockLock) {
-                    mySockets.remove(sockLock);
-                }
-            }
-        }
-    }
-    
-    private final Destination pickDestination() {
-        int size = dests.size();
-        if (size <= 0) {
-            if (_log.shouldLog(Log.ERROR))
-                _log.error("No client targets?!");
-            return null;
-        }
-        if (size == 1) // skip the rand in the most common case
-            return (Destination)dests.get(0);
-        int index = I2PAppContext.getGlobalContext().random().nextInt(size);
-        return (Destination)dests.get(index);
-    }
-}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java

@@ -1,532 +0,0 @@
-/* I2PTunnel is GPL'ed (with the exception mentioned in I2PTunnel.java)
- * (c) 2003 - 2004 mihi
- */
-package net.i2p.i2ptunnel;
-
-import java.io.IOException;
-import java.io.InterruptedIOException;
-import java.net.ConnectException;
-import java.net.InetAddress;
-import java.net.NoRouteToHostException;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-
-import net.i2p.I2PException;
-import net.i2p.I2PAppContext;
-import net.i2p.client.I2PSession;
-import net.i2p.client.streaming.I2PSocket;
-import net.i2p.client.streaming.I2PSocketManager;
-import net.i2p.client.streaming.I2PSocketManagerFactory;
-import net.i2p.client.streaming.I2PSocketOptions;
-import net.i2p.data.Destination;
-import net.i2p.util.EventDispatcher;
-import net.i2p.util.I2PThread;
-import net.i2p.util.SimpleTimer;
-import net.i2p.util.Log;
-
-public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runnable {
-
-    private static final Log _log = new Log(I2PTunnelClientBase.class);
-    protected I2PAppContext _context;
-    protected Logging l;
-
-    static final long DEFAULT_CONNECT_TIMEOUT = 60 * 1000;
-
-    private static volatile long __clientId = 0;
-    protected long _clientId;
-    protected Object sockLock = new Object(); // Guards sockMgr and mySockets
-    protected I2PSocketManager sockMgr;
-    protected List mySockets = new ArrayList();
-
-    protected Destination dest = null;
-    private int localPort;
-
-    private boolean listenerReady = false;
-
-    private ServerSocket ss;
-
-    private Object startLock = new Object();
-    private boolean startRunning = false;
-
-    private Object closeLock = new Object();
-
-    private byte[] pubkey;
-
-    private String handlerName;
-
-    private Object conLock = new Object();
-    
-    /** List of Socket for those accept()ed but not yet started up */
-    private List _waitingSockets = new ArrayList();
-    /** How many connections will we allow to be in the process of being built at once? */
-    private int _numConnectionBuilders;
-    /** How long will we allow sockets to sit in the _waitingSockets map before killing them? */
-    private int _maxWaitTime;
-    
-    /**
-     * How many concurrent connections this I2PTunnel instance will allow to be 
-     * in the process of connecting (or if less than 1, there is no limit)?
-     */
-    public static final String PROP_NUM_CONNECTION_BUILDERS = "i2ptunnel.numConnectionBuilders";
-    /**
-     * How long will we let a socket wait after being accept()ed without getting
-     * pumped through a connection builder (in milliseconds).  If this time is 
-     * reached, the socket is unceremoniously closed and discarded.  If the max 
-     * wait time is less than 1, there is no limit.
-     *
-     */
-    public static final String PROP_MAX_WAIT_TIME = "i2ptunnel.maxWaitTime";
-    
-    private static final int DEFAULT_NUM_CONNECTION_BUILDERS = 5;
-    private static final int DEFAULT_MAX_WAIT_TIME = 30*1000;
-    
-    //public I2PTunnelClientBase(int localPort, boolean ownDest,
-    //		       Logging l) {
-    //    I2PTunnelClientBase(localPort, ownDest, l, (EventDispatcher)null);
-    //}
-
-    /**
-     * @throws IllegalArgumentException if the I2CP configuration is b0rked so
-     *                                  badly that we cant create a socketManager
-     */
-    public I2PTunnelClientBase(int localPort, boolean ownDest, Logging l, 
-                               EventDispatcher notifyThis, String handlerName, 
-                               I2PTunnel tunnel) throws IllegalArgumentException{
-        super(localPort + " (uninitialized)", notifyThis, tunnel);
-        _clientId = ++__clientId;
-        this.localPort = localPort;
-        this.l = l;
-        this.handlerName = handlerName + _clientId;
-
-        _context = tunnel.getContext();
-        _context.statManager().createRateStat("i2ptunnel.client.closeBacklog", "How many pending sockets remain when we close one due to backlog?", "I2PTunnel", new long[] { 60*1000, 10*60*1000, 60*60*1000 });
-        _context.statManager().createRateStat("i2ptunnel.client.closeNoBacklog", "How many pending sockets remain when it was removed prior to backlog timeout?", "I2PTunnel", new long[] { 60*1000, 10*60*1000, 60*60*1000 });
-        _context.statManager().createRateStat("i2ptunnel.client.manageTime", "How long it takes to accept a socket and fire it into an i2ptunnel runner (or queue it for the pool)?", "I2PTunnel", new long[] { 60*1000, 10*60*1000, 60*60*1000 });
-        _context.statManager().createRateStat("i2ptunnel.client.buildRunTime", "How long it takes to run a queued socket into an i2ptunnel runner?", "I2PTunnel", new long[] { 60*1000, 10*60*1000, 60*60*1000 });
-
-        // no need to load the netDb with leaseSets for destinations that will never 
-        // be looked up
-        tunnel.getClientOptions().setProperty("i2cp.dontPublishLeaseSet", "true");
-        
-        while (sockMgr == null) {
-            synchronized (sockLock) {
-                if (ownDest) {
-                    sockMgr = buildSocketManager();
-                } else {
-                    sockMgr = getSocketManager();
-                }
-            }
-            if (sockMgr == null) {
-                _log.log(Log.CRIT, "Unable to create socket manager (our own? " + ownDest + ")");
-                try { Thread.sleep(10*1000); } catch (InterruptedException ie) {}
-            }
-        }
-        if (sockMgr == null) {
-            l.log("Invalid I2CP configuration");
-            throw new IllegalArgumentException("Socket manager could not be created");
-        }
-        l.log("I2P session created");
-
-        getTunnel().addSession(sockMgr.getSession());
-        
-        Thread t = new I2PThread(this);
-        t.setName("Client " + _clientId);
-        listenerReady = false;
-        t.start();
-        open = true;
-        synchronized (this) {
-            while (!listenerReady && open) {
-                try {
-                    wait();
-                } catch (InterruptedException e) {
-                    // ignore
-                }
-            }
-        }
-
-        configurePool(tunnel);
-        
-        if (open && listenerReady) {
-            l.log("Ready! Port " + getLocalPort());
-            notifyEvent("openBaseClientResult", "ok");
-        } else {
-            l.log("Error listening - please see the logs!");
-            notifyEvent("openBaseClientResult", "error");
-        }
-    }
-    
-    /** 
-     * build and configure the pool handling accept()ed but not yet 
-     * established connections 
-     *
-     */
-    private void configurePool(I2PTunnel tunnel) {
-        _waitingSockets = new ArrayList(4);
-        
-        Properties opts = tunnel.getClientOptions();
-        String maxWait = opts.getProperty(PROP_MAX_WAIT_TIME, DEFAULT_MAX_WAIT_TIME+"");
-        try { 
-            _maxWaitTime = Integer.parseInt(maxWait); 
-        } catch (NumberFormatException nfe) {
-            _maxWaitTime = DEFAULT_MAX_WAIT_TIME;
-        }
-        
-        String numBuild = opts.getProperty(PROP_NUM_CONNECTION_BUILDERS, DEFAULT_NUM_CONNECTION_BUILDERS+"");
-        try {
-            _numConnectionBuilders = Integer.parseInt(numBuild);
-        } catch (NumberFormatException nfe) {
-            _numConnectionBuilders = DEFAULT_NUM_CONNECTION_BUILDERS;
-        }
-
-        for (int i = 0; i < _numConnectionBuilders; i++) {
-            String name = "ClientBuilder" + _clientId + '.' + i;
-            I2PThread b = new I2PThread(new TunnelConnectionBuilder(), name);
-            b.setDaemon(true);
-            b.start();
-        }
-    }
-
-    private static I2PSocketManager socketManager;
-
-    protected synchronized I2PSocketManager getSocketManager() {
-        return getSocketManager(getTunnel());
-    }
-    protected static synchronized I2PSocketManager getSocketManager(I2PTunnel tunnel) {
-        if (socketManager != null) {
-            I2PSession s = socketManager.getSession();
-            if ( (s == null) || (s.isClosed()) ) {
-                _log.info("Building a new socket manager since the old one closed [s=" + s + "]");
-                socketManager = buildSocketManager(tunnel);
-            } else {
-                _log.info("Not building a new socket manager since the old one is open [s=" + s + "]");
-            }
-        } else {
-            _log.info("Building a new socket manager since there is no other one");
-            socketManager = buildSocketManager(tunnel);
-        }
-        return socketManager;
-    }
-
-    protected I2PSocketManager buildSocketManager() {
-        return buildSocketManager(getTunnel());
-    }
-    protected static I2PSocketManager buildSocketManager(I2PTunnel tunnel) {
-        Properties props = new Properties();
-        if (tunnel == null)
-            props.putAll(System.getProperties());
-        else
-            props.putAll(tunnel.getClientOptions());
-        int portNum = 7654;
-        if (tunnel.port != null) {
-            try {
-                portNum = Integer.parseInt(tunnel.port);
-            } catch (NumberFormatException nfe) {
-                _log.log(Log.CRIT, "Invalid port specified [" + tunnel.port + "], reverting to " + portNum);
-            }
-        }
-        
-        I2PSocketManager sockManager = null;
-        while (sockManager == null) {
-            sockManager = I2PSocketManagerFactory.createManager(tunnel.host, portNum, props);
-            
-            if (sockManager == null) {
-                _log.log(Log.CRIT, "Unable to create socket manager");
-                try { Thread.sleep(10*1000); } catch (InterruptedException ie) {}
-            }
-        }
-        sockManager.setName("Client");
-        return sockManager;
-    }
-
-    public final int getLocalPort() {
-        return localPort;
-    }
-
-    protected final InetAddress getListenHost(Logging l) {
-        try {
-            return InetAddress.getByName(getTunnel().listenHost);
-        } catch (UnknownHostException uhe) {
-            l.log("Could not find listen host to bind to [" + getTunnel().host + "]");
-            _log.error("Error finding host to bind", uhe);
-            notifyEvent("openBaseClientResult", "error");
-            return null;
-        }
-    }
-
-    /**
-     * Actually start working on incoming connections.  *Must* be
-     * called by derived classes after initialization.
-     *
-     */
-    public final void startRunning() {
-        synchronized (startLock) {
-            startRunning = true;
-            startLock.notify();
-        }
-    }
-
-    /** 
-     * create the default options (using the default timeout, etc)
-     *
-     */
-    protected I2PSocketOptions getDefaultOptions() {
-        Properties defaultOpts = getTunnel().getClientOptions();
-        I2PSocketOptions opts = sockMgr.buildOptions(defaultOpts);
-        if (!defaultOpts.containsKey(I2PSocketOptions.PROP_CONNECT_TIMEOUT))
-            opts.setConnectTimeout(DEFAULT_CONNECT_TIMEOUT);
-        return opts;
-    }
-    
-    /** 
-     * create the default options (using the default timeout, etc)
-     *
-     */
-    protected I2PSocketOptions getDefaultOptions(Properties overrides) {
-        Properties defaultOpts = getTunnel().getClientOptions();
-        defaultOpts.putAll(overrides);
-        I2PSocketOptions opts = sockMgr.buildOptions(defaultOpts);
-        if (!defaultOpts.containsKey(I2PSocketOptions.PROP_CONNECT_TIMEOUT))
-            opts.setConnectTimeout(DEFAULT_CONNECT_TIMEOUT);
-        return opts;
-    }
-
-    /**
-     * Create a new I2PSocket towards to the specified destination,
-     * adding it to the list of connections actually managed by this
-     * tunnel.
-     *
-     * @param dest The destination to connect to
-     * @return a new I2PSocket
-     */
-    public I2PSocket createI2PSocket(Destination dest) throws I2PException, ConnectException, NoRouteToHostException, InterruptedIOException {
-        return createI2PSocket(dest, getDefaultOptions());
-    }
-
-    /**
-     * Create a new I2PSocket towards to the specified destination,
-     * adding it to the list of connections actually managed by this
-     * tunnel.
-     *
-     * @param dest The destination to connect to
-     * @param opt Option to be used to open when opening the socket
-     * @return a new I2PSocket
-     *
-     * @throws ConnectException if the peer refuses the connection
-     * @throws NoRouteToHostException if the peer is not found or not reachable
-     * @throws InterruptedIOException if the connection timeouts
-     * @throws I2PException if there is some other I2P-related problem
-     */
-    public I2PSocket createI2PSocket(Destination dest, I2PSocketOptions opt) throws I2PException, ConnectException, NoRouteToHostException, InterruptedIOException {
-        I2PSocket i2ps;
-
-        i2ps = sockMgr.connect(dest, opt);
-        synchronized (sockLock) {
-            mySockets.add(i2ps);
-        }
-
-        return i2ps;
-    }
-
-    public final void run() {
-        try {
-            InetAddress addr = getListenHost(l);
-            if (addr == null) {
-                open = false;
-                synchronized (this) {
-                    notifyAll();
-                }
-                synchronized (_waitingSockets) { _waitingSockets.notifyAll(); }
-                return;
-            }
-            ss = new ServerSocket(localPort, 0, addr);
-
-            // If a free port was requested, find out what we got
-            if (localPort == 0) {
-                localPort = ss.getLocalPort();
-            }
-            notifyEvent("clientLocalPort", new Integer(ss.getLocalPort()));
-            l.log("Listening for clients on port " + localPort + " of " + getTunnel().listenHost);
-
-            // Notify constructor that port is ready
-            synchronized (this) {
-                listenerReady = true;
-                notify();
-            }
-
-            // Wait until we are authorized to process data
-            synchronized (startLock) {
-                while (!startRunning) {
-                    try {
-                        startLock.wait();
-                    } catch (InterruptedException ie) {
-                    }
-                }
-            }
-
-            while (true) {
-                Socket s = ss.accept();
-                long before = System.currentTimeMillis();
-                manageConnection(s);
-                long total = System.currentTimeMillis() - before;
-                _context.statManager().addRateData("i2ptunnel.client.manageTime", total, total);
-            }
-        } catch (IOException ex) {
-            _log.error("Error listening for connections on " + localPort, ex);
-            notifyEvent("openBaseClientResult", "error");
-            synchronized (sockLock) {
-                mySockets.clear();
-            }
-            open = false;
-            synchronized (this) {
-                notifyAll();
-            }
-        }
-        synchronized (_waitingSockets) {
-            _waitingSockets.notifyAll();
-        }
-    }
-
-    /**
-     * Manage the connection just opened on the specified socket
-     *
-     * @param s Socket to take care of
-     */
-    protected void manageConnection(Socket s) {
-        if (s == null) return;
-        if (_numConnectionBuilders <= 0) {
-            new I2PThread(new BlockingRunner(s), "Clinet run").start();
-            return;
-        }
-        
-        if (_maxWaitTime > 0)
-            SimpleTimer.getInstance().addEvent(new CloseEvent(s), _maxWaitTime);
-
-        synchronized (_waitingSockets) {
-            _waitingSockets.add(s);
-            _waitingSockets.notifyAll();
-        }
-    }
-
-    /** 
-     * Blocking runner, used during the connection establishment whenever we
-     * are not using the queued builders.
-     *
-     */
-    private class BlockingRunner implements Runnable {
-        private Socket _s;
-        public BlockingRunner(Socket s) { _s = s; }
-        public void run() {
-            clientConnectionRun(_s);
-        }
-    }
-    
-    /**
-     * Remove and close the socket from the waiting list, if it is still there.
-     *
-     */
-    private class CloseEvent implements SimpleTimer.TimedEvent {
-        private Socket _s;
-        public CloseEvent(Socket s) { _s = s; }
-        public void timeReached() {
-            int remaining = 0;
-            boolean stillWaiting = false;
-            synchronized (_waitingSockets) {
-                stillWaiting = _waitingSockets.remove(_s);
-                remaining = _waitingSockets.size();
-            }
-            if (stillWaiting) {
-                try { _s.close(); } catch (IOException ioe) {}
-                if (_log.shouldLog(Log.INFO)) {
-                    _context.statManager().addRateData("i2ptunnel.client.closeBacklog", remaining, 0);
-                    _log.info("Closed a waiting socket because of backlog");
-                }
-            } else {
-                _context.statManager().addRateData("i2ptunnel.client.closeNoBacklog", remaining, 0);
-            }
-        }
-    }
-
-    public boolean close(boolean forced) {
-        if (!open) return true;
-        // FIXME: here we might have to wait quite a long time if
-        // there is a connection attempt atm. But without waiting we
-        // might risk to create an orphan socket. Would be better
-        // to return with an error in that situation quickly.
-        synchronized (sockLock) {
-            mySockets.retainAll(sockMgr.listSockets());
-            if (!forced && mySockets.size() != 0) {
-                l.log("There are still active connections!");
-                _log.debug("can't close: there are still active connections!");
-                for (Iterator it = mySockets.iterator(); it.hasNext();) {
-                    l.log("->" + it.next());
-                }
-                return false;
-            }
-            I2PSession session = sockMgr.getSession();
-            if (session != null) {
-                getTunnel().removeSession(session);
-            }
-            l.log("Closing client " + toString());
-            try {
-                if (ss != null) ss.close();
-            } catch (IOException ex) {
-                ex.printStackTrace();
-                return false;
-            }
-            l.log("Client closed.");
-            open = false;
-        }
-        
-        synchronized (_waitingSockets) { _waitingSockets.notifyAll(); }
-        return true;
-    }
-
-    public static void closeSocket(Socket s) {
-        try {
-            s.close();
-        } catch (IOException ex) {
-            _log.error("Could not close socket", ex);
-        }
-    }
-    
-    /**
-     * Pool runner pulling sockets off the waiting list and pushing them
-     * through clientConnectionRun.  This dies when the I2PTunnel instance
-     * is closed.
-     *
-     */
-    private class TunnelConnectionBuilder implements Runnable {
-        public void run() { 
-            Socket s = null;
-            while (open) {
-                try {
-                    synchronized (_waitingSockets) {
-                        if (_waitingSockets.size() <= 0)
-                            _waitingSockets.wait();
-                        else
-                            s = (Socket)_waitingSockets.remove(0);
-                    }
-                } catch (InterruptedException ie) {}
-                
-                if (s != null) {
-                    long before = System.currentTimeMillis();
-                    clientConnectionRun(s);
-                    long total = System.currentTimeMillis() - before;
-                    _context.statManager().addRateData("i2ptunnel.client.buildRunTime", total, 0);
-                }
-                s = null;
-            }
-        }
-    }
-
-    /**
-     * Manage a connection in a separate thread. This only works if
-     * you do not override manageConnection()
-     */
-    protected abstract void clientConnectionRun(Socket s);
-}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelGUI.java

@@ -1,48 +0,0 @@
-/* I2PTunnel is GPL'ed (with the exception mentioned in I2PTunnel.java)
- * (c) 2003 - 2004 mihi
- */
-package net.i2p.i2ptunnel;
-
-import java.awt.BorderLayout;
-import java.awt.Font;
-import java.awt.Frame;
-import java.awt.TextArea;
-import java.awt.TextField;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-/**
- * AWT gui since kaffe doesn't support swing yet
- */
-public class I2PTunnelGUI extends Frame implements ActionListener, Logging {
-
-    TextField input;
-    TextArea log;
-    I2PTunnel t;
-
-    public I2PTunnelGUI(I2PTunnel t) {
-        super("I2PTunnel control panel");
-        this.t = t;
-        setLayout(new BorderLayout());
-        add("South", input = new TextField());
-        input.addActionListener(this);
-        Font font = new Font("Monospaced", Font.PLAIN, 12);
-        add("Center", log = new TextArea("", 20, 80, TextArea.SCROLLBARS_VERTICAL_ONLY));
-        log.setFont(font);
-        log.setEditable(false);
-        log("enter 'help' for help.");
-        pack();
-        setVisible(true);
-    }
-
-    public void log(String s) {
-        log.append(s + "\n");
-    }
-
-    public void actionPerformed(ActionEvent evt) {
-        log("I2PTunnel>" + input.getText());
-        t.runCommand(input.getText(), this);
-        log("---");
-        input.setText("");
-    }
-}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java

@@ -1,668 +0,0 @@
-/* I2PTunnel is GPL'ed (with the exception mentioned in I2PTunnel.java)
- * (c) 2003 - 2004 mihi
- */
-package net.i2p.i2ptunnel;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.net.SocketException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.StringTokenizer;
-import java.util.HashMap;
-import java.util.Properties;
-
-import net.i2p.I2PAppContext;
-import net.i2p.I2PException;
-import net.i2p.client.streaming.I2PSocket;
-import net.i2p.client.streaming.I2PSocketOptions;
-import net.i2p.data.DataFormatException;
-import net.i2p.data.Destination;
-import net.i2p.util.EventDispatcher;
-import net.i2p.util.FileUtil;
-import net.i2p.util.Log;
-
-/**
- * Act as a mini HTTP proxy, handling various different types of requests,
- * forwarding them through I2P appropriately, and displaying the reply.  Supported
- * request formats are: <pre>
- *   $method http://$site[$port]/$path $protocolVersion
- * or
- *   $method $path $protocolVersion\nHost: $site
- * or
- *   $method http://i2p/$site/$path $protocolVersion
- * or 
- *   $method /$site/$path $protocolVersion
- * </pre>
- *
- * If the $site resolves with the I2P naming service, then it is directed towards
- * that eepsite, otherwise it is directed towards this client's outproxy (typically
- * "squid.i2p").  Only HTTP is supported (no HTTPS, ftp, mailto, etc).  Both GET
- * and POST have been tested, though other $methods should work.
- *
- */
-public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable {
-    private static final Log _log = new Log(I2PTunnelHTTPClient.class);
-
-    private List proxyList;
-
-    private HashMap addressHelpers = new HashMap();
-
-    private final static byte[] ERR_REQUEST_DENIED =
-        ("HTTP/1.1 403 Access Denied\r\n"+
-         "Content-Type: text/html; charset=iso-8859-1\r\n"+
-         "Cache-control: no-cache\r\n"+
-         "\r\n"+
-         "<html><body><H1>I2P ERROR: REQUEST DENIED</H1>"+
-         "You attempted to connect to a non-I2P website or location.<BR>")
-        .getBytes();
-    
-    private final static byte[] ERR_DESTINATION_UNKNOWN =
-        ("HTTP/1.1 503 Service Unavailable\r\n"+
-         "Content-Type: text/html; charset=iso-8859-1\r\n"+
-         "Cache-control: no-cache\r\n"+
-         "\r\n"+
-         "<html><body><H1>I2P ERROR: DESTINATION NOT FOUND</H1>"+
-         "That I2P Destination was not found. Perhaps you pasted in the "+
-         "wrong BASE64 I2P Destination or the link you are following is "+
-         "bad. The host (or the WWW proxy, if you're using one) could also "+
-	 "be temporarily offline.  You may want to <b>retry</b>.  "+
-         "Could not find the following Destination:<BR><BR><div>")
-        .getBytes();
-    
-    private final static byte[] ERR_TIMEOUT =
-        ("HTTP/1.1 504 Gateway Timeout\r\n"+
-         "Content-Type: text/html; charset=iso-8859-1\r\n"+
-         "Cache-control: no-cache\r\n\r\n"+
-         "<html><body><H1>I2P ERROR: TIMEOUT</H1>"+
-         "That Destination was reachable, but timed out getting a "+
-         "response.  This is likely a temporary error, so you should simply "+
-         "try to refresh, though if the problem persists, the remote "+
-         "destination may have issues.  Could not get a response from "+
-         "the following Destination:<BR><BR>")
-        .getBytes();
-
-    private final static byte[] ERR_NO_OUTPROXY =
-        ("HTTP/1.1 503 Service Unavailable\r\n"+
-         "Content-Type: text/html; charset=iso-8859-1\r\n"+
-         "Cache-control: no-cache\r\n"+
-         "\r\n"+
-         "<html><body><H1>I2P ERROR: No outproxy found</H1>"+
-         "Your request was for a site outside of I2P, but you have no "+
-         "HTTP outproxy configured.  Please configure an outproxy in I2PTunnel")
-         .getBytes();
-    
-    private final static byte[] ERR_AHELPER_CONFLICT =
-        ("HTTP/1.1 409 Conflict\r\n"+
-         "Content-Type: text/html; charset=iso-8859-1\r\n"+
-         "Cache-control: no-cache\r\n"+
-         "\r\n"+
-         "<html><body><H1>I2P ERROR: Destination key conflict</H1>"+
-         "The addresshelper link you followed specifies a different destination key "+
-         "than a host entry in your host database. "+
-         "Someone could be trying to impersonate another eepsite, "+
-         "or people have given two eepsites identical names.<P/>"+
-         "You can resolve the conflict by considering which key you trust, "+
-         "and either discarding the addresshelper link, "+
-         "discarding the host entry from your host database, "+
-         "or naming one of them differently.<P/>")
-         .getBytes();
-    
-    /** used to assign unique IDs to the threads / clients.  no logic or functionality */
-    private static volatile long __clientId = 0;
-
-    /**
-     * @throws IllegalArgumentException if the I2PTunnel does not contain
-     *                                  valid config to contact the router
-     */
-    public I2PTunnelHTTPClient(int localPort, Logging l, boolean ownDest, 
-                               String wwwProxy, EventDispatcher notifyThis, 
-                               I2PTunnel tunnel) throws IllegalArgumentException {
-        super(localPort, ownDest, l, notifyThis, "HTTPHandler " + (++__clientId), tunnel);
-
-        if (waitEventValue("openBaseClientResult").equals("error")) {
-            notifyEvent("openHTTPClientResult", "error");
-            return;
-        }
-
-        proxyList = new ArrayList();
-        if (wwwProxy != null) {
-            StringTokenizer tok = new StringTokenizer(wwwProxy, ",");
-            while (tok.hasMoreTokens())
-                proxyList.add(tok.nextToken().trim());
-        }
-
-        setName(getLocalPort() + " -> HTTPClient [WWW outproxy list: " + wwwProxy + "]");
-
-        startRunning();
-
-        notifyEvent("openHTTPClientResult", "ok");
-    }
-
-    private String getPrefix(long requestId) { return "Client[" + _clientId + "/" + requestId + "]: "; }
-    
-    private String selectProxy() {
-        synchronized (proxyList) {
-            int size = proxyList.size();
-            if (size <= 0) {
-                if (_log.shouldLog(Log.INFO))
-                    _log.info("Proxy list is empty - no outproxy available");
-                l.log("Proxy list is emtpy - no outproxy available");
-                return null;
-            }
-            int index = I2PAppContext.getGlobalContext().random().nextInt(size);
-            String proxy = (String)proxyList.get(index);
-            return proxy;
-        }
-    }
-
-    private static final int DEFAULT_READ_TIMEOUT = 60*1000;
-    
-    /** 
-     * create the default options (using the default timeout, etc)
-     *
-     */
-    protected I2PSocketOptions getDefaultOptions() {
-        Properties defaultOpts = getTunnel().getClientOptions();
-        if (!defaultOpts.contains(I2PSocketOptions.PROP_READ_TIMEOUT))
-            defaultOpts.setProperty(I2PSocketOptions.PROP_READ_TIMEOUT, ""+DEFAULT_READ_TIMEOUT);
-        //if (!defaultOpts.contains("i2p.streaming.inactivityTimeout"))
-        //    defaultOpts.setProperty("i2p.streaming.inactivityTimeout", ""+DEFAULT_READ_TIMEOUT);
-        I2PSocketOptions opts = sockMgr.buildOptions(defaultOpts);
-        if (!defaultOpts.containsKey(I2PSocketOptions.PROP_CONNECT_TIMEOUT))
-            opts.setConnectTimeout(DEFAULT_CONNECT_TIMEOUT);
-        return opts;
-    }
-    
-    /** 
-     * create the default options (using the default timeout, etc)
-     *
-     */
-    protected I2PSocketOptions getDefaultOptions(Properties overrides) {
-        Properties defaultOpts = getTunnel().getClientOptions();
-        defaultOpts.putAll(overrides);
-        if (!defaultOpts.contains(I2PSocketOptions.PROP_READ_TIMEOUT))
-            defaultOpts.setProperty(I2PSocketOptions.PROP_READ_TIMEOUT, ""+DEFAULT_READ_TIMEOUT);
-        if (!defaultOpts.contains("i2p.streaming.inactivityTimeout"))
-            defaultOpts.setProperty("i2p.streaming.inactivityTimeout", ""+DEFAULT_READ_TIMEOUT);
-        I2PSocketOptions opts = sockMgr.buildOptions(defaultOpts);
-        if (!defaultOpts.containsKey(I2PSocketOptions.PROP_CONNECT_TIMEOUT))
-            opts.setConnectTimeout(DEFAULT_CONNECT_TIMEOUT);
-        return opts;
-    }
-
-    private static final boolean DEFAULT_GZIP = true;
-    
-    private static long __requestId = 0;
-    protected void clientConnectionRun(Socket s) {
-        OutputStream out = null;
-        String targetRequest = null;
-        boolean usingWWWProxy = false;
-        String currentProxy = null;
-        long requestId = ++__requestId;
-        try {
-            out = s.getOutputStream();
-            BufferedReader br = new BufferedReader(new InputStreamReader(s.getInputStream(), "ISO-8859-1"));
-            String line, method = null, protocol = null, host = null, destination = null;
-            StringBuffer newRequest = new StringBuffer();
-            int ahelper = 0;
-            while ((line = br.readLine()) != null) {
-                if (_log.shouldLog(Log.DEBUG))
-                    _log.debug(getPrefix(requestId) + "Line=[" + line + "]");
-                
-                String lowercaseLine = line.toLowerCase();
-                if (lowercaseLine.startsWith("connection: ") || 
-                    lowercaseLine.startsWith("keep-alive: ") || 
-                    lowercaseLine.startsWith("proxy-connection: "))
-                    continue;
-                
-                if (method == null) { // first line (GET /base64/realaddr)
-                    if (_log.shouldLog(Log.DEBUG))
-                        _log.debug(getPrefix(requestId) + "Method is null for [" + line + "]");
-                    
-                    line = line.trim();
-                    int pos = line.indexOf(" ");
-                    if (pos == -1) break;
-                    method = line.substring(0, pos);
-                    String request = line.substring(pos + 1);
-                    if (request.startsWith("/") && getTunnel().getClientOptions().getProperty("i2ptunnel.noproxy") != null) {
-                        request = "http://i2p" + request;
-                    } else if (request.startsWith("/eepproxy/")) {
-                        // /eepproxy/foo.i2p/bar/baz.html HTTP/1.0
-                        String subRequest = request.substring("/eepproxy/".length());
-                        int protopos = subRequest.indexOf(" ");
-                        String uri = subRequest.substring(0, protopos);
-                        if (uri.indexOf("/") == -1) {
-                                uri = uri + "/";
-                        }
-                        // "http://" + "foo.i2p/bar/baz.html" + " HTTP/1.0"
-                        request = "http://" + uri + subRequest.substring(protopos);
-                    }
-
-                    pos = request.indexOf("//");
-                    if (pos == -1) {
-                        method = null;
-                        break;
-                    }
-                    protocol = request.substring(0, pos + 2);
-                    request = request.substring(pos + 2);
-
-                    targetRequest = request;
-
-                    pos = request.indexOf("/");
-                    if (pos == -1) {
-                        method = null;
-                        break;
-                    }
-                    host = request.substring(0, pos);
-
-                    // Quick hack for foo.bar.i2p
-                    if (host.toLowerCase().endsWith(".i2p")) {
-                        // Destination gets the host name
-                        destination = host;
-                        // Host becomes the destination key
-                        host = getHostName(destination);
-
-                        int pos2;
-                        if ((pos2 = request.indexOf("?")) != -1) {
-                            // Try to find an address helper in the fragments
-                            // and split the request into it's component parts for rebuilding later
-                            String ahelperKey = null;
-                            boolean ahelperConflict = false;
-                            
-                            String fragments = request.substring(pos2 + 1);
-                            String uriPath = request.substring(0, pos2);
-                            pos2 = fragments.indexOf(" ");
-                            String protocolVersion = fragments.substring(pos2 + 1);
-                            String urlEncoding = "";
-                            fragments = fragments.substring(0, pos2);
-                            String initialFragments = fragments;
-                            fragments = fragments + "&";
-                            String fragment;
-                            while(fragments.length() > 0) {
-                                pos2 = fragments.indexOf("&");
-                                fragment = fragments.substring(0, pos2);
-                                fragments = fragments.substring(pos2 + 1);
-                                
-                                // Fragment looks like addresshelper key
-                                if (fragment.startsWith("i2paddresshelper=")) {
-                                    pos2 = fragment.indexOf("=");
-                                    ahelperKey = fragment.substring(pos2 + 1);
-                                    
-                                    // Key contains data, lets not ignore it
-                                    if (ahelperKey != null) {
-                                        
-                                        // Host resolvable only with addresshelper
-                                        if ( (host == null) || ("i2p".equals(host)) )
-                                        {
-                                            // Cannot check, use addresshelper key
-                                            addressHelpers.put(destination,ahelperKey);
-                                        } else {
-                                            // Host resolvable from database, verify addresshelper key
-                                            // Silently bypass correct keys, otherwise alert
-                                            if (!host.equals(ahelperKey))
-                                            {
-                                                // Conflict: handle when URL reconstruction done
-                                                ahelperConflict = true;
-                                                if (_log.shouldLog(Log.WARN))
-                                                    _log.warn(getPrefix(requestId) + "Addresshelper key conflict for site [" + destination + "], trusted key [" + host + "], specified key [" + ahelperKey + "].");
-                                            }
-                                        }
-                                    }
-                                } else {
-                                    // Other fragments, just pass along
-                                    // Append each fragment to urlEncoding
-                                    if ("".equals(urlEncoding)) {
-                                        urlEncoding = "?" + fragment;
-                                    } else {
-                                        urlEncoding = urlEncoding + "&" + fragment; 
-                                    }
-                                }
-                            }
-                            // Reconstruct the request minus the i2paddresshelper GET var
-                            request = uriPath + urlEncoding + " " + protocolVersion;
-                            
-                            // Did addresshelper key conflict?
-                            if (ahelperConflict)
-                            {
-                                String str;
-                                byte[] header;
-                                str = FileUtil.readTextFile("docs/ahelper-conflict-header.ht", 100, true);
-                                if (str != null) header = str.getBytes();
-                                  else header = ERR_AHELPER_CONFLICT;
-
-                                if (out != null) {
-                                    long alias = I2PAppContext.getGlobalContext().random().nextLong();
-                                    String trustedURL = protocol + uriPath + urlEncoding;
-                                    String conflictURL = protocol + alias + ".i2p/?" + initialFragments;
-                                    out.write(header);
-                                    out.write(("To visit the destination in your host database, click <a href=\"" + trustedURL + "\">here</a>. To visit the conflicting addresshelper link by temporarily giving it a random alias, click <a href=\"" + conflictURL + "\">here</a>.<P/>").getBytes());
-                                    out.write("</div><p><i>I2P HTTP Proxy Server<br>Generated on: ".getBytes());
-                                    out.write(new Date().toString().getBytes());
-                                    out.write("</i></body></html>\n".getBytes());
-                                    out.flush();
-                                }
-                                s.close();
-                                return;
-                            }
-                        }
-
-                        String addressHelper = (String) addressHelpers.get(destination);
-                        if (addressHelper != null) {
-                            destination = addressHelper;
-                            host = getHostName(destination);
-                            ahelper = 1;
-                        }
-                        
-                        line = method + " " + request.substring(pos);
-                    } else if (host.indexOf(".") != -1) {
-                        // The request must be forwarded to a WWW proxy
-                        if (_log.shouldLog(Log.DEBUG))
-                            _log.debug("Before selecting outproxy for " + host);
-                        currentProxy = selectProxy();
-                        if (_log.shouldLog(Log.DEBUG))
-                            _log.debug("After selecting outproxy for " + host + ": " + currentProxy);
-                        if (currentProxy == null) {
-                            if (_log.shouldLog(Log.WARN))
-                                _log.warn(getPrefix(requestId) + "Host wants to be outproxied, but we dont have any!");
-                            l.log("No HTTP outproxy found for the request.");
-                            if (out != null) {
-                                out.write(ERR_NO_OUTPROXY);
-                                out.write("<p /><i>Generated on: ".getBytes());
-                                out.write(new Date().toString().getBytes());
-                                out.write("</i></body></html>\n".getBytes());
-                                out.flush();
-                            }
-                            s.close();
-                            return;
-                        }
-                        destination = currentProxy;
-                        usingWWWProxy = true;
-                        if (_log.shouldLog(Log.DEBUG))
-                            _log.debug(getPrefix(requestId) + "Host doesnt end with .i2p and it contains a period [" + host + "]: wwwProxy!");
-                    } else {
-                        request = request.substring(pos + 1);
-                        pos = request.indexOf("/");
-                        if (pos < 0) {
-                            l.log("Invalid request url [" + request + "]");
-                            if (out != null) {
-                                out.write(ERR_REQUEST_DENIED);
-                                out.write("<p /><i>Generated on: ".getBytes());
-                                out.write(new Date().toString().getBytes());
-                                out.write("</i></body></html>\n".getBytes());
-                                out.flush();
-                            }
-                            s.close();
-                            return;
-                        }
-                        destination = request.substring(0, pos);
-                        line = method + " " + request.substring(pos);
-                    }
-
-                    boolean isValid = usingWWWProxy || isSupportedAddress(host, protocol);
-                    if (!isValid) {
-                        if (_log.shouldLog(Log.INFO)) _log.info(getPrefix(requestId) + "notValid(" + host + ")");
-                        method = null;
-                        destination = null;
-                        break;
-                    } else if (!usingWWWProxy) {
-                        if (_log.shouldLog(Log.INFO)) _log.info(getPrefix(requestId) + "host=getHostName(" + destination + ")");
-                        host = getHostName(destination); // hide original host
-                    }
-
-                    if (_log.shouldLog(Log.DEBUG)) {
-                        _log.debug(getPrefix(requestId) + "METHOD:" + method + ":");
-                        _log.debug(getPrefix(requestId) + "PROTOC:" + protocol + ":");
-                        _log.debug(getPrefix(requestId) + "HOST  :" + host + ":");
-                        _log.debug(getPrefix(requestId) + "DEST  :" + destination + ":");
-                    }
-                    
-                } else {
-                    if (lowercaseLine.startsWith("host: ") && !usingWWWProxy) {
-                        line = "Host: " + host;
-                        if (_log.shouldLog(Log.INFO)) 
-                            _log.info(getPrefix(requestId) + "Setting host = " + host);
-                    } else if (lowercaseLine.startsWith("user-agent: ")) {
-                        // always stripped, added back at the end
-                        line = null;
-                        continue;
-                    } else if (lowercaseLine.startsWith("accept")) {
-                        // strip the accept-blah headers, as they vary dramatically from
-                        // browser to browser
-                        line = null;
-                        continue;
-                    } else if (lowercaseLine.startsWith("referer: ")) {
-                        // Shouldn't we be more specific, like accepting in-site referers ?
-                        //line = "Referer: i2p";
-                        line = null;
-                        continue; // completely strip the line
-                    } else if (lowercaseLine.startsWith("via: ")) {
-                        //line = "Via: i2p";
-                        line = null;
-                        continue; // completely strip the line
-                    } else if (lowercaseLine.startsWith("from: ")) {
-                        //line = "From: i2p";
-                        line = null;
-                        continue; // completely strip the line
-                    }
-                }
-                
-                if (line.length() == 0) {
-                    
-                    String ok = getTunnel().getContext().getProperty("i2ptunnel.gzip");
-                    boolean gzip = DEFAULT_GZIP;
-                    if (ok != null)
-                        gzip = Boolean.valueOf(ok).booleanValue();
-                    if (gzip) {
-                        // according to rfc2616 s14.3, this *should* force identity, even if
-                        // an explicit q=0 for gzip doesn't.  tested against orion.i2p, and it
-                        // seems to work.
-                        newRequest.append("Accept-Encoding: \r\n");
-                        newRequest.append("X-Accept-Encoding: x-i2p-gzip;q=1.0, identity;q=0.5, deflate;q=0, gzip;q=0, *;q=0\r\n");
-                    }
-                    newRequest.append("User-Agent: MYOB/6.66 (AN/ON)\r\n");
-                    newRequest.append("Connection: close\r\n\r\n");
-                    break;
-                } else {
-                    newRequest.append(line.trim()).append("\r\n"); // HTTP spec
-                }
-            }
-            if (_log.shouldLog(Log.DEBUG))
-                _log.debug(getPrefix(requestId) + "NewRequest header: [" + newRequest.toString() + "]");
-            
-            while (br.ready()) { // empty the buffer (POST requests)
-                int i = br.read();
-                if (i != -1) {
-                    newRequest.append((char) i);
-                }
-            }
-            if (method == null || destination == null) {
-                l.log("No HTTP method found in the request.");
-                if (out != null) {
-                    out.write(ERR_REQUEST_DENIED);
-                    out.write("<p /><i>Generated on: ".getBytes());
-                    out.write(new Date().toString().getBytes());
-                    out.write("</i></body></html>\n".getBytes());
-                    out.flush();
-                }
-                s.close();
-                return;
-            }
-            
-            if (_log.shouldLog(Log.DEBUG))
-                _log.debug(getPrefix(requestId) + "Destination: " + destination);
-            
-            Destination dest = I2PTunnel.destFromName(destination);
-            if (dest == null) {
-                l.log("Could not resolve " + destination + ".");
-                if (_log.shouldLog(Log.WARN))
-                    _log.warn("Unable to resolve " + destination + " (proxy? " + usingWWWProxy + ", request: " + targetRequest);
-                String str;
-                byte[] header;
-                boolean showAddrHelper = false;
-                if (usingWWWProxy)
-                    str = FileUtil.readTextFile("docs/dnfp-header.ht", 100, true);
-                else if(ahelper != 0)
-                    str = FileUtil.readTextFile("docs/dnfb-header.ht", 100, true);
-                else {
-                    str = FileUtil.readTextFile("docs/dnfh-header.ht", 100, true);
-                    showAddrHelper = true;
-                }
-                if (str != null)
-                    header = str.getBytes();
-                else
-                    header = ERR_DESTINATION_UNKNOWN;
-                writeErrorMessage(header, out, targetRequest, usingWWWProxy, destination, showAddrHelper);
-                s.close();
-                return;
-            }
-            String remoteID;
-            
-            Properties opts = new Properties();
-            //opts.setProperty("i2p.streaming.inactivityTimeout", ""+120*1000);
-            // 1 == disconnect.  see ConnectionOptions in the new streaming lib, which i
-            // dont want to hard link to here
-            //opts.setProperty("i2p.streaming.inactivityTimeoutAction", ""+1);
-            I2PSocket i2ps = createI2PSocket(dest, getDefaultOptions(opts));
-            byte[] data = newRequest.toString().getBytes("ISO-8859-1");
-            Runnable onTimeout = new OnTimeout(s, s.getOutputStream(), targetRequest, usingWWWProxy, currentProxy, requestId);
-            I2PTunnelRunner runner = new I2PTunnelHTTPClientRunner(s, i2ps, sockLock, data, mySockets, onTimeout);
-        } catch (SocketException ex) {
-            _log.info(getPrefix(requestId) + "Error trying to connect", ex);
-            l.log(ex.getMessage());
-            handleHTTPClientException(ex, out, targetRequest, usingWWWProxy, currentProxy, requestId);
-            closeSocket(s);
-        } catch (IOException ex) {
-            _log.info(getPrefix(requestId) + "Error trying to connect", ex);
-            l.log(ex.getMessage());
-            handleHTTPClientException(ex, out, targetRequest, usingWWWProxy, currentProxy, requestId);
-            closeSocket(s);
-        } catch (I2PException ex) {
-            _log.info("getPrefix(requestId) + Error trying to connect", ex);
-            l.log(ex.getMessage());
-            handleHTTPClientException(ex, out, targetRequest, usingWWWProxy, currentProxy, requestId);
-            closeSocket(s);
-        }
-    }
-
-    private final static String getHostName(String host) {
-        if (host == null) return null;
-        try {
-            Destination dest = I2PTunnel.destFromName(host);
-            if (dest == null) return "i2p";
-            return dest.toBase64();
-        } catch (DataFormatException dfe) {
-            return "i2p";
-        }
-    }
-
-    private class OnTimeout implements Runnable {
-        private Socket _socket;
-        private OutputStream _out;
-        private String _target;
-        private boolean _usingProxy;
-        private String _wwwProxy;
-        private long _requestId;
-        public OnTimeout(Socket s, OutputStream out, String target, boolean usingProxy, String wwwProxy, long id) {
-            _socket = s;
-            _out = out;
-            _target = target;
-            _usingProxy = usingProxy;
-            _wwwProxy = wwwProxy;
-            _requestId = id;
-        }
-        public void run() {
-            if (_log.shouldLog(Log.DEBUG))
-                _log.debug("Timeout occured requesting " + _target);
-            handleHTTPClientException(new RuntimeException("Timeout"), _out, 
-                                      _target, _usingProxy, _wwwProxy, _requestId);
-            closeSocket(_socket);
-        }
-    }
-    
-    private static void writeErrorMessage(byte[] errMessage, OutputStream out, String targetRequest,
-                                          boolean usingWWWProxy, String wwwProxy, boolean showAddrHelper) throws IOException {
-        if (out != null) {
-            out.write(errMessage);
-            if (targetRequest != null) {
-                int protopos = targetRequest.indexOf(" ");
-                String uri = null;
-                if (protopos >= 0)
-                    uri = targetRequest.substring(0, protopos);
-                else
-                    uri = targetRequest;
-                out.write("<a href=\"http://".getBytes());
-                out.write(uri.getBytes());
-                out.write("\">http://".getBytes());
-                out.write(uri.getBytes());
-                out.write("</a>".getBytes());
-                if (usingWWWProxy) out.write(("<br>WWW proxy: " + wwwProxy).getBytes());
-                if (showAddrHelper) {
-                    out.write("<br><br>Click below to try an address helper link:<br><br><a href=\"http://orion.i2p/jump/".getBytes());
-                    out.write(uri.getBytes());
-                    out.write("\">http://orion.i2p/jump/".getBytes());
-                    out.write(uri.getBytes());
-                    out.write("</a>".getBytes());
-                }
-            }
-            out.write("</div><p><i>I2P HTTP Proxy Server<br>Generated on: ".getBytes());
-            out.write(new Date().toString().getBytes());
-            out.write("</i></body></html>\n".getBytes());
-            out.flush();
-        }
-    }
-
-    private void handleHTTPClientException(Exception ex, OutputStream out, String targetRequest,
-                                                  boolean usingWWWProxy, String wwwProxy, long requestId) {
-                                                      
-        if (_log.shouldLog(Log.WARN))
-            _log.warn(getPrefix(requestId) + "Error sending to " + wwwProxy + " (proxy? " + usingWWWProxy + ", request: " + targetRequest, ex);
-        if (out != null) {
-            try {
-                String str;
-                byte[] header;
-                if (usingWWWProxy)
-                    str = FileUtil.readTextFile("docs/dnfp-header.ht", 100, true);
-                else
-                    str = FileUtil.readTextFile("docs/dnf-header.ht", 100, true);
-                if (str != null)
-                    header = str.getBytes();
-                else
-                    header = ERR_DESTINATION_UNKNOWN;
-                writeErrorMessage(header, out, targetRequest, usingWWWProxy, wwwProxy, false);
-            } catch (IOException ioe) {
-                _log.warn(getPrefix(requestId) + "Error writing out the 'destination was unknown' " + "message", ioe);
-            }
-        } else {
-            _log.warn(getPrefix(requestId) + "Client disconnected before we could say that destination " + "was unknown", ex);
-        }
-    }
-
-    private final static String SUPPORTED_HOSTS[] = { "i2p", "www.i2p.com", "i2p."};
-
-    private boolean isSupportedAddress(String host, String protocol) {
-        if ((host == null) || (protocol == null)) return false;
-        boolean found = false;
-        String lcHost = host.toLowerCase();
-        for (int i = 0; i < SUPPORTED_HOSTS.length; i++) {
-            if (SUPPORTED_HOSTS[i].equals(lcHost)) {
-                found = true;
-                break;
-            }
-        }
-
-        if (!found) {
-            try {
-                Destination d = I2PTunnel.destFromName(host);
-                if (d == null) return false;
-            } catch (DataFormatException dfe) {
-            }
-        }
-
-        return protocol.equalsIgnoreCase("http://");
-    }
-}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientRunner.java

@@ -1,64 +0,0 @@
-/* I2PTunnel is GPL'ed (with the exception mentioned in I2PTunnel.java)
- * (c) 2003 - 2004 mihi
- */
-package net.i2p.i2ptunnel;
-
-import java.io.*;
-import java.net.Socket;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-
-import net.i2p.I2PAppContext;
-import net.i2p.client.streaming.I2PSocket;
-import net.i2p.data.ByteArray;
-import net.i2p.data.DataHelper;
-import net.i2p.util.ByteCache;
-import net.i2p.util.Log;
-
-/**
- * Override the response with a stream filtering the HTTP headers
- * received.  Specifically, this makes sure we get Connection: close,
- * so the browser knows they really shouldn't try to use persistent
- * connections.  The HTTP server *should* already be setting this, 
- * since the HTTP headers sent by the browser specify Connection: close,
- * and the server should echo it.  However, both broken and malicious
- * servers could ignore that, potentially confusing the user.
- *
- */
-public class I2PTunnelHTTPClientRunner extends I2PTunnelRunner {
-    private Log _log;
-    public I2PTunnelHTTPClientRunner(Socket s, I2PSocket i2ps, Object slock, byte[] initialI2PData, List sockList, Runnable onTimeout) {
-        super(s, i2ps, slock, initialI2PData, sockList, onTimeout);
-        _log = I2PAppContext.getGlobalContext().logManager().getLog(I2PTunnelHTTPClientRunner.class);
-    }
-
-    protected OutputStream getSocketOut() throws IOException { 
-        OutputStream raw = super.getSocketOut();
-        return new HTTPResponseOutputStream(raw);
-    }
-        
-    protected void close(OutputStream out, InputStream in, OutputStream i2pout, InputStream i2pin, Socket s, I2PSocket i2ps, Thread t1, Thread t2) throws InterruptedException, IOException {
-        try { 
-            i2pin.close();
-            i2pout.close();
-        } catch (IOException ioe) {
-            // ignore
-            if (_log.shouldLog(Log.DEBUG))
-                _log.debug("Unable to close the i2p socket output stream: " + i2pout, ioe);
-        }
-        try { 
-            in.close();
-            out.close(); 
-        } catch (IOException ioe) { 
-            // ignore
-            if (_log.shouldLog(Log.DEBUG))
-                _log.debug("Unable to close the browser output stream: " + out, ioe);
-        }
-        i2ps.close();
-        s.close();
-        t1.join(30*1000);
-        t2.join(30*1000);
-    }
-    
-}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java

@@ -1,338 +0,0 @@
-/* I2PTunnel is GPL'ed (with the exception mentioned in I2PTunnel.java)
- * (c) 2003 - 2004 mihi
- */
-package net.i2p.i2ptunnel;
-
-import java.io.*;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.net.SocketException;
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.zip.GZIPOutputStream;
-import java.util.zip.Deflater;
-
-import net.i2p.I2PAppContext;
-import net.i2p.I2PException;
-import net.i2p.client.streaming.I2PServerSocket;
-import net.i2p.client.streaming.I2PSocket;
-import net.i2p.data.DataHelper;
-import net.i2p.util.EventDispatcher;
-import net.i2p.util.I2PThread;
-import net.i2p.util.Log;
-
-/**
- * Simple extension to the I2PTunnelServer that filters the HTTP
- * headers sent from the client to the server, replacing the Host
- * header with whatever this instance has been configured with, and
- * if the browser set Accept-encoding: x-i2p-gzip, gzip the http 
- * message body and set Content-encoding: x-i2p-gzip.
- *
- */
-public class I2PTunnelHTTPServer extends I2PTunnelServer {
-    private final static Log _log = new Log(I2PTunnelHTTPServer.class);
-    /** what Host: should we seem to be to the webserver? */
-    private String _spoofHost;
-
-    public I2PTunnelHTTPServer(InetAddress host, int port, String privData, String spoofHost, Logging l, EventDispatcher notifyThis, I2PTunnel tunnel) {
-        super(host, port, privData, l, notifyThis, tunnel);
-        _spoofHost = spoofHost;
-        getTunnel().getContext().statManager().createRateStat("i2ptunnel.httpserver.blockingHandleTime", "how long the blocking handle takes to complete", "I2PTunnel.HTTPServer", new long[] { 60*1000, 10*60*1000, 3*60*60*1000 });
-        getTunnel().getContext().statManager().createRateStat("i2ptunnel.httpNullWorkaround", "How often an http server works around a streaming lib or i2ptunnel bug", "I2PTunnel.HTTPServer", new long[] { 60*1000, 10*60*1000 });
-    }
-
-    public I2PTunnelHTTPServer(InetAddress host, int port, File privkey, String privkeyname, String spoofHost, Logging l, EventDispatcher notifyThis, I2PTunnel tunnel) {
-        super(host, port, privkey, privkeyname, l, notifyThis, tunnel);
-        _spoofHost = spoofHost;
-        getTunnel().getContext().statManager().createRateStat("i2ptunnel.httpserver.blockingHandleTime", "how long the blocking handle takes to complete", "I2PTunnel.HTTPServer", new long[] { 60*1000, 10*60*1000, 3*60*60*1000 });
-        getTunnel().getContext().statManager().createRateStat("i2ptunnel.httpNullWorkaround", "How often an http server works around a streaming lib or i2ptunnel bug", "I2PTunnel.HTTPServer", new long[] { 60*1000, 10*60*1000 });
-    }
-
-    public I2PTunnelHTTPServer(InetAddress host, int port, InputStream privData, String privkeyname, String spoofHost, Logging l, EventDispatcher notifyThis, I2PTunnel tunnel) {
-        super(host, port, privData, privkeyname, l, notifyThis, tunnel);
-        _spoofHost = spoofHost;        
-        getTunnel().getContext().statManager().createRateStat("i2ptunnel.httpserver.blockingHandleTime", "how long the blocking handle takes to complete", "I2PTunnel.HTTPServer", new long[] { 60*1000, 10*60*1000, 3*60*60*1000 });
-        getTunnel().getContext().statManager().createRateStat("i2ptunnel.httpNullWorkaround", "How often an http server works around a streaming lib or i2ptunnel bug", "I2PTunnel.HTTPServer", new long[] { 60*1000, 10*60*1000 });
-    }
-
-    /**
-     * Called by the thread pool of I2PSocket handlers
-     *
-     */
-    protected void blockingHandle(I2PSocket socket) {
-        long afterAccept = getTunnel().getContext().clock().now();
-        long afterSocket = -1;
-        //local is fast, so synchronously. Does not need that many
-        //threads.
-        try {
-            // give them 5 seconds to send in the HTTP request
-            socket.setReadTimeout(5*1000);
-
-            InputStream in = socket.getInputStream();
-
-            StringBuffer command = new StringBuffer(128);
-            Properties headers = readHeaders(in, command);
-            if ( (_spoofHost != null) && (_spoofHost.trim().length() > 0) )
-                headers.setProperty("Host", _spoofHost);
-            headers.setProperty("Connection", "close");
-            // we keep the enc sent by the browser before clobbering it, since it may have 
-            // been x-i2p-gzip
-            String enc = headers.getProperty("Accept-encoding");
-            String altEnc = headers.getProperty("X-Accept-encoding");
-            
-            // according to rfc2616 s14.3, this *should* force identity, even if
-            // "identity;q=1, *;q=0" didn't.  
-            headers.setProperty("Accept-encoding", ""); 
-            String modifiedHeader = formatHeaders(headers, command);
-            
-            //String modifiedHeader = getModifiedHeader(socket);
-            if (_log.shouldLog(Log.DEBUG))
-                _log.debug("Modified header: [" + modifiedHeader + "]");
-
-            socket.setReadTimeout(readTimeout);
-            Socket s = new Socket(remoteHost, remotePort);
-            afterSocket = getTunnel().getContext().clock().now();
-            // instead of i2ptunnelrunner, use something that reads the HTTP 
-            // request from the socket, modifies the headers, sends the request to the 
-            // server, reads the response headers, rewriting to include Content-encoding: x-i2p-gzip
-            // if it was one of the Accept-encoding: values, and gzip the payload       
-            Properties opts = getTunnel().getClientOptions();
-            boolean allowGZIP = true;
-            if (opts != null) {
-                String val = opts.getProperty("i2ptunnel.gzip");
-                if ( (val != null) && (!Boolean.valueOf(val).booleanValue()) ) 
-                    allowGZIP = false;
-            }
-            if (_log.shouldLog(Log.INFO))
-                _log.info("HTTP server encoding header: " + enc + "/" + altEnc);
-            boolean useGZIP = ( (enc != null) && (enc.indexOf("x-i2p-gzip") >= 0) );
-            if ( (!useGZIP) && (altEnc != null) && (altEnc.indexOf("x-i2p-gzip") >= 0) )
-                useGZIP = true;
-            
-            if (allowGZIP && useGZIP) {
-                I2PThread req = new I2PThread(new CompressedRequestor(s, socket, modifiedHeader), Thread.currentThread().getName()+".hc");
-                req.start();
-            } else {
-                new I2PTunnelRunner(s, socket, slock, null, modifiedHeader.getBytes(), null);
-            }
-        } catch (SocketException ex) {
-            try {
-                socket.close();
-            } catch (IOException ioe) {
-                if (_log.shouldLog(Log.ERROR))
-                    _log.error("Error while closing the received i2p con", ex);
-            }
-        } catch (IOException ex) {
-            if (_log.shouldLog(Log.WARN))
-                _log.warn("Error while receiving the new HTTP request", ex);
-        }
-
-        long afterHandle = getTunnel().getContext().clock().now();
-        long timeToHandle = afterHandle - afterAccept;
-        getTunnel().getContext().statManager().addRateData("i2ptunnel.httpserver.blockingHandleTime", timeToHandle, 0);
-        if ( (timeToHandle > 1000) && (_log.shouldLog(Log.WARN)) )
-            _log.warn("Took a while to handle the request [" + timeToHandle + ", socket create: " + (afterSocket-afterAccept) + "]");
-    }
-    
-    private class CompressedRequestor implements Runnable {
-        private Socket _webserver;
-        private I2PSocket _browser;
-        private String _headers;
-        public CompressedRequestor(Socket webserver, I2PSocket browser, String headers) {
-            _webserver = webserver;
-            _browser = browser;
-            _headers = headers;
-        }
-        public void run() {
-            if (_log.shouldLog(Log.INFO))
-                _log.info("Compressed requestor running");
-            OutputStream serverout = null;
-            OutputStream browserout = null;
-            InputStream browserin = null;
-            InputStream serverin = null;
-            try {
-                serverout = _webserver.getOutputStream();
-                
-                if (_log.shouldLog(Log.INFO))
-                    _log.info("request headers: " + _headers);
-                serverout.write(_headers.getBytes());
-                browserin = _browser.getInputStream();
-                I2PThread sender = new I2PThread(new Sender(serverout, browserin, "server: browser to server"), Thread.currentThread().getName() + "hcs");
-                sender.start();
-                
-                browserout = _browser.getOutputStream();
-                serverin = _webserver.getInputStream(); 
-                CompressedResponseOutputStream compressedOut = new CompressedResponseOutputStream(browserout);
-                Sender s = new Sender(compressedOut, serverin, "server: server to browser");
-                if (_log.shouldLog(Log.INFO))
-                    _log.info("Before pumping the compressed response");
-                s.run(); // same thread
-                if (_log.shouldLog(Log.INFO))
-                    _log.info("After pumping the compressed response: " + compressedOut.getTotalRead() + "/" + compressedOut.getTotalCompressed());
-            } catch (IOException ioe) {
-                if (_log.shouldLog(Log.WARN))
-                    _log.warn("error compressing", ioe);
-            } finally {
-                if (browserout != null) try { browserout.close(); } catch (IOException ioe) {}
-                if (serverout != null) try { serverout.close(); } catch (IOException ioe) {}
-                if (browserin != null) try { browserin.close(); } catch (IOException ioe) {}
-                if (serverin != null) try { serverin.close(); } catch (IOException ioe) {}
-            }
-        }
-    }
-    private class Sender implements Runnable {
-        private OutputStream _out;
-        private InputStream _in;
-        private String _name;
-        public Sender(OutputStream out, InputStream in, String name) {
-            _out = out;
-            _in = in;
-            _name = name;
-        }
-        public void run() {
-            if (_log.shouldLog(Log.INFO))
-                _log.info(_name + ": Begin sending");
-            try {
-                byte buf[] = new byte[16*1024];
-                int read = 0;
-                int total = 0;
-                while ( (read = _in.read(buf)) != -1) {
-                    if (_log.shouldLog(Log.INFO))
-                        _log.info(_name + ": read " + read + " and sending through the stream");
-                    _out.write(buf, 0, read);
-                    total += read;
-                }
-                if (_log.shouldLog(Log.INFO))
-                    _log.info(_name + ": Done sending: " + total);
-                //_out.flush();
-            } catch (IOException ioe) {
-                if (_log.shouldLog(Log.DEBUG))
-                    _log.debug("Error sending", ioe);
-            } finally {
-                if (_out != null) try { _out.close(); } catch (IOException ioe) {}
-                if (_in != null) try { _in.close(); } catch (IOException ioe) {}
-            }
-        }
-    }
-    private class CompressedResponseOutputStream extends HTTPResponseOutputStream {
-        private InternalGZIPOutputStream _gzipOut;
-        public CompressedResponseOutputStream(OutputStream o) {
-            super(o);
-        }
-        
-        protected boolean shouldCompress() { return true; }
-        protected void finishHeaders() throws IOException {
-            if (_log.shouldLog(Log.INFO))
-                _log.info("Including x-i2p-gzip as the content encoding in the response");
-            out.write("Content-encoding: x-i2p-gzip\r\n".getBytes());
-            super.finishHeaders();
-        }
-
-        protected void beginProcessing() throws IOException {
-            if (_log.shouldLog(Log.INFO))
-                _log.info("Beginning compression processing");
-            //out.flush();
-            _gzipOut = new InternalGZIPOutputStream(out);
-            out = _gzipOut;
-        }
-        public long getTotalRead() { 
-            InternalGZIPOutputStream gzipOut = _gzipOut;
-            if (gzipOut != null)
-                return gzipOut.getTotalRead();
-            else
-                return 0;
-        }
-        public long getTotalCompressed() { 
-            InternalGZIPOutputStream gzipOut = _gzipOut;
-            if (gzipOut != null)
-                return gzipOut.getTotalCompressed();
-            else
-                return 0;
-        }
-    }
-    private class InternalGZIPOutputStream extends GZIPOutputStream {
-        public InternalGZIPOutputStream(OutputStream target) throws IOException {
-            super(target);
-        }
-        public long getTotalRead() { 
-            try {
-                return def.getTotalIn();
-            } catch (Exception e) {
-                // j2se 1.4.2_08 on linux is sometimes throwing an NPE in the getTotalIn() implementation
-                return 0; 
-            }
-        }
-        public long getTotalCompressed() { 
-            try {
-                return def.getTotalOut();
-            } catch (Exception e) {
-                // j2se 1.4.2_08 on linux is sometimes throwing an NPE in the getTotalOut() implementation
-                return 0;
-            }
-        }
-    }
-
-    private String formatHeaders(Properties headers, StringBuffer command) {
-        StringBuffer buf = new StringBuffer(command.length() + headers.size() * 64);
-        buf.append(command.toString().trim()).append("\r\n");
-        for (Iterator iter = headers.keySet().iterator(); iter.hasNext(); ) {
-            String name = (String)iter.next();
-            String val  = headers.getProperty(name);
-            buf.append(name.trim()).append(": ").append(val.trim()).append("\r\n");
-        }
-        buf.append("\r\n");
-        return buf.toString();
-    }
-    
-    private Properties readHeaders(InputStream in, StringBuffer command) throws IOException {
-        Properties headers = new Properties();
-        StringBuffer buf = new StringBuffer(128);
-        
-        boolean ok = DataHelper.readLine(in, command);
-        if (!ok) throw new IOException("EOF reached while reading the HTTP command [" + command.toString() + "]");
-        
-        if (_log.shouldLog(Log.DEBUG))
-            _log.debug("Read the http command [" + command.toString() + "]");
-        
-        int trimmed = 0;
-        if (command.length() > 0) {
-            for (int i = 0; i < command.length(); i++) {
-                if (command.charAt(i) == 0) {
-                    command = command.deleteCharAt(i);
-                    i--;
-                    trimmed++;
-                }
-            }
-        }
-        if (trimmed > 0)
-            getTunnel().getContext().statManager().addRateData("i2ptunnel.httpNullWorkaround", trimmed, 0);
-        
-        while (true) {
-            buf.setLength(0);
-            ok = DataHelper.readLine(in, buf);
-            if (!ok) throw new IOException("EOF reached before the end of the headers [" + buf.toString() + "]");
-            if ( (buf.length() == 0) || 
-                 ((buf.charAt(0) == '\n') || (buf.charAt(0) == '\r')) ) {
-                // end of headers reached
-                return headers;
-            } else {
-                int split = buf.indexOf(":");
-                if (split <= 0) throw new IOException("Invalid HTTP header, missing colon [" + buf.toString() + "]");
-                String name = buf.substring(0, split).trim();
-                String value = null;
-                if (buf.length() > split + 1)
-                    value = buf.substring(split+1).trim(); // ":"
-                else
-                    value = "";
-                if ("Accept-encoding".equalsIgnoreCase(name))
-                    name = "Accept-encoding";
-                else if ("X-Accept-encoding".equalsIgnoreCase(name))
-                    name = "X-Accept-encoding";
-                headers.setProperty(name, value);
-                if (_log.shouldLog(Log.DEBUG))
-                    _log.debug("Read the header [" + name + "] = [" + value + "]");
-            }
-        }
-    }
-}
-

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCClient.java

@@ -1,405 +0,0 @@
-package net.i2p.i2ptunnel;
-
-import java.io.*;
-import java.net.Socket;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-import java.lang.IndexOutOfBoundsException;
-
-import net.i2p.I2PAppContext;
-import net.i2p.client.streaming.I2PSocket;
-import net.i2p.data.DataFormatException;
-import net.i2p.data.DataHelper;
-import net.i2p.data.Destination;
-import net.i2p.util.EventDispatcher;
-import net.i2p.util.I2PThread;
-import net.i2p.util.Log;
-
-public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable {
-
-    private static final Log _log = new Log(I2PTunnelIRCClient.class);
-    
-    /** used to assign unique IDs to the threads / clients.  no logic or functionality */
-    private static volatile long __clientId = 0;
-    
-    /** list of Destination objects that we point at */
-    protected List dests;
-    private static final long DEFAULT_READ_TIMEOUT = 5*60*1000; // -1
-    protected long readTimeout = DEFAULT_READ_TIMEOUT;
-
-    /**
-     * @throws IllegalArgumentException if the I2PTunnel does not contain
-     *                                  valid config to contact the router
-     */
-    public I2PTunnelIRCClient(
-                              int localPort,
-                              String destinations,
-                              Logging l, 
-                              boolean ownDest,
-                              EventDispatcher notifyThis,
-                              I2PTunnel tunnel) throws IllegalArgumentException {
-        super(localPort, 
-              ownDest, 
-              l, 
-              notifyThis, 
-              "IRCHandler " + (++__clientId), tunnel);
-
-        StringTokenizer tok = new StringTokenizer(destinations, ",");
-        dests = new ArrayList(1);
-        while (tok.hasMoreTokens()) {
-            String destination = tok.nextToken();
-            try {
-                Destination dest = I2PTunnel.destFromName(destination);
-                if (dest == null)
-                    l.log("Could not resolve " + destination);
-                else
-                    dests.add(dest);
-            } catch (DataFormatException dfe) {
-                l.log("Bad format parsing \"" + destination + "\"");
-            }
-        }
-
-        if (dests.size() <= 0) {
-            l.log("No target destinations found");
-            notifyEvent("openClientResult", "error");
-            return;
-        }
-        
-        setName(getLocalPort() + " -> IRCClient");
-
-        startRunning();
-
-        notifyEvent("openIRCClientResult", "ok");
-    }
-    
-    protected void clientConnectionRun(Socket s) {
-        if (_log.shouldLog(Log.DEBUG))
-            _log.debug("got a connection.");
-        Destination dest = pickDestination();
-        I2PSocket i2ps = null;
-        try {
-            i2ps = createI2PSocket(dest);
-            i2ps.setReadTimeout(readTimeout);
-            Thread in = new I2PThread(new IrcInboundFilter(s,i2ps));
-            in.start();
-            Thread out = new I2PThread(new IrcOutboundFilter(s,i2ps));
-            out.start();
-        } catch (Exception ex) {
-            if (_log.shouldLog(Log.ERROR))
-                _log.error("Error connecting", ex);
-            l.log(ex.getMessage());
-            closeSocket(s);
-            if (i2ps != null) {
-                synchronized (sockLock) {
-                    mySockets.remove(sockLock);
-                }
-            }
-        }
-
-    }
-    
-    private final Destination pickDestination() {
-        int size = dests.size();
-        if (size <= 0) {
-            if (_log.shouldLog(Log.ERROR))
-                _log.error("No client targets?!");
-            return null;
-        }
-        if (size == 1) // skip the rand in the most common case
-            return (Destination)dests.get(0);
-        int index = I2PAppContext.getGlobalContext().random().nextInt(size);
-        return (Destination)dests.get(index);
-    }
-
-    /*************************************************************************
-     *
-     */
-    private class IrcInboundFilter implements Runnable {
-        
-        private Socket local;
-        private I2PSocket remote;
-                
-        IrcInboundFilter(Socket _local, I2PSocket _remote) {
-            local=_local;
-            remote=_remote;
-        }
-
-        public void run() {
-            BufferedReader in;
-            OutputStream output;
-            try {
-                in = new BufferedReader(new InputStreamReader(remote.getInputStream(), "ISO-8859-1"));
-                output=local.getOutputStream();
-            } catch (IOException e) {
-                if (_log.shouldLog(Log.ERROR))
-                    _log.error("IrcInboundFilter: no streams",e);
-                return;
-            }
-            if (_log.shouldLog(Log.DEBUG))
-                _log.debug("IrcInboundFilter: Running.");
-            try {
-                while(true)
-                {
-                    try {
-                        String inmsg = in.readLine();
-                        if(inmsg==null)
-                            break;
-                        if(inmsg.endsWith("\r"))
-                            inmsg=inmsg.substring(0,inmsg.length()-1);
-                        String outmsg = inboundFilter(inmsg);
-                        if(outmsg!=null)
-                        {
-                            if(!inmsg.equals(outmsg)) {
-                                if (_log.shouldLog(Log.WARN)) {
-                                    _log.warn("inbound FILTERED: "+outmsg);
-                                    _log.warn(" - inbound was: "+inmsg);
-                                }
-                            } else {
-                                if (_log.shouldLog(Log.INFO))
-                                    _log.info("inbound: "+outmsg);
-                            }
-                            outmsg=outmsg+"\n";
-                            output.write(outmsg.getBytes("ISO-8859-1"));
-                        } else {
-                            if (_log.shouldLog(Log.WARN))
-                                _log.warn("inbound BLOCKED: "+inmsg);
-                        }
-                    } catch (IOException e1) {
-                        if (_log.shouldLog(Log.WARN))
-                            _log.warn("IrcInboundFilter: disconnected",e1);
-                        break;
-                    }
-                }
-            } catch (RuntimeException re) {
-                _log.error("Error filtering inbound data", re);
-            } finally {
-                if (local != null) try { local.close(); } catch (IOException e) {}
-            }
-            if(_log.shouldLog(Log.DEBUG))
-                _log.debug("IrcInboundFilter: Done.");
-            }
-            
-        }
-                
-        /*************************************************************************
-         *
-         */
-        private class IrcOutboundFilter implements Runnable {
-                    
-            private Socket local;
-            private I2PSocket remote;
-                
-            IrcOutboundFilter(Socket _local, I2PSocket _remote) {
-                local=_local;
-                remote=_remote;
-            }
-                
-            public void run() {
-                BufferedReader in;
-                OutputStream output;
-                try {
-                    in = new BufferedReader(new InputStreamReader(local.getInputStream(), "ISO-8859-1"));
-                    output=remote.getOutputStream();
-                } catch (IOException e) {
-                    if (_log.shouldLog(Log.ERROR))
-                        _log.error("IrcOutboundFilter: no streams",e);
-                    return;
-                }
-                if (_log.shouldLog(Log.DEBUG))
-                    _log.debug("IrcOutboundFilter: Running.");
-                try {
-                    while(true)
-                    {
-                        try {
-                            String inmsg = in.readLine();
-                            if(inmsg==null)
-                                break;
-                            if(inmsg.endsWith("\r"))
-                                inmsg=inmsg.substring(0,inmsg.length()-1);
-                            String outmsg = outboundFilter(inmsg);
-                            if(outmsg!=null)
-                            {
-                                if(!inmsg.equals(outmsg)) {
-                                    if (_log.shouldLog(Log.WARN)) {
-                                        _log.warn("outbound FILTERED: "+outmsg);
-                                        _log.warn(" - outbound was: "+inmsg);
-                                    }
-                                } else {
-                                    if (_log.shouldLog(Log.INFO))
-                                        _log.info("outbound: "+outmsg);
-                                }
-                                outmsg=outmsg+"\n";
-                                output.write(outmsg.getBytes("ISO-8859-1"));
-                            } else {
-                                if (_log.shouldLog(Log.WARN))
-                                    _log.warn("outbound BLOCKED: "+"\""+inmsg+"\"");
-                            }
-                        } catch (IOException e1) {
-                            if (_log.shouldLog(Log.WARN))
-                                _log.warn("IrcOutboundFilter: disconnected",e1);
-                            break;
-                        }
-                    }
-                } catch (RuntimeException re) {
-                    _log.error("Error filtering outbound data", re);
-                } finally {
-                    if (remote != null) try { remote.close(); } catch (IOException e) {}
-                }
-                if (_log.shouldLog(Log.DEBUG))
-                    _log.debug("IrcOutboundFilter: Done.");
-            }
-        }
-
-    
-    /*************************************************************************
-     *
-     */
-    
-    public static String inboundFilter(String s) {
-        
-        String field[]=s.split(" ",4);
-        String command;
-        int idx=0;
-        final String[] allowedCommands =
-        {
-                "NOTICE",
-                "PING",
-                "PONG",
-                "MODE",
-                "JOIN",
-                "NICK",
-                "QUIT",
-                "PART",
-                "WALLOPS",
-                "ERROR",
-                "TOPIC"
-        };
-        
-        if(field[0].charAt(0)==':')
-            idx++;
-
-        try { command = field[idx++]; }
-         catch (IndexOutOfBoundsException ioobe) // wtf, server sent borked command?
-        {
-           _log.warn("Dropping defective message: index out of bounds while extracting command.");
-           return null;
-        }
-
-        idx++; //skip victim
-
-        // Allow numerical responses
-        try {
-            new Integer(command);
-            return s;
-        } catch(NumberFormatException nfe){}
-        
-        // Allow all allowedCommands
-        for(int i=0;i<allowedCommands.length;i++) {
-            if(allowedCommands[i].equals(command))
-                return s;
-        }
-        
-        // Allow PRIVMSG, but block CTCP.
-        if("PRIVMSG".equals(command))
-        {
-            String msg;
-            msg = field[idx++];
-        
-            byte[] bytes = msg.getBytes();
-            if(bytes[1]==0x01)
-            {
-                // CTCP
-                msg=msg.substring(2);
-                if(msg.startsWith("ACTION ")) {
-                    // /me says hello
-                    return s;
-                }
-                return null; // Block all other ctcp
-            }
-            return s;
-        }
-        
-        // Block the rest
-        return null;
-    }
-    
-    public static String outboundFilter(String s) {
-        
-        String field[]=s.split(" ",3);
-        String command;
-        final String[] allowedCommands =
-        {
-                "NOTICE",
-                "PONG",
-                "MODE",
-                "JOIN",
-                "NICK",
-                "WHO",
-                "WHOIS",
-                "LIST",
-                "NAMES",
-                "NICK",
-                // "QUIT", // replace with a filtered QUIT to hide client quit messages
-                "SILENCE",
-                "MAP", // seems safe enough, the ircd should protect themselves though
-                "PART",
-                "OPER",
-                "PING",
-                "KICK",
-                "HELPME",
-                "RULES",
-                "TOPIC"
-        };
-
-        if(field[0].length()==0)
-	    return null; // W T F?
-	
-        
-        if(field[0].charAt(0)==':')
-            return null; // wtf
-        
-        command = field[0].toUpperCase();
-
-        // Allow all allowedCommands
-        for(int i=0;i<allowedCommands.length;i++)
-        {
-            if(allowedCommands[i].equals(command))
-                return s;
-        }
-        
-        // Allow PRIVMSG, but block CTCP (except ACTION).
-        if("PRIVMSG".equals(command))
-        {
-            String msg;
-            msg = field[2];
-        
-            byte[] bytes = msg.getBytes();
-            if(bytes[1]==0x01)
-            {
-                    // CTCP
-                msg=msg.substring(2);
-                if(msg.startsWith("ACTION ")) {
-                    // /me says hello
-                    return s;
-                }
-                return null; // Block all other ctcp
-            }
-            return s;
-        }
-        
-        if("USER".equals(command)) {
-            int idx = field[2].lastIndexOf(":");
-            if(idx<0)
-                return "USER user hostname localhost :realname";
-            String realname = field[2].substring(idx+1);
-            String ret = "USER "+field[1]+" hostname localhost :"+realname;
-            return ret;
-        } else if ("QUIT".equals(command)) {
-            return "QUIT :leaving";
-        }
-        
-        // Block the rest
-        return null;
-    }
-}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelRunner.java

@@ -1,333 +0,0 @@
-/* I2PTunnel is GPL'ed (with the exception mentioned in I2PTunnel.java)
- * (c) 2003 - 2004 mihi
- */
-package net.i2p.i2ptunnel;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InterruptedIOException;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.net.SocketException;
-import java.util.HashMap;
-import java.util.List;
-
-import net.i2p.client.streaming.I2PSocket;
-import net.i2p.data.ByteArray;
-import net.i2p.util.ByteCache;
-import net.i2p.util.Clock;
-import net.i2p.util.I2PThread;
-import net.i2p.util.Log;
-
-public class I2PTunnelRunner extends I2PThread implements I2PSocket.SocketErrorListener {
-    private final static Log _log = new Log(I2PTunnelRunner.class);
-
-    private static volatile long __runnerId;
-    private long _runnerId;
-    /** 
-     * max bytes streamed in a packet - smaller ones might be filled
-     * up to this size. Larger ones are not split (at least not on
-     * Sun's impl of BufferedOutputStream), but that is the streaming
-     * api's job...
-     */
-    static int MAX_PACKET_SIZE = 1024 * 4;
-
-    static final int NETWORK_BUFFER_SIZE = MAX_PACKET_SIZE;
-
-    private Socket s;
-    private I2PSocket i2ps;
-    Object slock, finishLock = new Object();
-    boolean finished = false;
-    HashMap ostreams, sockets;
-    byte[] initialI2PData;
-    byte[] initialSocketData;
-    /** when the last data was sent/received (or -1 if never) */
-    private long lastActivityOn;
-    /** when the runner started up */
-    private long startedOn;
-    private List sockList;
-    /** if we die before receiving any data, run this job */
-    private Runnable onTimeout;
-    private long totalSent;
-    private long totalReceived;
-
-    private volatile long __forwarderId;
-    
-    public I2PTunnelRunner(Socket s, I2PSocket i2ps, Object slock, byte[] initialI2PData, List sockList) {
-        this(s, i2ps, slock, initialI2PData, null, sockList, null);
-    }
-    public I2PTunnelRunner(Socket s, I2PSocket i2ps, Object slock, byte[] initialI2PData, byte[] initialSocketData, List sockList) {
-        this(s, i2ps, slock, initialI2PData, initialSocketData, sockList, null);
-    }
-    public I2PTunnelRunner(Socket s, I2PSocket i2ps, Object slock, byte[] initialI2PData, List sockList, Runnable onTimeout) {
-        this(s, i2ps, slock, initialI2PData, null, sockList, onTimeout);
-    }
-    public I2PTunnelRunner(Socket s, I2PSocket i2ps, Object slock, byte[] initialI2PData, byte[] initialSocketData, List sockList, Runnable onTimeout) {
-        this.sockList = sockList;
-        this.s = s;
-        this.i2ps = i2ps;
-        this.slock = slock;
-        this.initialI2PData = initialI2PData;
-        this.initialSocketData = initialSocketData;
-        this.onTimeout = onTimeout;
-        lastActivityOn = -1;
-        startedOn = Clock.getInstance().now();
-        if (_log.shouldLog(Log.INFO))
-            _log.info("I2PTunnelRunner started");
-        _runnerId = ++__runnerId;
-        __forwarderId = i2ps.hashCode();
-        setName("I2PTunnelRunner " + _runnerId);
-        start();
-    }
-
-    /** 
-     * have we closed at least one (if not both) of the streams 
-     * [aka we're done running the streams]? 
-     *
-     */
-    public boolean isFinished() {
-        return finished;
-    }
-
-    /** 
-     * When was the last data for this runner sent or received?  
-     *
-     * @return date (ms since the epoch), or -1 if no data has been transferred yet
-     *
-     */
-    public long getLastActivityOn() {
-        return lastActivityOn;
-    }
-
-    private void updateActivity() {
-        lastActivityOn = Clock.getInstance().now();
-    }
-
-    /**
-     * When this runner started up transferring data
-     *
-     */
-    public long getStartedOn() {
-        return startedOn;
-    }
-
-    protected InputStream getSocketIn() throws IOException { return s.getInputStream(); }
-    protected OutputStream getSocketOut() throws IOException { return s.getOutputStream(); }
-    
-    public void run() {
-        try {
-            InputStream in = getSocketIn();
-            OutputStream out = getSocketOut(); // = new BufferedOutputStream(s.getOutputStream(), NETWORK_BUFFER_SIZE);
-            i2ps.setSocketErrorListener(this);
-            InputStream i2pin = i2ps.getInputStream();
-            OutputStream i2pout = i2ps.getOutputStream(); //new BufferedOutputStream(i2ps.getOutputStream(), MAX_PACKET_SIZE);
-            if (initialI2PData != null) {
-                synchronized (slock) {
-                    i2pout.write(initialI2PData);
-                    //i2pout.flush();
-                }
-            }
-            if (initialSocketData != null) {
-                out.write(initialSocketData);
-            }
-            if (_log.shouldLog(Log.DEBUG))
-                _log.debug("Initial data " + (initialI2PData != null ? initialI2PData.length : 0) 
-                           + " written to I2P, " + (initialSocketData != null ? initialSocketData.length : 0)
-                           + " written to the socket, starting forwarders");
-            Thread t1 = new StreamForwarder(in, i2pout, true);
-            Thread t2 = new StreamForwarder(i2pin, out, false);
-            synchronized (finishLock) {
-                while (!finished) {
-                    finishLock.wait();
-                }
-            }
-            if (_log.shouldLog(Log.DEBUG))
-                _log.debug("At least one forwarder completed, closing and joining");
-            
-            // this task is useful for the httpclient
-            if (onTimeout != null) {
-                if (_log.shouldLog(Log.DEBUG))
-                    _log.debug("runner has a timeout job, totalReceived = " + totalReceived
-                               + " totalSent = " + totalSent + " job = " + onTimeout);
-                if ( (totalSent <= 0) && (totalReceived <= 0) )
-                    onTimeout.run();
-            }
-            
-            // now one connection is dead - kill the other as well, after making sure we flush
-            close(out, in, i2pout, i2pin, s, i2ps, t1, t2);
-        } catch (InterruptedException ex) {
-            if (_log.shouldLog(Log.ERROR))
-                _log.error("Interrupted", ex);
-        } catch (IOException ex) {
-            if (_log.shouldLog(Log.DEBUG))
-                _log.debug("Error forwarding", ex);
-        } catch (Exception e) {
-            if (_log.shouldLog(Log.ERROR))
-                _log.error("Internal error", e);
-        } finally {
-            removeRef();
-            try {
-                if (s != null)
-                    s.close();
-            } catch (IOException ex) {
-                if (_log.shouldLog(Log.ERROR))
-                    _log.error("Could not close java socket", ex);
-            }
-            if (i2ps != null) {
-                try {
-                    i2ps.close();
-                } catch (IOException ex) {
-                    if (_log.shouldLog(Log.ERROR))
-                        _log.error("Could not close I2PSocket", ex);
-                }
-                i2ps.setSocketErrorListener(null);
-            }
-        }
-    }
-    
-    protected void close(OutputStream out, InputStream in, OutputStream i2pout, InputStream i2pin, Socket s, I2PSocket i2ps, Thread t1, Thread t2) throws InterruptedException, IOException {
-        try { 
-            out.flush(); 
-        } catch (IOException ioe) { 
-            // ignore
-        }
-        try { 
-            i2pout.flush();
-        } catch (IOException ioe) {
-            // ignore
-        }
-        in.close();
-        i2pin.close();
-        // ok, yeah, there's a race here in theory, if data comes in after flushing and before
-        // closing, but its better than before...
-        s.close();
-        i2ps.close();
-        t1.join(30*1000);
-        t2.join(30*1000);
-    }
-    
-    public void errorOccurred() {
-        synchronized (finishLock) {
-            finished = true;
-            finishLock.notifyAll();
-        }
-    }
-    
-    private void removeRef() {
-        if (sockList != null) {
-            synchronized (slock) {
-                boolean removed = sockList.remove(i2ps);
-                //System.out.println("Removal of i2psocket " + i2ps + " successful? " 
-                //                   + removed + " remaining: " + sockList.size());
-            }
-        }
-    }
-    
-    private class StreamForwarder extends I2PThread {
-
-        InputStream in;
-        OutputStream out;
-        String direction;
-        private boolean _toI2P;
-        private ByteCache _cache;
-
-        private StreamForwarder(InputStream in, OutputStream out, boolean toI2P) {
-            this.in = in;
-            this.out = out;
-            _toI2P = toI2P;
-            direction = (toI2P ? "toI2P" : "fromI2P");
-            _cache = ByteCache.getInstance(32, NETWORK_BUFFER_SIZE);
-            setName("StreamForwarder " + _runnerId + "." + (++__forwarderId));
-            start();
-        }
-
-        public void run() {
-            String from = i2ps.getThisDestination().calculateHash().toBase64().substring(0,6);
-            String to = i2ps.getPeerDestination().calculateHash().toBase64().substring(0,6);
-
-            if (_log.shouldLog(Log.DEBUG)) {
-                _log.debug(direction + ": Forwarding between " 
-                           + from + " and " + to);
-            }
-            
-            // boo, hiss!  shouldn't need this - the streaming lib should be configurable, but
-            // somehow the inactivity timer is sometimes failing to get triggered properly
-            //i2ps.setReadTimeout(2*60*1000);
-            
-            ByteArray ba = _cache.acquire();
-            byte[] buffer = ba.getData(); // new byte[NETWORK_BUFFER_SIZE];
-            try {
-                int len;
-                while ((len = in.read(buffer)) != -1) {
-                    out.write(buffer, 0, len);
-                    if (_toI2P)
-                        totalSent += len;
-                    else
-                        totalReceived += len;
-
-                    if (len > 0) updateActivity();
-
-                    if (in.available() == 0) {
-                        //if (_log.shouldLog(Log.DEBUG))
-                        //    _log.debug("Flushing after sending " + len + " bytes through");
-                        if (_log.shouldLog(Log.DEBUG))
-                            _log.debug(direction + ": " + len + " bytes flushed through to " 
-                                       + i2ps.getPeerDestination().calculateHash().toBase64().substring(0,6));
-                        try {
-                            Thread.sleep(I2PTunnel.PACKET_DELAY);
-                        } catch (InterruptedException e) {
-                            e.printStackTrace();
-                        }
-                        
-                        if (in.available() <= 0)
-                            out.flush(); // make sure the data get though
-                    }
-                }
-                //out.flush(); // close() flushes
-            } catch (SocketException ex) {
-                // this *will* occur when the other threads closes the socket
-                synchronized (finishLock) {
-                    if (!finished) {
-                        if (_log.shouldLog(Log.DEBUG))
-                            _log.debug(direction + ": Socket closed - error reading and writing",
-                                       ex);
-                    }
-                }
-            } catch (InterruptedIOException ex) {
-                if (_log.shouldLog(Log.WARN))
-                    _log.warn(direction + ": Closing connection due to timeout (error: \""
-                              + ex.getMessage() + "\")");
-            } catch (IOException ex) {
-                if (!finished) {
-                    if (_log.shouldLog(Log.WARN))
-                        _log.warn(direction + ": Error forwarding", ex);
-                }
-                //else
-                //    _log.warn("You may ignore this", ex);
-            } finally {
-                _cache.release(ba);
-                if (_log.shouldLog(Log.INFO)) {
-                    _log.info(direction + ": done forwarding between " 
-                              + from + " and " + to);
-                }
-                try {
-                    in.close();
-                } catch (IOException ex) {
-                    if (_log.shouldLog(Log.WARN))
-                        _log.warn(direction + ": Error closing input stream", ex);
-                }
-                try {
-                    out.flush();
-                } catch (IOException ioe) {
-                    if (_log.shouldLog(Log.WARN))
-                        _log.warn(direction + ": Error flushing to close", ioe);
-                }
-                synchronized (finishLock) {
-                    finished = true;
-                    finishLock.notifyAll();
-                    // the main thread will close sockets etc. now
-                }
-            }
-        }
-    }
-}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java

@@ -1,280 +0,0 @@
-/* I2PTunnel is GPL'ed (with the exception mentioned in I2PTunnel.java)
- * (c) 2003 - 2004 mihi
- */
-package net.i2p.i2ptunnel;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.net.SocketException;
-import java.net.ConnectException;
-import java.util.Iterator;
-import java.util.Properties;
-
-import net.i2p.I2PAppContext;
-import net.i2p.I2PException;
-import net.i2p.client.I2PClient;
-import net.i2p.client.I2PClientFactory;
-import net.i2p.client.streaming.I2PServerSocket;
-import net.i2p.client.streaming.I2PSocket;
-import net.i2p.client.streaming.I2PSocketManager;
-import net.i2p.client.streaming.I2PSocketManagerFactory;
-import net.i2p.data.Base64;
-import net.i2p.util.EventDispatcher;
-import net.i2p.util.I2PThread;
-import net.i2p.util.Log;
-
-public class I2PTunnelServer extends I2PTunnelTask implements Runnable {
-
-    private final static Log _log = new Log(I2PTunnelServer.class);
-
-    protected I2PSocketManager sockMgr;
-    protected I2PServerSocket i2pss;
-
-    private Object lock = new Object();
-    protected Object slock = new Object();
-
-    protected InetAddress remoteHost;
-    protected int remotePort;
-    private boolean _usePool;
-
-    private Logging l;
-
-    private static final long DEFAULT_READ_TIMEOUT = -1; // 3*60*1000;
-    /** default timeout to 3 minutes - override if desired */
-    protected long readTimeout = DEFAULT_READ_TIMEOUT;
-
-    private static final boolean DEFAULT_USE_POOL = false;
-    
-    public I2PTunnelServer(InetAddress host, int port, String privData, Logging l, EventDispatcher notifyThis, I2PTunnel tunnel) {
-        super(host + ":" + port + " <- " + privData, notifyThis, tunnel);
-        ByteArrayInputStream bais = new ByteArrayInputStream(Base64.decode(privData));
-        String usePool = tunnel.getClientOptions().getProperty("i2ptunnel.usePool");
-        if (usePool != null)
-            _usePool = "true".equalsIgnoreCase(usePool);
-        else
-            _usePool = DEFAULT_USE_POOL;
-        init(host, port, bais, privData, l);
-    }
-
-    public I2PTunnelServer(InetAddress host, int port, File privkey, String privkeyname, Logging l,
-                           EventDispatcher notifyThis, I2PTunnel tunnel) {
-        super(host + ":" + port + " <- " + privkeyname, notifyThis, tunnel);
-        String usePool = tunnel.getClientOptions().getProperty("i2ptunnel.usePool");
-        if (usePool != null)
-            _usePool = "true".equalsIgnoreCase(usePool);
-        else
-            _usePool = DEFAULT_USE_POOL;
-        try {
-            init(host, port, new FileInputStream(privkey), privkeyname, l);
-        } catch (IOException ioe) {
-            _log.error("Error starting server", ioe);
-            notifyEvent("openServerResult", "error");
-        }
-    }
-
-    public I2PTunnelServer(InetAddress host, int port, InputStream privData, String privkeyname, Logging l,  EventDispatcher notifyThis, I2PTunnel tunnel) {
-        super(host + ":" + port + " <- " + privkeyname, notifyThis, tunnel);
-        String usePool = tunnel.getClientOptions().getProperty("i2ptunnel.usePool");
-        if (usePool != null)
-            _usePool = "true".equalsIgnoreCase(usePool);
-        else
-            _usePool = DEFAULT_USE_POOL;
-        init(host, port, privData, privkeyname, l);
-    }
-
-    private void init(InetAddress host, int port, InputStream privData, String privkeyname, Logging l) {
-        this.l = l;
-        this.remoteHost = host;
-        this.remotePort = port;
-        I2PClient client = I2PClientFactory.createClient();
-        Properties props = new Properties();
-        props.putAll(getTunnel().getClientOptions());
-        int portNum = 7654;
-        if (getTunnel().port != null) {
-            try {
-                portNum = Integer.parseInt(getTunnel().port);
-            } catch (NumberFormatException nfe) {
-                _log.log(Log.CRIT, "Invalid port specified [" + getTunnel().port + "], reverting to " + portNum);
-            }
-        }
-
-        while (sockMgr == null) {
-            synchronized (slock) {
-                sockMgr = I2PSocketManagerFactory.createManager(privData, getTunnel().host, portNum,
-                                                                props);
-
-            }
-            if (sockMgr == null) {
-                _log.log(Log.CRIT, "Unable to create socket manager");
-                try { Thread.sleep(10*1000); } catch (InterruptedException ie) {}
-            }
-        }
-        sockMgr.setName("Server");
-        getTunnel().addSession(sockMgr.getSession());
-        l.log("Ready!");
-        notifyEvent("openServerResult", "ok");
-        open = true;
-    }
-
-    
-    private static volatile long __serverId = 0;
-    
-    /**
-     * Start running the I2PTunnelServer.
-     *
-     */
-    public void startRunning() {
-        Thread t = new I2PThread(this);
-        t.setName("Server " + (++__serverId));
-        t.start();
-    }
-
-    /**
-     * Set the read idle timeout for newly-created connections (in
-     * milliseconds).  After this time expires without data being reached from
-     * the I2P network, the connection itself will be closed.
-     */
-    public void setReadTimeout(long ms) {
-        readTimeout = ms;
-    }
-    
-    /**
-     * Get the read idle timeout for newly-created connections (in
-     * milliseconds).
-     *
-     * @return The read timeout used for connections
-     */
-    public long getReadTimeout() {
-        return readTimeout;
-    }
-
-    public boolean close(boolean forced) {
-        if (!open) return true;
-        synchronized (lock) {
-            if (!forced && sockMgr.listSockets().size() != 0) {
-                l.log("There are still active connections!");
-                for (Iterator it = sockMgr.listSockets().iterator(); it.hasNext();) {
-                    l.log("->" + it.next());
-                }
-                return false;
-            }
-            l.log("Shutting down server " + toString());
-            try {
-                if (i2pss != null) i2pss.close();
-                getTunnel().removeSession(sockMgr.getSession());
-                sockMgr.getSession().destroySession();
-            } catch (I2PException ex) {
-                _log.error("Error destroying the session", ex);
-                System.exit(1);
-            }
-            l.log("Server shut down.");
-            open = false;
-            return true;
-        }
-    }
-
-    private static final String PROP_HANDLER_COUNT = "i2ptunnel.blockingHandlerCount";
-    private static final int DEFAULT_HANDLER_COUNT = 10;
-    
-    protected int getHandlerCount() { 
-        int rv = DEFAULT_HANDLER_COUNT;
-        String cnt = getTunnel().getClientOptions().getProperty(PROP_HANDLER_COUNT);
-        if (cnt != null) {
-            try {
-                rv = Integer.parseInt(cnt);
-                if (rv <= 0)
-                    rv = DEFAULT_HANDLER_COUNT;
-            } catch (NumberFormatException nfe) {
-                rv = DEFAULT_HANDLER_COUNT;
-            }
-        }
-        return rv;
-    }
-    
-    public void run() {
-        if (shouldUsePool()) {
-            I2PServerSocket i2pss = sockMgr.getServerSocket();
-            int handlers = getHandlerCount();
-            for (int i = 0; i < handlers; i++) {
-                I2PThread handler = new I2PThread(new Handler(i2pss), "Handle Server " + i);
-                handler.start();
-            }
-        } else {
-            I2PServerSocket i2pss = sockMgr.getServerSocket();
-            while (true) {
-                try {
-                    final I2PSocket i2ps = i2pss.accept();
-                    if (i2ps == null) throw new I2PException("I2PServerSocket closed");
-                    new I2PThread(new Runnable() { public void run() { blockingHandle(i2ps); } }).start();
-                } catch (I2PException ipe) {
-                    if (_log.shouldLog(Log.ERROR))
-                        _log.error("Error accepting - KILLING THE TUNNEL SERVER", ipe);
-                    return;
-                } catch (ConnectException ce) {
-                    if (_log.shouldLog(Log.ERROR))
-                        _log.error("Error accepting", ce);
-                    // not killing the server..
-                }
-            }
-        }
-    }
-    
-    public boolean shouldUsePool() { return _usePool; }
-    
-    /**
-     * minor thread pool to pull off the accept() concurrently.  there are still lots
-     * (and lots) of wasted threads within the I2PTunnelRunner, but its a start
-     *
-     */
-    private class Handler implements Runnable { 
-        private I2PServerSocket _serverSocket;
-        public Handler(I2PServerSocket serverSocket) {
-            _serverSocket = serverSocket;
-        }
-        public void run() {
-            while (open) {
-                try {
-                    blockingHandle(_serverSocket.accept());   
-                } catch (I2PException ex) {
-                    _log.error("Error while waiting for I2PConnections", ex);
-                    return;
-                } catch (IOException ex) {
-                    _log.error("Error while waiting for I2PConnections", ex);
-                    return;
-                }
-            }
-        }
-    }
-    
-    protected void blockingHandle(I2PSocket socket) {
-        long afterAccept = I2PAppContext.getGlobalContext().clock().now();
-        long afterSocket = -1;
-        //local is fast, so synchronously. Does not need that many
-        //threads.
-        try {
-            socket.setReadTimeout(readTimeout);
-            Socket s = new Socket(remoteHost, remotePort);
-            afterSocket = I2PAppContext.getGlobalContext().clock().now();
-            new I2PTunnelRunner(s, socket, slock, null, null);
-        } catch (SocketException ex) {
-            try {
-                socket.close();
-            } catch (IOException ioe) {
-                _log.error("Error while closing the received i2p con", ex);
-            }
-        } catch (IOException ex) {
-            _log.error("Error while waiting for I2PConnections", ex);
-        }
-
-        long afterHandle = I2PAppContext.getGlobalContext().clock().now();
-        long timeToHandle = afterHandle - afterAccept;
-        if (timeToHandle > 1000)
-            _log.warn("Took a while to handle the request [" + timeToHandle + ", socket create: " + (afterSocket-afterAccept) + "]");
-    }
-}
-

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelTask.java

@@ -1,116 +0,0 @@
-/* I2PTunnel is GPL'ed (with the exception mentioned in I2PTunnel.java)
- * (c) 2003 - 2004 mihi
- */
-package net.i2p.i2ptunnel;
-
-import java.util.Set;
-
-import net.i2p.client.I2PSession;
-import net.i2p.util.EventDispatcher;
-import net.i2p.util.EventDispatcherImpl;
-
-/**
- * Either a Server or a Client.
- */
-
-public abstract class I2PTunnelTask implements EventDispatcher {
-
-    private final EventDispatcherImpl _event = new EventDispatcherImpl();
-
-    private int id;
-    private String name;
-    protected boolean open;
-    private I2PTunnel tunnel;
-
-    //protected I2PTunnelTask(String name) {
-    //	I2PTunnelTask(name, (EventDispatcher)null);
-    //}
-
-    protected I2PTunnelTask(String name, EventDispatcher notifyThis, I2PTunnel tunnel) {
-        attachEventDispatcher(notifyThis);
-        this.name = name;
-        this.id = -1;
-        this.tunnel = tunnel;
-    }
-
-    /** for apps that use multiple I2PTunnel instances */
-    public void setTunnel(I2PTunnel pTunnel) {
-        tunnel = pTunnel;
-    }
-    
-    public I2PTunnel getTunnel() { return tunnel; }
-
-    public int getId() {
-        return this.id;
-    }
-
-    public boolean isOpen() {
-        return open;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    protected void setName(String name) {
-        this.name = name;
-    }
-
-    protected void routerDisconnected() {
-        tunnel.routerDisconnected();
-    }
-
-    public abstract boolean close(boolean forced);
-
-    public void disconnected(I2PSession session) {
-        routerDisconnected();
-        getTunnel().removeSession(session);
-    }
-
-    public void errorOccurred(I2PSession session, String message, Throwable error) {
-    }
-
-    public void reportAbuse(I2PSession session, int severity) {
-    }
-
-    public String toString() {
-        return name;
-    }
-
-    /* Required by the EventDispatcher interface */
-    public EventDispatcher getEventDispatcher() {
-        return _event;
-    }
-
-    public void attachEventDispatcher(EventDispatcher e) {
-        _event.attachEventDispatcher(e.getEventDispatcher());
-    }
-
-    public void detachEventDispatcher(EventDispatcher e) {
-        _event.detachEventDispatcher(e.getEventDispatcher());
-    }
-
-    public void notifyEvent(String e, Object a) {
-        _event.notifyEvent(e, a);
-    }
-
-    public Object getEventValue(String n) {
-        return _event.getEventValue(n);
-    }
-
-    public Set getEvents() {
-        return _event.getEvents();
-    }
-
-    public void ignoreEvents() {
-        _event.ignoreEvents();
-    }
-
-    public void unIgnoreEvents() {
-        _event.unIgnoreEvents();
-    }
-
-    public Object waitEventValue(String n) {
-        return _event.waitEventValue(n);
-    }
-}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java

@@ -1,222 +0,0 @@
-/* I2PTunnel is GPL'ed (with the exception mentioned in I2PTunnel.java)
- * (c) 2003 - 2004 mihi
- */
-package net.i2p.i2ptunnel;
-
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import net.i2p.I2PException;
-import net.i2p.client.streaming.I2PSocketManager;
-import net.i2p.data.Destination;
-import net.i2p.util.EventDispatcher;
-import net.i2p.util.I2PThread;
-import net.i2p.util.Log;
-
-public class I2Ping extends I2PTunnelTask implements Runnable {
-    private final static Log _log = new Log(I2Ping.class);
-
-    private static final int PING_COUNT = 3;
-    private static final int CPING_COUNT = 5;
-    private static final int PING_TIMEOUT = 5000;
-
-    private static final long PING_DISTANCE = 1000;
-
-    private int MAX_SIMUL_PINGS = 10; // not really final...
-
-    private boolean countPing = false;
-
-    private I2PSocketManager sockMgr;
-    private Logging l;
-    private boolean finished = false;
-    private String command;
-    private long timeout = PING_TIMEOUT;
-
-    private Object simulLock = new Object();
-    private int simulPings = 0;
-    private long lastPingTime = 0;
-
-    private Object lock = new Object(), slock = new Object();
-
-    //public I2Ping(String cmd, Logging l,
-    //		  boolean ownDest) {
-    //	I2Ping(cmd, l, (EventDispatcher)null);
-    //}
-
-    public I2Ping(String cmd, Logging l, boolean ownDest, EventDispatcher notifyThis, I2PTunnel tunnel) {
-        super("I2Ping [" + cmd + "]", notifyThis, tunnel);
-        this.l = l;
-        command = cmd;
-        synchronized (slock) {
-            if (ownDest) {
-                sockMgr = I2PTunnelClient.buildSocketManager(tunnel);
-            } else {
-                sockMgr = I2PTunnelClient.getSocketManager(tunnel);
-            }
-        }
-        Thread t = new I2PThread(this);
-        t.setName("Client");
-        t.start();
-        open = true;
-    }
-
-    public void run() {
-        l.log("*** I2Ping results:");
-        try {
-            runCommand(command);
-        } catch (InterruptedException ex) {
-            l.log("*** Interrupted");
-            _log.error("Pinger interrupted", ex);
-        } catch (IOException ex) {
-            _log.error("Pinger exception", ex);
-        }
-        l.log("*** Finished.");
-        synchronized (lock) {
-            finished = true;
-        }
-        close(false);
-    }
-
-    public void runCommand(String cmd) throws InterruptedException, IOException {
-        if (cmd.startsWith("-t ")) { // timeout
-            cmd = cmd.substring(3);
-            int pos = cmd.indexOf(" ");
-            if (pos == -1) {
-                l.log("Syntax error");
-                return;
-            } else {
-                timeout = Long.parseLong(cmd.substring(0, pos));
-                cmd = cmd.substring(pos + 1);
-            }
-        }
-        if (cmd.startsWith("-m ")) { // max simultaneous pings
-            cmd = cmd.substring(3);
-            int pos = cmd.indexOf(" ");
-            if (pos == -1) {
-                l.log("Syntax error");
-                return;
-            } else {
-                MAX_SIMUL_PINGS = Integer.parseInt(cmd.substring(0, pos));
-                cmd = cmd.substring(pos + 1);
-            }
-        }
-        if (cmd.startsWith("-c ")) { // "count" ping
-            countPing = true;
-            cmd = cmd.substring(3);
-        }
-        if (cmd.equals("-h")) { // ping all hosts
-            cmd = "-l hosts.txt";
-        }
-        if (cmd.startsWith("-l ")) { // ping a list of hosts
-            BufferedReader br = new BufferedReader(new FileReader(cmd.substring(3)));
-            String line;
-            List pingHandlers = new ArrayList();
-            while ((line = br.readLine()) != null) {
-                if (line.startsWith("#")) continue; // comments
-                if (line.startsWith(";")) continue;
-                if (line.startsWith("!")) continue;
-                if (line.indexOf("=") != -1) { // maybe file is hosts.txt?
-                    line = line.substring(0, line.indexOf("="));
-                }
-                pingHandlers.add(new PingHandler(line));
-            }
-            br.close();
-            for (Iterator it = pingHandlers.iterator(); it.hasNext();) {
-                Thread t = (Thread) it.next();
-                t.join();
-            }
-
-        } else {
-            Thread t = new PingHandler(cmd);
-            t.join();
-        }
-    }
-
-    public boolean close(boolean forced) {
-        if (!open) return true;
-        synchronized (lock) {
-            if (!forced && !finished) {
-                l.log("There are still pings running!");
-                return false;
-            }
-            l.log("Closing pinger " + toString());
-            l.log("Pinger closed.");
-            open = false;
-            return true;
-        }
-    }
-
-    public boolean ping(Destination dest) throws I2PException {
-        try {
-            synchronized (simulLock) {
-                while (simulPings >= MAX_SIMUL_PINGS) {
-                    simulLock.wait();
-                }
-                simulPings++;
-                while (lastPingTime + PING_DISTANCE > System.currentTimeMillis()) {
-                    // no wait here, to delay all pingers
-                    Thread.sleep(PING_DISTANCE / 2);
-                }
-                lastPingTime = System.currentTimeMillis();
-            }
-            boolean sent = sockMgr.ping(dest, PING_TIMEOUT);
-            synchronized (simulLock) {
-                simulPings--;
-                simulLock.notifyAll();
-            }
-            return sent;
-        } catch (InterruptedException ex) {
-            _log.error("Interrupted", ex);
-            return false;
-        }
-    }
-
-    public class PingHandler extends I2PThread {
-        private String destination;
-
-        public PingHandler(String dest) {
-            this.destination = dest;
-            setName("PingHandler for " + dest);
-            start();
-        }
-
-        public void run() {
-            try {
-                Destination dest = I2PTunnel.destFromName(destination);
-                if (dest == null) {
-                    synchronized (lock) { // Logger is not thread safe
-                        l.log("Unresolvable: " + destination + "");
-                    }
-                    return;
-                }
-                int cnt = countPing ? CPING_COUNT : PING_COUNT;
-                StringBuffer pingResults = new StringBuffer(2 * cnt + destination.length() + 3);
-                for (int i = 0; i < cnt; i++) {
-                    boolean sent;
-                    sent = ping(dest);
-                    if (countPing) {
-                        if (!sent) {
-                            pingResults.append(i).append(" ");
-                            break;
-                        } else if (i == cnt - 1) {
-                            pingResults.append("+ ");
-                        }
-                    } else {
-                        pingResults.append(sent ? "+ " : "- ");
-                    }
-                    //		    System.out.println(sent+" -> "+destination);
-                }
-                pingResults.append("  ").append(destination);
-                synchronized (lock) { // Logger is not thread safe
-                    l.log(pingResults.toString());
-                }
-            } catch (I2PException ex) {
-                _log.error("Error pinging " + destination, ex);
-            }
-        }
-    }
-}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/Logging.java

@@ -1,8 +0,0 @@
-/* I2PTunnel is GPL'ed (with the exception mentioned in I2PTunnel.java)
- * (c) 2003 - 2004 mihi
- */
-package net.i2p.i2ptunnel;
-
-public interface Logging {
-    public void log(String s);
-}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java

@@ -1,497 +0,0 @@
-package net.i2p.i2ptunnel;
-
-import java.io.IOException;
-import java.io.File;
-import java.io.FileOutputStream;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-import java.util.Random;
-
-import net.i2p.I2PAppContext;
-import net.i2p.I2PException;
-import net.i2p.client.I2PClient;
-import net.i2p.client.I2PClientFactory;
-import net.i2p.client.I2PSession;
-import net.i2p.data.Destination;
-import net.i2p.util.I2PThread;
-import net.i2p.util.Log;
-
-/**
- * Coordinate the runtime operation and configuration of a tunnel.  
- * These objects are bundled together under a TunnelControllerGroup where the
- * entire group is stored / loaded from a single config file.
- *
- */
-public class TunnelController implements Logging {
-    private Log _log;
-    private Properties _config;
-    private I2PTunnel _tunnel;
-    private List _messages;
-    private List _sessions;
-    private boolean _running;
-    private boolean _starting;
-    
-    /**
-     * Create a new controller for a tunnel out of the specific config options.
-     * The config may contain a large number of options - only ones that begin in
-     * the prefix should be used (and, in turn, that prefix should be stripped off
-     * before being interpreted by this controller)
-     * 
-     * @param config original key=value mapping
-     * @param prefix beginning of key values that are relevent to this tunnel
-     */
-    public TunnelController(Properties config, String prefix) {
-        this(config, prefix, true);
-    }
-    /**
-     * 
-     * @param createKey for servers, whether we want to create a brand new destination
-     *                  with private keys at the location specified or not (does not
-     *                  overwrite existing ones)
-     */
-    public TunnelController(Properties config, String prefix, boolean createKey) {
-        _tunnel = new I2PTunnel();
-        _log = I2PAppContext.getGlobalContext().logManager().getLog(TunnelController.class);
-        setConfig(config, prefix);
-        _messages = new ArrayList(4);
-        _running = false;
-        if (createKey && ("server".equals(getType()) || "httpserver".equals(getType())) )
-            createPrivateKey();
-        _starting = getStartOnLoad();
-    }
-    
-    private void createPrivateKey() {
-        I2PClient client = I2PClientFactory.createClient();
-        String filename = getPrivKeyFile();
-        if ( (filename == null) || (filename.trim().length() <= 0) ) {
-            log("No filename specified for the private key");
-            return;
-        }
-        
-        File keyFile = new File(getPrivKeyFile());
-        if (keyFile.exists()) {
-            log("Not overwriting existing private keys in " + keyFile.getAbsolutePath());
-            return;
-        } else {
-            File parent = keyFile.getParentFile();
-            if ( (parent != null) && (!parent.exists()) )
-                parent.mkdirs();
-        }
-        FileOutputStream fos = null;
-        try {
-            fos = new FileOutputStream(keyFile);
-            Destination dest = client.createDestination(fos);
-            String destStr = dest.toBase64();
-            log("Private key created and saved in " + keyFile.getAbsolutePath());
-            log("New destination: " + destStr);
-        } catch (I2PException ie) {
-            if (_log.shouldLog(Log.ERROR))
-                _log.error("Error creating new destination", ie);
-            log("Error creating new destination: " + ie.getMessage());
-        } catch (IOException ioe) {
-            if (_log.shouldLog(Log.ERROR))
-                _log.error("Error creating writing the destination to " + keyFile.getAbsolutePath(), ioe);
-            log("Error writing the keys to " + keyFile.getAbsolutePath());
-        } finally {
-            if (fos != null) try { fos.close(); } catch (IOException ioe) {}
-        }
-    }
-    
-    public void startTunnelBackground() {
-        if (_running) return;
-        _starting = true;
-        new I2PThread(new Runnable() { public void run() { startTunnel(); } }).start();
-    }
-    
-    /**
-     * Start up the tunnel (if it isn't already running)
-     *
-     */
-    public void startTunnel() {
-        _starting = true;
-        try {
-            doStartTunnel();
-        } catch (Exception e) {
-            _log.error("Error starting up the tunnel", e);
-            log("Error starting up the tunnel - " + e.getMessage());
-        }
-        _starting = false;
-    }
-    private void doStartTunnel() {
-        if (_running) {
-            if (_log.shouldLog(Log.INFO))
-                _log.info("Already running");
-            log("Tunnel " + getName() + " is already running");
-            return;
-        }
-        String type = getType(); 
-        if ( (type == null) || (type.length() <= 0) ) {
-            if (_log.shouldLog(Log.WARN))
-                _log.warn("Cannot start the tunnel - no type specified");
-            return;
-        }
-        if ("httpclient".equals(type)) {
-            startHttpClient();
-        }else if("ircclient".equals(type)) {
-            startIrcClient();
-        } else if ("client".equals(type)) {
-            startClient();
-        } else if ("server".equals(type)) {
-            startServer();
-        } else if ("httpserver".equals(type)) {
-            startHttpServer();
-        } else {
-            if (_log.shouldLog(Log.ERROR))
-                _log.error("Cannot start tunnel - unknown type [" + type + "]");
-        }
-    }
-    
-    private void startHttpClient() {
-        setI2CPOptions();
-        setSessionOptions();
-        setListenOn();
-        String listenPort = getListenPort();
-        String proxyList = getProxyList();
-        String sharedClient = getSharedClient();
-        if (proxyList == null)
-            _tunnel.runHttpClient(new String[] { listenPort, sharedClient }, this);
-        else
-            _tunnel.runHttpClient(new String[] { listenPort, sharedClient, proxyList }, this);
-        acquire();
-        _running = true;
-    }
-    
-    private void startIrcClient() {
-        setI2CPOptions();
-        setSessionOptions();
-        setListenOn();
-        String listenPort = getListenPort();
-        String dest = getTargetDestination();
-        String sharedClient = getSharedClient();
-        _tunnel.runIrcClient(new String[] { listenPort, dest, sharedClient }, this);
-        acquire();
-        _running = true;
-    }
-    
-    /** 
-     * Note the fact that we are using some sessions, so that they dont get
-     * closed by some other tunnels
-     */
-    private void acquire() {
-        List sessions = _tunnel.getSessions();
-        if (sessions != null) {
-            for (int i = 0; i < sessions.size(); i++) {
-                I2PSession session = (I2PSession)sessions.get(i);
-                TunnelControllerGroup.getInstance().acquire(this, session);
-            }
-            _sessions = sessions;
-        } else {
-            _log.error("No sessions to acquire?");
-        }
-    }
-    
-    /** 
-     * Note the fact that we are no longer using some sessions, and if
-     * no other tunnels are using them, close them.
-     */
-    private void release() {
-        if (_sessions != null) {
-            for (int i = 0; i < _sessions.size(); i++) {
-                I2PSession s = (I2PSession)_sessions.get(i);
-                TunnelControllerGroup.getInstance().release(this, s);
-            }
-        } else {
-            _log.error("No sessions to release?");
-        }
-    }
-    
-    private void startClient() {
-        setI2CPOptions();
-        setSessionOptions();
-        setListenOn();
-        String listenPort = getListenPort(); 
-        String dest = getTargetDestination();
-        String sharedClient = getSharedClient();
-        _tunnel.runClient(new String[] { listenPort, dest, sharedClient }, this);
-        acquire();
-        _running = true;
-    }
-
-    private void startServer() {
-        setI2CPOptions();
-        setSessionOptions();
-        String targetHost = getTargetHost(); 
-        String targetPort = getTargetPort(); 
-        String privKeyFile = getPrivKeyFile(); 
-        _tunnel.runServer(new String[] { targetHost, targetPort, privKeyFile }, this);
-        acquire();
-        _running = true;
-    }
-    
-    private void startHttpServer() {
-        setI2CPOptions();
-        setSessionOptions();
-        String targetHost = getTargetHost(); 
-        String targetPort = getTargetPort(); 
-        String spoofedHost = getSpoofedHost(); 
-        String privKeyFile = getPrivKeyFile(); 
-        _tunnel.runHttpServer(new String[] { targetHost, targetPort, spoofedHost, privKeyFile }, this);
-        acquire();
-        _running = true;
-    }
-    
-    private void setListenOn() {
-        String listenOn = getListenOnInterface();
-        if ( (listenOn != null) && (listenOn.length() > 0) ) {
-            _tunnel.runListenOn(new String[] { listenOn }, this);
-        }
-    }
-    
-    private void setSessionOptions() {
-        List opts = new ArrayList();
-        for (Iterator iter = _config.keySet().iterator(); iter.hasNext(); ) {
-            String key = (String)iter.next();
-            String val = _config.getProperty(key);
-            if (key.startsWith("option.")) {
-                key = key.substring("option.".length());
-                opts.add(key + "=" + val);
-            }
-        }
-        String args[] = new String[opts.size()];
-        for (int i = 0; i < opts.size(); i++)
-            args[i] = (String)opts.get(i);
-        _tunnel.runClientOptions(args, this);
-    }
-    
-    private void setI2CPOptions() {
-        String host = getI2CPHost();
-        if ( (host != null) && (host.length() > 0) ) 
-            _tunnel.host = host;
-        // woohah, special casing for people with ipv6/etc
-        if ("localhost".equals(_tunnel.host)) 
-            _tunnel.host = "127.0.0.1";
-        String port = getI2CPPort();
-        if ( (port != null) && (port.length() > 0) ) {
-            try {
-                int portNum = Integer.parseInt(port);
-                _tunnel.port = String.valueOf(portNum);
-            } catch (NumberFormatException nfe) {
-                _tunnel.port = "7654";
-            }
-        } else {
-            _tunnel.port = "7654";
-        }
-    }
-    
-    public void stopTunnel() {
-        _tunnel.runClose(new String[] { "forced", "all" }, this);
-        release();
-        _running = false;
-    }
-    
-    public void restartTunnel() {
-        stopTunnel();
-        startTunnel();
-    }
-    
-    public void setConfig(Properties config, String prefix) {
-        Properties props = new Properties();
-        for (Iterator iter = config.keySet().iterator(); iter.hasNext(); ) {
-            String key = (String)iter.next();
-            String val = config.getProperty(key);
-            if (key.startsWith(prefix)) {
-                key = key.substring(prefix.length());
-                props.setProperty(key, val);
-                if (_log.shouldLog(Log.DEBUG))
-                    _log.debug("Set prop [" + key + "] to [" + val + "]");
-            }
-        }
-        _config = props;
-    }
-    public Properties getConfig(String prefix) { 
-        Properties rv = new Properties();
-        for (Iterator iter = _config.keySet().iterator(); iter.hasNext(); ) {
-            String key = (String)iter.next();
-            String val = _config.getProperty(key);
-            rv.setProperty(prefix + key, val);
-        }
-        return rv;
-    }
-
-    public String getType() { return _config.getProperty("type"); }
-    public String getName() { return _config.getProperty("name"); }
-    public String getDescription() { return _config.getProperty("description"); }
-    public String getI2CPHost() { return _config.getProperty("i2cpHost"); }
-    public String getI2CPPort() { return _config.getProperty("i2cpPort"); }
-    public String getClientOptions() {
-        StringBuffer opts = new StringBuffer(64);
-        for (Iterator iter = _config.keySet().iterator(); iter.hasNext(); ) {
-            String key = (String)iter.next();
-            String val = _config.getProperty(key);
-            if (key.startsWith("option.")) {
-                key = key.substring("option.".length());
-                if (opts.length() > 0) opts.append(' ');
-                opts.append(key).append('=').append(val);
-            }
-        }
-        return opts.toString();
-    }
-    public String getListenOnInterface() { return _config.getProperty("interface"); }
-    public String getTargetHost() { return _config.getProperty("targetHost"); }
-    public String getTargetPort() { return _config.getProperty("targetPort"); }
-    public String getSpoofedHost() { return _config.getProperty("spoofedHost"); }
-    public String getPrivKeyFile() { return _config.getProperty("privKeyFile"); }
-    public String getListenPort() { return _config.getProperty("listenPort"); }
-    public String getTargetDestination() { return _config.getProperty("targetDestination"); }
-    public String getProxyList() { return _config.getProperty("proxyList"); }
-    public String getSharedClient() { return _config.getProperty("sharedClient", "true"); }
-    public boolean getStartOnLoad() { return "true".equalsIgnoreCase(_config.getProperty("startOnLoad", "true")); }
-    public String getMyDestination() {
-        if (_tunnel != null) {
-            List sessions = _tunnel.getSessions();
-            for (int i = 0; i < sessions.size(); i++) {
-                I2PSession session = (I2PSession)sessions.get(i);
-                Destination dest = session.getMyDestination();
-                if (dest != null)
-                    return dest.toBase64();
-            }
-        }
-        return null;
-    }
-    
-    public boolean getIsRunning() { return _running; }
-    public boolean getIsStarting() { return _starting; }
-    
-    public void getSummary(StringBuffer buf) {
-        String type = getType();
-        if ("httpclient".equals(type))
-            getHttpClientSummary(buf);
-        else if ("client".equals(type))
-            getClientSummary(buf);
-        else if ("server".equals(type))
-            getServerSummary(buf);
-        else if ("httpserver".equals(type))
-            getHttpServerSummary(buf);
-        else
-            buf.append("Unknown type ").append(type);
-    }
-    
-    private void getHttpClientSummary(StringBuffer buf) {
-        String description = getDescription();
-        if ( (description != null) && (description.trim().length() > 0) )
-            buf.append("<i>").append(description).append("</i><br />\n");
-        buf.append("HTTP proxy listening on port ").append(getListenPort());
-        String listenOn = getListenOnInterface();
-        if ("0.0.0.0".equals(listenOn)) 
-            buf.append(" (reachable by any machine)");
-        else if ("127.0.0.1".equals(listenOn))
-            buf.append(" (reachable locally only)");
-        else
-            buf.append(" (reachable at the ").append(listenOn).append(" interface)");
-        buf.append("<br />\n");
-        String proxies = getProxyList();
-        if ( (proxies == null) || (proxies.trim().length() <= 0) )
-            buf.append("Outproxy: default [squid.i2p]<br />\n");
-        else
-            buf.append("Outproxy: ").append(proxies).append("<br />\n");
-        getOptionSummary(buf);
-    }
-    
-    private void getClientSummary(StringBuffer buf) {
-        String description = getDescription();
-        if ( (description != null) && (description.trim().length() > 0) )
-            buf.append("<i>").append(description).append("</i><br />\n");
-        buf.append("Client tunnel listening on port ").append(getListenPort());
-        buf.append(" pointing at ").append(getTargetDestination());
-        String listenOn = getListenOnInterface();
-        if ("0.0.0.0".equals(listenOn)) 
-            buf.append(" (reachable by any machine)");
-        else if ("127.0.0.1".equals(listenOn))
-            buf.append(" (reachable locally only)");
-        else
-            buf.append(" (reachable at the ").append(listenOn).append(" interface)");
-        buf.append("<br />\n");
-        getOptionSummary(buf);
-    }
-    
-    private void getServerSummary(StringBuffer buf) {
-        String description = getDescription();
-        if ( (description != null) && (description.trim().length() > 0) )
-            buf.append("<i>").append(description).append("</i><br />\n");
-        buf.append("Server tunnel pointing at port ").append(getTargetPort());
-        buf.append(" on ").append(getTargetHost());
-        buf.append("<br />\n");
-        buf.append("Private destination loaded from ").append(getPrivKeyFile()).append("<br />\n");
-        getOptionSummary(buf);
-    }
-    
-    private void getHttpServerSummary(StringBuffer buf) {
-        String description = getDescription();
-        if ( (description != null) && (description.trim().length() > 0) )
-            buf.append("<i>").append(description).append("</i><br />\n");
-        buf.append("Server tunnel pointing at port ").append(getTargetPort());
-        buf.append(" on ").append(getTargetHost());
-        buf.append(" for the site ").append(getSpoofedHost());
-        buf.append("<br />\n");
-        buf.append("Private destination loaded from ").append(getPrivKeyFile()).append("<br />\n");
-        getOptionSummary(buf);
-    }
-    
-    private void getOptionSummary(StringBuffer buf) {
-        String opts = getClientOptions();
-        if ( (opts != null) && (opts.length() > 0) )
-            buf.append("Network options: ").append(opts).append("<br />\n");
-        if (_running) {
-            List sessions = _tunnel.getSessions();
-            for (int i = 0; i < sessions.size(); i++) {
-                I2PSession session = (I2PSession)sessions.get(i);
-                Destination dest = session.getMyDestination();
-                if (dest != null) {
-                    buf.append("Destination hash: ").append(dest.calculateHash().toBase64()).append("<br />\n");
-                    if ( ("server".equals(getType())) || ("httpserver".equals(getType())) ) {
-                        buf.append("Full destination: ");
-                        buf.append("<input type=\"text\" size=\"10\" onclick=\"this.select();\" ");
-                        buf.append("value=\"").append(dest.toBase64()).append("\" />\n");
-                        long val = new Random().nextLong();
-                        if (val < 0) val = 0 - val;
-                        buf.append("<br />You can <a href=\"http://temp").append(val);
-                        buf.append(".i2p/?i2paddresshelper=").append(dest.toBase64()).append("\">view</a>");
-                        buf.append(" it in a browser (only when you're using the eepProxy)\n");
-                        buf.append("<br />If you are going to share this on IRC, you need to split it up:<br />\n");
-                        String str = dest.toBase64();
-                        buf.append(str.substring(0, str.length()/2)).append("<br />\n");
-                        buf.append(str.substring(str.length()/2)).append("<br />\n");
-                        buf.append("You can also post it to <a href=\"http://forum.i2p/viewforum.php?f=16\">Eepsite announcement forum</a><br />");
-                    }
-                }
-            }
-        }
-    }
-    
-    public void log(String s) {
-        synchronized (this) {
-            _messages.add(s);
-            while (_messages.size() > 10)
-                _messages.remove(0);
-        }
-        if (_log.shouldLog(Log.INFO))
-            _log.info(s);
-    }
-    
-    /**
-     * Pull off any messages that the I2PTunnel has produced 
-     *
-     * @return list of messages pulled off (each is a String, earliest first)
-     */
-    public List clearMessages() { 
-        List rv = null;
-        synchronized (this) {
-            rv = new ArrayList(_messages);
-            _messages.clear();
-        }
-        return rv;
-    }
-}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelControllerGroup.java

@@ -1,354 +0,0 @@
-package net.i2p.i2ptunnel;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.TreeMap;
-
-import net.i2p.I2PAppContext;
-import net.i2p.client.I2PSession;
-import net.i2p.client.I2PSessionException;
-import net.i2p.data.DataHelper;
-import net.i2p.util.I2PThread;
-import net.i2p.util.Log;
-
-/**
- * Coordinate a set of tunnels within the JVM, loading and storing their config
- * to disk, and building new ones as requested.
- *
- */
-public class TunnelControllerGroup {
-    private Log _log;
-    private static TunnelControllerGroup _instance;
-    static final String DEFAULT_CONFIG_FILE = "i2ptunnel.config";
-    
-    private List _controllers;
-    private String _configFile = DEFAULT_CONFIG_FILE;
-    
-    /** 
-     * Map of I2PSession to a Set of TunnelController objects 
-     * using the session (to prevent closing the session until
-     * no more tunnels are using it)
-     *
-     */
-    private Map _sessions;
-    
-    public static TunnelControllerGroup getInstance() { 
-        synchronized (TunnelControllerGroup.class) {
-            if (_instance == null)
-                _instance = new TunnelControllerGroup(DEFAULT_CONFIG_FILE);
-            return _instance; 
-        }
-    }
-
-    private TunnelControllerGroup(String configFile) {
-        _log = I2PAppContext.getGlobalContext().logManager().getLog(TunnelControllerGroup.class);
-        _controllers = Collections.synchronizedList(new ArrayList());
-        _configFile = configFile;
-        _sessions = new HashMap(4);
-        loadControllers(_configFile);
-    }
-
-    public static void main(String args[]) {
-        synchronized (TunnelControllerGroup.class) {
-            if (_instance != null) return; // already loaded through the web
-            
-            if ( (args == null) || (args.length <= 0) ) {
-                _instance = new TunnelControllerGroup(DEFAULT_CONFIG_FILE);
-            } else if (args.length == 1) {
-                _instance = new TunnelControllerGroup(args[0]);
-            } else {
-                System.err.println("Usage: TunnelControllerGroup [filename]");
-                return;
-            }
-        }
-    }
-    
-    /**
-     * Load up all of the tunnels configured in the given file (but do not start
-     * them)
-     *
-     */
-    public void loadControllers(String configFile) {
-        Properties cfg = loadConfig(configFile);
-        if (cfg == null) {
-            if (_log.shouldLog(Log.WARN))
-                _log.warn("Unable to load the config from " + configFile);
-            return;
-        }
-        int i = 0; 
-        while (true) {
-            String type = cfg.getProperty("tunnel." + i + ".type");
-            if (type == null) 
-                break;
-            TunnelController controller = new TunnelController(cfg, "tunnel." + i + ".");
-            _controllers.add(controller);
-            i++;
-        }
-        I2PThread startupThread = new I2PThread(new StartControllers(), "Startup tunnels");
-        startupThread.start();
-        
-        if (_log.shouldLog(Log.INFO))
-            _log.info(i + " controllers loaded from " + configFile);
-    }
-    
-    private class StartControllers implements Runnable {
-        public void run() {
-            for (int i = 0; i < _controllers.size(); i++) {
-                TunnelController controller = (TunnelController)_controllers.get(i);
-                if (controller.getStartOnLoad())
-                    controller.startTunnel();
-            }
-        }
-    }
-    
-    
-    public void reloadControllers() {
-        unloadControllers();
-        loadControllers(_configFile);
-    }
-    
-    /**
-     * Stop and remove reference to all known tunnels (but dont delete any config
-     * file or do other silly things)
-     *
-     */
-    public void unloadControllers() {
-        stopAllControllers();
-        _controllers.clear();
-        if (_log.shouldLog(Log.INFO))
-            _log.info("All controllers stopped and unloaded");
-    }
-    
-    /**
-     * Add the given tunnel to the set of known controllers (but dont add it to
-     * a config file or start it or anything)
-     *
-     */
-    public void addController(TunnelController controller) { _controllers.add(controller); }
-    
-    /**
-     * Stop and remove the given tunnel
-     *
-     * @return list of messages from the controller as it is stopped
-     */
-    public List removeController(TunnelController controller) {
-        if (controller == null) return new ArrayList();
-        controller.stopTunnel();
-        List msgs = controller.clearMessages();
-        _controllers.remove(controller);
-        msgs.add("Tunnel " + controller.getName() + " removed");
-        return msgs;
-    }
-    
-    /**
-     * Stop all tunnels
-     *
-     * @return list of messages the tunnels generate when stopped
-     */
-    public List stopAllControllers() {
-        List msgs = new ArrayList();
-        for (int i = 0; i < _controllers.size(); i++) {
-            TunnelController controller = (TunnelController)_controllers.get(i);
-            controller.stopTunnel();
-            msgs.addAll(controller.clearMessages());
-        }
-        if (_log.shouldLog(Log.INFO))
-            _log.info(_controllers.size() + " controllers stopped");
-        return msgs;
-    }
-    
-    /**
-     * Start all tunnels
-     *
-     * @return list of messages the tunnels generate when started
-     */
-    public List startAllControllers() {
-        List msgs = new ArrayList();
-        for (int i = 0; i < _controllers.size(); i++) {
-            TunnelController controller = (TunnelController)_controllers.get(i);
-            controller.startTunnelBackground();
-            msgs.addAll(controller.clearMessages());
-        }
-
-        if (_log.shouldLog(Log.INFO))
-            _log.info(_controllers.size() + " controllers started");
-        return msgs;
-    }
-    
-    /**
-     * Restart all tunnels
-     *
-     * @return list of messages the tunnels generate when restarted
-     */
-    public List restartAllControllers() {
-        List msgs = new ArrayList();
-        for (int i = 0; i < _controllers.size(); i++) {
-            TunnelController controller = (TunnelController)_controllers.get(i);
-            controller.restartTunnel();
-            msgs.addAll(controller.clearMessages());
-        }
-        if (_log.shouldLog(Log.INFO))
-            _log.info(_controllers.size() + " controllers restarted");
-        return msgs;
-    }
-    
-    /**
-     * Fetch all outstanding messages from any of the known tunnels
-     *
-     * @return list of messages the tunnels have generated
-     */
-    public List clearAllMessages() {
-        List msgs = new ArrayList();
-        for (int i = 0; i < _controllers.size(); i++) {
-            TunnelController controller = (TunnelController)_controllers.get(i);
-            msgs.addAll(controller.clearMessages());
-        }
-        return msgs;
-    }
-    
-    /**
-     * Save the configuration of all known tunnels to the default config 
-     * file
-     *
-     */
-    public void saveConfig() {
-        saveConfig(_configFile);
-    }
-    /**
-     * Save the configuration of all known tunnels to the given file
-     *
-     */
-    public void saveConfig(String configFile) {
-        _configFile = configFile;
-        File cfgFile = new File(configFile);
-        File parent = cfgFile.getParentFile();
-        if ( (parent != null) && (!parent.exists()) )
-            parent.mkdirs();
-        
-        
-        TreeMap map = new TreeMap();
-        for (int i = 0; i < _controllers.size(); i++) {
-            TunnelController controller = (TunnelController)_controllers.get(i);
-            Properties cur = controller.getConfig("tunnel." + i + ".");
-            map.putAll(cur);
-        }
-        
-        StringBuffer buf = new StringBuffer(1024);
-        for (Iterator iter = map.keySet().iterator(); iter.hasNext(); ) {
-            String key = (String)iter.next();
-            String val = (String)map.get(key);
-            buf.append(key).append('=').append(val).append('\n');
-        }
-        
-        FileOutputStream fos = null;
-        try {
-            fos = new FileOutputStream(cfgFile);
-            fos.write(buf.toString().getBytes());
-            if (_log.shouldLog(Log.INFO))
-                _log.info("Config written to " + cfgFile.getPath());
-        } catch (IOException ioe) {
-            _log.error("Error writing out the config");
-        } finally {
-            if (fos != null) try { fos.close(); } catch (IOException ioe) {}
-        }
-    }
-    
-    /**
-     * Load up the config data from the file
-     *
-     * @return properties loaded or null if there was an error
-     */
-    private Properties loadConfig(String configFile) {
-        File cfgFile = new File(configFile);
-        if (!cfgFile.exists()) {
-            if (_log.shouldLog(Log.ERROR))
-                _log.error("Unable to load the controllers from " + configFile);
-            return null;
-        }
-        
-        Properties props = new Properties();
-        try {
-            DataHelper.loadProps(props, cfgFile);
-            return props;
-        } catch (IOException ioe) {
-            if (_log.shouldLog(Log.ERROR))
-                _log.error("Error reading the controllers from " + configFile, ioe);
-            return null;
-        }
-    }
-    
-    /**
-     * Retrieve a list of tunnels known
-     *
-     * @return list of TunnelController objects
-     */
-    public List getControllers() { return _controllers; }
-    
-    
-    /** 
-     * Note the fact that the controller is using the session so that
-     * it isn't destroyed prematurely.
-     *
-     */
-    void acquire(TunnelController controller, I2PSession session) {
-        synchronized (_sessions) {
-            Set owners = (Set)_sessions.get(session);
-            if (owners == null) {
-                owners = new HashSet(1);
-                _sessions.put(session, owners);
-            }
-            owners.add(controller);
-        }
-        if (_log.shouldLog(Log.INFO))
-            _log.info("Acquiring session " + session + " for " + controller);
-
-    }
-    
-    /** 
-     * Note the fact that the controller is no longer using the session, and if
-     * no other controllers are using it, destroy the session.
-     *
-     */
-    void release(TunnelController controller, I2PSession session) {
-        boolean shouldClose = false;
-        synchronized (_sessions) {
-            Set owners = (Set)_sessions.get(session);
-            if (owners != null) {
-                owners.remove(controller);
-                if (owners.size() <= 0) {
-                    if (_log.shouldLog(Log.INFO))
-                        _log.info("After releasing session " + session + " by " + controller + ", no more owners remain");
-                    shouldClose = true;
-                    _sessions.remove(session);
-                } else {
-                    if (_log.shouldLog(Log.INFO))
-                        _log.info("After releasing session " + session + " by " + controller + ", " + owners.size() + " owners remain");
-                    shouldClose = false;
-                }
-            } else {
-                if (_log.shouldLog(Log.WARN))
-                    _log.warn("After releasing session " + session + " by " + controller + ", no owners were even known?!");
-                shouldClose = true;
-            }
-        }
-        if (shouldClose) {
-            try {
-                session.destroySession();
-                if (_log.shouldLog(Log.INFO))
-                    _log.info("Session destroyed: " + session);
-            } catch (I2PSessionException ise) {
-                _log.error("Error closing the client session", ise);
-            }
-        }
-    }
-}