diff --git a/core/java/src/net/i2p/CoreVersion.java b/core/java/src/net/i2p/CoreVersion.java
index 382306bdfe090ec1db816f9d4fcd863384e893ca..ce1b54d1a6bae29a6b688dda2cbe759873949586 100644
--- 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.44 $ $Date: 2005/10/01 14:20:09 $";
- public final static String VERSION = "0.6.1.2";
+ public final static String ID = "$Revision: 1.45 $ $Date: 2005/10/07 15:19:09 $";
+ public final static String VERSION = "0.6.1.3";
public static void main(String args[]) {
System.out.println("I2P Core version: " + VERSION);
diff --git a/history.txt b/history.txt
index 03150a4df134b1869f014b0ef1bdb23d38a4f3e3..3d21f6d56a408f701abecaaa48ca3002803dad07 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,9 @@
-$Id: history.txt,v 1.293 2005/10/13 04:18:37 jrandom Exp $
+$Id: history.txt,v 1.294 2005/10/13 21:15:40 jrandom Exp $
+
+* 2005-10-14 0.6.1.3 released
+
+2005-10-14 jrandom
+ * Added a key explaining peers.jsp a bit (thanks tethra!)
2005-10-13 dust
* Bundled dust's Sucker for pulling RSS/Atom content into SML, which can
diff --git a/initialNews.xml b/initialNews.xml
index b55013c00c0dffa30dfef9dad7922de06d47b916..27f4371d4d272f8bbe275b56c16fde7375ae028a 100644
--- a/initialNews.xml
+++ b/initialNews.xml
@@ -1,5 +1,5 @@
-<i2p.news date="$Date: 2005/10/01 14:20:10 $">
- <i2p.release version="0.6.1.2" date="2005/10/07" minVersion="0.6"
+<i2p.news date="$Date: 2005/10/07 15:19:04 $">
+ <i2p.release version="0.6.1.3" date="2005/10/14" 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"
diff --git a/installer/install.xml b/installer/install.xml
index dffedbe0e2bfd9749a6f15a5d5cb9a2304612043..8bb719c41b9988cccd2de2c40701552a4192e636 100644
--- a/installer/install.xml
+++ b/installer/install.xml
@@ -4,7 +4,7 @@
<info>
<appname>i2p</appname>
- <appversion>0.6.1.2</appversion>
+ <appversion>0.6.1.3</appversion>
<authors>
<author name="I2P" email="support@i2p.net"/>
</authors>
diff --git a/installer/resources/i2ptunnel.config b/installer/resources/i2ptunnel.config
index aea7de09c355c25274a79b34ec7a4029744970fb..96c4e61d5fbc83e79f21a3a45ed4e94233bdd75b 100644
--- a/installer/resources/i2ptunnel.config
+++ b/installer/resources/i2ptunnel.config
@@ -16,7 +16,7 @@ tunnel.0.startOnLoad=true
# irc
tunnel.1.name=ircProxy
tunnel.1.description=IRC proxy to access the anonymous irc net
-tunnel.1.type=client
+tunnel.1.type=ircclient
tunnel.1.sharedClient=true
tunnel.1.interface=127.0.0.1
tunnel.1.listenPort=6668
diff --git a/news.xml b/news.xml
index c8788ababe6c53ecb0a46f116add4da4a3394906..994b3f82d0b8dc1afe77c395e868802563fe46ae 100644
--- a/news.xml
+++ b/news.xml
@@ -1,5 +1,5 @@
-<i2p.news date="$Date: 2005/10/07 15:19:04 $">
- <i2p.release version="0.6.1.2" date="2005/10/07" minVersion="0.6"
+<i2p.news date="$Date: 2005/10/07 18:45:48 $">
+ <i2p.release version="0.6.1.3" date="2005/10/14" 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"
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 25c37cdb404a8fc4025ecfa5675f967e20cffce1..95d4fd6f4f19b863703b10a332540d4a44da183f 100644
--- 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.268 $ $Date: 2005/10/13 04:18:36 $";
- public final static String VERSION = "0.6.1.2";
- public final static long BUILD = 9;
+ public final static String ID = "$Revision: 1.269 $ $Date: 2005/10/13 21:15:40 $";
+ public final static String VERSION = "0.6.1.3";
+ 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);
diff --git a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
index 3a747aae5ff75503d73d31a16b64d0138d48a9a6..bf00cc1d1c10126b2f14b34a23a0c0e7ede7f521 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
@@ -906,13 +906,13 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
StringBuffer buf = new StringBuffer(512);
buf.append("<b id=\"udpcon\">UDP connections: ").append(peers.size()).append("</b><br />\n");
buf.append("<table border=\"1\">\n");
- buf.append(" <tr><td><b>peer</b></td><td><b>idle</b></td>");
- buf.append(" <td><b>in/out</b></td>\n");
- buf.append(" <td><b>up</b></td><td><b>skew</b></td>\n");
- buf.append(" <td><b>cwnd</b></td><td><b>ssthresh</b></td>\n");
- buf.append(" <td><b>rtt</b></td><td><b>dev</b></td><td><b>rto</b></td>\n");
- buf.append(" <td><b>send</b></td><td><b>recv</b></td>\n");
- buf.append(" <td><b>resent</b></td><td><b>dupRecv</b></td>\n");
+ buf.append(" <tr><td><b><a href=\"#def.peer\">peer</a></b></td><td><b><a href=\"#def.idle\">idle</a></b></td>");
+ buf.append(" <td><b><a href=\"#def.rate\">in/out</a></b></td>\n");
+ buf.append(" <td><b><a href=\"#def.up\">up</a></b></td><td><b><a href=\"#def.skew\">skew</a></b></td>\n");
+ buf.append(" <td><b><a href=\"#def.cwnd\">cwnd</a></b></td><td><b><a href=\"#def.ssthresh\">ssthresh</a></b></td>\n");
+ buf.append(" <td><b><a href=\"#def.rtt\">rtt</a></b></td><td><b><a href=\"#def.dev\">dev</a></b></td><td><b><a href=\"#def.rto\">rto</a></b></td>\n");
+ buf.append(" <td><b><a href=\"#def.send\">send</a></b></td><td><b><a href=\"#def.recv\">recv</a></b></td>\n");
+ buf.append(" <td><b><a href=\"#def.resent\">resent</a></b></td><td><b><a href=\"#def.dupRecv\">dupRecv</a></b></td>\n");
buf.append(" </tr>\n");
out.write(buf.toString());
buf.setLength(0);
@@ -1095,7 +1095,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
buf.append(formatKBps(bpsIn)).append("KBps/").append(formatKBps(bpsOut));
buf.append("KBps</td>");
buf.append(" <td>").append(numPeers > 0 ? DataHelper.formatDuration(uptimeMsTotal/numPeers) : "0s");
- buf.append("</td><td> </td>\n");
+ buf.append("</td><td>").append(numPeers > 0 ? DataHelper.formatDuration(offsetTotal/numPeers) : "0ms").append("</td>\n");
buf.append(" <td>");
buf.append(numPeers > 0 ? cwinTotal/(numPeers*1024) + "K" : "0K");
buf.append("</td><td> </td>\n");
@@ -1120,17 +1120,8 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
buf.append("</td></tr>\n");
out.write(buf.toString());
buf.setLength(0);
-
+ out.write(KEY);
out.write("</table>\n");
-
- buf.append("<b>Average clock skew, UDP peers:");
- if (peers.size() > 0)
- buf.append(offsetTotal / peers.size()).append("ms</b><br><br>\n");
- else
- buf.append("n/a</b><br><br>\n");
-
- out.write(buf.toString());
- buf.setLength(0);
}
private static final DecimalFormat _fmt = new DecimalFormat("#,##0.00");
@@ -1146,6 +1137,23 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
}
}
+ private static final String KEY = "<tr><td colspan=\"14\" valign=\"top\" align=\"left\">" +
+ "<b id=\"def.peer\">peer</b>: the remote peer (< means they offer to introduce us, > means we offer to introduce them)<br />\n" +
+ "<b id=\"def.idle\">idle</b>: the idle time is how long since a packet has been received or sent<br />\n" +
+ "<b id=\"def.rate\">in/out</b>: the rates show a smoothed inbound and outbound transfer rate (KBytes per second)<br />\n" +
+ "<b id=\"def.up\">up</b>: the uptime is how long ago this session was established<br />\n" +
+ "<b id=\"def.skew\">skew</b>: the skew says how far off the other user's clock is, relative to your own<br />\n" +
+ "<b id=\"def.cwnd\">cwnd</b>: the congestion window is how many bytes in 'in flight' you can send without an acknowledgement<br />\n" +
+ "<b id=\"def.ssthresh\">ssthresh</b>: the slow start threshold help make sure the cwnd doesn't grow too fast<br />\n" +
+ "<b id=\"def.rtt\">rtt</b>: the round trip time is how long it takes to get an acknowledgement of a packet<br />\n" +
+ "<b id=\"def.dev\">dev</b>: the standard deviation of the round trip time, to help control the retransmit timeout<br />\n" +
+ "<b id=\"def.rto\">rto</b>: the retransmit timeout controls how frequently an unacknowledged packet will be retransmitted<br />\n" +
+ "<b id=\"def.send\">send</b>: the number of packets sent to the peer<br />\n" +
+ "<b id=\"def.recv\">recv</b>: the number of packets received from the peer<br />\n" +
+ "<b id=\"def.resent\">resent</b>: the number of packets retransmitted to the peer<br />\n" +
+ "<b id=\"def.dupRecv\">dupRecv</b>: the number of duplicate packets received from the peer" +
+ "</td></tr>\n";
+
/**
* Cache the bid to reduce object churn
*/