Changeset cbeaca6

Timestamp:

May 9, 2019 11:31:06 AM (2 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

be6b200

Parents:

585778cd

Message:

rename method

Location:

router/java/src/net/i2p/router

Files:

• CommSystemFacade.java (modified) (1 diff)
• Router.java (modified) (1 diff)
• networkdb/kademlia/FloodfillMonitorJob.java (modified) (1 diff)
• networkdb/kademlia/FloodfillPeerSelector.java (modified) (1 diff)
• networkdb/reseed/ReseedBundler.java (modified) (1 diff)
• peermanager/ProfileOrganizer.java (modified) (1 diff)
• transport/CommSystemFacadeImpl.java (modified) (3 diffs)
• transport/GeoIP.java (modified) (1 diff)

router/java/src/net/i2p/router/CommSystemFacade.java

@@ -115 +115 @@
 
     /** @since 0.8.13 */
-    public boolean isInBadCountry() { return false; }
+    public boolean isInStrictCountry() { return false; }
 
     /** @since 0.9.16 */
-    public boolean isInBadCountry(Hash peer) { return false; }
+    public boolean isInStrictCountry(Hash peer) { return false; }
 
     /** @since 0.9.16 */
-    public boolean isInBadCountry(RouterInfo ri) { return false; }
+    public boolean isInStrictCountry(RouterInfo ri) { return false; }
 
     public String getCountry(Hash peer) { return null; }

router/java/src/net/i2p/router/Router.java

@@ -1165 +1165 @@
         if (h != null)
             return Boolean.parseBoolean(h);
-        return _context.commSystem().isInBadCountry();
+        return _context.commSystem().isInStrictCountry();
     }
     

router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java

@@ -126 +126 @@
             return false;
 
-        if (getContext().commSystem().isInBadCountry())
+        if (getContext().commSystem().isInStrictCountry())
             return false;
         String country = getContext().commSystem().getOurCountry();

router/java/src/net/i2p/router/networkdb/kademlia/FloodfillPeerSelector.java

@@ -254 +254 @@
                 if (_log.shouldLog(Log.DEBUG))
                     _log.debug("Old: " + entry);
-            } else if (info != null && _context.commSystem().isInBadCountry(info)) {
+            } else if (info != null && _context.commSystem().isInStrictCountry(info)) {
                 badff.add(entry);
                 if (_log.shouldLog(Log.DEBUG))

router/java/src/net/i2p/router/networkdb/reseed/ReseedBundler.java

@@ -113 +113 @@
             if (!hasIPv4)
                 continue;
-            if (_context.commSystem().isInBadCountry(ri))
+            if (_context.commSystem().isInStrictCountry(ri))
                 continue;
 

router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java

@@ -1392 +1392 @@
             if (_thresholdCapacityValue <= profile.getCapacityValue() &&
                 isSelectable(peer) &&
-                !_context.commSystem().isInBadCountry(peer)) {
+                !_context.commSystem().isInStrictCountry(peer)) {
                 _highCapacityPeers.put(peer, profile);
                 if (_log.shouldLog(Log.DEBUG))

router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java

@@ -437 +437 @@
      */
     @Override
-    public boolean isInBadCountry() {
+    public boolean isInStrictCountry() {
         String us = getOurCountry();
         return (us != null && StrictCountries.contains(us)) || _context.getBooleanProperty("router.forceBadCountry");
@@ -448 +448 @@
      */
     @Override
-    public boolean isInBadCountry(Hash peer) {
+    public boolean isInStrictCountry(Hash peer) {
         String c = getCountry(peer);
         return c != null && StrictCountries.contains(c);
@@ -459 +459 @@
      */
     @Override
-    public boolean isInBadCountry(RouterInfo ri) {
+    public boolean isInStrictCountry(RouterInfo ri) {
         byte[] ip = getIP(ri);
         if (ip == null)

router/java/src/net/i2p/router/transport/GeoIP.java

@@ -484 +484 @@
         if (country != null && !country.equals(oldCountry)) {
             ctx.router().saveConfig(PROP_IP_COUNTRY, country);
-            if (ctx.commSystem().isInBadCountry() && ctx.getProperty(Router.PROP_HIDDEN_HIDDEN) == null) {
+            if (ctx.commSystem().isInStrictCountry() && ctx.getProperty(Router.PROP_HIDDEN_HIDDEN) == null) {
                 String name = fullName(country);
                 if (name == null)