Changeset d8980d1

Timestamp:

May 10, 2019 11:46:25 AM (11 months ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

0a73303

Parents:

c7d0526

Message:

Transport: Revert GeoIP changes that broke BundleRouterInfos?

File:

• router/java/src/net/i2p/router/transport/GeoIP.java (modified) (5 diffs)

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

@@ -126 +126 @@
      * Blocking lookup of all pending IPs.
      * Results will be added to the table and available via get() after completion.
-     */
-    void blockingLookup() {
+     *
+     * Public for BundleRouterInfos
+     */
+    public void blockingLookup() {
         if (! _context.getBooleanPropertyDefaultTrue(PROP_GEOIP_ENABLED)) {
             _pendingSearch.clear();
@@ -497 +499 @@
     /**
      * Add to the list needing lookup
+     * Public for BundleRouterInfos
+     *
      * @param ip IPv4 or IPv6
      */
-    void add(String ip) {
+    public void add(String ip) {
         byte[] pib = Addresses.getIP(ip);
         if (pib == null) return;
@@ -507 +511 @@
     /**
      * Add to the list needing lookup
+     * Public for BundleRouterInfos
+     *
      * @param ip IPv4 or IPv6
      */
-    void add(byte ip[]) {
+    public void add(byte ip[]) {
         add(toLong(ip));
     }
@@ -526 +532 @@
     /**
      * Get the country for an IP from the cache.
+     * Public for BundleRouterInfos
+     *
      * @param ip IPv4 or IPv6
      * @return lower-case code, generally two letters, or null.
      */
-    String get(String ip) {
+    public String get(String ip) {
         byte[] pib = Addresses.getIP(ip);
         if (pib == null) return null;
@@ -594 +602 @@
     /**
      * Get the country for a country code
+     * Public for BundleRouterInfos
+     *
      * @param code two-letter lower case code
      * @return untranslated name or null
      */
-    String fullName(String code) {
+    public String fullName(String code) {
         return _codeToName.get(code);
     }