From 20ea680ff051c6ce15390bc604937337c6619bba Mon Sep 17 00:00:00 2001 From: jrandom Date: Fri, 14 Oct 2005 13:48:04 +0000 Subject: [PATCH] * 2005-10-14 0.6.1.3 released 2005-10-14 jrandom * Added a key explaining peers.jsp a bit (thanks tethra!) --- core/java/src/net/i2p/CoreVersion.java | 4 +- history.txt | 7 ++- initialNews.xml | 4 +- installer/install.xml | 2 +- installer/resources/i2ptunnel.config | 2 +- news.xml | 4 +- .../src/net/i2p/router/RouterVersion.java | 6 +-- .../router/transport/udp/UDPTransport.java | 44 +++++++++++-------- 8 files changed, 43 insertions(+), 30 deletions(-) diff --git a/core/java/src/net/i2p/CoreVersion.java b/core/java/src/net/i2p/CoreVersion.java index 382306bdf..ce1b54d1a 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 03150a4df..3d21f6d56 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 b55013c00..27f4371d4 100644 --- a/initialNews.xml +++ b/initialNews.xml @@ -1,5 +1,5 @@ - - + i2p - 0.6.1.2 + 0.6.1.3 diff --git a/installer/resources/i2ptunnel.config b/installer/resources/i2ptunnel.config index aea7de09c..96c4e61d5 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 c8788abab..994b3f82d 100644 --- a/news.xml +++ b/news.xml @@ -1,5 +1,5 @@ - - + UDP connections: ").append(peers.size()).append("
\n"); buf.append("\n"); - buf.append(" "); - buf.append(" \n"); - buf.append(" \n"); - buf.append(" \n"); - buf.append(" \n"); - buf.append(" \n"); - buf.append(" \n"); + buf.append(" "); + buf.append(" \n"); + buf.append(" \n"); + buf.append(" \n"); + buf.append(" \n"); + buf.append(" \n"); + buf.append(" \n"); buf.append(" \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"); buf.append(" \n"); + buf.append("\n"); buf.append(" \n"); @@ -1120,17 +1120,8 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority buf.append("\n"); out.write(buf.toString()); buf.setLength(0); - + out.write(KEY); out.write("
peeridlein/outupskewcwndssthreshrttdevrtosendrecvresentdupRecv
peeridlein/outupskewcwndssthreshrttdevrtosendrecvresentdupRecv
").append(numPeers > 0 ? DataHelper.formatDuration(uptimeMsTotal/numPeers) : "0s"); - buf.append(" ").append(numPeers > 0 ? DataHelper.formatDuration(offsetTotal/numPeers) : "0ms").append(""); buf.append(numPeers > 0 ? cwinTotal/(numPeers*1024) + "K" : "0K"); buf.append(" 
\n"); - - buf.append("Average clock skew, UDP peers:"); - if (peers.size() > 0) - buf.append(offsetTotal / peers.size()).append("ms

\n"); - else - buf.append("n/a

\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 = "" + + "peer: the remote peer (< means they offer to introduce us, > means we offer to introduce them)
\n" + + "idle: the idle time is how long since a packet has been received or sent
\n" + + "in/out: the rates show a smoothed inbound and outbound transfer rate (KBytes per second)
\n" + + "up: the uptime is how long ago this session was established
\n" + + "skew: the skew says how far off the other user's clock is, relative to your own
\n" + + "cwnd: the congestion window is how many bytes in 'in flight' you can send without an acknowledgement
\n" + + "ssthresh: the slow start threshold help make sure the cwnd doesn't grow too fast
\n" + + "rtt: the round trip time is how long it takes to get an acknowledgement of a packet
\n" + + "dev: the standard deviation of the round trip time, to help control the retransmit timeout
\n" + + "rto: the retransmit timeout controls how frequently an unacknowledged packet will be retransmitted
\n" + + "send: the number of packets sent to the peer
\n" + + "recv: the number of packets received from the peer
\n" + + "resent: the number of packets retransmitted to the peer
\n" + + "dupRecv: the number of duplicate packets received from the peer" + + "\n"; + /** * Cache the bid to reduce object churn */