commit c6aef928c1c15301a2a32904d699d559586dca0a
author Pavlin Radoslavov <pavlin@onlab.us> Fri Feb 27 10:23:04 2015 -0800
committer Pavlin Radoslavov <pavlin@onlab.us> Fri Feb 27 10:23:04 2015 -0800
tree 1b104cc1fc22777f7909ceff0df5a6c0d95e2921
parent eeb95106f8db22b42da0b11f6a56bb387ee61742

Fix a bug when serliazing ICMPv6 packets and the IPv6 packet contains
hop-by-hop options.

This fixes ONOS-1201

Change-Id: I736f96268695dd7e74c99631f25273d1b34d8a6c

utils/misc/src/main/java/org/onlab/packet/ICMP6.java

diff --git a/utils/misc/src/main/java/org/onlab/packet/ICMP6.java b/utils/misc/src/main/java/org/onlab/packet/ICMP6.java
index fbbc9ef..03d3102 100644
--- a/utils/misc/src/main/java/org/onlab/packet/ICMP6.java
+++ b/utils/misc/src/main/java/org/onlab/packet/ICMP6.java
@@ -18,6 +18,7 @@
 
 package org.onlab.packet;
 
+import org.onlab.packet.ipv6.IExtensionHeader;
 import org.onlab.packet.ndp.NeighborAdvertisement;
 import org.onlab.packet.ndp.NeighborSolicitation;
 import org.onlab.packet.ndp.Redirect;
@@ -53,6 +54,8 @@
     protected byte icmpCode;
     protected short checksum;
 
+    private static final byte[] ZERO_ADDRESS = new byte[Ip6Address.BYTE_LENGTH];
+
     /**
      * Gets ICMP6 type.
      *
@@ -138,8 +141,21 @@
         // Creating IPv6 Pseudo Header for checksum calculation according
         // to RFC 4443 and RFC 2460
         //
-        bbChecksum.put(((IPv6) this.parent).getSourceAddress());
-        bbChecksum.put(((IPv6) this.parent).getDestinationAddress());
+        IPv6 ipv6Parent = null;
+        for (IPacket p = this.parent; p != null; p = p.getParent()) {
+            if (p instanceof IPv6) {
+                ipv6Parent = (IPv6) p;
+                break;
+            }
+        }
+        if (ipv6Parent != null) {
+            bbChecksum.put(((IPv6) ipv6Parent).getSourceAddress());
+            bbChecksum.put(((IPv6) ipv6Parent).getDestinationAddress());
+        } else {
+            // NOTE: IPv6 source and destination addresses unknown. Use zeroes.
+            bbChecksum.put(ZERO_ADDRESS);
+            bbChecksum.put(ZERO_ADDRESS);
+        }
         bbChecksum.putInt(HEADER_LENGTH + payloadLength);
         bbChecksum.put((byte) 0);
         bbChecksum.put((byte) 0);
@@ -158,8 +174,12 @@
             bbChecksum.put(payloadData);
         }
 
-        if (this.parent != null && this.parent instanceof IPv6) {
-            ((IPv6) this.parent).setNextHeader(IPv6.PROTOCOL_ICMP6);
+        if (this.parent != null) {
+            if (this.parent instanceof IPv6) {
+                ((IPv6) this.parent).setNextHeader(IPv6.PROTOCOL_ICMP6);
+            } else if (this.parent instanceof IExtensionHeader) {
+                ((IExtensionHeader) this.parent).setNextHeader(IPv6.PROTOCOL_ICMP6);
+            }
         }
 
         // compute checksum if needed