commit 2095dc698b68afc6df7b812bd3a3c66403e61e07
author Amit Ghosh <aghosh@radisys.com> Mon Sep 25 20:56:55 2017 +0100
committer David Bainbridge <dbainbri@ciena.com> Tue Sep 26 08:59:45 2017 -0700
tree e85eeb2316b6b883915203cf35438a86fdfcfcfc
parent e5e0a00d5a318ffb334906b5f92f56b677e156fe

VOL-432 : NPE in ONOS dhcpl2relay app
Also some other fixes found during testing

Change-Id: I0dd047827e5144a36717e09f5c5dccf9d3371589

src/main/java/org/opencord/dhcpl2relay/DhcpL2Relay.java

diff --git a/src/main/java/org/opencord/dhcpl2relay/DhcpL2Relay.java b/src/main/java/org/opencord/dhcpl2relay/DhcpL2Relay.java
index 4f801cf..5516086 100755
--- a/src/main/java/org/opencord/dhcpl2relay/DhcpL2Relay.java
+++ b/src/main/java/org/opencord/dhcpl2relay/DhcpL2Relay.java
@@ -73,6 +73,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.nio.ByteBuffer;
+import java.util.Arrays;
 import java.util.Dictionary;
 import java.util.List;
 import java.util.Map;
@@ -136,7 +137,7 @@
     protected boolean option82 = true;
 
     @Property(name = "enableDhcpBroadcastReplies", boolValue = false,
-            label = "Add option 82 to relayed packets")
+            label = "Ask the DHCP Server to send back replies as L2 broadcast")
     protected boolean enableDhcpBroadcastReplies = false;
 
     private DhcpRelayPacketProcessor dhcpRelayPacketProcessor =
@@ -199,6 +200,11 @@
         if (o != null) {
             option82 = o;
         }
+
+        o = Tools.isPropertyEnabled(properties, "enableDhcpBroadcastReplies");
+        if (o != null) {
+            enableDhcpBroadcastReplies = o;
+        }
     }
 
     /**
@@ -553,6 +559,10 @@
 
             MacAddress dstMac = valueOf(dhcpPayload.getClientHardwareAddress());
             ConnectPoint subsCp = getConnectPointOfClient(dstMac);
+            // If we can't find the subscriber, can't process further
+            if (subsCp == null) {
+                return null;
+            }
             // if it's an ACK packet store the information for display purpose
             if (getDhcpPacketType(dhcpPayload) == DHCPPacketType.DHCPACK) {
 
@@ -566,7 +576,12 @@
 
                     String circuitId = "None";
                     if (circuitIds.size() == 1) {
-                        circuitId = circuitIds.get(0).getData().toString();
+                        byte[] array = circuitIds.get(0).getData();
+
+                        try {
+                            // we leave the first two bytes as they are the id and length
+                            circuitId = new String(Arrays.copyOfRange(array, 2, array.length), "UTF-8");
+                        } catch (Exception e) { }
                     }
 
                     IpAddress ip = IpAddress.valueOf(dhcpPayload.getYourIPAddress());