* 2005-12-22 0.6.1.8 released

2005-12-22 jrandom * Bundle the standalone I2PSnark launcher in the installer and update process (launch as "java -jar launch-i2psnark.jar", viewing the interface on http://localhost:8002/) * Don't autostart swarming torrents by default so that you can run a standalone I2PSnark from the I2P install dir and not have the embedded I2PSnark autolaunch the torrents that the standalone instance is running * Fixed a rare streaming lib bug that could let a blocking call wait forever.
2005-12-22 12:49:09 +00:00
parent 327089c9d1
commit 784d465d17
14 changed files with 55 additions and 24 deletions
--- a/apps/i2psnark/java/build.xml
+++ b/apps/i2psnark/java/build.xml
@ -57,7 +57,8 @@
        <delete dir="./dist" />
        <mkdir dir="./dist" />
        <copy file="./build/launch-i2psnark.jar" tofile="./dist/launch-i2psnark.jar" />
-        <copy file="../i2psnark.war" tofile="./dist/i2psnark.war" />
+        <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" />
--- a/apps/i2psnark/java/src/org/klomp/snark/PeerCheckerTask.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/PeerCheckerTask.java
@ -197,5 +197,8 @@ class PeerCheckerTask extends TimerTask
        coordinator.peers.addAll(removed);
        coordinator.peerCount = coordinator.peers.size();
      }
+    if (coordinator.halted()) {
+        cancel();
+    }
  }
 }
--- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
@ -30,7 +30,7 @@ public class SnarkManager implements Snark.CompleteListener {
    public static final String PROP_DIR = "i2psnark.dir";

    public static final String PROP_AUTO_START = "i2snark.autoStart";
-    public static final String DEFAULT_AUTO_START = "true";
+    public static final String DEFAULT_AUTO_START = "false";
    
    private SnarkManager() {
        _snarks = new HashMap();
--- a/apps/i2psnark/jetty-i2psnark.xml
+++ b/apps/i2psnark/jetty-i2psnark.xml
@ -19,7 +19,7 @@
      <New class="org.mortbay.http.SocketListener">
        <Arg>
          <New class="org.mortbay.util.InetAddrPort">
-            <Set name="host">0.0.0.0</Set>
+            <Set name="host">127.0.0.1</Set>
            <Set name="port">8002</Set>
          </New>
        </Arg>
@ -88,7 +88,7 @@
  <Set name="rootWebApp">i2psnark</Set>
  <Call name="addWebApplication">
    <Arg>/</Arg>
-    <Arg>i2psnark.war</Arg>
+    <Arg>webapps/i2psnark.war</Arg>
  </Call>

  <!-- =============================================================== -->
--- a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java
@ -89,6 +89,8 @@ public class ConnectionOptions extends I2PSocketOptionsImpl {
            setInboundBufferSize(opts.getInboundBufferSize());
            setCongestionAvoidanceGrowthRateFactor(opts.getCongestionAvoidanceGrowthRateFactor());
            setSlowStartGrowthRateFactor(opts.getSlowStartGrowthRateFactor());
+            setWriteTimeout(opts.getWriteTimeout());
+            setReadTimeout(opts.getReadTimeout());
        }
    }
    
--- a/apps/streaming/java/src/net/i2p/client/streaming/MessageOutputStream.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/MessageOutputStream.java
@ -256,8 +256,12 @@ public class MessageOutputStream extends OutputStream {
        long begin = _context.clock().now();
        WriteStatus ws = null;
        synchronized (_dataLock) {
-            if (_buf == null) throw new IOException("closed (buffer went away)");
+            if (_buf == null) {
+                _dataLock.notifyAll();
+                throw new IOException("closed (buffer went away)");
+            }
            if (_dataReceiver == null) {
+                _dataLock.notifyAll();
                throwAnyError();
                return;
            }
@ -293,7 +297,10 @@ public class MessageOutputStream extends OutputStream {
    }
    
    public void close() throws IOException {
-        if (_closed) return;
+        if (_closed) {
+            synchronized (_dataLock) { _dataLock.notifyAll(); }
+            return;
+        }
        _closed = true;
        flush();
        _log.debug("Output stream closed after writing " + _written);
@ -305,6 +312,7 @@ public class MessageOutputStream extends OutputStream {
                _valid = 0;
                locked_updateBufferSize();
            }
+            _dataLock.notifyAll();
        }
        if (ba != null) {
            _dataCache.release(ba);
--- a/build.xml
+++ b/build.xml
@ -32,7 +32,7 @@
        <ant dir="apps/susimail/" target="war" />
        <ant dir="apps/susidns/src" target="all" />
        <ant dir="apps/syndie/java/" target="jar" />
-        <ant dir="apps/i2psnark/java/" target="war" />
+        <ant dir="apps/i2psnark/java/" target="standalone" />
    </target>
    <target name="buildrouter">
        <ant dir="core/java/" target="distclean" />
@ -253,6 +253,8 @@
        <copy file="build/susidns.war" todir="pkg-temp/webapps/" />
        <copy file="build/syndie.war" todir="pkg-temp/webapps/" />
        <copy file="build/i2psnark.war" todir="pkg-temp/webapps/" />
+        <copy file="apps/i2psnark/java/build/launch-i2psnark.jar" todir="pkg-temp/" />
+        <copy file="apps/i2psnark/jetty-i2psnark.xml" todir="pkg-temp/" />
        <copy file="installer/resources/clients.config" todir="pkg-temp/" />
        <copy file="installer/resources/eepget" todir="pkg-temp/" />
        <copy file="installer/resources/i2prouter" todir="pkg-temp/" />
@ -363,6 +365,8 @@
        <copy file="build/susidns.war" todir="pkg-temp/webapps/" />
        <copy file="build/syndie.war" todir="pkg-temp/webapps/" />
        <copy file="build/i2psnark.war" todir="pkg-temp/webapps/" />
+        <copy file="apps/i2psnark/java/build/launch-i2psnark.jar" todir="pkg-temp/" />
+        <copy file="apps/i2psnark/jetty-i2psnark.xml" todir="pkg-temp/" />
        <copy file="history.txt" todir="pkg-temp/" />
        <mkdir dir="pkg-temp/docs/" />
        <copy file="news.xml" todir="pkg-temp/docs/" />
--- a/core/java/src/net/i2p/CoreVersion.java
+++ b/core/java/src/net/i2p/CoreVersion.java
@ -14,8 +14,8 @@ package net.i2p;
 *
 */
 public class CoreVersion {
-    public final static String ID = "$Revision: 1.49 $ $Date: 2005/11/26 13:26:22 $";
-    public final static String VERSION = "0.6.1.7";
+    public final static String ID = "$Revision: 1.50 $ $Date: 2005/12/01 12:16:54 $";
+    public final static String VERSION = "0.6.1.8";

    public static void main(String args[]) {
        System.out.println("I2P Core version: " + VERSION);
--- a/history.txt
+++ b/history.txt
@ -1,4 +1,16 @@
-$Id: history.txt,v 1.367 2005/12/22 05:04:15 jrandom Exp $
+$Id: history.txt,v 1.368 2005/12/22 05:10:39 jrandom Exp $
+
+* 2005-12-22  0.6.1.8 released
+
+2005-12-22  jrandom
+    * Bundle the standalone I2PSnark launcher in the installer and update
+      process (launch as "java -jar launch-i2psnark.jar", viewing the 
+      interface on http://localhost:8002/)
+    * Don't autostart swarming torrents by default so that you can run a
+      standalone I2PSnark from the I2P install dir and not have the embedded
+      I2PSnark autolaunch the torrents that the standalone instance is running
+    * Fixed a rare streaming lib bug that could let a blocking call wait
+      forever.

 2005-12-22  jrandom
    * Cleaned up some buffer synchronization issues in I2PSnark that could
--- a/initialNews.xml
+++ b/initialNews.xml
@ -1,5 +1,5 @@
-<i2p.news date="$Date: 2005/11/26 13:26:24 $">
- <i2p.release version="0.6.1.7" date="2005/12/01" minVersion="0.6"
+<i2p.news date="$Date: 2005/12/01 12:16:53 $">
+ <i2p.release version="0.6.1.8" date="2005/12/22" minVersion="0.6"
              anonurl="http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/i2p/i2pupdate.sud"
              publicurl="http://dev.i2p.net/i2p/i2pupdate.sud"
              anonannouncement="http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/pipermail/i2p/2005-September/000878.html" 
--- a/installer/install.xml
+++ b/installer/install.xml
@ -4,7 +4,7 @@

    <info>
        <appname>i2p</appname>
-        <appversion>0.6.1.7</appversion>
+        <appversion>0.6.1.8</appversion>
        <authors>
            <author name="I2P" email="support@i2p.net"/>
        </authors>
--- a/news.xml
+++ b/news.xml
@ -1,5 +1,5 @@
-<i2p.news date="$Date: 2005/11/26 13:26:24 $">
- <i2p.release version="0.6.1.7" date="2005/12/01" minVersion="0.6"
+<i2p.news date="$Date: 2005/12/01 12:16:53 $">
+ <i2p.release version="0.6.1.8" date="2005/12/22" minVersion="0.6"
              anonurl="http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/i2p/i2pupdate.sud"
              publicurl="http://dev.i2p.net/i2p/i2pupdate.sud"
              anonannouncement="http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/pipermail/i2p/2005-September/000878.html" 
@ -9,7 +9,6 @@
            publicurl="http://dev.i2p.net/pipermail/i2p/2005-July/000826.html"
            anonlogs="http://i2p/Nf3ab-ZFkmI-LyMt7GjgT-jfvZ3zKDl0L96pmGQXF1B82W2Bfjf0n7~288vafocjFLnQnVcmZd~-p0-Oolfo9aW2Rm-AhyqxnxyLlPBqGxsJBXjPhm1JBT4Ia8FB-VXt0BuY0fMKdAfWwN61-tj4zIcQWRxv3DFquwEf035K~Ra4SWOqiuJgTRJu7~o~DzHVljVgWIzwf8Z84cz0X33pv-mdG~~y0Bsc2qJVnYwjjR178YMcRSmNE0FVMcs6f17c6zqhMw-11qjKpY~EJfHYCx4lBWF37CD0obbWqTNUIbL~78vxqZRT3dgAgnLixog9nqTO-0Rh~NpVUZnoUi7fNR~awW5U3Cf7rU7nNEKKobLue78hjvRcWn7upHUF45QqTDuaM3yZa7OsjbcH-I909DOub2Q0Dno6vIwuA7yrysccN1sbnkwZbKlf4T6~iDdhaSLJd97QCyPOlbyUfYy9QLNExlRqKgNVJcMJRrIual~Lb1CLbnzt0uvobM57UpqSAAAA/meeting141"
            publiclogs="http://www.i2p.net/meeting141" />
-&#149; Tip: if an eepsite isn't reachable, it may not be online - <a href="http://orion.i2p/">orion</a> or 
-       <a href="http://polecat.i2p/i2psurvey/">polecat</a> tells whether they can reach the site as well<br />
-&#149; I2Phex users should keep track of the progress on the <a href="http://forum.i2p/viewforum.php?f=25">forum</a><br />
+&#149; In the latest release, there's an integrated multisource bittorrent client - <a href="i2psnark/">I2PSnark</a><br />
+&#149; Syndie now has a <a href="syndie/blogs.jsp">blog interface</a>, giving you an overview of recent activity<br />
 </i2p.news>
--- a/readme.html
+++ b/readme.html
@ -17,7 +17,7 @@ you can:</p>
         <li><a href="http://search.i2p/">search.i2p</a>: an anonymously hosted search engine of eepsites</li>
         <li><a href="http://ugha.i2p/">ugha.i2p</a>: ugha's eepsite, a wiki that anyone can edit, and lots of links</li>
         <li><a href="http://dev.i2p/">dev.i2p</a>: a secure and anonymous connection to <a href="http://dev.i2p.net/">dev.i2p.net</a></li>
-         <li>Freenet proxies: <a href="http://fproxy.i2p/">fproxy.i2p</a> and <a href="http://fproxy.tino.i2p">fproxy.tino.i2p</a></li>
+         <li>Freenet proxy: <a href="http://fproxy.tino.i2p">fproxy.tino.i2p</a></li>
     </ul>
     There are many more eepsites - just follow the links from the ones you see,
     bookmark your favorites, and visit them often!</li>
@ -25,8 +25,10 @@ you can:</p>
     up to your own HTTP proxy on port 4444 - simply set your browser's proxy to
     use it (as above) and go to any normal URL - your requests will be bounced
     through the I2P network.</li>
- <li><b>transfer files</b> - there is an <a href="http://i2p-bt.postman.i2p/">I2P port</a>
-     of the <a href="http://www.bittorrent.com/">BitTorrent</a> application available.</li>
+ <li><b>transfer files</b> - there is an integrated <a href="i2psnark/">port</a> of the
+     <a href="http://www.klomp.org/snark/">Snark</a> <a href="http://www.bittorrent.com/">BitTorrent</a>
+     client, which is compatible with the Python 
+     <a href="http://i2p-bt.postman.i2p/">mainline I2P-BT</a>.</li>
 <li><b>use anonymous email</b> - postman has created a mail system compatible with normal mail
     clients (POP3 / SMTP) that allows email within I2P as well as mail from and to the normal
     internet!  get your account at <a href="http://hq.postman.i2p/">hq.postman.i2p</a>.
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
 *
 */
 public class RouterVersion {
-    public final static String ID = "$Revision: 1.315 $ $Date: 2005/12/21 07:04:55 $";
-    public final static String VERSION = "0.6.1.7";
-    public final static long BUILD = 9;
+    public final static String ID = "$Revision: 1.316 $ $Date: 2005/12/22 05:04:13 $";
+    public final static String VERSION = "0.6.1.8";
+    public final static long BUILD = 0;
    public static void main(String args[]) {
        System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
        System.out.println("Router ID: " + RouterVersion.ID);