commit 29813b03311264073d4dccc6ef4773a8921b3b21
author Charles Chan <rascov@gmail.com> Fri Apr 13 14:03:13 2018 -0400
committer Thomas Vachuska <tom@opennetworking.org> Thu Apr 19 21:42:26 2018 +0000
tree 144e0c672e310228165014eb8d847d25585fa80e
parent 62cd4490ad9dc8038fdb06724dba81833b851afe

Implement RFC6355 DUID_UUID

Change-Id: Ic1fa1ca8483437498787f84bf0b2b99fb3c12d70

utils/misc/src/main/java/org/onlab/packet/dhcp/Dhcp6Duid.java

diff --git a/utils/misc/src/main/java/org/onlab/packet/dhcp/Dhcp6Duid.java b/utils/misc/src/main/java/org/onlab/packet/dhcp/Dhcp6Duid.java
index 80675e2..63be1f0 100644
--- a/utils/misc/src/main/java/org/onlab/packet/dhcp/Dhcp6Duid.java
+++ b/utils/misc/src/main/java/org/onlab/packet/dhcp/Dhcp6Duid.java
@@ -28,10 +28,13 @@
     private static final int DEFAULT_LLT_LEN = 8;
     private static final int DEFAULT_EN_LEN = 6;
     private static final int DEFAULT_LL_LEN = 4;
+    private static final int DEFAULT_UUID_LEN = 2;
+
     public enum DuidType {
         DUID_LLT((short) 1),
         DUID_EN((short) 2),
-        DUID_LL((short) 3);
+        DUID_LL((short) 3),
+        DUID_UUID((short) 4); // RFC6355
 
         private short value;
         DuidType(short value) {
@@ -50,6 +53,8 @@
                     return DUID_EN;
                 case 3:
                     return DUID_LL;
+                case 4:
+                    return DUID_UUID;
                 default:
                     throw new IllegalArgumentException("Unknown type: " + type);
             }
@@ -67,6 +72,9 @@
     private int enterpriseNumber;
     private byte[] identifier;
 
+    // fields for DUID_UUID
+    private byte[] uuid;
+
     public DuidType getDuidType() {
         return duidType;
     }
@@ -96,7 +104,7 @@
     }
 
     public void setLinkLayerAddress(byte[] linkLayerAddress) {
-        this.linkLayerAddress = linkLayerAddress;
+        this.linkLayerAddress = Arrays.copyOf(linkLayerAddress, linkLayerAddress.length);
     }
 
     public int getEnterpriseNumber() {
@@ -112,7 +120,15 @@
     }
 
     public void setIdentifier(byte[] identifier) {
-        this.identifier = identifier;
+        this.identifier = Arrays.copyOf(identifier, identifier.length);
+    }
+
+    public byte[] getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(byte[] uuid) {
+        this.uuid = Arrays.copyOf(uuid, uuid.length);
     }
 
     @Override
@@ -138,6 +154,11 @@
                 byteBuffer.putShort(hardwareType);
                 byteBuffer.put(linkLayerAddress);
                 break;
+            case DUID_UUID:
+                byteBuffer = ByteBuffer.allocate(DEFAULT_UUID_LEN + uuid.length);
+                byteBuffer.putShort(duidType.value);
+                byteBuffer.put(linkLayerAddress);
+                break;
             default:
                 throw new IllegalArgumentException("Unknown duidType: " + duidType.toString());
         }
@@ -170,6 +191,10 @@
                     duid.linkLayerAddress = new byte[length - DEFAULT_LL_LEN];
                     byteBuffer.get(duid.linkLayerAddress);
                     break;
+                case DUID_UUID:
+                    duid.uuid = new byte[length - DEFAULT_LL_LEN];
+                    byteBuffer.get(duid.uuid);
+                    break;
                 default:
                     throw new IllegalArgumentException("Unknown type: " + duidType);
             }
@@ -198,6 +223,10 @@
                 helper.add("hardwareType", hardwareType);
                 helper.add("linkLayerAddress", Arrays.toString(linkLayerAddress));
                 break;
+            case DUID_UUID:
+                helper.add("type", "DUID_UUID");
+                helper.add("uuid", Arrays.toString(uuid));
+                break;
             default:
                 helper.add("type", "Unknown");
         }