diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/PeerHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/PeerHelper.java
index 54ce51ed9..807c47044 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/PeerHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/PeerHelper.java
@@ -266,12 +266,12 @@ public class PeerHelper extends HelperBase {
.append("| RTT | ").append(_t("The round trip time in milliseconds")).append(" |
\n")
//.append("| ").append(_t("Dev")).append(" | ").append(_t("The standard deviation of the round trip time in milliseconds")).append(" |
\n")
.append("| RTO | ").append(_t("The retransmit timeout in milliseconds")).append(" |
\n")
- .append("| MTU | ").append(_t("Current maximum send packet size / estimated maximum receive packet size (bytes)")).append(" |
\n");
+ .append("| MTU | ").append(_t("Maximum receive / send packet size (bytes)")).append(" |
\n");
}
- buf.append("| ").append(_t("TX")).append(" | ").append(_t("The total number of messages sent to the peer")).append(" |
\n")
- .append("| ").append(_t("RX")).append(" | ").append(_t("The total number of messages received from the peer")).append(" |
\n")
- .append("| ").append(_t("Dup TX")).append(" | ").append(_t("The total number of packets retransmitted to the peer")).append(" |
\n")
+ buf.append("| ").append(_t("RX")).append(" | ").append(_t("The total number of messages received from the peer")).append(" |
\n")
+ .append("| ").append(_t("TX")).append(" | ").append(_t("The total number of messages sent to the peer")).append(" |
\n")
.append("| ").append(_t("Dup RX")).append(" | ").append(_t("The total number of duplicate packets received from the peer")).append(" |
\n")
+ .append("| ").append(_t("Dup TX")).append(" | ").append(_t("The total number of packets retransmitted to the peer")).append(" |
\n")
.append("");
return buf.toString();
}
@@ -318,8 +318,8 @@ public class PeerHelper extends HelperBase {
"").append(_t("In/Out")).append(" | " +
"").append(_t("Up")).append(" | " +
"").append(_t("Skew")).append(" | " +
- "").append(_t("TX")).append(" | " +
"").append(_t("RX")).append(" | " +
+ "").append(_t("TX")).append(" | " +
"").append(_t("Out Queue")).append(" | " +
"").append(_t("Backlogged?")).append(" | " +
//"").append(_t("Reading?")).append(" | " +
@@ -368,10 +368,10 @@ public class PeerHelper extends HelperBase {
totalUptime += con.getUptime();
offsetTotal = offsetTotal + con.getClockSkew();
buf.append("").append(DataHelper.formatDuration2(1000 * con.getClockSkew()));
- buf.append(" | ").append(con.getMessagesSent());
- totalSend += con.getMessagesSent();
buf.append(" | ").append(con.getMessagesReceived());
totalRecv += con.getMessagesReceived();
+ buf.append(" | ").append(con.getMessagesSent());
+ totalSend += con.getMessagesSent();
long outQueue = con.getOutboundQueueSize();
buf.append(" | ").append(outQueue);
buf.append(" | ");
@@ -398,7 +398,7 @@ public class PeerHelper extends HelperBase {
buf.append(THINSP).append("").append(formatRate(bpsSend/1000)).append("");
buf.append(" | ").append(DataHelper.formatDuration2(totalUptime/peers.size()));
buf.append(" | ").append(DataHelper.formatDuration2(offsetTotal*1000/peers.size()));
- buf.append(" | ").append(totalSend).append(" | ").append(totalRecv);
+ buf.append(" | ").append(totalRecv).append(" | ").append(totalSend);
buf.append(" | | | \n");
}
@@ -511,15 +511,15 @@ public class PeerHelper extends HelperBase {
appendSortLinks(buf, urlBase, sortFlags, _t("Sort by outbound maximum transmit unit"), FLAG_MTU);
buf.append("");
}
- buf.append("").append(_t("TX")).append("
");
- appendSortLinks(buf, urlBase, sortFlags, _t("Sort by packets sent"), FLAG_SEND);
buf.append(" | ").append(_t("RX")).append("
");
appendSortLinks(buf, urlBase, sortFlags, _t("Sort by packets received"), FLAG_RECV);
+ buf.append(" | ").append(_t("TX")).append("
");
+ appendSortLinks(buf, urlBase, sortFlags, _t("Sort by packets sent"), FLAG_SEND);
buf.append(" | \n");
- buf.append("").append(_t("Dup TX")).append("
");
- appendSortLinks(buf, urlBase, sortFlags, _t("Sort by packets retransmitted"), FLAG_RESEND);
buf.append(" | ").append(_t("Dup RX")).append("
");
appendSortLinks(buf, urlBase, sortFlags, _t("Sort by packets received more than once"), FLAG_DUP);
+ buf.append(" | ").append(_t("Dup TX")).append("
");
+ appendSortLinks(buf, urlBase, sortFlags, _t("Sort by packets retransmitted"), FLAG_RESEND);
buf.append(" | \n");
out.write(buf.toString());
buf.setLength(0);
@@ -610,24 +610,25 @@ public class PeerHelper extends HelperBase {
buf.append("");
offsetTotal = offsetTotal + skew;
- long sendWindow = peer.getSendWindowBytes();
-
int rtt = 0;
int rto = 0;
if (isAdvanced) {
+ int sendWindow = peer.getSendWindowBytes();
+ cwinTotal += sendWindow;
buf.append("");
- buf.append(sendWindow/1024);
- buf.append("K");
+ buf.append(DataHelper.formatSize2(sendWindow));
+ buf.append("B");
buf.append("").append(THINSP).append("").append(peer.getConcurrentSends());
buf.append("").append(THINSP).append("").append(peer.getConcurrentSendWindow());
buf.append("").append(THINSP).append("").append(peer.getConsecutiveSendRejections());
+ buf.append("");
if (peer.isBacklogged())
- buf.append(' ').append(_t("backlogged"));
- buf.append(" | ");
+ buf.append("
").append(_t("backlogged")).append("");
+ buf.append("");
buf.append("");
- buf.append(peer.getSlowStartThreshold()/1024);
- buf.append("K | ");
+ buf.append(DataHelper.formatSize2(peer.getSlowStartThreshold()));
+ buf.append("B");
rtt = peer.getRTT();
rto = peer.getRTO();
@@ -648,12 +649,9 @@ public class PeerHelper extends HelperBase {
buf.append("");
buf.append("");
- buf.append(peer.getMTU()).append("").append(THINSP);
- buf.append("").append(peer.getReceiveMTU());
+ buf.append(peer.getReceiveMTU()).append("").append(THINSP);
+ buf.append("").append(peer.getMTU());
- //.append('/');
- //buf.append(peer.getMTUIncreases()).append('/');
- //buf.append(peer.getMTUDecreases());
buf.append(" | ");
}
@@ -661,11 +659,11 @@ public class PeerHelper extends HelperBase {
long recv = peer.getMessagesReceived();
buf.append("");
- buf.append(sent);
+ buf.append(recv);
buf.append(" | ");
buf.append("");
- buf.append(recv);
+ buf.append(sent);
buf.append(" | ");
//double sent = (double)peer.getPacketsPeriodTransmitted();
@@ -694,7 +692,6 @@ public class PeerHelper extends HelperBase {
bpsOut += sendBps;
uptimeMsTotal += uptime;
- cwinTotal += sendWindow;
if (rtt > 0) {
rttTotal += rtt;
numRTTPeers++;
@@ -737,9 +734,9 @@ public class PeerHelper extends HelperBase {
buf.append("").append(ut.getMTU(false)).append(" | ");
}
buf.append("");
- buf.append(sendTotal).append(" | ").append(recvTotal).append(" | \n" +
- "").append(resentTotal);
- buf.append(" | ").append(dupRecvTotal).append(" | \n");
+ buf.append(recvTotal).append("").append(sendTotal).append(" | \n" +
+ "").append(dupRecvTotal);
+ buf.append(" | ").append(resentTotal).append(" | \n");
/****
if (sortFlags == FLAG_DEBUG) {
buf.append("| ");
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index a411b0099..87e5bffca 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
- public final static long BUILD = 0;
+ public final static long BUILD = 1;
/** for example "-test" */
public final static String EXTRA = "";
|