From 3a141e17a1b241fb8c0441010c3194baba385373 Mon Sep 17 00:00:00 2001
From: Michal Polkorab <michal.polkorab@pantheon.sk>
Date: Thu, 5 Dec 2013 20:47:20 +0100
Subject: [PATCH] MacAddress (de)serialization for OF1.0

Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
---
 .../OF10FeaturesReplyMessageFactory.java       | 10 ++++------
 .../OF10PortStatusMessageFactory.java          | 10 ++++------
 .../impl/util/OF10ActionsDeserializer.java     | 10 +++-------
 .../impl/util/OF10MatchDeserializer.java       | 18 ++++++------------
 4 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FeaturesReplyMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FeaturesReplyMessageFactory.java
index a73466bb..e68de8ba 100644
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FeaturesReplyMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FeaturesReplyMessageFactory.java
@@ -6,6 +6,7 @@ import io.netty.buffer.ByteBuf;
 import java.math.BigInteger;
 
 import org.opendaylight.openflowjava.protocol.impl.deserialization.OFDeserializer;
+import org.opendaylight.openflowjava.protocol.impl.util.ByteBufUtils;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ActionTypeV10;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.CapabilitiesV10;
@@ -93,12 +94,9 @@ public class OF10FeaturesReplyMessageFactory implements OFDeserializer<GetFeatur
     
     private static void deserializePort(ByteBuf rawMessage, GetFeaturesOutputBuilder builder) {
         builder.setPortNo((long) rawMessage.readUnsignedShort());
-        StringBuffer macToString = new StringBuffer();
-        for(int i = 0; i < MAC_ADDRESS_LENGTH; i++){
-            short mac = rawMessage.readUnsignedByte();
-            macToString.append(String.format("%02X", mac));
-        }
-        builder.setHwAddr(new MacAddress(macToString.toString()));
+        byte[] address = new byte[MAC_ADDRESS_LENGTH];
+        rawMessage.readBytes(address);
+        builder.setHwAddr(new MacAddress(ByteBufUtils.macAddressToString(address)));
         byte[] name = new byte[MAX_PORT_NAME_LENGTH];
         rawMessage.readBytes(name);
         builder.setName(name.toString());
diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PortStatusMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PortStatusMessageFactory.java
index 9275f3c3..16b86978 100644
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PortStatusMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PortStatusMessageFactory.java
@@ -4,6 +4,7 @@ package org.opendaylight.openflowjava.protocol.impl.deserialization.factories;
 import io.netty.buffer.ByteBuf;
 
 import org.opendaylight.openflowjava.protocol.impl.deserialization.OFDeserializer;
+import org.opendaylight.openflowjava.protocol.impl.util.ByteBufUtils;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortConfigV10;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortFeaturesV10;
@@ -91,12 +92,9 @@ public class OF10PortStatusMessageFactory implements OFDeserializer<PortStatusMe
     
     private static void deserializePort(ByteBuf rawMessage, PortStatusMessageBuilder builder) {
         builder.setPortNo((long) rawMessage.readUnsignedShort());
-        StringBuffer macToString = new StringBuffer();
-        for(int i = 0; i < MAC_ADDRESS_LENGTH; i++){
-            short mac = rawMessage.readUnsignedByte();
-            macToString.append(String.format("%02X", mac));
-        }
-        builder.setHwAddr(new MacAddress(macToString.toString()));
+        byte[] address = new byte[MAC_ADDRESS_LENGTH];
+        rawMessage.readBytes(address);
+        builder.setHwAddr(new MacAddress(ByteBufUtils.macAddressToString(address)));
         byte[] name = new byte[MAX_PORT_NAME_LENGTH];
         rawMessage.readBytes(name);
         builder.setName(name.toString());
diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/OF10ActionsDeserializer.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/OF10ActionsDeserializer.java
index f406b956..5fd546df 100644
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/OF10ActionsDeserializer.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/OF10ActionsDeserializer.java
@@ -177,13 +177,9 @@ public class OF10ActionsDeserializer {
         final byte MAC_ADDRESS_LENGTH = 6;
         final byte PADDING_IN_SET_DL_ACTION = 6;
         DlAddressActionBuilder dlBuilder = new DlAddressActionBuilder();
-        short mac = 0;
-        StringBuffer macAddress = new StringBuffer();
-        for(int i = 0; i < MAC_ADDRESS_LENGTH; i++){
-            mac = input.readUnsignedByte();
-            macAddress.append(String.format("%02X", mac));
-        }
-        dlBuilder.setDlAddress(new MacAddress(macAddress.toString()));
+        byte[] address = new byte[MAC_ADDRESS_LENGTH];
+        input.readBytes(address);
+        dlBuilder.setDlAddress(new MacAddress(ByteBufUtils.macAddressToString(address)));
         input.skipBytes(PADDING_IN_SET_DL_ACTION);
         return dlBuilder.build();
     }
diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/OF10MatchDeserializer.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/OF10MatchDeserializer.java
index 216cbd3e..c6643236 100644
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/OF10MatchDeserializer.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/OF10MatchDeserializer.java
@@ -33,18 +33,12 @@ public abstract class OF10MatchDeserializer {
         MatchV10Builder builder = new MatchV10Builder();
         builder.setWildcards(rawMessage.readUnsignedInt());
         builder.setInPort(rawMessage.readUnsignedShort());
-        StringBuffer dlSrc = new StringBuffer();
-        for(int i = 0; i < MAC_ADDRESS_LENGTH; i++){
-            short mac = rawMessage.readUnsignedByte();
-            dlSrc.append(String.format("%02X", mac));
-        }
-        builder.setDlSrc(new MacAddress(dlSrc.toString()));
-        StringBuffer dlDst = new StringBuffer();
-        for(int i = 0; i < MAC_ADDRESS_LENGTH; i++){
-            short mac = rawMessage.readUnsignedByte();
-            dlDst.append(String.format("%02X", mac));
-        }
-        builder.setDlDst(new MacAddress(dlDst.toString()));
+        byte[] dlSrc = new byte[MAC_ADDRESS_LENGTH];
+        rawMessage.readBytes(dlSrc);
+        builder.setDlSrc(new MacAddress(ByteBufUtils.macAddressToString(dlSrc)));
+        byte[] dlDst = new byte[MAC_ADDRESS_LENGTH];
+        rawMessage.readBytes(dlDst);
+        builder.setDlDst(new MacAddress(ByteBufUtils.macAddressToString(dlDst)));
         builder.setDlVlan(rawMessage.readUnsignedShort());
         builder.setDlVlanPcp(rawMessage.readUnsignedByte());
         rawMessage.skipBytes(PADDING_IN_MATCH);
-- 
2.36.6