commit 9148d2d15df19ee306e3a93441438ad07a01e815
author Charles M.C. Chan <rascov@gmail.com> Mon Apr 27 03:36:39 2015 +0800
committer Gerrit Code Review <gerrit@onlab.us> Sun Apr 26 21:43:54 2015 +0000
tree fffebd193361c0348d0301f5d6ac5bb4728cb366
parent 0f6d0b81cf3d8ca6fb8c7fc431f0902ea9692bcb

Bugfix for gerrit #3377

NDP packets, especially NS/NA packets, are not resolved correctly in my previous commit #3377.
As a result, the IPv6 addresses of normal hosts are not recorded by HostLocationProvider.

Change-Id: Id44485902d9b593c2a8aa376e405f548774203d2

providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java

diff --git a/providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java b/providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java
index e320eda..11888fd 100644
--- a/providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java
+++ b/providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java
@@ -321,15 +321,16 @@
                 }
 
                 // Neighbor Discovery Protocol
-                if (pkt instanceof ICMP6) {
+                pkt = pkt.getPayload();
+                if (pkt != null && pkt instanceof ICMP6) {
                     pkt = pkt.getPayload();
                     // RouterSolicitation, RouterAdvertisement
-                    if (pkt instanceof RouterAdvertisement ||
-                        pkt instanceof RouterSolicitation) {
+                    if (pkt != null && (pkt instanceof RouterAdvertisement ||
+                        pkt instanceof RouterSolicitation)) {
                         return;
                     }
-                    if (pkt instanceof NeighborSolicitation ||
-                        pkt instanceof NeighborAdvertisement) {
+                    if (pkt != null && (pkt instanceof NeighborSolicitation ||
+                        pkt instanceof NeighborAdvertisement)) {
                         // Duplicate Address Detection
                         if (ip.isZero()) {
                             return;