I2P Address: [http://git.idk.i2p]

Skip to content
Snippets Groups Projects
Commit 0c51f2b5 authored by jrandom's avatar jrandom Committed by zzz
Browse files

2004-10-27 jrandom

    * Fix a strange race condition on i2cp client disconnect.
    * win98 startup fixes (thanks tester-1 and ardvark!)
    * include build scripts for the new streaming lib (which is NOT ready
      for use yet, but you can hack around with it)
(enjoy, duck)
parent d5607ca1
No related branches found
No related tags found
No related merge requests found
<?xml version="1.0" encoding="UTF-8"?>
<project basedir="." default="all" name="streaming">
<target name="all" depends="clean, build" />
<target name="build" depends="builddep, jar" />
<target name="builddep">
<ant dir="../../ministreaming/java/" target="build" />
<!-- ministreaming will build core -->
</target>
<target name="compile">
<mkdir dir="./build" />
<mkdir dir="./build/obj" />
<javac
srcdir="./src:./test"
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/streaming.jar" basedir="./build/obj" includes="**/*.class" />
</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="Streaming" />
</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>
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
<ant dir="core/java/" target="jar" /> <ant dir="core/java/" target="jar" />
<ant dir="router/java/" target="jar" /> <ant dir="router/java/" target="jar" />
<ant dir="apps/ministreaming/java/" target="jar" /> <ant dir="apps/ministreaming/java/" target="jar" />
<ant dir="apps/streaming/java/" target="jar" />
<ant dir="apps/i2ptunnel/java/" target="jar" /> <ant dir="apps/i2ptunnel/java/" target="jar" />
<ant dir="apps/sam/java/" target="jar" /> <ant dir="apps/sam/java/" target="jar" />
<ant dir="apps/heartbeat/java/" target="jar" /> <ant dir="apps/heartbeat/java/" target="jar" />
...@@ -46,6 +47,7 @@ ...@@ -46,6 +47,7 @@
<copy file="core/java/build/i2p.jar" todir="build/" /> <copy file="core/java/build/i2p.jar" todir="build/" />
<copy file="router/java/build/router.jar" todir="build/" /> <copy file="router/java/build/router.jar" todir="build/" />
<copy file="apps/ministreaming/java/build/mstreaming.jar" todir="build/" /> <copy file="apps/ministreaming/java/build/mstreaming.jar" todir="build/" />
<copy file="apps/streaming/java/build/streaming.jar" todir="build/" />
<copy file="apps/i2ptunnel/java/build/i2ptunnel.jar" todir="build/" /> <copy file="apps/i2ptunnel/java/build/i2ptunnel.jar" todir="build/" />
<copy file="apps/i2ptunnel/java/build/i2ptunnel.war" todir="build/" /> <copy file="apps/i2ptunnel/java/build/i2ptunnel.war" todir="build/" />
<copy file="apps/sam/java/build/sam.jar" todir="build/" /> <copy file="apps/sam/java/build/sam.jar" todir="build/" />
...@@ -75,6 +77,7 @@ ...@@ -75,6 +77,7 @@
<pathelement location="router/java/src" /> <pathelement location="router/java/src" />
<pathelement location="router/java/test" /> <pathelement location="router/java/test" />
<pathelement location="apps/ministreaming/java/src" /> <pathelement location="apps/ministreaming/java/src" />
<pathelement location="apps/streaming/java/src" />
<pathelement location="apps/i2ptunnel/java/src" /> <pathelement location="apps/i2ptunnel/java/src" />
<pathelement location="apps/systray/java/src" /> <pathelement location="apps/systray/java/src" />
<pathelement location="apps/routerconsole/java/src" /> <pathelement location="apps/routerconsole/java/src" />
...@@ -93,6 +96,7 @@ ...@@ -93,6 +96,7 @@
<ant dir="core/java/" target="distclean" /> <ant dir="core/java/" target="distclean" />
<ant dir="router/java/" target="distclean" /> <ant dir="router/java/" target="distclean" />
<ant dir="apps/ministreaming/java/" target="distclean" /> <ant dir="apps/ministreaming/java/" target="distclean" />
<ant dir="apps/streaming/java/" target="distclean" />
<ant dir="apps/i2ptunnel/java/" target="distclean" /> <ant dir="apps/i2ptunnel/java/" target="distclean" />
<ant dir="apps/sam/java/" target="distclean" /> <ant dir="apps/sam/java/" target="distclean" />
<ant dir="apps/heartbeat/java/" target="distclean" /> <ant dir="apps/heartbeat/java/" target="distclean" />
...@@ -158,6 +162,7 @@ ...@@ -158,6 +162,7 @@
<copy file="build/jbigi.jar" todir="pkg-temp/lib" /> <copy file="build/jbigi.jar" todir="pkg-temp/lib" />
<copy file="build/jnet.jar" todir="pkg-temp/lib/" /> <copy file="build/jnet.jar" todir="pkg-temp/lib/" />
<copy file="build/mstreaming.jar" todir="pkg-temp/lib/" /> <copy file="build/mstreaming.jar" todir="pkg-temp/lib/" />
<copy file="build/streaming.jar" todir="pkg-temp/lib/" />
<copy file="build/netmonitor.jar" todir="pkg-temp/lib/" /> <copy file="build/netmonitor.jar" todir="pkg-temp/lib/" />
<copy file="build/org.mortbay.jetty-jdk1.2.jar" todir="pkg-temp/lib/" /> <copy file="build/org.mortbay.jetty-jdk1.2.jar" todir="pkg-temp/lib/" />
<copy file="build/org.mortbay.jetty.jar" todir="pkg-temp/lib/" /> <copy file="build/org.mortbay.jetty.jar" todir="pkg-temp/lib/" />
...@@ -224,6 +229,7 @@ ...@@ -224,6 +229,7 @@
<copy file="build/i2p.jar" todir="pkg-temp/lib/" /> <copy file="build/i2p.jar" todir="pkg-temp/lib/" />
<copy file="build/i2ptunnel.jar" todir="pkg-temp/lib/" /> <copy file="build/i2ptunnel.jar" todir="pkg-temp/lib/" />
<copy file="build/mstreaming.jar" todir="pkg-temp/lib/" /> <copy file="build/mstreaming.jar" todir="pkg-temp/lib/" />
<copy file="build/streaming.jar" todir="pkg-temp/lib/" />
<copy file="build/router.jar" todir="pkg-temp/lib/" /> <copy file="build/router.jar" todir="pkg-temp/lib/" />
<copy file="build/routerconsole.jar" todir="pkg-temp/lib/" /> <copy file="build/routerconsole.jar" todir="pkg-temp/lib/" />
<copy file="build/i2ptunnel.war" todir="pkg-temp/webapps/" /> <copy file="build/i2ptunnel.war" todir="pkg-temp/webapps/" />
......
$Id: history.txt,v 1.55 2004/10/23 20:42:35 jrandom Exp $ $Id: history.txt,v 1.56 2004/10/24 18:00:44 jrandom Exp $
2004-10-27 jrandom
* Fix a strange race condition on i2cp client disconnect.
* win98 startup fixes (thanks tester-1 and ardvark!)
* include build scripts for the new streaming lib (which is NOT ready
for use yet, but you can hack around with it)
2004-10-24 jrandom 2004-10-24 jrandom
* Allow explicit inclusion of session tags in the SDK, enabling the * Allow explicit inclusion of session tags in the SDK, enabling the
......
@echo off @echo off
setlocal start /m I2Psvc.exe -c wrapper.config
REM Isn't it great the lengths we go through to launch a task without a dos box?
start javaw -cp lib\i2p.jar net.i2p.util.ShellCommand i2prouter.bat
exit exit
...@@ -15,9 +15,9 @@ import net.i2p.CoreVersion; ...@@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
* *
*/ */
public class RouterVersion { public class RouterVersion {
public final static String ID = "$Revision: 1.61 $ $Date: 2004/10/23 20:42:35 $"; public final static String ID = "$Revision: 1.62 $ $Date: 2004/10/24 18:00:44 $";
public final static String VERSION = "0.4.1.3"; public final static String VERSION = "0.4.1.3";
public final static long BUILD = 2; public final static long BUILD = 3;
public static void main(String args[]) { public static void main(String args[]) {
System.out.println("I2P Router version: " + VERSION); System.out.println("I2P Router version: " + VERSION);
System.out.println("Router ID: " + RouterVersion.ID); System.out.println("Router ID: " + RouterVersion.ID);
......
...@@ -126,7 +126,8 @@ public class ClientConnectionRunner { ...@@ -126,7 +126,8 @@ public class ClientConnectionRunner {
synchronized (_messages) { synchronized (_messages) {
_messages.clear(); _messages.clear();
} }
_manager.unregisterConnection(this); if (_manager != null)
_manager.unregisterConnection(this);
if (_currentLeaseSet != null) if (_currentLeaseSet != null)
_context.netDb().unpublish(_currentLeaseSet); _context.netDb().unpublish(_currentLeaseSet);
_leaseRequest = null; _leaseRequest = null;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment