commit 29d959805cf257ce0facbf2bb1500d6fda48d0b1
author Charles Chan <rascov@gmail.com> Tue Mar 27 18:50:59 2018 -0700
committer Charles Chan <charles@opennetworking.org> Mon Apr 02 01:08:54 2018 +0000
tree 59eae3a499e3866d5361c7f6cd2c26738f378a5e
parent 3331f7bfb82f2b8a715d0f64b402566f679c6b92

Protect DhcpServerConfig from IllegalArgumentException

Change-Id: I76a942a322d203bf7bc0315478d1378bd9f45f18

apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/config/DhcpServerConfig.java

diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/config/DhcpServerConfig.java b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/config/DhcpServerConfig.java
index c8c0f55..cf71aa2a 100644
--- a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/config/DhcpServerConfig.java
+++ b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/config/DhcpServerConfig.java
@@ -27,17 +27,21 @@
 import org.onlab.packet.IpAddress;
 import org.onosproject.net.ConnectPoint;
 import org.onosproject.net.DeviceId;
+import org.slf4j.Logger;
 
 import java.util.Map;
 import java.util.Optional;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
+import static org.slf4j.LoggerFactory.getLogger;
 
 /**
  * DHCP server configuration.
  */
 public class DhcpServerConfig {
+    private final Logger log = getLogger(getClass());
+
     private static final String DHCP_CONNECT_POINT = "dhcpServerConnectPoint";
     private static final String DHCP_SERVER_IP = "serverIps";
     private static final String DHCP_GATEWAY_IP = "gatewayIps";
@@ -102,10 +106,20 @@
                 Ip4Address ipv4 = null;
                 Ip6Address ipv6 = null;
                 if (ips.has(IPV4)) {
-                    ipv4 = Ip4Address.valueOf(ips.get(IPV4).asText());
+                    String ipv4Str = ips.get(IPV4).asText();
+                    try {
+                        ipv4 = Ip4Address.valueOf(ipv4Str);
+                    } catch (IllegalArgumentException iae) {
+                        log.warn("Invalid IPv4 address {} found in DHCP relay config. Ignored.", ipv4Str);
+                    }
                 }
                 if (ips.has(IPV6)) {
-                    ipv6 = Ip6Address.valueOf(ips.get(IPV6).asText());
+                    String ipv6Str = ips.get(IPV6).asText();
+                    try {
+                        ipv6 = Ip6Address.valueOf(ipv6Str);
+                    } catch (IllegalArgumentException iae) {
+                        log.warn("Invalid IPv6 address {} found in DHCP relay config. Ignored.", ipv6Str);
+                    }
                 }
                 relayAgentIps.put(deviceId, Pair.of(ipv4, ipv6));
             });