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

Console: Hide some columns on SSU tab unless advanced

Browse Source
This commit is contained in:
zzz
2019-05-20 12:50:27 +00:00
parent f543a45a72
commit b3cb09481c
1 changed files with 79 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
apps/routerconsole/java/src/net/i2p/router/web/helpers/PeerHelper.java
View File

@ -228,8 +228,9 @@ public class PeerHelper extends HelperBase {
.append("<tr><td><b id=\"def.idle\">").append(_t("Idle")).append("</b></td><td>").append(_t("How long since a packet has been received / sent")).append("</td></tr>\n") .append("<tr><td><b id=\"def.idle\">").append(_t("Idle")).append("</b></td><td>").append(_t("How long since a packet has been received / sent")).append("</td></tr>\n")
.append("<tr><td><b id=\"def.rate\">").append(_t("In/Out")).append("</b></td><td>").append(_t("The smoothed inbound / outbound transfer rate (KBytes per second)")).append("</td></tr>\n") .append("<tr><td><b id=\"def.rate\">").append(_t("In/Out")).append("</b></td><td>").append(_t("The smoothed inbound / outbound transfer rate (KBytes per second)")).append("</td></tr>\n")
.append("<tr><td><b id=\"def.up\">").append(_t("Up")).append("</b></td><td>").append(_t("How long ago this connection was established")).append("</td></tr>\n") .append("<tr><td><b id=\"def.up\">").append(_t("Up")).append("</b></td><td>").append(_t("How long ago this connection was established")).append("</td></tr>\n")
.append("<tr><td><b id=\"def.skew\">").append(_t("Skew")).append("</b></td><td>").append(_t("The difference between the peer's clock and your own")).append("</td></tr>\n") .append("<tr><td><b id=\"def.skew\">").append(_t("Skew")).append("</b></td><td>").append(_t("The difference between the peer's clock and your own")).append("</td></tr>\n");
.append("<tr><td><b id=\"def.cwnd\">CWND</b></td><td>").append(_t("The congestion window, which is how many bytes can be sent without an acknowledgement")).append(" /<br>\n") if (isAdvanced()) {
buf.append("<tr><td><b id=\"def.cwnd\">CWND</b></td><td>").append(_t("The congestion window, which is how many bytes can be sent without an acknowledgement")).append(" /<br>\n")
.append(_t("The number of sent messages awaiting acknowledgement")).append(" /<br>\n") .append(_t("The number of sent messages awaiting acknowledgement")).append(" /<br>\n")
.append(_t("The maximum number of concurrent messages to send")).append(" /<br>\n") .append(_t("The maximum number of concurrent messages to send")).append(" /<br>\n")
.append(_t("The number of pending sends which exceed congestion window")).append("</td></tr>\n") .append(_t("The number of pending sends which exceed congestion window")).append("</td></tr>\n")
@ -237,8 +238,9 @@ public class PeerHelper extends HelperBase {
.append("<tr><td><b id=\"def.rtt\">RTT</b></td><td>").append(_t("The round trip time in milliseconds")).append("</td></tr>\n") .append("<tr><td><b id=\"def.rtt\">RTT</b></td><td>").append(_t("The round trip time in milliseconds")).append("</td></tr>\n")
//.append("<tr><td><b id=\"def.dev\">").append(_t("Dev")).append("</b></td><td>").append(_t("The standard deviation of the round trip time in milliseconds")).append("</td></tr>\n") //.append("<tr><td><b id=\"def.dev\">").append(_t("Dev")).append("</b></td><td>").append(_t("The standard deviation of the round trip time in milliseconds")).append("</td></tr>\n")
.append("<tr><td><b id=\"def.rto\">RTO</b></td><td>").append(_t("The retransmit timeout in milliseconds")).append("</td></tr>\n") .append("<tr><td><b id=\"def.rto\">RTO</b></td><td>").append(_t("The retransmit timeout in milliseconds")).append("</td></tr>\n")
.append("<tr><td><b id=\"def.mtu\">MTU</b></td><td>").append(_t("Current maximum send packet size / estimated maximum receive packet size (bytes)")).append("</td></tr>\n") .append("<tr><td><b id=\"def.mtu\">MTU</b></td><td>").append(_t("Current maximum send packet size / estimated maximum receive packet size (bytes)")).append("</td></tr>\n");
.append("<tr><td><b id=\"def.send\">").append(_t("TX")).append("</b></td><td>").append(_t("The total number of messages sent to the peer")).append("</td></tr>\n") }
buf.append("<tr><td><b id=\"def.send\">").append(_t("TX")).append("</b></td><td>").append(_t("The total number of messages sent to the peer")).append("</td></tr>\n")
.append("<tr><td><b id=\"def.recv\">").append(_t("RX")).append("</b></td><td>").append(_t("The total number of messages received from the peer")).append("</td></tr>\n") .append("<tr><td><b id=\"def.recv\">").append(_t("RX")).append("</b></td><td>").append(_t("The total number of messages received from the peer")).append("</td></tr>\n")
.append("<tr><td><b id=\"def.resent\">").append(_t("Dup TX")).append("</b></td><td>").append(_t("The total number of packets retransmitted to the peer")).append("</td></tr>\n") .append("<tr><td><b id=\"def.resent\">").append(_t("Dup TX")).append("</b></td><td>").append(_t("The total number of packets retransmitted to the peer")).append("</td></tr>\n")
.append("<tr><td><b id=\"def.dupRecv\">").append(_t("Dup RX")).append("</b></td><td>").append(_t("The total number of duplicate packets received from the peer")).append("</td></tr>\n") .append("<tr><td><b id=\"def.dupRecv\">").append(_t("Dup RX")).append("</b></td><td>").append(_t("The total number of duplicate packets received from the peer")).append("</td></tr>\n")
@ -437,7 +439,8 @@ public class PeerHelper extends HelperBase {
buf.append("<h3 id=\"udpcon\">").append(_t("UDP connections")).append(": ").append(peers.size()); buf.append("<h3 id=\"udpcon\">").append(_t("UDP connections")).append(": ").append(peers.size());
buf.append(". ").append(_t("Limit")).append(": ").append(ut.getMaxConnections()); buf.append(". ").append(_t("Limit")).append(": ").append(ut.getMaxConnections());
//buf.append(". ").append(_t("Timeout")).append(": ").append(DataHelper.formatDuration2(_expireTimeout)); //buf.append(". ").append(_t("Timeout")).append(": ").append(DataHelper.formatDuration2(_expireTimeout));
if (isAdvanced()) { final boolean isAdvanced = isAdvanced();
if (isAdvanced) {
buf.append(". ").append(_t("Status")).append(": ").append(_t(ut.getReachabilityStatus().toStatusString())); buf.append(". ").append(_t("Status")).append(": ").append(_t(ut.getReachabilityStatus().toStatusString()));
} }
buf.append(".</h3>\n"); buf.append(".</h3>\n");
@ -463,6 +466,7 @@ public class PeerHelper extends HelperBase {
buf.append("</span></th><th nowrap><span class=\"peersort\"><a href=\"#def.skew\">").append(_t("Skew")).append("</a><br>"); buf.append("</span></th><th nowrap><span class=\"peersort\"><a href=\"#def.skew\">").append(_t("Skew")).append("</a><br>");
appendSortLinks(buf, urlBase, sortFlags, _t("Sort by clock skew"), FLAG_SKEW); appendSortLinks(buf, urlBase, sortFlags, _t("Sort by clock skew"), FLAG_SKEW);
buf.append("</span></th>\n"); buf.append("</span></th>\n");
if (isAdvanced) {
buf.append("<th nowrap><a href=\"#def.cwnd\">CWND</a><br>"); buf.append("<th nowrap><a href=\"#def.cwnd\">CWND</a><br>");
appendSortLinks(buf, urlBase, sortFlags, _t("Sort by congestion window"), FLAG_CWND); appendSortLinks(buf, urlBase, sortFlags, _t("Sort by congestion window"), FLAG_CWND);
buf.append("</th><th nowrap><span class=\"peersort\"><a href=\"#def.ssthresh\">SST</a><br>"); buf.append("</th><th nowrap><span class=\"peersort\"><a href=\"#def.ssthresh\">SST</a><br>");
@ -477,7 +481,9 @@ public class PeerHelper extends HelperBase {
buf.append("</span></th>\n"); buf.append("</span></th>\n");
buf.append("<th nowrap><a href=\"#def.mtu\">MTU</a><br>"); buf.append("<th nowrap><a href=\"#def.mtu\">MTU</a><br>");
appendSortLinks(buf, urlBase, sortFlags, _t("Sort by outbound maximum transmit unit"), FLAG_MTU); appendSortLinks(buf, urlBase, sortFlags, _t("Sort by outbound maximum transmit unit"), FLAG_MTU);
buf.append("</th><th nowrap><span class=\"peersort\"><a href=\"#def.send\">").append(_t("TX")).append("</a><br>"); buf.append("</th>");
}
buf.append("<th nowrap><span class=\"peersort\"><a href=\"#def.send\">").append(_t("TX")).append("</a><br>");
appendSortLinks(buf, urlBase, sortFlags, _t("Sort by packets sent"), FLAG_SEND); appendSortLinks(buf, urlBase, sortFlags, _t("Sort by packets sent"), FLAG_SEND);
buf.append("</span></th><th nowrap><span class=\"peersort\"><a href=\"#def.recv\">").append(_t("RX")).append("</a><br>"); buf.append("</span></th><th nowrap><span class=\"peersort\"><a href=\"#def.recv\">").append(_t("RX")).append("</a><br>");
appendSortLinks(buf, urlBase, sortFlags, _t("Sort by packets received"), FLAG_RECV); appendSortLinks(buf, urlBase, sortFlags, _t("Sort by packets received"), FLAG_RECV);
@ -576,6 +582,9 @@ public class PeerHelper extends HelperBase {
long sendWindow = peer.getSendWindowBytes(); long sendWindow = peer.getSendWindowBytes();
int rtt = 0;
int rto = 0;
if (isAdvanced) {
buf.append("<td class=\"cells cwnd\" align=\"center\"><span class=\"right\">"); buf.append("<td class=\"cells cwnd\" align=\"center\"><span class=\"right\">");
buf.append(sendWindow/1024); buf.append(sendWindow/1024);
buf.append("K"); buf.append("K");
@ -590,8 +599,8 @@ public class PeerHelper extends HelperBase {
buf.append(peer.getSlowStartThreshold()/1024); buf.append(peer.getSlowStartThreshold()/1024);
buf.append("K</td>"); buf.append("K</td>");
int rtt = peer.getRTT(); rtt = peer.getRTT();
int rto = peer.getRTO(); rto = peer.getRTO();
buf.append("<td class=\"cells\" align=\"right\">"); buf.append("<td class=\"cells\" align=\"right\">");
if (rtt > 0) if (rtt > 0)
@ -616,6 +625,7 @@ public class PeerHelper extends HelperBase {
//buf.append(peer.getMTUIncreases()).append('/'); //buf.append(peer.getMTUIncreases()).append('/');
//buf.append(peer.getMTUDecreases()); //buf.append(peer.getMTUDecreases());
buf.append("</span></td>"); buf.append("</span></td>");
}
long sent = peer.getMessagesSent(); long sent = peer.getMessagesSent();
long recv = peer.getMessagesReceived(); long recv = peer.getMessagesReceived();
@ -681,8 +691,9 @@ public class PeerHelper extends HelperBase {
buf.append("</b></span></td>" + buf.append("</b></span></td>" +
"<td align=\"right\"><b>").append(DataHelper.formatDuration2(x)); "<td align=\"right\"><b>").append(DataHelper.formatDuration2(x));
x = offsetTotal/numPeers; x = offsetTotal/numPeers;
buf.append("</b></td><td align=\"right\"><b>").append(DataHelper.formatDuration2(x)).append("</b></td>\n" + buf.append("</b></td><td align=\"right\"><b>").append(DataHelper.formatDuration2(x)).append("</b></td>\n");
"<td align=\"center\"><b>"); if (isAdvanced) {
buf.append("<td align=\"center\"><b>");
buf.append(cwinTotal/(numPeers*1024) + "K"); buf.append(cwinTotal/(numPeers*1024) + "K");
buf.append("</b></td><td>&nbsp;</td>\n" + buf.append("</b></td><td>&nbsp;</td>\n" +
"<td align=\"right\"><b>"); "<td align=\"right\"><b>");
@ -693,7 +704,9 @@ public class PeerHelper extends HelperBase {
//buf.append("</b></td><td>&nbsp;</td><td align=\"center\"><b>"); //buf.append("</b></td><td>&nbsp;</td><td align=\"center\"><b>");
buf.append("</b></td><td align=\"right\"><b>"); buf.append("</b></td><td align=\"right\"><b>");
buf.append(DataHelper.formatDuration2(rtoTotal/numPeers)); buf.append(DataHelper.formatDuration2(rtoTotal/numPeers));
buf.append("</b></td><td align=\"center\"><b>").append(ut.getMTU(false)).append("</b></td><td align=\"right\"><b>"); buf.append("</b></td><td align=\"center\"><b>").append(ut.getMTU(false)).append("</b></td>");
}
buf.append("<td align=\"right\"><b>");
buf.append(sendTotal).append("</b></td><td align=\"right\"><b>").append(recvTotal).append("</b></td>\n" + buf.append(sendTotal).append("</b></td><td align=\"right\"><b>").append(recvTotal).append("</b></td>\n" +
"<td align=\"right\"><b>").append(resentTotal); "<td align=\"right\"><b>").append(resentTotal);
buf.append("</b></td><td align=\"right\"><b>").append(dupRecvTotal).append("</b></td></tr>\n"); buf.append("</b></td><td align=\"right\"><b>").append(dupRecvTotal).append("</b></td></tr>\n");