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

* peers.jsp: Remove SSU "Dev" column

Browse Source
This commit is contained in:
zzz
2012-09-28 18:48:58 +00:00
parent 49b11e1f84
commit eeaa4fbbb4
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
router/java/src/net/i2p/router/transport/TransportManager.java
View File

@ -545,7 +545,7 @@ public class TransportManager implements TransportEventListener {
"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ").append(_("The number of pending sends which exceed congestion window")).append("<br>\n" + "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ").append(_("The number of pending sends which exceed congestion window")).append("<br>\n" +
"<b id=\"def.ssthresh\">SST</b>: ").append(_("The slow start threshold")).append("<br>\n" + "<b id=\"def.ssthresh\">SST</b>: ").append(_("The slow start threshold")).append("<br>\n" +
"<b id=\"def.rtt\">RTT</b>: ").append(_("The round trip time in milliseconds")).append("<br>\n" + "<b id=\"def.rtt\">RTT</b>: ").append(_("The round trip time in milliseconds")).append("<br>\n" +
"<b id=\"def.dev\">").append(_("Dev")).append("</b>: ").append(_("The standard deviation of the round trip time in milliseconds")).append("<br>\n" + //"<b id=\"def.dev\">").append(_("Dev")).append("</b>: ").append(_("The standard deviation of the round trip time in milliseconds")).append("<br>\n" +
"<b id=\"def.rto\">RTO</b>: ").append(_("The retransmit timeout in milliseconds")).append("<br>\n" + "<b id=\"def.rto\">RTO</b>: ").append(_("The retransmit timeout in milliseconds")).append("<br>\n" +
"<b id=\"def.mtu\">MTU</b>: ").append(_("Current maximum send packet size / estimated maximum receive packet size (bytes)")).append("<br>\n" + "<b id=\"def.mtu\">MTU</b>: ").append(_("Current maximum send packet size / estimated maximum receive packet size (bytes)")).append("<br>\n" +
"<b id=\"def.send\">").append(_("TX")).append("</b>: ").append(_("The total number of packets sent to the peer")).append("<br>\n" + "<b id=\"def.send\">").append(_("TX")).append("</b>: ").append(_("The total number of packets sent to the peer")).append("<br>\n" +

26
router/java/src/net/i2p/router/transport/udp/UDPTransport.java
View File

@ -1744,7 +1744,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
private static final int FLAG_CWND= 6; private static final int FLAG_CWND= 6;
private static final int FLAG_SSTHRESH = 7; private static final int FLAG_SSTHRESH = 7;
private static final int FLAG_RTT = 8; private static final int FLAG_RTT = 8;
private static final int FLAG_DEV = 9; //private static final int FLAG_DEV = 9;
private static final int FLAG_RTO = 10; private static final int FLAG_RTO = 10;
private static final int FLAG_MTU = 11; private static final int FLAG_MTU = 11;
private static final int FLAG_SEND = 12; private static final int FLAG_SEND = 12;
@ -1784,9 +1784,9 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
case FLAG_RTT: case FLAG_RTT:
rv = RTTComparator.instance(); rv = RTTComparator.instance();
break; break;
case FLAG_DEV: //case FLAG_DEV:
rv = DevComparator.instance(); // rv = DevComparator.instance();
break; // break;
case FLAG_RTO: case FLAG_RTO:
rv = RTOComparator.instance(); rv = RTOComparator.instance();
break; break;
@ -1927,6 +1927,8 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
return rv; return rv;
} }
} }
/***
private static class DevComparator extends PeerComparator { private static class DevComparator extends PeerComparator {
private static final DevComparator _instance = new DevComparator(); private static final DevComparator _instance = new DevComparator();
public static final DevComparator instance() { return _instance; } public static final DevComparator instance() { return _instance; }
@ -1939,6 +1941,9 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
return (int)rv; return (int)rv;
} }
} }
****/
/** */
private static class RTOComparator extends PeerComparator { private static class RTOComparator extends PeerComparator {
private static final RTOComparator _instance = new RTOComparator(); private static final RTOComparator _instance = new RTOComparator();
public static final RTOComparator instance() { return _instance; } public static final RTOComparator instance() { return _instance; }
@ -2088,8 +2093,8 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
buf.append("</th>\n"); buf.append("</th>\n");
buf.append("<th class=\"smallhead\" nowrap><a href=\"#def.rtt\">RTT</a><br>"); buf.append("<th class=\"smallhead\" nowrap><a href=\"#def.rtt\">RTT</a><br>");
appendSortLinks(buf, urlBase, sortFlags, _("Sort by round trip time"), FLAG_RTT); appendSortLinks(buf, urlBase, sortFlags, _("Sort by round trip time"), FLAG_RTT);
buf.append("</th><th class=\"smallhead\" nowrap><a href=\"#def.dev\">").append(_("Dev")).append("</a><br>"); //buf.append("</th><th class=\"smallhead\" nowrap><a href=\"#def.dev\">").append(_("Dev")).append("</a><br>");
appendSortLinks(buf, urlBase, sortFlags, _("Sort by round trip time deviation"), FLAG_DEV); //appendSortLinks(buf, urlBase, sortFlags, _("Sort by round trip time deviation"), FLAG_DEV);
buf.append("</th><th class=\"smallhead\" nowrap><a href=\"#def.rto\">RTO</a><br>"); buf.append("</th><th class=\"smallhead\" nowrap><a href=\"#def.rto\">RTO</a><br>");
appendSortLinks(buf, urlBase, sortFlags, _("Sort by retransmission timeout"), FLAG_RTO); appendSortLinks(buf, urlBase, sortFlags, _("Sort by retransmission timeout"), FLAG_RTO);
buf.append("</th>\n"); buf.append("</th>\n");
@ -2212,9 +2217,9 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
buf.append(DataHelper.formatDuration2(rtt)); buf.append(DataHelper.formatDuration2(rtt));
buf.append("</td>"); buf.append("</td>");
buf.append("<td class=\"cells\" align=\"right\">"); //buf.append("<td class=\"cells\" align=\"right\">");
buf.append(DataHelper.formatDuration2(peer.getRTTDeviation())); //buf.append(DataHelper.formatDuration2(peer.getRTTDeviation()));
buf.append("</td>"); //buf.append("</td>");
buf.append("<td class=\"cells\" align=\"right\">"); buf.append("<td class=\"cells\" align=\"right\">");
buf.append(DataHelper.formatDuration2(rto)); buf.append(DataHelper.formatDuration2(rto));
@ -2291,7 +2296,8 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
buf.append("</b></td><td>&nbsp;</td>\n" + buf.append("</b></td><td>&nbsp;</td>\n" +
"<td align=\"center\"><b>"); "<td align=\"center\"><b>");
buf.append(numPeers > 0 ? DataHelper.formatDuration2(rttTotal/numPeers) : '0'); buf.append(numPeers > 0 ? DataHelper.formatDuration2(rttTotal/numPeers) : '0');
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=\"center\"><b>");
buf.append(numPeers > 0 ? DataHelper.formatDuration2(rtoTotal/numPeers) : '0'); buf.append(numPeers > 0 ? DataHelper.formatDuration2(rtoTotal/numPeers) : '0');
buf.append("</b></td><td align=\"center\"><b>").append(_mtu).append("</b></td><td align=\"center\"><b>"); buf.append("</b></td><td align=\"center\"><b>").append(_mtu).append("</b></td><td align=\"center\"><b>");
buf.append(sendTotal).append("</b></td><td align=\"center\"><b>").append(recvTotal).append("</b></td>\n" + buf.append(sendTotal).append("</b></td><td align=\"center\"><b>").append(recvTotal).append("</b></td>\n" +