Changeset 2c502c5


Ignore:
Timestamp:
Sep 4, 2011 10:16:04 PM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
7a135b9, ebf0128
Parents:
63958df
Message:

shorten netdb expiration again

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • history.txt

    r63958df r2c502c5  
    112011-09-04 zzz
    2   * NetDB: Try again to fix ISJ deadlock, thx devzero
     2  * NetDB:
     3    - Try again to fix ISJ deadlock, thx devzero
     4    - Lower RI expiration again
     5    - Expire RIs with SSU only and no introducers sooner
    36  * Transport: Remove one global lock in OutboundMessageRegistry.
    47
  • router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java

    r63958df r2c502c5  
    122122     * know anyone or just started up) -- see validate() below
    123123     */
    124     private final static long ROUTER_INFO_EXPIRATION = 3*24*60*60*1000l;
    125     private final static long ROUTER_INFO_EXPIRATION_MIN = 120*60*1000l;
    126     private final static long ROUTER_INFO_EXPIRATION_SHORT = 90*60*1000l;
     124    private final static long ROUTER_INFO_EXPIRATION = 2*24*60*60*1000l;
     125    private final static long ROUTER_INFO_EXPIRATION_MIN = 90*60*1000l;
     126    private final static long ROUTER_INFO_EXPIRATION_SHORT = 75*60*1000l;
    127127    private final static long ROUTER_INFO_EXPIRATION_FLOODFILL = 60*60*1000l;
    128128   
     
    773773        } else if (upLongEnough && !routerInfo.isCurrent(ROUTER_INFO_EXPIRATION_SHORT)) {
    774774            if (routerInfo.getAddresses().isEmpty())
    775                 return "Peer " + key.toBase64() + " published > 90m ago with no addresses";
     775                return "Peer " + key.toBase64() + " published > 75m ago with no addresses";
    776776            // This should cover the introducers case below too
    777777            // And even better, catches the case where the router is unreachable but knows no introducers
    778778            if (routerInfo.getCapabilities().indexOf(Router.CAPABILITY_UNREACHABLE) >= 0)
    779                 return "Peer " + key.toBase64() + " published > 90m ago and thinks it is unreachable";
     779                return "Peer " + key.toBase64() + " published > 75m ago and thinks it is unreachable";
    780780            RouterAddress ra = routerInfo.getTargetAddress("SSU");
    781781            if (ra != null) {
     
    783783                Properties props = ra.getOptions();
    784784                if (props != null && props.getProperty("ihost0") != null)
    785                     return "Peer " + key.toBase64() + " published > 90m ago with SSU Introducers";
     785                    return "Peer " + key.toBase64() + " published > 75m ago with SSU Introducers";
     786                if (routerInfo.getTargetAddress("NTCP") == null)
     787                    return "Peer " + key.toBase64() + " published > 75m ago, SSU only without introducers";
    786788            }
    787789        }
Note: See TracChangeset for help on using the changeset viewer.