From 906482823c93633992784d138881a62100b272b6 Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 26 May 2009 14:48:58 +0000 Subject: [PATCH] Flags fixup --- .../peermanager/ProfileOrganizerRenderer.java | 7 ++++--- .../transport/CommSystemFacadeImpl.java | 21 ++++++++++--------- .../router/transport/ntcp/NTCPTransport.java | 14 ++++++------- .../router/transport/udp/UDPTransport.java | 2 +- 4 files changed, 23 insertions(+), 21 deletions(-) diff --git a/router/java/src/net/i2p/router/peermanager/ProfileOrganizerRenderer.java b/router/java/src/net/i2p/router/peermanager/ProfileOrganizerRenderer.java index a0531fffb..464fbd836 100644 --- a/router/java/src/net/i2p/router/peermanager/ProfileOrganizerRenderer.java +++ b/router/java/src/net/i2p/router/peermanager/ProfileOrganizerRenderer.java @@ -58,9 +58,10 @@ class ProfileOrganizerRenderer { int failing = 0; StringBuffer buf = new StringBuffer(16*1024); buf.append("

Peer Profiles

\n"); + buf.append("

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

"); buf.append(""); buf.append(""); - buf.append(""); + buf.append(""); buf.append(""); buf.append(""); buf.append(""); @@ -97,7 +98,7 @@ class ProfileOrganizerRenderer { buf.append("\n"); prevTier = tier; - buf.append(""); RouterInfo info = _context.netDb().lookupRouterInfoLocally(peer); diff --git a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java index 2bddc3982..a798e0c18 100644 --- a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java +++ b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java @@ -128,6 +128,7 @@ public class CommSystemFacadeImpl extends CommSystemFacade { } int getTransportCount() { return _manager.getTransportCount(); } + /** Send the message out */ public void processMessage(OutNetMessage msg) { //GetBidsJob j = new GetBidsJob(_context, this, msg); //j.runJob(); @@ -436,6 +437,16 @@ public class CommSystemFacadeImpl extends CommSystemFacade { public String renderPeerHTML(Hash peer) { String h = peer.toBase64().substring(0, 4); StringBuffer buf = new StringBuffer(128); + String c = getCountry(peer); + if (c != null) { + buf.append("\"").append(c.toUpperCase()).append("\" "); + } buf.append(""); boolean found = _context.netDb().lookupRouterInfoLocally(peer) != null; if (found) @@ -444,16 +455,6 @@ public class CommSystemFacadeImpl extends CommSystemFacade { if (found) buf.append(""); buf.append(""); - String c = getCountry(peer); - if (c != null) { - buf.append(" \"").append(c.toUpperCase()).append("\""); - } return buf.toString(); } } 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 d2f2f8bc4..8b3f5f9e6 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java +++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java @@ -265,7 +265,7 @@ public class NTCPTransport extends TransportImpl { boolean established = isEstablished(toAddress.getIdentity()); if (established) { // should we check the queue size? nah, if its valid, use it if (_log.shouldLog(Log.DEBUG)) - _log.debug("fast bid when trying to send to " + toAddress.getIdentity().calculateHash().toBase64() + " as its already established"); + _log.debug("fast bid when trying to send to " + peer.toBase64() + " as its already established"); return _fastBid; } RouterAddress addr = toAddress.getTargetAddress(STYLE); @@ -275,7 +275,7 @@ public class NTCPTransport extends TransportImpl { _context.statManager().addRateData("ntcp.bidRejectedNoNTCPAddress", 1, 0); //_context.shitlist().shitlistRouter(toAddress.getIdentity().calculateHash(), "No NTCP address", STYLE); if (_log.shouldLog(Log.DEBUG)) - _log.debug("no bid when trying to send to " + toAddress.getIdentity().calculateHash().toBase64() + " as they don't have an ntcp address"); + _log.debug("no bid when trying to send to " + peer.toBase64() + " as they don't have an ntcp address"); return null; } NTCPAddress naddr = new NTCPAddress(addr); @@ -284,7 +284,7 @@ public class NTCPTransport extends TransportImpl { markUnreachable(peer); //_context.shitlist().shitlistRouter(toAddress.getIdentity().calculateHash(), "Invalid NTCP address", STYLE); if (_log.shouldLog(Log.DEBUG)) - _log.debug("no bid when trying to send to " + toAddress.getIdentity().calculateHash().toBase64() + " as they don't have a valid ntcp address"); + _log.debug("no bid when trying to send to " + peer.toBase64() + " as they don't have a valid ntcp address"); return null; } if (!naddr.isPubliclyRoutable()) { @@ -292,14 +292,14 @@ public class NTCPTransport extends TransportImpl { _context.statManager().addRateData("ntcp.bidRejectedLocalAddress", 1, 0); markUnreachable(peer); if (_log.shouldLog(Log.DEBUG)) - _log.debug("no bid when trying to send to " + toAddress.getIdentity().calculateHash().toBase64() + " as they have a private ntcp address"); + _log.debug("no bid when trying to send to " + peer.toBase64() + " as they have a private ntcp address"); return null; } } if (!allowConnection()) { if (_log.shouldLog(Log.WARN)) - _log.warn("no bid when trying to send to " + toAddress.getIdentity().calculateHash().toBase64() + ", max connection limit reached"); + _log.warn("no bid when trying to send to " + peer.toBase64() + ", max connection limit reached"); return _transientFail; } @@ -307,7 +307,7 @@ public class NTCPTransport extends TransportImpl { // return null; // dont talk to yourself if (_log.shouldLog(Log.DEBUG)) - _log.debug("slow bid when trying to send to " + toAddress.getIdentity().calculateHash().toBase64()); + _log.debug("slow bid when trying to send to " + peer.toBase64()); return _slowBid; } @@ -655,7 +655,7 @@ public class NTCPTransport extends TransportImpl { buf.setLength(0); for (Iterator iter = peers.iterator(); iter.hasNext(); ) { NTCPConnection con = (NTCPConnection)iter.next(); - buf.append(""); - buf.append("
Peer (").append(order.size()).append(", hiding ").append(peers.size()-order.size()).append(")PeerGroups (Caps)SpeedCapacity
"); + buf.append("
"); buf.append(_context.commSystem().renderPeerHTML(peer)); buf.append(""); @@ -179,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("
"); + 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 b438d115f..877a0a9aa 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java @@ -1807,7 +1807,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority buf.append("
"); + buf.append(""); buf.append(_context.commSystem().renderPeerHTML(peer.getRemotePeer())); //byte ip[] = peer.getRemoteIP(); //if (ip != null)