Changeset cbeaca6 for router


Ignore:
Timestamp:
May 9, 2019 11:31:06 AM (14 months ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
be6b200
Parents:
585778cd
Message:

rename method

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

Legend:

Unmodified
Added
Removed
  • router/java/src/net/i2p/router/CommSystemFacade.java

    r585778cd rcbeaca6  
    115115
    116116    /** @since 0.8.13 */
    117     public boolean isInBadCountry() { return false; }
     117    public boolean isInStrictCountry() { return false; }
    118118
    119119    /** @since 0.9.16 */
    120     public boolean isInBadCountry(Hash peer) { return false; }
     120    public boolean isInStrictCountry(Hash peer) { return false; }
    121121
    122122    /** @since 0.9.16 */
    123     public boolean isInBadCountry(RouterInfo ri) { return false; }
     123    public boolean isInStrictCountry(RouterInfo ri) { return false; }
    124124
    125125    public String getCountry(Hash peer) { return null; }
  • router/java/src/net/i2p/router/Router.java

    r585778cd rcbeaca6  
    11651165        if (h != null)
    11661166            return Boolean.parseBoolean(h);
    1167         return _context.commSystem().isInBadCountry();
     1167        return _context.commSystem().isInStrictCountry();
    11681168    }
    11691169   
  • router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java

    r585778cd rcbeaca6  
    126126            return false;
    127127
    128         if (getContext().commSystem().isInBadCountry())
     128        if (getContext().commSystem().isInStrictCountry())
    129129            return false;
    130130        String country = getContext().commSystem().getOurCountry();
  • router/java/src/net/i2p/router/networkdb/kademlia/FloodfillPeerSelector.java

    r585778cd rcbeaca6  
    254254                if (_log.shouldLog(Log.DEBUG))
    255255                    _log.debug("Old: " + entry);
    256             } else if (info != null && _context.commSystem().isInBadCountry(info)) {
     256            } else if (info != null && _context.commSystem().isInStrictCountry(info)) {
    257257                badff.add(entry);
    258258                if (_log.shouldLog(Log.DEBUG))
  • router/java/src/net/i2p/router/networkdb/reseed/ReseedBundler.java

    r585778cd rcbeaca6  
    113113            if (!hasIPv4)
    114114                continue;
    115             if (_context.commSystem().isInBadCountry(ri))
     115            if (_context.commSystem().isInStrictCountry(ri))
    116116                continue;
    117117
  • router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java

    r585778cd rcbeaca6  
    13921392            if (_thresholdCapacityValue <= profile.getCapacityValue() &&
    13931393                isSelectable(peer) &&
    1394                 !_context.commSystem().isInBadCountry(peer)) {
     1394                !_context.commSystem().isInStrictCountry(peer)) {
    13951395                _highCapacityPeers.put(peer, profile);
    13961396                if (_log.shouldLog(Log.DEBUG))
  • router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java

    r585778cd rcbeaca6  
    437437     */
    438438    @Override
    439     public boolean isInBadCountry() {
     439    public boolean isInStrictCountry() {
    440440        String us = getOurCountry();
    441441        return (us != null && StrictCountries.contains(us)) || _context.getBooleanProperty("router.forceBadCountry");
     
    448448     */
    449449    @Override
    450     public boolean isInBadCountry(Hash peer) {
     450    public boolean isInStrictCountry(Hash peer) {
    451451        String c = getCountry(peer);
    452452        return c != null && StrictCountries.contains(c);
     
    459459     */
    460460    @Override
    461     public boolean isInBadCountry(RouterInfo ri) {
     461    public boolean isInStrictCountry(RouterInfo ri) {
    462462        byte[] ip = getIP(ri);
    463463        if (ip == null)
  • router/java/src/net/i2p/router/transport/GeoIP.java

    r585778cd rcbeaca6  
    484484        if (country != null && !country.equals(oldCountry)) {
    485485            ctx.router().saveConfig(PROP_IP_COUNTRY, country);
    486             if (ctx.commSystem().isInBadCountry() && ctx.getProperty(Router.PROP_HIDDEN_HIDDEN) == null) {
     486            if (ctx.commSystem().isInStrictCountry() && ctx.getProperty(Router.PROP_HIDDEN_HIDDEN) == null) {
    487487                String name = fullName(country);
    488488                if (name == null)
Note: See TracChangeset for help on using the changeset viewer.