tweak ip ranges impl

Signed-off-by: neo <1100909+neowu@users.noreply.github.com>

Author: neowu

core-ng/src/main/java/core/framework/internal/web/http/IPv4Ranges.java

@@ -66,16 +66,15 @@ public IPv4Ranges(List<String> cidrs) {
         int[][] ranges = new int[cidrs.size()][];
         int index = 0;
         for (String cidr : cidrs) {
-            int[] range = comparableIPRanges(cidr);
+            int[] range = sortableRange(cidr);
             ranges[index++] = range;
         }
         this.ranges = mergeRanges(ranges);
     }
 
-    private int[] comparableIPRanges(String cidr) {
+    private int[] sortableRange(String cidr) {
         int index = cidr.indexOf('/');
         if (index <= 0 || index >= cidr.length() - 1) throw new Error("invalid cidr, value=" + cidr);
-        int address = toInt(address(cidr.substring(0, index)));
         int maskBits = Integer.parseInt(cidr.substring(index + 1));
 
         int rangeStart;
@@ -88,6 +87,7 @@ private int[] comparableIPRanges(String cidr) {
             rangeStart = 0;
             rangeEnd = -1;
         } else {
+            int address = toInt(address(cidr.substring(0, index)));
             int mask = -1 << (32 - maskBits);
             rangeStart = address & mask;
             rangeEnd = rangeStart + ~mask;
@@ -107,8 +107,8 @@ private int toInt(byte[] address) {
 
     public boolean matches(byte[] address) {
         if (ranges.length == 0) return false;
-        int comparableIP = toSortable(toInt(address));
-        return withinRanges(ranges, comparableIP);
+        int sortable = toSortable(toInt(address));
+        return withinRanges(ranges, sortable);
     }
 
     // with address ^ MIN_VALUE, it converts binary presentation to sortable number form (due to java doesn't have unsigned number type)

core-ng/src/main/java/core/framework/internal/web/http/IPv6Ranges.java

@@ -80,13 +80,13 @@ public IPv6Ranges(List<String> cidrs) {
         LongLong[][] ranges = new LongLong[cidrs.size()][];
         int index = 0;
         for (String cidr : cidrs) {
-            LongLong[] range = comparableIPRanges(cidr);
+            LongLong[] range = sortableRange(cidr);
             ranges[index++] = range;
         }
         this.ranges = mergeRanges(ranges);
     }
 
-    private LongLong[] comparableIPRanges(String cidr) {
+    private LongLong[] sortableRange(String cidr) {
         int index = cidr.indexOf('/');
         if (index <= 0 || index >= cidr.length() - 1) throw new Error("invalid cidr, value=" + cidr);
         LongLong address = toLongLong(IPv4Ranges.address(cidr.substring(0, index)));
@@ -114,8 +114,8 @@ public boolean matches(byte[] address) {
         if (ranges.length == 0) return false;
         if (address.length != 16) return false;
 
-        LongLong comparableIP = toLongLong(address).toSortable();
-        return withinRanges(ranges, comparableIP);
+        LongLong sortable = toLongLong(address).toSortable();
+        return withinRanges(ranges, sortable);
     }
 
     // high,low are used to represent a 128-bit IPv6 address as two 64-bit long values

core-ng/src/test/java/core/framework/internal/web/http/IPv6RangesTest.java

@@ -42,7 +42,7 @@ void matches() {
     }
 
     @Test
-    void matchesMultipleRanges() {
+    void matchesWithMultipleRanges() {
         var ranges = new IPv6Ranges(List.of("2001:db8::/32", "2001:db9::/32", "2001:dba::/32"));
         assertTrue(ranges.matches(address("2001:db8::1")));
         assertTrue(ranges.matches(address("2001:db9::1")));