From be480d577c5dd0f72e66ffaf1afa897109182177 Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 27 May 2009 16:27:57 +0000 Subject: [PATCH] more peers.jsp and profiles.jsp cleanup --- .../peermanager/ProfileOrganizerRenderer.java | 2 +- .../router/transport/ntcp/NTCPTransport.java | 24 ++++++------- .../router/transport/udp/UDPTransport.java | 34 +++++++++---------- 3 files changed, 29 insertions(+), 31 deletions(-) diff --git a/router/java/src/net/i2p/router/peermanager/ProfileOrganizerRenderer.java b/router/java/src/net/i2p/router/peermanager/ProfileOrganizerRenderer.java index 464fbd836..e3aff9a50 100644 --- a/router/java/src/net/i2p/router/peermanager/ProfileOrganizerRenderer.java +++ b/router/java/src/net/i2p/router/peermanager/ProfileOrganizerRenderer.java @@ -180,7 +180,7 @@ class ProfileOrganizerRenderer { PeerProfile prof = (PeerProfile)iter.next(); Hash peer = prof.getPeer(); - buf.append(""); + buf.append(""); buf.append(_context.commSystem().renderPeerHTML(peer)); buf.append(""); RouterInfo info = _context.netDb().lookupRouterInfoLocally(peer); diff --git a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java index 8b3f5f9e6..5a51e9c9b 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java +++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java @@ -639,23 +639,23 @@ public class NTCPTransport extends TransportImpl { buf.append(" timeout: ").append(DataHelper.formatDuration(_pumper.getIdleTimeout())); buf.append("
\n"); buf.append("\n"); - buf.append(" "); - buf.append(" "); - buf.append(" "); - buf.append(" "); - buf.append(" "); - buf.append(" "); - buf.append(" "); - buf.append(" "); - buf.append(" "); - buf.append(" "); - buf.append(" "); + buf.append(""); + buf.append(""); + buf.append(""); + buf.append(""); + buf.append(""); + buf.append(""); + buf.append(""); + buf.append(""); + buf.append(""); + buf.append(""); + buf.append(""); buf.append(" \n"); out.write(buf.toString()); buf.setLength(0); for (Iterator iter = peers.iterator(); iter.hasNext(); ) { NTCPConnection con = (NTCPConnection)iter.next(); - buf.append("
peerdiridlein/outupskewsendrecvout queuebacklogged?reading?
PeerDirIdleIn/OutUpSkewSendRecvOut queueBacklogged?Reading?
"); + buf.append("
"); buf.append(_context.commSystem().renderPeerHTML(con.getRemotePeer().calculateHash())); //byte[] ip = getIP(con.getRemotePeer().calculateHash()); //if (ip != null) 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 877a0a9aa..a0e76bfbd 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java @@ -1754,49 +1754,49 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority buf.append(" timeout: ").append(DataHelper.formatDuration(_expireTimeout)); 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"); + buf.append("\n"); out.write(buf.toString()); buf.setLength(0); long now = _context.clock().now(); @@ -1805,9 +1805,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority if (now-peer.getLastReceiveTime() > 60*60*1000) continue; // don't include old peers - buf.append(""); - - buf.append("
peer"); + buf.append("
Peer"); if (sortFlags != FLAG_ALPHA) buf.append(" V "); - buf.append("dir/introidle"); + buf.append("dir/introIdle"); appendSortLinks(buf, urlBase, sortFlags, "Sort by idle inbound", FLAG_IDLE_IN); buf.append("/"); appendSortLinks(buf, urlBase, sortFlags, "Sort by idle outbound", FLAG_IDLE_OUT); buf.append("in/out"); + buf.append("In/Out"); appendSortLinks(buf, urlBase, sortFlags, "Sort by inbound rate", FLAG_RATE_IN); buf.append("/"); appendSortLinks(buf, urlBase, sortFlags, "Sort by outbound rate", FLAG_RATE_OUT); buf.append("up"); + buf.append("Up"); appendSortLinks(buf, urlBase, sortFlags, "Sort by connection uptime", FLAG_UPTIME); buf.append("skew"); appendSortLinks(buf, urlBase, sortFlags, "Sort by clock skew", FLAG_SKEW); buf.append("cwnd"); + buf.append("Cwnd"); appendSortLinks(buf, urlBase, sortFlags, "Sort by congestion window", FLAG_CWND); - buf.append("ssthresh"); + buf.append("Ssthresh"); appendSortLinks(buf, urlBase, sortFlags, "Sort by slow start threshold", FLAG_SSTHRESH); buf.append("rtt"); + buf.append("Rtt"); appendSortLinks(buf, urlBase, sortFlags, "Sort by round trip time", FLAG_RTT); - buf.append("dev"); + buf.append("Dev"); appendSortLinks(buf, urlBase, sortFlags, "Sort by round trip time deviation", FLAG_DEV); - buf.append("rto"); + buf.append("Rto"); appendSortLinks(buf, urlBase, sortFlags, "Sort by retransmission timeout", FLAG_RTO); buf.append("mtu"); + buf.append("Mtu"); appendSortLinks(buf, urlBase, sortFlags, "Sort by maximum transmit unit", FLAG_MTU); - buf.append("send"); + buf.append("Send"); appendSortLinks(buf, urlBase, sortFlags, "Sort by packets sent", FLAG_SEND); - buf.append("recv"); + buf.append("Recv"); appendSortLinks(buf, urlBase, sortFlags, "Sort by packets received", FLAG_RECV); buf.append("resent"); + buf.append("Resent"); appendSortLinks(buf, urlBase, sortFlags, "Sort by packets retransmitted", FLAG_RESEND); - buf.append("dupRecv"); + buf.append("DupRecv"); appendSortLinks(buf, urlBase, sortFlags, "Sort by packets received more than once", FLAG_DUP); buf.append("
"); + buf.append("
"); buf.append(_context.commSystem().renderPeerHTML(peer.getRemotePeer())); //byte ip[] = peer.getRemoteIP(); //if (ip != null)