Changeset 90648282


Ignore:
Timestamp:
May 26, 2009 2:48:58 PM (11 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
32dddac
Parents:
91c3897
Message:

Flags fixup

Location:
router/java/src/net/i2p/router
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • router/java/src/net/i2p/router/peermanager/ProfileOrganizerRenderer.java

    r91c3897 r90648282  
    5959        StringBuffer buf = new StringBuffer(16*1024);
    6060        buf.append("<h2>Peer Profiles</h2>\n");
     61        buf.append("<p>Showing ").append(order.size()).append(" recent profiles, hiding ").append(peers.size()-order.size()).append(" older profiles</p>");
    6162        buf.append("<table border=\"1\">");
    6263        buf.append("<tr>");
    63         buf.append("<td><b>Peer</b> (").append(order.size()).append(", hiding ").append(peers.size()-order.size()).append(")</td>");
     64        buf.append("<td><b>Peer</b></td>");
    6465        buf.append("<td><b>Groups (Caps)</b></td>");
    6566        buf.append("<td><b>Speed</b></td>");
     
    9899            prevTier = tier;
    99100           
    100             buf.append("<tr><td>");
     101            buf.append("<tr><td nowrap>");
    101102            buf.append(_context.commSystem().renderPeerHTML(peer));
    102103            buf.append("</td><td>");
     
    180181            Hash peer = prof.getPeer();
    181182
    182             buf.append("<tr><td>");
     183            buf.append("<tr><td nowrap>");
    183184            buf.append(_context.commSystem().renderPeerHTML(peer));
    184185            buf.append("</td>");
  • router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java

    r91c3897 r90648282  
    129129    int getTransportCount() { return _manager.getTransportCount(); }
    130130   
     131    /** Send the message out */
    131132    public void processMessage(OutNetMessage msg) {     
    132133        //GetBidsJob j = new GetBidsJob(_context, this, msg);
     
    437438        String h = peer.toBase64().substring(0, 4);
    438439        StringBuffer buf = new StringBuffer(128);
     440        String c = getCountry(peer);
     441        if (c != null) {
     442            buf.append("<img alt=\"").append(c.toUpperCase()).append("\" title=\"");
     443            String n = _geoIP.fullName(c);
     444            if (n != null)
     445                buf.append(n);
     446            else
     447                buf.append(c);
     448            buf.append("\" src=\"/flags.jsp?c=").append(c).append("\"> ");
     449        }
    439450        buf.append("<tt><font size=\"+1\">");
    440451        boolean found = _context.netDb().lookupRouterInfoLocally(peer) != null;
     
    445456            buf.append("</a>");
    446457        buf.append("</font></tt>");
    447         String c = getCountry(peer);
    448         if (c != null) {
    449             buf.append(" <img alt=\"").append(c.toUpperCase()).append("\" title=\"");
    450             String n = _geoIP.fullName(c);
    451             if (n != null)
    452                 buf.append(n);
    453             else
    454                 buf.append(c);
    455             buf.append("\" src=\"/flags.jsp?c=").append(c).append("\">");
    456         }
    457458        return buf.toString();
    458459    }
  • router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java

    r91c3897 r90648282  
    266266        if (established) { // should we check the queue size?  nah, if its valid, use it
    267267            if (_log.shouldLog(Log.DEBUG))
    268                 _log.debug("fast bid when trying to send to " + toAddress.getIdentity().calculateHash().toBase64() + " as its already established");
     268                _log.debug("fast bid when trying to send to " + peer.toBase64() + " as its already established");
    269269            return _fastBid;
    270270        }
     
    276276            //_context.shitlist().shitlistRouter(toAddress.getIdentity().calculateHash(), "No NTCP address", STYLE);
    277277            if (_log.shouldLog(Log.DEBUG))
    278                 _log.debug("no bid when trying to send to " + toAddress.getIdentity().calculateHash().toBase64() + " as they don't have an ntcp address");
     278                _log.debug("no bid when trying to send to " + peer.toBase64() + " as they don't have an ntcp address");
    279279            return null;
    280280        }
     
    285285            //_context.shitlist().shitlistRouter(toAddress.getIdentity().calculateHash(), "Invalid NTCP address", STYLE);
    286286            if (_log.shouldLog(Log.DEBUG))
    287                 _log.debug("no bid when trying to send to " + toAddress.getIdentity().calculateHash().toBase64() + " as they don't have a valid ntcp address");
     287                _log.debug("no bid when trying to send to " + peer.toBase64() + " as they don't have a valid ntcp address");
    288288            return null;
    289289        }
     
    293293                markUnreachable(peer);
    294294                if (_log.shouldLog(Log.DEBUG))
    295                     _log.debug("no bid when trying to send to " + toAddress.getIdentity().calculateHash().toBase64() + " as they have a private ntcp address");
     295                    _log.debug("no bid when trying to send to " + peer.toBase64() + " as they have a private ntcp address");
    296296                return null;
    297297            }
     
    300300        if (!allowConnection()) {
    301301            if (_log.shouldLog(Log.WARN))
    302                 _log.warn("no bid when trying to send to " + toAddress.getIdentity().calculateHash().toBase64() + ", max connection limit reached");
     302                _log.warn("no bid when trying to send to " + peer.toBase64() + ", max connection limit reached");
    303303            return _transientFail;
    304304        }
     
    308308
    309309        if (_log.shouldLog(Log.DEBUG))
    310             _log.debug("slow bid when trying to send to " + toAddress.getIdentity().calculateHash().toBase64());
     310            _log.debug("slow bid when trying to send to " + peer.toBase64());
    311311        return _slowBid;
    312312    }
     
    656656        for (Iterator iter = peers.iterator(); iter.hasNext(); ) {
    657657            NTCPConnection con = (NTCPConnection)iter.next();
    658             buf.append("<tr><td>");
     658            buf.append("<tr><td nowrap>");
    659659            buf.append(_context.commSystem().renderPeerHTML(con.getRemotePeer().calculateHash()));
    660660            //byte[] ip = getIP(con.getRemotePeer().calculateHash());
  • router/java/src/net/i2p/router/transport/udp/UDPTransport.java

    r91c3897 r90648282  
    18081808            buf.append("<tr>");
    18091809           
    1810             buf.append("<td>");
     1810            buf.append("<td nowrap>");
    18111811            buf.append(_context.commSystem().renderPeerHTML(peer.getRemotePeer()));
    18121812            //byte ip[] = peer.getRemoteIP();
Note: See TracChangeset for help on using the changeset viewer.