forked from I2P_Developers/i2p.i2p
propagate from branch 'i2p.i2p.zzz.test' (head 0f2e109194f1fcc94e8a3f37cbf804446abddeff)
to branch 'i2p.i2p' (head 7bb99f9e0d436cf9923ed17465f15e73c78e7b13)
This commit is contained in:
@ -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++;
|
||||
|
@ -389,8 +389,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
|
||||
// pos is the start of the path
|
||||
pos = request.indexOf("/");
|
||||
if (pos == -1) {
|
||||
method = null;
|
||||
break;
|
||||
pos = request.length();
|
||||
}
|
||||
host = request.substring(0, pos);
|
||||
|
||||
|
@ -63,7 +63,7 @@ public class ConfigUIHelper extends HelperBase {
|
||||
_x("German"), _x("English"), _x("Spanish"),_x("Finnish"),
|
||||
_x("French"), _x("Italian"), _x("Dutch"), _x("Polish"),
|
||||
_x("Portuguese"), _x("Russian"), _x("Swedish"),
|
||||
_x("Ukranian"), _x("Vietnamese"), _x("Chinese")};
|
||||
_x("Ukrainian"), _x("Vietnamese"), _x("Chinese")};
|
||||
|
||||
/** todo sort by translated string */
|
||||
public String getLangSettings() {
|
||||
|
@ -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());
|
||||
}
|
||||
|
@ -44,7 +44,7 @@
|
||||
<a href="/?lang=pt&consoleNonce=<%=consoleNonce%>"><img src="/flags.jsp?c=pt" title="Português" alt="Português"></a>
|
||||
<a href="/?lang=ru&consoleNonce=<%=consoleNonce%>"><img src="/flags.jsp?c=ru" title="Русский" alt="Русский"></a>
|
||||
<a href="/?lang=sv&consoleNonce=<%=consoleNonce%>"><img src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a>
|
||||
<a href="/?lang=uk&consoleNonce=<%=consoleNonce%>"><img src="/flags.jsp?c=ua" title="Ukranian" alt="Ukranian"></a>
|
||||
<a href="/?lang=uk&consoleNonce=<%=consoleNonce%>"><img src="/flags.jsp?c=ua" title="Ukrainian" alt="Ukrainian"></a>
|
||||
<a href="/?lang=vi&consoleNonce=<%=consoleNonce%>"><img src="/flags.jsp?c=vn" title="Tiếng Việt" alt="Tiếng Việt"></a>
|
||||
</div>
|
||||
<a name="top"></a>
|
||||
|
@ -1202,6 +1202,8 @@ public class WebMail extends HttpServlet
|
||||
private void processRequest( HttpServletRequest httpRequest, HttpServletResponse response )
|
||||
throws IOException, ServletException
|
||||
{
|
||||
httpRequest.setCharacterEncoding("UTF-8");
|
||||
response.setCharacterEncoding("UTF-8");
|
||||
RequestWrapper request = new RequestWrapper( httpRequest );
|
||||
|
||||
SessionObject sessionObject = null;
|
||||
@ -1268,13 +1270,18 @@ public class WebMail extends HttpServlet
|
||||
subtitle = _("Show Message");
|
||||
|
||||
response.setContentType( "text/html" );
|
||||
out.println( "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n<html>" );
|
||||
|
||||
/*
|
||||
* write header
|
||||
*/
|
||||
out.println( "<head>\n<title>susimail v0." + version + " - " + subtitle +
|
||||
"</title>\n<link rel=\"stylesheet\" type=\"text/css\" href=\"css.css\">\n</head>\n<body>\n<div class=\"page\"><p><img src=\"susimail.png\" alt=\"Susimail\"><br> </p>\n<form method=\"POST\" enctype=\"multipart/form-data\" action=\"" + myself + "\">" );
|
||||
out.println( "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n<html>\n" +
|
||||
"<head>\n" +
|
||||
"<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\n" +
|
||||
"<title>susimail - " + subtitle + "</title>\n" +
|
||||
"<link rel=\"stylesheet\" type=\"text/css\" href=\"css.css\">\n" +
|
||||
"</head>\n<body>\n" +
|
||||
"<div class=\"page\"><p><img src=\"susimail.png\" alt=\"Susimail\"><br> </p>\n" +
|
||||
"<form method=\"POST\" enctype=\"multipart/form-data\" action=\"" + myself + "\">" );
|
||||
|
||||
if( sessionObject.error != null && sessionObject.error.length() > 0 ) {
|
||||
out.println( "<p class=\"error\">" + sessionObject.error + "</p>" );
|
||||
|
89
build.xml
89
build.xml
@ -434,10 +434,18 @@
|
||||
<arg value="public final static String VERSION" />
|
||||
<arg value="core/java/src/net/i2p/CoreVersion.java" />
|
||||
</exec>
|
||||
<exec executable="cut" inputstring="${versionLine}" outputproperty="release.number" failonerror="true" >
|
||||
<exec executable="cut" osfamily="unix" inputstring="${versionLine}" outputproperty="release.number" failonerror="true" >
|
||||
<arg value="-f2" />
|
||||
<arg value="-d"" />
|
||||
</exec>
|
||||
<exec executable="cut" osfamily="mac" inputstring="${versionLine}" outputproperty="release.number" failonerror="true" >
|
||||
<arg value="-f2" />
|
||||
<arg value="-d""/>
|
||||
</exec>
|
||||
<exec executable="cut" osfamily="windows" inputstring="${versionLine}" outputproperty="release.number" failonerror="true" >
|
||||
<arg value="-f2" />
|
||||
<arg value="-d"\"""/>
|
||||
</exec>
|
||||
<echo message="Release number is ${release.number}" />
|
||||
</target>
|
||||
|
||||
@ -1019,30 +1027,6 @@
|
||||
<mkdir dir="pkg-temp/installer" />
|
||||
<!-- set if unset -->
|
||||
<property name="workspace.changes.util.tr" value="" />
|
||||
<jar destfile="./pkg-temp/installer/copy.jar" basedir="./core/java/build/obj" includes="net/i2p/util/Copy.class net/i2p/util/FileUtil.class">
|
||||
<manifest>
|
||||
<attribute name="Main-Class" value="net.i2p.util.Copy" />
|
||||
<attribute name="Build-Date" value="${build.timestamp}" />
|
||||
<attribute name="Base-Revision" value="${workspace.version}" />
|
||||
<attribute name="Workspace-Changes" value="${workspace.changes.util.tr}" />
|
||||
</manifest>
|
||||
</jar>
|
||||
<jar destfile="./pkg-temp/installer/delete.jar" basedir="./core/java/build/obj" includes="net/i2p/util/Delete.class net/i2p/util/FileUtil.class">
|
||||
<manifest>
|
||||
<attribute name="Main-Class" value="net.i2p.util.Delete" />
|
||||
<attribute name="Build-Date" value="${build.timestamp}" />
|
||||
<attribute name="Base-Revision" value="${workspace.version}" />
|
||||
<attribute name="Workspace-Changes" value="${workspace.changes.util.tr}" />
|
||||
</manifest>
|
||||
</jar>
|
||||
<jar destfile="./pkg-temp/installer/exec.jar" basedir="./core/java/build/obj" includes="net/i2p/util/Exec.class">
|
||||
<manifest>
|
||||
<attribute name="Main-Class" value="net.i2p.util.Exec" />
|
||||
<attribute name="Build-Date" value="${build.timestamp}" />
|
||||
<attribute name="Base-Revision" value="${workspace.version}" />
|
||||
<attribute name="Workspace-Changes" value="${workspace.changes.util.tr}" />
|
||||
</manifest>
|
||||
</jar>
|
||||
<izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-freebsd-only.jar" installerType="standard" basedir="${basedir}" />
|
||||
</target>
|
||||
|
||||
@ -1051,30 +1035,6 @@
|
||||
<mkdir dir="pkg-temp/installer" />
|
||||
<!-- set if unset -->
|
||||
<property name="workspace.changes.util.tr" value="" />
|
||||
<jar destfile="./pkg-temp/installer/copy.jar" basedir="./core/java/build/obj" includes="net/i2p/util/Copy.class net/i2p/util/FileUtil.class">
|
||||
<manifest>
|
||||
<attribute name="Main-Class" value="net.i2p.util.Copy" />
|
||||
<attribute name="Build-Date" value="${build.timestamp}" />
|
||||
<attribute name="Base-Revision" value="${workspace.version}" />
|
||||
<attribute name="Workspace-Changes" value="${workspace.changes.util.tr}" />
|
||||
</manifest>
|
||||
</jar>
|
||||
<jar destfile="./pkg-temp/installer/delete.jar" basedir="./core/java/build/obj" includes="net/i2p/util/Delete.class net/i2p/util/FileUtil.class">
|
||||
<manifest>
|
||||
<attribute name="Main-Class" value="net.i2p.util.Delete" />
|
||||
<attribute name="Build-Date" value="${build.timestamp}" />
|
||||
<attribute name="Base-Revision" value="${workspace.version}" />
|
||||
<attribute name="Workspace-Changes" value="${workspace.changes.util.tr}" />
|
||||
</manifest>
|
||||
</jar>
|
||||
<jar destfile="./pkg-temp/installer/exec.jar" basedir="./core/java/build/obj" includes="net/i2p/util/Exec.class">
|
||||
<manifest>
|
||||
<attribute name="Main-Class" value="net.i2p.util.Exec" />
|
||||
<attribute name="Build-Date" value="${build.timestamp}" />
|
||||
<attribute name="Base-Revision" value="${workspace.version}" />
|
||||
<attribute name="Workspace-Changes" value="${workspace.changes.util.tr}" />
|
||||
</manifest>
|
||||
</jar>
|
||||
<izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-linux-only.jar" installerType="standard" basedir="${basedir}" />
|
||||
</target>
|
||||
|
||||
@ -1085,30 +1045,6 @@
|
||||
<mkdir dir="pkg-temp/osx" />
|
||||
<!-- set if unset -->
|
||||
<property name="workspace.changes.util.tr" value="" />
|
||||
<jar destfile="./pkg-temp/installer/copy.jar" basedir="./core/java/build/obj" includes="net/i2p/util/Copy.class net/i2p/util/FileUtil.class">
|
||||
<manifest>
|
||||
<attribute name="Main-Class" value="net.i2p.util.Copy" />
|
||||
<attribute name="Build-Date" value="${build.timestamp}" />
|
||||
<attribute name="Base-Revision" value="${workspace.version}" />
|
||||
<attribute name="Workspace-Changes" value="${workspace.changes.util.tr}" />
|
||||
</manifest>
|
||||
</jar>
|
||||
<jar destfile="./pkg-temp/installer/delete.jar" basedir="./core/java/build/obj" includes="net/i2p/util/Delete.class net/i2p/util/FileUtil.class">
|
||||
<manifest>
|
||||
<attribute name="Main-Class" value="net.i2p.util.Delete" />
|
||||
<attribute name="Build-Date" value="${build.timestamp}" />
|
||||
<attribute name="Base-Revision" value="${workspace.version}" />
|
||||
<attribute name="Workspace-Changes" value="${workspace.changes.util.tr}" />
|
||||
</manifest>
|
||||
</jar>
|
||||
<jar destfile="./pkg-temp/installer/exec.jar" basedir="./core/java/build/obj" includes="net/i2p/util/Exec.class">
|
||||
<manifest>
|
||||
<attribute name="Main-Class" value="net.i2p.util.Exec" />
|
||||
<attribute name="Build-Date" value="${build.timestamp}" />
|
||||
<attribute name="Base-Revision" value="${workspace.version}" />
|
||||
<attribute name="Workspace-Changes" value="${workspace.changes.util.tr}" />
|
||||
</manifest>
|
||||
</jar>
|
||||
<izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-osx-only.jar" installerType="standard" basedir="${basedir}" />
|
||||
<ant target="installer2app" />
|
||||
<delete dir="pkg-temp/osx" />
|
||||
@ -1181,12 +1117,7 @@
|
||||
<arg value="--output=${basedir}/i2pinstall-${release.number}-windows.exe" />
|
||||
</exec>
|
||||
</target>
|
||||
<target name="installer-all" >
|
||||
<ant target="installer-freebsd" />
|
||||
<ant target="installer-linux" />
|
||||
<ant target="installer-osx" />
|
||||
<ant target="installer-windows" />
|
||||
<ant target="installer" />
|
||||
<target name="installer-all" depends="installer-freebsd, installer-linux, installer-osx, installer-windows, installer" >
|
||||
</target>
|
||||
<!-- end custom installers -->
|
||||
|
||||
|
@ -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);
|
||||
|
@ -32,7 +32,7 @@ public class RateStat {
|
||||
for (int i = 0; i < periods.length; i++) {
|
||||
Rate rate = new Rate(periods[i]);
|
||||
rate.setRateStat(this);
|
||||
_rates.put(rate.getPeriod(),rate);;
|
||||
_rates.put(rate.getPeriod(),rate);
|
||||
}
|
||||
}
|
||||
public void setStatLog(StatLog sl) { _statLog = sl; }
|
||||
@ -75,19 +75,19 @@ public class RateStat {
|
||||
}
|
||||
|
||||
public double getLifetimeAverageValue() {
|
||||
if ( (_rates == null) || (_rates.size() <= 0) ) return 0;
|
||||
if (_rates.isEmpty()) return 0;
|
||||
return _rates.values().iterator().next().getLifetimeAverageValue();
|
||||
}
|
||||
public long getLifetimeEventCount() {
|
||||
if ( (_rates == null) || (_rates.size() <= 0) ) return 0;
|
||||
if (_rates.isEmpty()) return 0;
|
||||
return _rates.values().iterator().next().getLifetimeEventCount();
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns rate with requested period if it exists,
|
||||
* otherwise creates new rate with requested period, adds it to list of rates and returns it.
|
||||
* @param period
|
||||
* @return
|
||||
* @param period ms
|
||||
* @return the Rate
|
||||
*/
|
||||
public Rate getRate(long period) {
|
||||
if (_rates.containsKey(period)){
|
||||
@ -103,7 +103,8 @@ public class RateStat {
|
||||
/**
|
||||
* Adds a new rate with the requested period, provided that
|
||||
* a rate with that period does not already exist.
|
||||
* @param period
|
||||
* @param period ms
|
||||
* @since 0.8.8
|
||||
*/
|
||||
public void addRate(long period) {
|
||||
if (!_rates.containsKey(period)){
|
||||
@ -115,7 +116,8 @@ public class RateStat {
|
||||
|
||||
/**
|
||||
* If a rate with the provided period exists, remove it.
|
||||
* @param period
|
||||
* @param period ms
|
||||
* @since 0.8.8
|
||||
*/
|
||||
public void removeRate(long period) {
|
||||
_rates.remove(period);
|
||||
@ -123,8 +125,9 @@ public class RateStat {
|
||||
|
||||
/**
|
||||
* Tests if a rate with the provided period exists within this RateStat.
|
||||
* @param period
|
||||
* @return
|
||||
* @param period ms
|
||||
* @return true if exists
|
||||
* @since 0.8.8
|
||||
*/
|
||||
public boolean containsRate(long period) {
|
||||
return _rates.containsKey(period);
|
||||
|
@ -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) {
|
||||
|
6
debian/changelog
vendored
6
debian/changelog
vendored
@ -1,3 +1,9 @@
|
||||
i2p (0.8.8-1) stable; urgency=low
|
||||
|
||||
* New upstream release.
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sun, 21 Aug 2011 12:00:00 +0000
|
||||
|
||||
i2p (0.8.7-6) UNRELEASED; urgency=low
|
||||
|
||||
* Add ttf-dejavu to recommends, so that graphs on
|
||||
|
25
debian/i2pversion
vendored
25
debian/i2pversion
vendored
@ -1,25 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
ROUTER=$(/bin/echo -ne "_")$(cat ./router/java/src/net/i2p/router/RouterVersion.java | grep -e "public final static long BUILD" | cut -f2 -d"=" | cut -f1 -d";" | sed -re "s/ //g")
|
||||
if [ "$ROUTER" = "_" ] ; then
|
||||
ROUTER="_0"
|
||||
fi
|
||||
|
||||
#
|
||||
# That was the easy one, now for the tough one.
|
||||
#
|
||||
|
||||
CORE=$(cat core/java/src/net/i2p/CoreVersion.java | grep -e "public final static String VERSION" | cut -f2 -d'"' | sed -re "s/ //g")
|
||||
CORE1=$(/bin/echo -n $CORE.x.x | sed -re "s/(.*)\.(.*)\.(.*)\.(.*)/\1/")
|
||||
CORE2=$(/bin/echo -n $CORE.x | sed -re "s/(.*)\.(.*)\.(.*)\.(.*)/\1/")
|
||||
|
||||
if [ "$CORE.x.x" = "$CORE1" ] ; then
|
||||
CORE=$(/bin/echo -ne $CORE".0.0")
|
||||
fi
|
||||
if [ "$CORE.x" = "$CORE2" ] ; then
|
||||
CORE=$(/bin/echo -ne $CORE".0")
|
||||
fi
|
||||
|
||||
VERSION=$(/bin/echo $CORE$ROUTER)
|
||||
|
||||
echo $VERSION
|
@ -1,3 +1,12 @@
|
||||
* 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
|
||||
|
||||
2011-08-20 zzz
|
||||
* Translations:
|
||||
- New Danish and Ukranian translations from transifex
|
||||
|
@ -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>
|
||||
|
@ -26,7 +26,7 @@
|
||||
:: lameness.
|
||||
::
|
||||
cd /d %~dp0
|
||||
find /V /I "wrapper.logfile=" wrapper.config > wrapper.new
|
||||
findstr /V /R "^wrapper.logfile=" wrapper.config > wrapper.new
|
||||
echo wrapper.logfile=%%temp%%\wrapper.log >> wrapper.new
|
||||
move wrapper.new wrapper.config
|
||||
|
||||
|
@ -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.
|
||||
|
@ -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
|
||||
|
||||
|
@ -54,7 +54,7 @@
|
||||
anonymous connections to <a href="http://www.i2p2.de/" target="_blank">www.i2p2.de</a>. There's also an official mirror running on <a href="http://geti2p.net/" target="_blank">geti2p.net</a>. If you want to know more about how I2P works or how you can participate, this is your first port of call!</li>
|
||||
<li class="tidylist"><b>I2P Community Forums</b><br><a href="http://forum.i2p/" target="_blank">forum.i2p</a>: A secure
|
||||
and anonymous connection to <a href="http://forum.i2p2.de/" target="_blank">forum.i2p2.de</a>, an online forum community where developers and users alike discuss problems and ideas relating to I2P and associated topics, and <a href="http://zzz.i2p/" target="_blank">zzz's developer forums</a> for both end users and developers.</li>
|
||||
<li class="tidylist"><b>I2P Anonymous Pastebin</b><br><a href="http://paste.i2p2.i2p/" target="_blank">paste.i2p2.i2p</a>: Secure and
|
||||
<li class="tidylist"><b>I2P Anonymous Pastebin</b><br><a href="http://pastethis.i2p/" target="_blank">pastethis.i2p</a>: Secure and
|
||||
anonymous paste service allowing anonymous text and text-based code sharing over I2P.</li>
|
||||
<li class="tidylist"><b>Echelon's I2P Resources</b><br><a href="http://echelon.i2p/" target="_blank">echelon.i2p</a>: I2P software
|
||||
archive with source code (where permissible), information about I2P, including a <a href="http://echelon.i2p/I2Pguide/index.html" target="_blank">beginner's guide</a> and pre-release developer builds of I2P for the adventurous to try.</li>
|
||||
@ -89,7 +89,7 @@
|
||||
make sure your browser's proxy is set to access http traffic (<i>not</i> https, <i>not</i> socks) via <code>127.0.0.1 port 4444</code>. If you need some help, there's <a href="http://www.i2p2.i2p/htproxyports.html" target="_blank">a guide</a> to configuring your browser for I2P use, also <a href="http://www.i2p2.de/htproxyports.html" target="_blank">available</a> on the normal web.
|
||||
</li>
|
||||
|
||||
<li class="tidylist"><b>Check Your Logs</b><br><a href="/logs">Logs</a> may help resolve a problem. You may wish to paste excerpts in a <a href="http://forum.i2p/viewforum.php?f=10" target="_blank">forum</a> for help, or perhaps <a href="http://paste.i2p2.i2p/" target="_blank">paste</a> it instead and reference the link on IRC for help.
|
||||
<li class="tidylist"><b>Check Your Logs</b><br><a href="/logs">Logs</a> may help resolve a problem. You may wish to paste excerpts in a <a href="http://forum.i2p/viewforum.php?f=10" target="_blank">forum</a> for help, or perhaps <a href="http://pastethis.i2p/" target="_blank">paste</a> it instead and reference the link on IRC for help.
|
||||
</li>
|
||||
|
||||
<li class="tidylist"><b>Verify Java is Up to Date</b><br>Ensure your Java is up to date [version 1.6 recommended and required for some features]. Check the version of your JRE (<a href="https://secure.wikimedia.org/wikipedia/en/wiki/JRE" target="_blank">Java Runtime Environment</a>)
|
||||
|
@ -12,7 +12,7 @@
|
||||
<li><a href="http://ugha.i2p/">ugha.i2p</a>: Ugha's Eepseite, ein öffentliches Wiki mit vielen Links</li>
|
||||
<li><a href="http://fproxy.tino.i2p">fproxy.tino.i2p</a>: ein Freenet-Proxy</li>
|
||||
<li><a href="http://echelon.i2p">echelon.i2p</a>: Softwarearchiv und Informationen zu I2P (mit BitTorrent-Klienten, iMule, I2PFox, I2P-Messenger, …)</li>
|
||||
<li><a href="http://paste.i2p2.i2p">paste.i2p2.i2p</a>: anonymer Pastebin</li>
|
||||
<li><a href="http://pastethis.i2p">pastethis.i2p</a>: anonymer Pastebin</li>
|
||||
</ul><br />
|
||||
Es gibt viele andere Eepseiten - folge einfach den Links, die du findest,
|
||||
setze Lesezeichen für Deine Favoriten, und besuche sie oft!</li>
|
||||
|
@ -12,7 +12,7 @@
|
||||
<li><a href="http://ugha.i2p/">ugha.i2p</a>: página de Ugha; un wiki público con muchos enlaces</li>
|
||||
<li><a href="http://fproxy.tino.i2p">fproxy.tino.i2p</a>: un proxy para acceder a Freenet</li>
|
||||
<li><a href="http://echelon.i2p">echelon.i2p</a>: archivo de software e informaciones sobre I2P (con aplicaciones de BitTorrent, iMule, I2PFox, I2P-Messenger, ...)</li>
|
||||
<li><a href="http://paste.i2p2.i2p">paste.i2p2.i2p</a>: pastebin anónimo</li>
|
||||
<li><a href="http://pastethis.i2p">pastethis.i2p</a>: pastebin anónimo</li>
|
||||
</ul><br />
|
||||
Hay muchas páginas I2P más - simplemente ¡sigue los enlaces que encuentres, pon marcadores para tus favoritos y visítalos frecuentemente!</li>
|
||||
<li class="tidylist"><b>navegar en internet</b> - I2P cuenta con un HTTP-"Outproxy". Para poder usarlo, puedes también utilizar el proxy HTTP en el puerto 4444 - Si configuras tu navegador web para usar este proxy, puedes visitar las páginas web de forma anónima. El tráfico será enrutado através de la red I2P.</li>
|
||||
|
@ -126,7 +126,7 @@ façon d'y contribuer, vous venez de trouver la porte d'entrée.</li>
|
||||
utilisateurs aiment discuter de problèmes et d'idées relatifs à I2P et aux sujets apparentés, et le
|
||||
<a href="http://zzz.i2p/" target="_blank">forum des développeurs de zzz</a> également ouvert aux utilisateurs.</li>
|
||||
<li class="tidylist"><b>Pastebin anonyme I2P</b><br>
|
||||
<a href="http://paste.i2p2.i2p/" target="_blank">paste.i2p2.i2p</a>: service de collage sécurisé et anonyme pour le
|
||||
<a href="http://pastethis.i2p/" target="_blank">pastethis.i2p</a>: service de collage sécurisé et anonyme pour le
|
||||
partage de texte et de code au format textuel sur I2P.</li>
|
||||
<li class="tidylist"><b>Les ressources i2P d'Echelon</b>
|
||||
<br><a href="http://echelon.i2p/" target="_blank">echelon.i2p</a>: dépôt de logiciels I2P (I2PFox, iMule,
|
||||
@ -198,7 +198,7 @@ l'utilisation avec I2P, également
|
||||
<li class="tidylist"><b>Vérifiez vos historiques</b><br>Les <a href="/logs">historiques</a> peuvent aider à
|
||||
diagnostiquer un problème. Vous pouvez en coller un extrait sur un
|
||||
<a href="http://forum.i2p/viewforum.php?f=10" target="_blank">forum</a> pour obtenir de l'aide, ou plutôt le
|
||||
<a href="http://paste.i2p2.i2p/" target="_blank">coller ici</a> et faire référence au lien sur le canal IRC #i2p-fr
|
||||
<a href="http://pastethis.i2p/" target="_blank">coller ici</a> et faire référence au lien sur le canal IRC #i2p-fr
|
||||
(Freenode).
|
||||
</li>
|
||||
|
||||
|
@ -41,7 +41,7 @@ en maak verbinding met de <a href="irc://127.0.0.1:6668/i2p">server</a> op <code
|
||||
anonieme verbindingen naar <a href="http://www.i2p2.de/" target="_blank">www.i2p2.de</a>. Er is ook een officiële mirror actief op <a href="http://geti2p.net/" target="_blank">geti2p.net</a>. Als je meer wilt weten over hoe I2P werkt of hoe je mee kan doen is dit de website waar je terecht kan!</li>
|
||||
<li class="tidylist"><b>I2P Community Forums</b><br><a href="http://forum.i2p/" target="_blank">forum.i2p</a>: Een veilige
|
||||
en anonieme verbinding naar <a href="http://forum.i2p2.de/" target="_blank">forum.i2p2.de</a>, een online forum waar ontwikkelaars en gebruikers problemen bespreken en ideëen uitwisselen gerelateerd aan I2P en geassocieerde onderwerpen, en <a href="http://zzz.i2p/" target="_blank">zzz's developer forums</a> voor zowel ontwikkelaars als eindgebruikers.</li>
|
||||
<li class="tidylist"><b>I2P Anonieme Pastebin</b><br><a href="http://paste.i2p2.i2p/" target="_blank">paste.i2p2.i2p</a>: Veilige en
|
||||
<li class="tidylist"><b>I2P Anonieme Pastebin</b><br><a href="http://pastethis.i2p/" target="_blank">pastethis.i2p</a>: Veilige en
|
||||
anonieme paste dienst die het anoniem delen van tekst en tekst-based code over I2P.</li>
|
||||
<li class="tidylist"><b>Echelon's I2P Resources</b><br><a href="http://echelon.i2p/" target="_blank">echelon.i2p</a>: I2P software
|
||||
archief met broncode (waar toegestaan), informatie over I2P, inclusief een <a href="http://echelon.i2p/I2Pguide/index.html" target="_blank">beginner's guide</a> en pre-release ontwikkelaars versies van I2P voor de avonturiers om te proberen.</li>
|
||||
@ -70,7 +70,7 @@ Als je achter een verbiedende firewall zit maar wel onbeperkt uitgaande toegang,
|
||||
je helemaal geen eepsites kan zien (zelfs niet <a href="http://www.i2p2.i2p/" target="_blank">www.i2p2.i2p</a>),
|
||||
zorg er dan voor dat je browser's proxy is ingesteld op http proxy (<i>niet</i> https, <i>niet</i> socks) via <code>127.0.0.1 poort 4444</code>. Als je hulp nodig hebt is er een <a href="http://www.i2p2.i2p/htproxyports.html" target="_blank">handleiding</a> voor het configureren van je browser voor gebruik met I2P, ook <a href="http://www.i2p2.de/htproxyports.html" target="_blank">beschikbaar</a> op het normale Internet. </li>
|
||||
|
||||
<li class="tidylist"><b>Controleer je Logs</b><br><a href="/logs">Logs</a> kunnen je helpen met problemen oplossen. Je kan mogelijk fragmenten in een <a href="http://forum.i2p/viewforum.php?f=10" target="_blank">forum</a> posten voor hulp, of misschien <a href="http://paste.i2p2.i2p/" target="_blank">plakken</a> en als referentie link laten zien op IRC voor hulp.</li>
|
||||
<li class="tidylist"><b>Controleer je Logs</b><br><a href="/logs">Logs</a> kunnen je helpen met problemen oplossen. Je kan mogelijk fragmenten in een <a href="http://forum.i2p/viewforum.php?f=10" target="_blank">forum</a> posten voor hulp, of misschien <a href="http://pastethis.i2p/" target="_blank">plakken</a> en als referentie link laten zien op IRC voor hulp.</li>
|
||||
<li class="tidylist"><b>Verifieer dat Java up-to-date is</b><br>Zorg er voor dat Java up-to-date is [versie 1.6 aanbevolen en vereist voor sommige functies]. Als je geen Java geinstalleerd hebt wil je waarschijnlijk een implementatie van de JRE (<a href="https://secure.wikimedia.org/wikipedia/en/wiki/JRE" target="_blank">Java Runtime Environment</a>); als je een ontwikkelaar bent is de <a href="https://secure.wikimedia.org/wikipedia/en/wiki/Java_SDK" target="_blank">SDK</a> mogelijk ook interessant, en misschien <a href="http://ant.apache.org/" target="_blank">Apache Ant</a> die we gebruiken om de I2P Java binaries te compileren.
|
||||
</li>
|
||||
|
||||
|
@ -12,7 +12,7 @@
|
||||
<li><a href="http://ugha.i2p/">ugha.i2p</a>: página de Ugha; um wiki público com muitos links</li>
|
||||
<li><a href="http://fproxy.tino.i2p">fproxy.tino.i2p</a>: um proxy para acessar à Freenet</li>
|
||||
<li><a href="http://echelon.i2p">echelon.i2p</a>: arquivo de software e informações sobre I2P (com aplicações de BitTorrent, iMule, I2PFox, I2P-Messenger, ...)</li>
|
||||
<li><a href="http://paste.i2p2.i2p">paste.i2p2.i2p</a>: pastebin anônimo</li>
|
||||
<li><a href="http://pastethis.i2p">pastethis.i2p</a>: pastebin anônimo</li>
|
||||
</ul><br />
|
||||
Ha muitas mais páginas I2P - simplesmente segue os links que encontre, ponhe marcadores para os seus favoritos e visíte-los freqüentemente!</li>
|
||||
<li class="tidylist"><b>navegar na internet</b> - I2P dispõe de um "outproxy" http - para usâ-lo, também pode empregar o proxy http no porto 4444 - Se configurar o seu navegador web para usar este proxy, pode visitar as páginas web de maneira anônima e o trânsito será roteado atravez da rede I2P.</li>
|
||||
|
@ -44,7 +44,7 @@
|
||||
доступ к <a href="http://www.i2p2.de/" target="_blank">www.i2p2.de</a>. Так же имеется официальное зеркало на <a href="http://geti2p.net" target="_blank">geti2p.net</a>. Если вы хотите узнать больше о том, как работает I2P, или о том, как вы можете принять участие, это послужит вам точкой входа.</li>
|
||||
<li class="tidylist"><b>Форумы сообщества I2P</b><br><a href="http://forum.i2p/" target="_blank">forum.i2p</a>: Безопасный
|
||||
и анонимный доступ к <a href="http://forum.i2p2.de/" target="_blank">forum.i2p2.de</a>, где разработчики и пользователи обсуждают относящиеся к I2P и сопутствующим вещам проблемы и идеи, и <a href="http://zzz.i2p" target="_blank">форумы разработчика zzz</a> как для разработчиков, так и для конечных пользователей.</li>
|
||||
<li class="tidylist"><b>Анонимный I2P Pastebin</b><br><a href="http://paste.i2p2.i2p" target="_blank">paste.i2p2.i2p</a>:
|
||||
<li class="tidylist"><b>Анонимный I2P Pastebin</b><br><a href="http://pastethis.i2p" target="_blank">pastethis.i2p</a>:
|
||||
Безопасный и анонимный pastebin-сервис, предоставляющий возможность анонимного обмена текстом и кодом через I2P.</li>
|
||||
<li class="tidylist"><b>Ресурсы Echelon-а</b><br><a href="http://echelon.i2p" target="_blank">echelon.i2p</a>: архив I2P
|
||||
софта с исходными текстами (где позволяет лицензия), информация об I2P, включая <a href="http://echelon.i2p/I2Pguide/index.html" target="_blank">руководство для начинающих</a> и пре-релизные девелоперские сборки I2P для тестирования.</li>
|
||||
@ -73,7 +73,7 @@
|
||||
вы не можете попасть ни на один eep-сайт (даже на <a href="http://www.i2p2.i2p/" target="_blank">www.i2p2.i2p</a>),
|
||||
убедитесь, что в браузере прописан именно http-прокси (<i>не</i> https и <i>не</i> socks) <code>127.0.0.1 port 4444</code>. Если вам нужна помощь, здесь есть <a href="http://www.i2p2.i2p/htproxyports.html" target="_blank">руководство</a> по настройке браузера для использования I2P, которое так же <a href="http://www.i2p2.de/htproxyports.html" target="_blank">доступно</a> через обычный интернет. </li>
|
||||
|
||||
<li class="tidylist"><b>Проверьте логи</b><br><a href="/logs">Логи</a> могут помочь решить проблему. У вас может возникнуть желание запостить часть логов на <a href="http://forum.i2p/viewforum.php?f=10" target="_blank">форум</a>, чтобы получить помощь, или, может быть, на <a href="http://paste.i2p2.i2p" target="_blank">pastebin</a>, чтобы дать ссылку на IRC.</li>
|
||||
<li class="tidylist"><b>Проверьте логи</b><br><a href="/logs">Логи</a> могут помочь решить проблему. У вас может возникнуть желание запостить часть логов на <a href="http://forum.i2p/viewforum.php?f=10" target="_blank">форум</a>, чтобы получить помощь, или, может быть, на <a href="http://pastethis.i2p" target="_blank">pastebin</a>, чтобы дать ссылку на IRC.</li>
|
||||
|
||||
<li class="tidylist"><b>Проверьте свежесть Java</b><br>Убедитесь, что у вас достаточно свежая Java [версия 1.6 рекомендуется и необходима для функционирования некоторых возможностей]. Если у вас не установлена Java, скорее всего, вам требуется какая-нибудь реализация JRE (<a href="https://secure.wikimedia.org/wikipedia/en/wiki/JRE" target="_blank">Java Runtime Environment</a>); если вы программист, <a href="https://secure.wikimedia.org/wikipedia/en/wiki/Java_SDK" target="_blank">SDK</a> так же может быть интересен, и, возможно, <a href="http://ant.apache.org/" target="_blank">Apache Ant</a>, который мы используем для сборки бинарников I2P.
|
||||
</li>
|
||||
|
@ -23,7 +23,7 @@ wiki som alla kan förändra, innehåller många länkar</
|
||||
<li><a href="http://fproxy.tino.i2p">fproxy.tino.i2p</a>:
|
||||
Freenet proxy</li>
|
||||
<li><a href="http://echelon.i2p">echelon.i2p</a>: programvaruförråd och information om I2P</li>
|
||||
<li><a href="http://paste.i2p2.i2p">paste.i2p2.i2p</a>: anonym och säker pastebin</li>
|
||||
<li><a href="http://pastethis.i2p">pastethis.i2p</a>: anonym och säker pastebin</li>
|
||||
</ul><br>
|
||||
Det finns många fler eepsidor - följ bara länkarna från dom du ser,
|
||||
spara dina favoriter och besök dom ofta!</li>
|
||||
|
@ -11,7 +11,7 @@
|
||||
<li><a href="http://ugha.i2p/">ugha.i2p</a>:UGHA 的 I2P 小站,开放编辑的WIKI,有丰富的链接</li>
|
||||
<li><a href="http://fproxy.tino.i2p/">fproxy.tino.i2p</a>:FREENET 代理</li>
|
||||
<li><a href="http://echelon.i2p/">echelon.i2p</a>:软件存档及有关I2P的相关文档 (例如 I2P Messenger 基于I2P的匿名聊天工具等) </li>
|
||||
<li><a href="http://paste.i2p2.i2p/">paste.i2p2.i2p</a>:安全匿名的公共剪贴板</li>
|
||||
<li><a href="http://pastethis.i2p/">pastethis.i2p</a>:安全匿名的公共剪贴板</li>
|
||||
</ul> <br>
|
||||
I2P网络中还有很多其他站点 - 访问上面的网站你会找到更多,别忘了收藏你喜爱的 I2P 网站方便访问。<br>
|
||||
<li><b>浏览 Web 网页</b> - 目前 IP2 网络中的出口代理("Outproxy")只有一个,它的HTTP代理映射在本机的4444端口上。- 将浏览器的代理设置指向为上述地址(127.0.0.1:4444)后,访问任何普通链接即可 - 您的HTTP请求将在 I2P 网络内部传递。</li>
|
||||
|
@ -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 = 26;
|
||||
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);
|
||||
|
Reference in New Issue
Block a user