commit 2a65575cf89829aca8dc4684dcf3669d630366a0
author Jonathan Hart <jono@onlab.us> Tue Apr 07 16:46:33 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Mon Jun 29 16:31:11 2015 +0000
tree ec89e0607a078d1a5e02b645dbae4d77bd2e3076
parent 08e457ab8ba31e4f91f936d28ce0fa8b91ce94ef

Improve the resiliency of the packet deserialization code.

Packet deserializers now check for malformed input while reading the byte
stream. Deserializers are re-implemented as functions that take a byte array
and return a packet object. The old IPacket.deserialize(...) methods have been
deprecated with the goal of eventually moving to immutable packet objects.
Unit tests have been implemented for all Deserializer functions.

ONOS-1589

Change-Id: I9073d5e6e7991e15d43830cfd810989256b71c56

utils/misc/src/main/java/org/onlab/packet/ndp/Redirect.java

diff --git a/utils/misc/src/main/java/org/onlab/packet/ndp/Redirect.java b/utils/misc/src/main/java/org/onlab/packet/ndp/Redirect.java
index 0515869..c3f46dd 100644
--- a/utils/misc/src/main/java/org/onlab/packet/ndp/Redirect.java
+++ b/utils/misc/src/main/java/org/onlab/packet/ndp/Redirect.java
@@ -16,6 +16,7 @@
 package org.onlab.packet.ndp;
 
 import org.onlab.packet.BasePacket;
+import org.onlab.packet.Deserializer;
 import org.onlab.packet.IPacket;
 import org.onlab.packet.Ip6Address;
 
@@ -23,6 +24,8 @@
 import java.util.Arrays;
 import java.util.List;
 
+import static org.onlab.packet.PacketUtils.checkInput;
+
 /**
  * Implements ICMPv6 Redirect packet format. (RFC 4861)
  */
@@ -188,4 +191,33 @@
         }
         return true;
     }
+
+    /**
+     * Deserializer function for redirect packets.
+     *
+     * @return deserializer function
+     */
+    public static Deserializer<Redirect> deserializer() {
+        return (data, offset, length) -> {
+            checkInput(data, offset, length, HEADER_LENGTH);
+
+            Redirect redirect = new Redirect();
+
+            ByteBuffer bb = ByteBuffer.wrap(data, offset, length);
+
+            bb.getInt();
+
+            bb.get(redirect.targetAddress, 0, Ip6Address.BYTE_LENGTH);
+            bb.get(redirect.destinationAddress, 0, Ip6Address.BYTE_LENGTH);
+
+            NeighborDiscoveryOptions options = NeighborDiscoveryOptions.deserializer()
+                    .deserialize(data, bb.position(), bb.limit() - bb.position());
+
+            for (NeighborDiscoveryOptions.Option option : options.options()) {
+                redirect.addOption(option.type(), option.data());
+            }
+
+            return redirect;
+        };
+    }
 }