diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java index 984569b96..7acccdc49 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java @@ -15,7 +15,7 @@ public class ConfigClientsHelper extends HelperBase { public String getForm1() { StringBuffer buf = new StringBuffer(1024); buf.append("\n"); - buf.append("\n"); + buf.append("\n"); List clients = ClientAppConfig.getClientApps(_context); for (int cur = 0; cur < clients.size(); cur++) { @@ -31,7 +31,7 @@ public class ConfigClientsHelper extends HelperBase { public String getForm2() { StringBuffer buf = new StringBuffer(1024); buf.append("
ClientRun at Startup?Start NowClass and arguments
ClientRun at Startup?Start NowClass and arguments
\n"); - buf.append("\n"); + buf.append("\n"); Properties props = RouterConsoleRunner.webAppProperties(); Set keys = new TreeSet(props.keySet()); for (Iterator iter = keys.iterator(); iter.hasNext(); ) { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java index 2e53be6b5..f1a63e421 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java @@ -56,27 +56,27 @@ public class ConfigTunnelsHelper extends HelperBase { private static final int MIN_NEG_VARIANCE = -1; private void renderForm(StringBuffer buf, int index, String prefix, String name, TunnelPoolSettings in, TunnelPoolSettings out) { - buf.append("\n"); + buf.append("\n"); if (in.getLength() <= 0 || in.getLength() + in.getLengthVariance() <= 0 || out.getLength() <= 0 || out.getLength() + out.getLengthVariance() <= 0) - buf.append(""); + buf.append(""); else if (in.getLength() <= 1 || in.getLength() + in.getLengthVariance() <= 1 || out.getLength() <= 1 || out.getLength() + out.getLengthVariance() <= 1) - buf.append(""); + buf.append(""); if (in.getLength() + Math.abs(in.getLengthVariance()) >= WARN_LENGTH || out.getLength() + Math.abs(out.getLengthVariance()) >= WARN_LENGTH) - buf.append(""); + buf.append(""); if (in.getQuantity() + in.getBackupQuantity() >= WARN_QUANTITY || out.getQuantity() + out.getBackupQuantity() >= WARN_QUANTITY) - buf.append(""); + buf.append(""); - buf.append("\n"); + buf.append("\n"); // tunnel depth buf.append("\n"); diff --git a/router/java/src/net/i2p/router/JobQueue.java b/router/java/src/net/i2p/router/JobQueue.java index 8ec40f56e..890b303c0 100644 --- a/router/java/src/net/i2p/router/JobQueue.java +++ b/router/java/src/net/i2p/router/JobQueue.java @@ -669,9 +669,9 @@ public class JobQueue { /** render the HTML for the job stats */ private void getJobStats(StringBuffer buf) { buf.append("
WebAppRun at Startup?Start NowDescription
WebAppRun at Startup?Start NowDescription
"); - buf.append(name).append("
"); + buf.append(name).append("
ANONYMITY WARNING - Settings include 0-hop tunnels
ANONYMITY WARNING - Settings include 0-hop tunnels
ANONYMITY WARNING - Settings include 1-hop tunnels
ANONYMITY WARNING - Settings include 1-hop tunnels
PERFORMANCE WARNING - Settings include very long tunnels
PERFORMANCE WARNING - Settings include very long tunnels
PERFORMANCE WARNING - Settings include high tunnel quantities
PERFORMANCE WARNING - Settings include high tunnel quantities
InboundOutbound
InboundOutbound
Depth
\n"); - buf.append(""); - buf.append(""); - buf.append("\n"); + buf.append(""); + buf.append(""); + buf.append("\n"); long totRuns = 0; long totExecTime = 0; long avgExecTime = 0; diff --git a/router/java/src/net/i2p/router/peermanager/ProfileOrganizerRenderer.java b/router/java/src/net/i2p/router/peermanager/ProfileOrganizerRenderer.java index 0aff93485..20806cca7 100644 --- a/router/java/src/net/i2p/router/peermanager/ProfileOrganizerRenderer.java +++ b/router/java/src/net/i2p/router/peermanager/ProfileOrganizerRenderer.java @@ -61,13 +61,13 @@ class ProfileOrganizerRenderer { buf.append("

Showing ").append(order.size()).append(" recent profiles, hiding ").append(peers.size()-order.size()).append(" older profiles

"); buf.append("
JobRunsTimeAvgMaxMinPendingAvgMaxMin
JobRunsTimeAvgMaxMinPendingAvgMaxMin
"); 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(""); int prevTier = 1; for (Iterator iter = order.iterator(); iter.hasNext();) { @@ -159,22 +159,22 @@ class ProfileOrganizerRenderer { buf.append("

Floodfill and Integrated Peers

\n"); buf.append("
PeerGroups (Caps)SpeedCapacityIntegrationFailing? PeerGroups (Caps)SpeedCapacityIntegrationFailing? 
"); 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(""); + buf.append(""); + buf.append(""); + buf.append(""); + buf.append(""); + buf.append(""); + buf.append(""); + buf.append(""); + buf.append(""); + buf.append(""); + buf.append(""); buf.append(""); for (Iterator iter = integratedPeers.iterator(); iter.hasNext();) { PeerProfile prof = (PeerProfile)iter.next(); 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 b42efbfae..e010e5213 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java @@ -1769,48 +1769,48 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority buf.append(" timeout: ").append(DataHelper.formatDuration(_expireTimeout)); buf.append("
\n"); buf.append("
PeerCapsInteg. ValueLast Heard AboutLast Heard FromLast Successful SendLast Failed Send10m Resp. Time1h Resp. Time1d Resp. TimeSuccessful LookupsFailed LookupsNew StoresOld Stores1h Fail Rate1d Fail RatePeerCapsInteg. ValueLast Heard AboutLast Heard FromLast Successful SendLast Failed Send10m Resp. Time1h Resp. Time1d Resp. TimeSuccessful LookupsFailed LookupsNew StoresOld Stores1h Fail Rate1d Fail Rate
\n"); - buf.append("\n"); buf.append("\n"); out.write(buf.toString()); buf.setLength(0); diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java index 7293b6a1e..49f82acae 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java @@ -439,9 +439,9 @@ public class TunnelPoolManager implements TunnelManagerFacade { List participating = _context.tunnelDispatcher().listParticipatingTunnels(); Collections.sort(participating, new TunnelComparator()); out.write("

Participating tunnels:

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(""); - buf.append("In/Out"); + buf.append(""); + 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("\n"); - buf.append("Up"); + buf.append("\n"); + buf.append("Up"); appendSortLinks(buf, urlBase, sortFlags, "Sort by connection uptime", FLAG_UPTIME); - buf.append("skew"); + buf.append("skew"); appendSortLinks(buf, urlBase, sortFlags, "Sort by clock skew", FLAG_SKEW); - buf.append("\n"); - buf.append("Cwnd"); + buf.append("\n"); + 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("\n"); - buf.append("Rtt"); + buf.append("\n"); + 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("\n"); - buf.append("Mtu"); + buf.append("\n"); + 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("\n"); - buf.append("Resent"); + buf.append("\n"); + 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("\n"); + buf.append("
\n"); - out.write("" - + "\n"); + out.write("" + + "\n"); long processed = 0; RateStat rs = _context.statManager().getRate("tunnel.participatingMessageCount"); if (rs != null) @@ -602,7 +602,7 @@ public class TunnelPoolManager implements TunnelManagerFacade { Collections.sort(peerList, new HashComparator()); out.write("

Tunnel Counts By Peer:

\n"); - out.write("
Receive onFrom" - + "Send onToExpirationUsageRateRole
Receive onFrom" + + "Send onToExpirationUsageRateRole
\n"); + out.write("
PeerExpl. + Client% of totalPart. from + to% of total
\n"); for (Hash h : peerList) { out.write("
PeerExpl. + Client% of totalPart. from + to% of total
"); out.write(netDbLink(h));