Changeset 4c9023f


Ignore:
Timestamp:
Sep 30, 2011 5:24:14 PM (8 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
14c305a
Parents:
6a15d8c (diff), 7afa63c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge of '2eddbf584c44e72288f74d0f19e716e2a49a847f'

and '45a8f320f0562000d9fb5cb009885b921ab79fdf'

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • apps/routerconsole/jsp/logs.jsp

    r6a15d8c r4c9023f  
    2121<b>I2P version:</b> <%=net.i2p.router.RouterVersion.FULL_VERSION%><br>
    2222<b>Java version:</b> <%=System.getProperty("java.vendor")%> <%=System.getProperty("java.version")%> (<%=System.getProperty("java.runtime.name")%> <%=System.getProperty("java.runtime.version")%>)<br>
     23<b>Wrapper version:</b> <%=System.getProperty("wrapper.version", "none")%><br>
    2324<b>Platform:</b> <%=System.getProperty("os.name")%> <%=System.getProperty("os.arch")%> <%=System.getProperty("os.version")%><br>
    2425<b>Processor:</b> <%=net.i2p.util.NativeBigInteger.cpuModel()%> (<%=net.i2p.util.NativeBigInteger.cpuType()%>)<br>
  • router/java/src/net/i2p/router/Shitlist.java

    r6a15d8c r4c9023f  
    4747    }
    4848   
    49     public final static long SHITLIST_DURATION_MS = 20*60*1000;
     49    /**
     50     *  Don't make this too long as the failure may be transient
     51     *  due to connection limits.
     52     */
     53    public final static long SHITLIST_DURATION_MS = 7*60*1000;
    5054    public final static long SHITLIST_DURATION_MAX = 30*60*1000;
    5155    public final static long SHITLIST_DURATION_PARTIAL = 10*60*1000;
     
    108112        return shitlistRouter(peer, null);
    109113    }
     114
    110115    public boolean shitlistRouter(Hash peer, String reason) { return shitlistRouter(peer, reason, null); }
     116
    111117    /** ick have to put the reasonCode in the front to avoid ambiguity */
    112118    public boolean shitlistRouter(String reasonCode, Hash peer, String reason) {
    113119        return shitlistRouter(peer, reason, reasonCode, null, false);
    114120    }
     121
    115122    public boolean shitlistRouter(Hash peer, String reason, String transport) {
    116123        return shitlistRouter(peer, reason, transport, false);
    117124    }
     125
    118126    public boolean shitlistRouterForever(Hash peer, String reason) {
    119127        return shitlistRouter(peer, reason, null, true);
    120128    }
     129
    121130    public boolean shitlistRouterForever(Hash peer, String reason, String reasonCode) {
    122131        return shitlistRouter(peer, reason, reasonCode, null, true);
    123132    }
     133
    124134    public boolean shitlistRouter(Hash peer, String reason, String transport, boolean forever) {
    125135        return shitlistRouter(peer, reason, null, transport, forever);
    126136    }
     137
    127138    private boolean shitlistRouter(Hash peer, String reason, String reasonCode, String transport, boolean forever) {
    128139        if (peer == null) {
     
    145156            e.expireOn = _context.clock().now() + SHITLIST_DURATION_PARTIAL;
    146157        } else {
    147             long period = SHITLIST_DURATION_MS + _context.random().nextLong(SHITLIST_DURATION_MS);
     158            long period = SHITLIST_DURATION_MS + _context.random().nextLong(SHITLIST_DURATION_MS / 4);
    148159            PeerProfile prof = _context.profileOrganizer().getProfile(peer);
    149160            if (prof != null) {
     
    199210        unshitlistRouter(peer, true);
    200211    }
     212
    201213    private void unshitlistRouter(Hash peer, boolean realUnshitlist) { unshitlistRouter(peer, realUnshitlist, null); }
     214
    202215    public void unshitlistRouter(Hash peer, String transport) { unshitlistRouter(peer, true, transport); }
     216
    203217    private void unshitlistRouter(Hash peer, boolean realUnshitlist, String transport) {
    204218        if (peer == null) return;
     
    234248   
    235249    public boolean isShitlisted(Hash peer) { return isShitlisted(peer, null); }
     250
    236251    public boolean isShitlisted(Hash peer, String transport) {
    237252        boolean rv = false;
Note: See TracChangeset for help on using the changeset viewer.