commit 76adba20fbd4f07e13201057cf206d875b880271
author Charles Chan <rascov@gmail.com> Fri Mar 30 12:11:34 2018 -0700
committer Charles Chan <charles@opennetworking.org> Mon Apr 02 01:09:01 2018 +0000
tree 7290b66f49905bb1779f079fc6c4fdb5f3f6b38a
parent 1a7e0c0a813a67036359d3ba1f5d61deb1e62d03

Better error handling

Change-Id: Iac5934a89b177f4e0207a6ecc2e2f0731aca115e

app/src/main/java/org/onosproject/segmentrouting/ArpHandler.java

diff --git a/app/src/main/java/org/onosproject/segmentrouting/ArpHandler.java b/app/src/main/java/org/onosproject/segmentrouting/ArpHandler.java
index b3a0aca..af62525 100644
--- a/app/src/main/java/org/onosproject/segmentrouting/ArpHandler.java
+++ b/app/src/main/java/org/onosproject/segmentrouting/ArpHandler.java
@@ -102,6 +102,11 @@
         // ARP request for router. Send ARP reply.
         if (isArpForRouter(pkt)) {
             MacAddress targetMac = config.getRouterMacForAGatewayIp(pkt.target().getIp4Address());
+            if (targetMac == null) {
+                log.warn("Router MAC of {} is not configured. Cannot handle ARP request from {}",
+                        pkt.inPort().deviceId(), pkt.sender());
+                return;
+            }
             sendResponse(pkt, targetMac, hostService);
         } else {
             // NOTE: Ignore ARP packets except those target for the router