commit 475fb2c14d0fcbc2ae7c2907f3db894f7dd2e950
author Kalhee Kim <Kalhee.Kim@nokia.com> Tue Jan 16 21:25:53 2018 +0000
committer Charles Chan <rascov@gmail.com> Fri Jan 19 13:20:17 2018 -0800
tree 1dbb234d55e7cc5ad3286351c3962f59a308bc3f
parent 40beb72eb5f107c1c3b753083ab382e729cde644

[CORD-2528] RIPngEntry handling byte

Change-Id: I0b5d1166a2576be879c209954bed15191f439eae

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

diff --git a/utils/misc/src/main/java/org/onlab/packet/RIPngEntry.java b/utils/misc/src/main/java/org/onlab/packet/RIPngEntry.java
index acc500c..cfe3b62 100644
--- a/utils/misc/src/main/java/org/onlab/packet/RIPngEntry.java
+++ b/utils/misc/src/main/java/org/onlab/packet/RIPngEntry.java
@@ -33,13 +33,13 @@
     public static final int OPT_CODE_LEN = 1;
     public static final int ENTRY_LEN = 20;
     public static final byte INFINITY_METRIC = 16;
-    public static final byte NEXTHOP_METRIC =  -128; // actually it is 0xFF
+    public static final int NEXTHOP_METRIC =  255; // actually it is 0xFF
 
     private final Logger log = getLogger(getClass());
     protected byte[] prefix; // 16 bytes
     protected short routeTag;
-    protected byte prefixLen;
-    protected byte metric;
+    protected int prefixLen;
+    protected int metric;
 
     @Override
     public byte[] serialize() {
@@ -47,8 +47,8 @@
         byteBuffer = ByteBuffer.allocate(ENTRY_LEN);
         byteBuffer.put(prefix);
         byteBuffer.putShort(routeTag);
-        byteBuffer.put(prefixLen);
-        byteBuffer.put(metric);
+        byteBuffer.put((byte) prefixLen);
+        byteBuffer.put((byte) metric);
         return byteBuffer.array();
     }
 
@@ -76,8 +76,8 @@
             ripngEntry.prefix = new byte[IpAddress.INET6_BYTE_LENGTH];
             bb.get(ripngEntry.prefix);
             ripngEntry.routeTag = bb.getShort();
-            ripngEntry.prefixLen = bb.get();
-            ripngEntry.metric = bb.get();
+            ripngEntry.prefixLen = 0xFF & bb.get();
+            ripngEntry.metric = 0xFF & bb.get();
             return ripngEntry;
         };
     }
@@ -148,7 +148,7 @@
     /**
      * @return the prefix length
      */
-    public byte getPrefixLen() {
+    public int getPrefixLen() {
         return this.prefixLen;
     }
 
@@ -156,7 +156,7 @@
      * @param prefixlen the prefix length to set
      * @return this
      */
-    public RIPngEntry setPrefixLen(final byte prefixlen) {
+    public RIPngEntry setPrefixLen(final int prefixlen) {
         this.prefixLen = prefixlen;
         return this;
     }
@@ -164,7 +164,7 @@
     /**
      * @return the metric
      */
-    public byte getMetric() {
+    public int getMetric() {
         return this.metric;
     }
 
@@ -172,7 +172,7 @@
      * @param metric the route metric to set
      * @return this
      */
-    public RIPngEntry setMetric(final byte metric) {
+    public RIPngEntry setMetric(final int metric) {
         this.metric = metric;
         return this;
     }
@@ -184,8 +184,7 @@
      */
     @Override
     public String toString() {
-        return "RIPngEntry [prefix=" + Arrays.toString(this.prefix)
-                + ", route tag=" + this.routeTag
+        return "RIPngEntry [prefix=" + Arrays.toString(this.prefix) + ", route tag=" + this.routeTag
                 + ", prefix length=" + this.prefixLen
                 + ", metric = " + this.metric + "]";
     }