From 903477e90541aa92a998e1fbaa61efb8eadac40d Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Tue, 20 Dec 2022 08:51:29 -0500
Subject: [PATCH] Change calls from Addresses.getIP() to Addresses.getIPOnly()
 for peer IPs

getIPOnly() is more efficient for pure IP addresses (no hostnames)
---
 .../java/src/net/i2p/router/web/helpers/NetDbRenderer.java  | 2 +-
 router/java/src/net/i2p/router/Blocklist.java               | 6 +++---
 router/java/src/net/i2p/router/sybil/Analysis.java          | 2 +-
 router/java/src/net/i2p/router/transport/GeoIP.java         | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java
index 39bb3fcfd..f5ca57658 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java
@@ -1258,7 +1258,7 @@ class NetDbRenderer {
     private static String getAltIPv6(String ip) {
         if (ip.contains("::")) {
             // convert to expanded
-            byte[] bip = Addresses.getIP(ip);
+            byte[] bip = Addresses.getIPOnly(ip);
             if (bip != null)
                 return Addresses.toString(bip);
         } else if (ip.contains(":0:")) {
diff --git a/router/java/src/net/i2p/router/Blocklist.java b/router/java/src/net/i2p/router/Blocklist.java
index f9f46065b..b97777ca3 100644
--- a/router/java/src/net/i2p/router/Blocklist.java
+++ b/router/java/src/net/i2p/router/Blocklist.java
@@ -666,7 +666,7 @@ public class Blocklist {
      * @param ip IPv4 or IPv6
      */
     public void add(String ip) {
-        byte[] pib = Addresses.getIP(ip);
+        byte[] pib = Addresses.getIPOnly(ip);
         if (pib == null) return;
         add(pib, null);
     }
@@ -681,7 +681,7 @@ public class Blocklist {
      * @since 0.9.57
      */
     public void add(String ip, String source) {
-        byte[] pib = Addresses.getIP(ip);
+        byte[] pib = Addresses.getIPOnly(ip);
         if (pib == null) return;
         add(pib, source);
     }
@@ -876,7 +876,7 @@ public class Blocklist {
      * @param ip IPv4 or IPv6
      */
     public boolean isBlocklisted(String ip) {
-        byte[] pib = Addresses.getIP(ip);
+        byte[] pib = Addresses.getIPOnly(ip);
         if (pib == null) return false;
         return isBlocklisted(pib);
     }
diff --git a/router/java/src/net/i2p/router/sybil/Analysis.java b/router/java/src/net/i2p/router/sybil/Analysis.java
index 5adb818d1..ec1513fa9 100644
--- a/router/java/src/net/i2p/router/sybil/Analysis.java
+++ b/router/java/src/net/i2p/router/sybil/Analysis.java
@@ -559,7 +559,7 @@ public class Analysis extends JobImpl implements RouterApp {
             String last = _context.getProperty("i2np.lastIP");
             if (last == null)
                 return;
-            ourIP = Addresses.getIP(last);
+            ourIP = Addresses.getIPOnly(last);
             if (ourIP == null)
                 return;
         }
diff --git a/router/java/src/net/i2p/router/transport/GeoIP.java b/router/java/src/net/i2p/router/transport/GeoIP.java
index efcd855e7..bcdff76b5 100644
--- a/router/java/src/net/i2p/router/transport/GeoIP.java
+++ b/router/java/src/net/i2p/router/transport/GeoIP.java
@@ -770,7 +770,7 @@ public class GeoIP {
      * @param ip IPv4 or IPv6
      */
     public void add(String ip) {
-        byte[] pib = Addresses.getIP(ip);
+        byte[] pib = Addresses.getIPOnly(ip);
         if (pib == null) return;
         add(pib);
     }
@@ -812,7 +812,7 @@ public class GeoIP {
      * @return lower-case code, generally two letters, or null.
      */
     public String get(String ip) {
-        byte[] pib = Addresses.getIP(ip);
+        byte[] pib = Addresses.getIPOnly(ip);
         if (pib == null) return null;
         return get(pib);
     }