Changeset 6ca797e


Ignore:
Timestamp:
Aug 30, 2013 12:07:42 PM (8 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
d6c4e41
Parents:
8655988
Message:
  • Console: Display "accepting tunnels" instead of "rejecting tunnels" after 20 minutes (ticket #902)
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • history.txt

    r8655988 r6ca797e  
    112013-08-30 zzz
    22 * Addresses: Treat Teredo addresses 2001:0::/32 as local
     3 * Console: Display "accepting tunnels" instead of "rejecting tunnels"
     4            after 20 minutes (ticket #902)
     5 * NTCP: Handle race where peer's NTCP address goes away
    36 * SSU, confignet: Add support for specifiying multiple addresses
    47 * SusiDNS: Don't require last subscription to be terminated by newline (ticket #1000)
  • router/java/src/net/i2p/router/RouterThrottleImpl.java

    r8655988 r6ca797e  
    22
    33import net.i2p.data.Hash;
     4import net.i2p.data.RouterInfo;
    45import net.i2p.router.peermanager.TunnelHistory;
    56import net.i2p.stat.Rate;
     
    1718    protected final RouterContext _context;
    1819    private final Log _log;
    19     private String _tunnelStatus;
     20    private volatile String _tunnelStatus;
    2021   
    2122    /**
     
    504505    /** @since 0.8.12 */
    505506    public void cancelShutdownStatus() {
    506         setTunnelStatus(_x("Rejecting tunnels"));
     507        // try hard to guess the state, before we actually get a request
     508        int maxTunnels = _context.getProperty(PROP_MAX_TUNNELS, DEFAULT_MAX_TUNNELS);
     509        RouterInfo ri = _context.router().getRouterInfo();
     510        if (maxTunnels > 0 &&
     511            !_context.router().isHidden() &&
     512            ri != null && !ri.getBandwidthTier().equals("K")) {
     513            setTunnelStatus(_x("Accepting tunnels"));
     514        } else {
     515            setTunnelStatus(_x("Rejecting tunnels"));
     516        }
    507517    }
    508518
  • router/java/src/net/i2p/router/RouterVersion.java

    r8655988 r6ca797e  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 21;
     21    public final static long BUILD = 22;
    2222
    2323    /** for example "-test" */
Note: See TracChangeset for help on using the changeset viewer.