From 6bccd0aff8d4579a58b5ec3ecb6e6241d0a5d839 Mon Sep 17 00:00:00 2001
From: MV Shiva Prasad <okshiva@google.com>
Date: Sun, 2 Mar 2025 08:28:11 +0000
Subject: [PATCH] xds: avoid unnecessary dns lookup

---
 xds/src/main/java/io/grpc/xds/EnvoyServerProtoData.java | 6 +++---
 xds/src/main/java/io/grpc/xds/XdsListenerResource.java  | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/xds/src/main/java/io/grpc/xds/EnvoyServerProtoData.java b/xds/src/main/java/io/grpc/xds/EnvoyServerProtoData.java
index 4a6213277e7..5ae4d909067 100644
--- a/xds/src/main/java/io/grpc/xds/EnvoyServerProtoData.java
+++ b/xds/src/main/java/io/grpc/xds/EnvoyServerProtoData.java
@@ -21,13 +21,13 @@
 import com.google.auto.value.AutoValue;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
+import com.google.common.net.InetAddresses;
 import com.google.protobuf.util.Durations;
 import io.envoyproxy.envoy.extensions.transport_sockets.tls.v3.CommonTlsContext;
 import io.grpc.Internal;
 import io.grpc.xds.client.EnvoyProtoData;
 import io.grpc.xds.internal.security.SslContextProviderSupplier;
 import java.net.InetAddress;
-import java.net.UnknownHostException;
 import java.util.Objects;
 import javax.annotation.Nullable;
 
@@ -150,9 +150,9 @@ abstract static class CidrRange {
 
     abstract int prefixLen();
 
-    static CidrRange create(String addressPrefix, int prefixLen) throws UnknownHostException {
+    static CidrRange create(String addressPrefix, int prefixLen) throws IllegalArgumentException {
       return new AutoValue_EnvoyServerProtoData_CidrRange(
-          InetAddress.getByName(addressPrefix), prefixLen);
+          InetAddresses.forString(addressPrefix), prefixLen);
     }
   }
 
diff --git a/xds/src/main/java/io/grpc/xds/XdsListenerResource.java b/xds/src/main/java/io/grpc/xds/XdsListenerResource.java
index 4b554be1743..019d93c7903 100644
--- a/xds/src/main/java/io/grpc/xds/XdsListenerResource.java
+++ b/xds/src/main/java/io/grpc/xds/XdsListenerResource.java
@@ -43,7 +43,6 @@
 import io.grpc.xds.Filter.FilterConfig;
 import io.grpc.xds.XdsListenerResource.LdsUpdate;
 import io.grpc.xds.client.XdsResourceType;
-import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
@@ -453,7 +452,7 @@ private static FilterChainMatch parseFilterChainMatch(
         sourcePrefixRanges.add(
             CidrRange.create(range.getAddressPrefix(), range.getPrefixLen().getValue()));
       }
-    } catch (UnknownHostException e) {
+    } catch (IllegalArgumentException e) {
       throw new ResourceInvalidException("Failed to create CidrRange", e);
     }
     ConnectionSourceType sourceType;