loveisgrief/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge of '804bb87106b8e0129d06020ddf5f77ddc242d622'

Browse Source 
and 'ebb90f58c9b8363abd9b1f7d8f61c81ca478d811'
This commit is contained in:
kytv
2011-08-23 20:18:56 +00:00
parent 73aade4fb3 010399d865
commit 2aee4376cb
11 changed files with 61 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/addressbook/java/src/net/i2p/addressbook/Daemon.java
View File

@@ -201,7 +201,7 @@ public class Daemon {
}
} catch (DataFormatException dfe) {
if (log != null)
log.append("Invalid b64 for" + key + " From: " + sub.getLocation());
log.append("Invalid b64 for " + key + " From: " + sub.getLocation());
invalid++;
}
total++;

8
apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
View File

@@ -515,11 +515,11 @@ public class SummaryHelper extends HelperBase {
*/
public String getJobLag() {
if (_context == null)
return "0 ms";
return "0";
RateStat rs = _context.statManager().getRate("jobQueue.jobLag");
if (rs == null)
return "0 ms";
return "0";
Rate lagRate = rs.getRate(60*1000);
return DataHelper.formatDuration2((long)lagRate.getAverageValue());
}
@@ -531,7 +531,7 @@ public class SummaryHelper extends HelperBase {
*/
public String getMessageDelay() {
if (_context == null)
return "0 ms";
return "0";
return DataHelper.formatDuration2(_context.throttle().getMessageDelay());
}
@@ -543,7 +543,7 @@ public class SummaryHelper extends HelperBase {
*/
public String getTunnelLag() {
if (_context == null)
return "0 ms";
return "0";
return DataHelper.formatDuration2(_context.throttle().getTunnelLag());
}

2
core/java/src/net/i2p/CoreVersion.java
View File

@@ -16,7 +16,7 @@ package net.i2p;
public class CoreVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = "0.8.7";
public final static String VERSION = "0.8.8";
public static void main(String args[]) {
System.out.println("I2P Core version: " + VERSION);

4
core/java/src/net/i2p/util/LogConsoleBuffer.java
View File

@@ -36,8 +36,8 @@ public class LogConsoleBuffer {
lim = Math.max(limit, 4);
// Add some extra room to minimize the chance of losing a message,
// since we are doing offer() below.
_buffer = new LinkedBlockingQueue(limit + 4);
_critBuffer = new LinkedBlockingQueue(limit + 4);
_buffer = new LinkedBlockingQueue(lim + 4);
_critBuffer = new LinkedBlockingQueue(lim + 4);
}
void add(String msg) {

5
history.txt
View File

@@ -1,3 +1,8 @@
* 2011-08-23 0.8.8 released
2011-08-23 zzz
* Tweaks after review
2011-08-21 zzz
* RateStat: Cleanups and javadoc fixes
* susimail: Fix page encoding

2
installer/install.xml
View File

@@ -4,7 +4,7 @@
<info>
<appname>i2p</appname>
<appversion>0.8.7</appversion>
<appversion>0.8.8</appversion>
<authors>
<author name="I2P" email="http://forum.i2p2.de/"/>
</authors>

66
installer/resources/fix_logfile_path.cmd
View File

@@ -1,33 +1,33 @@
@echo off
:: fix_logfile_path.cmd
::
:: This is a simple (and/or stupid) script whose sole purpose is to set the
:: correct path for wrapper.logfile, by explicitly setting it to use the
:: environment variable %temp%.
::
:: On every *NIX-like system, $SYSTEM_java_io_tmpdir/wrapper.log points to a system-level
:: temp directory (/tmp on Linux, /var/tmp on BSD, etc.), but in Windows the value of %temp%
:: depends on whose account a process is running under. If the same user that installs I2P
:: is the only one that will run I2P, this isn't a problem.
::
:: The problem comes from trying to run the process as a service, or trying to run under an
:: account other than the one that did the installation. For example if the user "Administrator"
:: installed I2P on Windows 7, the value for wrapper.logfile will be set to the hardcoded value of
:: C:\Users\Administrator\AppData\Local\Temp\wrapper.log (if it's left at the default value of
:: $SYSTEM_java_io_tmpdir/wrapper.log.
::
:: If user Alice tries to run I2P, the wrapper will try to write its logfile to
:: C:\Users\Administrator\AppData\Local\Temp\wrapper.log. Unfortunately Alice
:: doesn't have the rights to access Administrator's temp directory. The same
:: will happen with the "limited access account" that the I2P service runs
:: under.
::
:: Since Windows doesn't have sed and it has a retarded find, we resort to this
:: lameness.
::
cd /d %~dp0
find /V /I "wrapper.logfile=" wrapper.config > wrapper.new
echo wrapper.logfile=%%temp%%\wrapper.log >> wrapper.new
move wrapper.new wrapper.config
:: As an added bonus, wrapper.config now has DOS line endings in Windows.
@echo off
:: fix_logfile_path.cmd
::
:: This is a simple (and/or stupid) script whose sole purpose is to set the
:: correct path for wrapper.logfile, by explicitly setting it to use the
:: environment variable %temp%.
::
:: On every *NIX-like system, $SYSTEM_java_io_tmpdir/wrapper.log points to a system-level
:: temp directory (/tmp on Linux, /var/tmp on BSD, etc.), but in Windows the value of %temp%
:: depends on whose account a process is running under. If the same user that installs I2P
:: is the only one that will run I2P, this isn't a problem.
::
:: The problem comes from trying to run the process as a service, or trying to run under an
:: account other than the one that did the installation. For example if the user "Administrator"
:: installed I2P on Windows 7, the value for wrapper.logfile will be set to the hardcoded value of
:: C:\Users\Administrator\AppData\Local\Temp\wrapper.log (if it's left at the default value of
:: $SYSTEM_java_io_tmpdir/wrapper.log.
::
:: If user Alice tries to run I2P, the wrapper will try to write its logfile to
:: C:\Users\Administrator\AppData\Local\Temp\wrapper.log. Unfortunately Alice
:: doesn't have the rights to access Administrator's temp directory. The same
:: will happen with the "limited access account" that the I2P service runs
:: under.
::
:: Since Windows doesn't have sed and it has a retarded find, we resort to this
:: lameness.
::
cd /d %~dp0
findstr /V /R "^wrapper.logfile=" wrapper.config > wrapper.new
echo wrapper.logfile=%%temp%%\wrapper.log >> wrapper.new
move wrapper.new wrapper.config
:: As an added bonus, wrapper.config now has DOS line endings in Windows.

36
installer/resources/news.xml
View File

@@ -1,33 +1,19 @@
<!--
<i2p.news date="$Date: 2011-05-16 00:00:00 $">
<i2p.release version="0.8.7" date="2011/06/27" minVersion="0.6" />
<i2p.release version="0.8.8" date="2011/08/23" minVersion="0.6" />
-->
<div lang="en">
<h3>2011-06-27: <b>0.8.7 <a href="http://www.i2p2.i2p/release-0.8.7.html">Released</a></b></h3>
<p>I2P release 0.8.7 contains several upgrades to long-neglected components,
including the Naming Services, graphing, the native CPU ID and BigInteger
libraries, crypto implementations, and the wrapper.</p>
<p>Thanks to new contributor KillYourTV who was instrumental in implementing
and testing these upgrades, with additional support from sponge and hottuna.</p>
<p>CPU ID enhancements are by hottuna, generously funded by
<a href="http://relakks.com/">http://relakks.com/</a> and <a href="http://ipredator.se/">http://ipredator.se/</a> -
thanks to Peter Sunde and Jan-Erik Fiske for their support.</p>
<p>Also, for the first time, we now have an official
<a href="https://launchpad.net/~i2p-maintainers/+archive/i2p">I2P Personal Package Archive (PPA) on launchpad.net</a>.
For those of you using Ubuntu, this offers an easy way to install I2P and keep the
various components up-to-date. The I2P package offers the option of installing as
a service, or it may be started on-demand as usual. This PPA is currently maintained
by KillYourTV with support by other members of the development team.
The <a href="http://www.i2p2.i2p/debian">Ubuntu/Debian installation instructions</a> are on our website.
</p>
<p>For those updating over the network, this update is about 4 times the usual size,
due to the inclusion of the jbigi updates. Please be patient while downloading the update over the network.
<h3>2011-08-23: <b>0.8.8 <a href="http://www.i2p2.i2p/release-0.8.8.html">Released</a></b></h3>
<p>I2P release 0.8.8 enables the new hosts.txt database to speed hostname lookups
and store additional information on hostname entries.
It also includes improvements to speed a router's integration on startup.
There is new code to detect and react to large clock shifts that should help
a router recover after suspend/resume of the computer.
</p><p>
There are new translations for Danish and Ukranian and lots of updates in other languages.
Also included are, of course, a large collection of bug fixes, performance improvements,
and updates to deal with the continued rapid expansion of the network.
</p><p>
Please help grow the network.

1
installer/resources/postinstall.sh
View File

@@ -95,6 +95,7 @@ rm -rf ./icons
rm -rf ./lib/wrapper
rm -f ./lib/*.dll
rm -f ./*.bat
rm -f ./fix_logfile_path.cmd
rm -f ./*.exe
rm -rf ./installer

0
release_checklist.txt → installer/resources/release_checklist.txt
View File

4
router/java/src/net/i2p/router/RouterVersion.java
View File

@@ -18,10 +18,10 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 27;
public final static long BUILD = 0;
/** for example "-test" */
public final static String EXTRA = "-rc";
public final static String EXTRA = "";
public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
public static void main(String args[]) {
System.out.println("I2P Router version: " + FULL_VERSION);