X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflow-protocol-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fopenflowjava%2Fprotocol%2Fimpl%2Fdeserialization%2Ffactories%2FMultipartReplyMessageFactory.java;h=f03563bdf5dd50afe47127096eef7aadf1989789;hb=469250a7335c48547b0765d3c070c16c43c60589;hp=8a078d1b8d671db79ece2c8df120f05e1961a69e;hpb=8d785e650476b80189b86f6ad44c5a24d5ccbf6d;p=openflowjava.git

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactory.java
index 8a078d1b..f03563bd 100644
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactory.java
@@ -168,7 +168,6 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
     private static final byte PADDING_IN_METER_BAND_DSCP_HEADER = 3;
     private static final byte PADDING_IN_PORT_DESC_HEADER_01 = 4;
     private static final byte PADDING_IN_PORT_DESC_HEADER_02 = 2;
-    private static final byte MAX_PORT_NAME_LEN = 16;
     private static final int GROUP_TYPES = 4;
     private static final byte PADDING_IN_GROUP_DESC_HEADER = 1;
     private static final byte PADDING_IN_BUCKETS_HEADER = 4;
@@ -273,27 +272,28 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
         List<FlowStats> flowStatsList = new ArrayList<>();
         while (input.readableBytes() > 0) {
             FlowStatsBuilder flowStatsBuilder = new FlowStatsBuilder();
-            input.skipBytes(EncodeConstants.SIZE_OF_SHORT_IN_BYTES);
-            flowStatsBuilder.setTableId(input.readUnsignedByte());
-            input.skipBytes(PADDING_IN_FLOW_STATS_HEADER_01);
-            flowStatsBuilder.setDurationSec(input.readUnsignedInt());
-            flowStatsBuilder.setDurationNsec(input.readUnsignedInt());
-            flowStatsBuilder.setPriority(input.readUnsignedShort());
-            flowStatsBuilder.setIdleTimeout(input.readUnsignedShort());
-            flowStatsBuilder.setHardTimeout(input.readUnsignedShort());
-            flowStatsBuilder.setFlags(createFlowModFlagsFromBitmap(input.readShort()));
-            input.skipBytes(PADDING_IN_FLOW_STATS_HEADER_02);
-            byte[] cookie = new byte[Long.SIZE/Byte.SIZE];
-            input.readBytes(cookie);
-            flowStatsBuilder.setCookie(new BigInteger(cookie));
-            byte[] packetCount = new byte[Long.SIZE/Byte.SIZE];
-            input.readBytes(packetCount);
-            flowStatsBuilder.setPacketCount(new BigInteger(packetCount));
-            byte[] byteCount = new byte[Long.SIZE/Byte.SIZE];
-            input.readBytes(byteCount);
-            flowStatsBuilder.setByteCount(new BigInteger(byteCount));
-            flowStatsBuilder.setMatch(MatchDeserializer.createMatch(input));
-            flowStatsBuilder.setInstructions(InstructionsDeserializer.createInstructions(input, input.readableBytes()));
+            int flowRecordLength = input.readUnsignedShort();
+            ByteBuf subInput = input.readSlice(flowRecordLength - EncodeConstants.SIZE_OF_SHORT_IN_BYTES);
+            flowStatsBuilder.setTableId(subInput.readUnsignedByte());
+            subInput.skipBytes(PADDING_IN_FLOW_STATS_HEADER_01);
+            flowStatsBuilder.setDurationSec(subInput.readUnsignedInt());
+            flowStatsBuilder.setDurationNsec(subInput.readUnsignedInt());
+            flowStatsBuilder.setPriority(subInput.readUnsignedShort());
+            flowStatsBuilder.setIdleTimeout(subInput.readUnsignedShort());
+            flowStatsBuilder.setHardTimeout(subInput.readUnsignedShort());
+            flowStatsBuilder.setFlags(createFlowModFlagsFromBitmap(subInput.readUnsignedShort()));
+            subInput.skipBytes(PADDING_IN_FLOW_STATS_HEADER_02);
+            byte[] cookie = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
+            subInput.readBytes(cookie);
+            flowStatsBuilder.setCookie(new BigInteger(1, cookie));
+            byte[] packetCount = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
+            subInput.readBytes(packetCount);
+            flowStatsBuilder.setPacketCount(new BigInteger(1, packetCount));
+            byte[] byteCount = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
+            subInput.readBytes(byteCount);
+            flowStatsBuilder.setByteCount(new BigInteger(1, byteCount));
+            flowStatsBuilder.setMatch(MatchDeserializer.createMatch(subInput));
+            flowStatsBuilder.setInstructions(InstructionsDeserializer.createInstructions(subInput, subInput.readableBytes()));
             flowStatsList.add(flowStatsBuilder.build());
         }
         flowBuilder.setFlowStats(flowStatsList);
@@ -301,7 +301,7 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
         return caseBuilder.build();
     }
     
-    private static FlowModFlags createFlowModFlagsFromBitmap(short input){
+    private static FlowModFlags createFlowModFlagsFromBitmap(int input){
         final Boolean _oFPFFSENDFLOWREM = (input & (1 << 0)) != 0;
         final Boolean _oFPFFCHECKOVERLAP = (input & (1 << 1)) != 0;
         final Boolean _oFPFFRESETCOUNTS = (input & (1 << 2)) != 0; 
@@ -313,12 +313,12 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
     private static MultipartReplyAggregateCase setAggregate(ByteBuf input) {
         MultipartReplyAggregateCaseBuilder caseBuilder = new MultipartReplyAggregateCaseBuilder();
         MultipartReplyAggregateBuilder builder = new MultipartReplyAggregateBuilder();
-        byte[] packetCount = new byte[Long.SIZE/Byte.SIZE];
+        byte[] packetCount = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
         input.readBytes(packetCount);
-        builder.setPacketCount(new BigInteger(packetCount));
-        byte[] byteCount = new byte[Long.SIZE/Byte.SIZE];
+        builder.setPacketCount(new BigInteger(1, packetCount));
+        byte[] byteCount = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
         input.readBytes(byteCount);
-        builder.setByteCount(new BigInteger(byteCount));
+        builder.setByteCount(new BigInteger(1, byteCount));
         builder.setFlowCount(input.readUnsignedInt());
         input.skipBytes(PADDING_IN_AGGREGATE_HEADER);
         caseBuilder.setMultipartReplyAggregate(builder.build());
@@ -334,12 +334,12 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
             tableStatsBuilder.setTableId(input.readUnsignedByte());
             input.skipBytes(PADDING_IN_TABLE_HEADER);
             tableStatsBuilder.setActiveCount(input.readUnsignedInt());
-            byte[] lookupCount = new byte[Long.SIZE/Byte.SIZE];
+            byte[] lookupCount = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
             input.readBytes(lookupCount);
-            tableStatsBuilder.setLookupCount(new BigInteger(lookupCount));
-            byte[] matchedCount = new byte[Long.SIZE/Byte.SIZE];
+            tableStatsBuilder.setLookupCount(new BigInteger(1, lookupCount));
+            byte[] matchedCount = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
             input.readBytes(matchedCount);
-            tableStatsBuilder.setMatchedCount(new BigInteger(matchedCount));
+            tableStatsBuilder.setMatchedCount(new BigInteger(1, matchedCount));
             tableStatsList.add(tableStatsBuilder.build());
         }
         builder.setTableStats(tableStatsList);
@@ -387,11 +387,12 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
             TableFeaturesPropType type = TableFeaturesPropType.forValue(input.readUnsignedShort());
             builder.setType(type);
             int propertyLength = input.readUnsignedShort();
+            int paddingRemainder = propertyLength % EncodeConstants.PADDING;
             tableFeaturesLength -= propertyLength;
             if (type.equals(TableFeaturesPropType.OFPTFPTINSTRUCTIONS)
                     || type.equals(TableFeaturesPropType.OFPTFPTINSTRUCTIONSMISS)) {
                 InstructionRelatedTableFeaturePropertyBuilder insBuilder = new InstructionRelatedTableFeaturePropertyBuilder();
-                insBuilder.setInstructions(InstructionsDeserializer.createInstructions(input, propertyLength - COMMON_PROPERTY_LENGTH));
+                insBuilder.setInstructions(InstructionsDeserializer.createInstructionIds(input, propertyLength - COMMON_PROPERTY_LENGTH));
                 builder.addAugmentation(InstructionRelatedTableFeatureProperty.class, insBuilder.build());
             } else if (type.equals(TableFeaturesPropType.OFPTFPTNEXTTABLES)
                     || type.equals(TableFeaturesPropType.OFPTFPTNEXTTABLESMISS)) {
@@ -402,6 +403,7 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
                     NextTableIdsBuilder nextTableIdsBuilder = new NextTableIdsBuilder();
                     nextTableIdsBuilder.setTableId(input.readUnsignedByte());
                     ids.add(nextTableIdsBuilder.build());
+                    propertyLength--;
                 }
                 tableBuilder.setNextTableIds(ids);
                 builder.addAugmentation(NextTableRelatedTableFeatureProperty.class, tableBuilder.build());
@@ -410,7 +412,7 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
                     || type.equals(TableFeaturesPropType.OFPTFPTAPPLYACTIONS)
                     || type.equals(TableFeaturesPropType.OFPTFPTAPPLYACTIONSMISS)) {
                 ActionRelatedTableFeaturePropertyBuilder actionBuilder = new ActionRelatedTableFeaturePropertyBuilder();
-                actionBuilder.setActionsList(ActionsDeserializer.createActionsList(input, propertyLength - COMMON_PROPERTY_LENGTH));
+                actionBuilder.setActionsList(ActionsDeserializer.createActionIds(input, propertyLength - COMMON_PROPERTY_LENGTH));
                 builder.addAugmentation(ActionRelatedTableFeatureProperty.class, actionBuilder.build());
             } else if (type.equals(TableFeaturesPropType.OFPTFPTMATCH)
                     || type.equals(TableFeaturesPropType.OFPTFPTWILDCARDS)
@@ -419,19 +421,25 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
                     || type.equals(TableFeaturesPropType.OFPTFPTAPPLYSETFIELD)
                     || type.equals(TableFeaturesPropType.OFPTFPTAPPLYSETFIELDMISS)) {
                 OxmRelatedTableFeaturePropertyBuilder oxmBuilder = new OxmRelatedTableFeaturePropertyBuilder();
-                oxmBuilder.setMatchEntries(MatchDeserializer.createMatchEntries(input, propertyLength - COMMON_PROPERTY_LENGTH));
+                oxmBuilder.setMatchEntries(MatchDeserializer.createMatchIds(input, propertyLength - COMMON_PROPERTY_LENGTH));
                 builder.addAugmentation(OxmRelatedTableFeatureProperty.class, oxmBuilder.build());
             } else if (type.equals(TableFeaturesPropType.OFPTFPTEXPERIMENTER)
                     || type.equals(TableFeaturesPropType.OFPTFPTEXPERIMENTERMISS)) {
-                final byte EXPERIMENTER_PROPERTY_LENGTH = 12;
                 ExperimenterRelatedTableFeaturePropertyBuilder expBuilder = new ExperimenterRelatedTableFeaturePropertyBuilder();
                 expBuilder.setExperimenter(input.readUnsignedInt());
                 expBuilder.setExpType(input.readUnsignedInt());
-                byte[] data = new byte[propertyLength - EXPERIMENTER_PROPERTY_LENGTH];
-                input.readBytes(data);
-                expBuilder.setData(data);
+                int dataLength = propertyLength - COMMON_PROPERTY_LENGTH - 2 * EncodeConstants.SIZE_OF_INT_IN_BYTES;
+                if (dataLength > 0) {
+                    byte[] data = new byte[dataLength];
+                    input.readBytes(data);
+                    expBuilder.setData(data);
+                }
                 builder.addAugmentation(ExperimenterRelatedTableFeatureProperty.class, expBuilder.build());
             }
+            if (paddingRemainder != 0) {
+                input.skipBytes(EncodeConstants.PADDING - paddingRemainder);
+                tableFeaturesLength -= EncodeConstants.PADDING - paddingRemainder;
+            }
             properties.add(builder.build());
         }
         return properties;
@@ -445,42 +453,42 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
             PortStatsBuilder portStatsBuilder = new PortStatsBuilder();
             portStatsBuilder.setPortNo(input.readUnsignedInt());
             input.skipBytes(PADDING_IN_PORT_STATS_HEADER);
-            byte[] rxPackets = new byte[Long.SIZE/Byte.SIZE];
+            byte[] rxPackets = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
             input.readBytes(rxPackets);
-            portStatsBuilder.setRxPackets(new BigInteger(rxPackets));
-            byte[] txPackets = new byte[Long.SIZE/Byte.SIZE];
+            portStatsBuilder.setRxPackets(new BigInteger(1, rxPackets));
+            byte[] txPackets = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
             input.readBytes(txPackets);
-            portStatsBuilder.setTxPackets(new BigInteger(txPackets));
-            byte[] rxBytes = new byte[Long.SIZE/Byte.SIZE];
+            portStatsBuilder.setTxPackets(new BigInteger(1, txPackets));
+            byte[] rxBytes = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
             input.readBytes(rxBytes);
-            portStatsBuilder.setRxBytes(new BigInteger(rxBytes));
-            byte[] txBytes = new byte[Long.SIZE/Byte.SIZE];
+            portStatsBuilder.setRxBytes(new BigInteger(1, rxBytes));
+            byte[] txBytes = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
             input.readBytes(txBytes);
-            portStatsBuilder.setTxBytes(new BigInteger(txBytes));
-            byte[] rxDropped = new byte[Long.SIZE/Byte.SIZE];
+            portStatsBuilder.setTxBytes(new BigInteger(1, txBytes));
+            byte[] rxDropped = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
             input.readBytes(rxDropped);
-            portStatsBuilder.setRxDropped(new BigInteger(rxDropped));
-            byte[] txDropped = new byte[Long.SIZE/Byte.SIZE];
+            portStatsBuilder.setRxDropped(new BigInteger(1, rxDropped));
+            byte[] txDropped = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
             input.readBytes(txDropped);
-            portStatsBuilder.setTxDropped(new BigInteger(txDropped));
-            byte[] rxErrors = new byte[Long.SIZE/Byte.SIZE];
+            portStatsBuilder.setTxDropped(new BigInteger(1, txDropped));
+            byte[] rxErrors = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
             input.readBytes(rxErrors);
-            portStatsBuilder.setRxErrors(new BigInteger(rxErrors));
-            byte[] txErrors = new byte[Long.SIZE/Byte.SIZE];
+            portStatsBuilder.setRxErrors(new BigInteger(1, rxErrors));
+            byte[] txErrors = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
             input.readBytes(txErrors);
-            portStatsBuilder.setTxErrors(new BigInteger(txErrors));
-            byte[] rxFrameErr = new byte[Long.SIZE/Byte.SIZE];
+            portStatsBuilder.setTxErrors(new BigInteger(1, txErrors));
+            byte[] rxFrameErr = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
             input.readBytes(rxFrameErr);
-            portStatsBuilder.setRxFrameErr(new BigInteger(rxFrameErr));
-            byte[] rxOverErr = new byte[Long.SIZE/Byte.SIZE];
+            portStatsBuilder.setRxFrameErr(new BigInteger(1, rxFrameErr));
+            byte[] rxOverErr = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
             input.readBytes(rxOverErr);
-            portStatsBuilder.setRxOverErr(new BigInteger(rxOverErr));
-            byte[] rxCrcErr = new byte[Long.SIZE/Byte.SIZE];
+            portStatsBuilder.setRxOverErr(new BigInteger(1, rxOverErr));
+            byte[] rxCrcErr = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
             input.readBytes(rxCrcErr);
-            portStatsBuilder.setRxCrcErr(new BigInteger(rxCrcErr));
-            byte[] collisions = new byte[Long.SIZE/Byte.SIZE];
+            portStatsBuilder.setRxCrcErr(new BigInteger(1, rxCrcErr));
+            byte[] collisions = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
             input.readBytes(collisions);
-            portStatsBuilder.setCollisions(new BigInteger(collisions));
+            portStatsBuilder.setCollisions(new BigInteger(1, collisions));
             portStatsBuilder.setDurationSec(input.readUnsignedInt());
             portStatsBuilder.setDurationNsec(input.readUnsignedInt());
             portStatsList.add(portStatsBuilder.build());
@@ -498,15 +506,15 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
             QueueStatsBuilder queueStatsBuilder = new QueueStatsBuilder();
             queueStatsBuilder.setPortNo(input.readUnsignedInt());
             queueStatsBuilder.setQueueId(input.readUnsignedInt());
-            byte[] txBytes = new byte[Long.SIZE/Byte.SIZE];
+            byte[] txBytes = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
             input.readBytes(txBytes);
-            queueStatsBuilder.setTxBytes(new BigInteger(txBytes));
-            byte[] txPackets = new byte[Long.SIZE/Byte.SIZE];
+            queueStatsBuilder.setTxBytes(new BigInteger(1, txBytes));
+            byte[] txPackets = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
             input.readBytes(txPackets);
-            queueStatsBuilder.setTxPackets(new BigInteger(txPackets));
-            byte[] txErrors = new byte[Long.SIZE/Byte.SIZE];
+            queueStatsBuilder.setTxPackets(new BigInteger(1, txPackets));
+            byte[] txErrors = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
             input.readBytes(txErrors);
-            queueStatsBuilder.setTxErrors(new BigInteger(txErrors));
+            queueStatsBuilder.setTxErrors(new BigInteger(1, txErrors));
             queueStatsBuilder.setDurationSec(input.readUnsignedInt());
             queueStatsBuilder.setDurationNsec(input.readUnsignedInt());
             queueStatsList.add(queueStatsBuilder.build());
@@ -527,24 +535,24 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
             groupStatsBuilder.setGroupId(new GroupId(input.readUnsignedInt()));
             groupStatsBuilder.setRefCount(input.readUnsignedInt());
             input.skipBytes(PADDING_IN_GROUP_HEADER_02);
-            byte[] packetCount = new byte[Long.SIZE/Byte.SIZE];
+            byte[] packetCount = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
             input.readBytes(packetCount);
-            groupStatsBuilder.setPacketCount(new BigInteger(packetCount));
-            byte[] byteCount = new byte[Long.SIZE/Byte.SIZE];
+            groupStatsBuilder.setPacketCount(new BigInteger(1, packetCount));
+            byte[] byteCount = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
             input.readBytes(byteCount);
-            groupStatsBuilder.setByteCount(new BigInteger(byteCount));
+            groupStatsBuilder.setByteCount(new BigInteger(1, byteCount));
             groupStatsBuilder.setDurationSec(input.readUnsignedInt());
             groupStatsBuilder.setDurationNsec(input.readUnsignedInt());
             int actualLength = GROUP_BODY_LENGTH;
             List<BucketStats> bucketStatsList = new ArrayList<>();
             while (actualLength < bodyLength) {
                 BucketStatsBuilder bucketStatsBuilder = new BucketStatsBuilder();
-                byte[] packetCountBucket = new byte[Long.SIZE/Byte.SIZE];
+                byte[] packetCountBucket = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
                 input.readBytes(packetCountBucket);
-                bucketStatsBuilder.setPacketCount(new BigInteger(packetCountBucket));
-                byte[] byteCountBucket = new byte[Long.SIZE/Byte.SIZE];
+                bucketStatsBuilder.setPacketCount(new BigInteger(1, packetCountBucket));
+                byte[] byteCountBucket = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
                 input.readBytes(byteCountBucket);
-                bucketStatsBuilder.setByteCount(new BigInteger(byteCountBucket));
+                bucketStatsBuilder.setByteCount(new BigInteger(1, byteCountBucket));
                 bucketStatsList.add(bucketStatsBuilder.build());
                 actualLength += BUCKET_COUNTER_LENGTH;
             } 
@@ -593,24 +601,24 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
             int meterStatsBodyLength = input.readUnsignedShort();
             input.skipBytes(PADDING_IN_METER_STATS_HEADER);
             meterStatsBuilder.setFlowCount(input.readUnsignedInt());
-            byte[] packetInCount = new byte[Long.SIZE/Byte.SIZE];
+            byte[] packetInCount = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
             input.readBytes(packetInCount);
-            meterStatsBuilder.setPacketInCount(new BigInteger(packetInCount));
-            byte[] byteInCount = new byte[Long.SIZE/Byte.SIZE];
+            meterStatsBuilder.setPacketInCount(new BigInteger(1, packetInCount));
+            byte[] byteInCount = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
             input.readBytes(byteInCount);
-            meterStatsBuilder.setByteInCount(new BigInteger(byteInCount));
+            meterStatsBuilder.setByteInCount(new BigInteger(1, byteInCount));
             meterStatsBuilder.setDurationSec(input.readUnsignedInt());
             meterStatsBuilder.setDurationNsec(input.readUnsignedInt());
             int actualLength = METER_BODY_LENGTH;
             List<MeterBandStats> meterBandStatsList = new ArrayList<>();
             while (actualLength < meterStatsBodyLength) {
                 MeterBandStatsBuilder meterBandStatsBuilder = new MeterBandStatsBuilder();
-                byte[] packetBandCount = new byte[Long.SIZE/Byte.SIZE];
+                byte[] packetBandCount = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
                 input.readBytes(packetBandCount);
-                meterBandStatsBuilder.setPacketBandCount(new BigInteger(packetBandCount));
-                byte[] byteBandCount = new byte[Long.SIZE/Byte.SIZE];
+                meterBandStatsBuilder.setPacketBandCount(new BigInteger(1, packetBandCount));
+                byte[] byteBandCount = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
                 input.readBytes(byteBandCount);
-                meterBandStatsBuilder.setByteBandCount(new BigInteger(byteBandCount));
+                meterBandStatsBuilder.setByteBandCount(new BigInteger(1, byteBandCount));
                 meterBandStatsList.add(meterBandStatsBuilder.build());
                 actualLength += METER_BAND_STATS_LENGTH;
             }
@@ -708,10 +716,7 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
             input.readBytes(hwAddress);
             portsBuilder.setHwAddr(new MacAddress(ByteBufUtils.macAddressToString(hwAddress)));
             input.skipBytes(PADDING_IN_PORT_DESC_HEADER_02);
-            byte[] portNameBytes = new byte[MAX_PORT_NAME_LEN];
-            input.readBytes(portNameBytes);
-            String portName = new String(portNameBytes);
-            portsBuilder.setName(portName.trim());
+            portsBuilder.setName(ByteBufUtils.decodeNullTerminatedString(input, EncodeConstants.MAX_PORT_NAME_LENGTH));
             portsBuilder.setConfig(createPortConfig(input.readUnsignedInt()));
             portsBuilder.setState(createPortState(input.readUnsignedInt()));
             portsBuilder.setCurrentFeatures(createPortFeatures(input.readUnsignedInt()));
@@ -759,8 +764,8 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
         final Boolean _autoneg = ((input) & (1<<13)) != 0;
         final Boolean _pause = ((input) & (1<<14)) != 0;
         final Boolean _pauseAsym = ((input) & (1<<15)) != 0;
-        return new PortFeatures(_10mbHd, _10mbFd, _100mbHd, _100mbFd, _1gbHd, _1gbFd, _10gbFd,
-                _40gbFd, _100gbFd, _1tbFd, _other, _copper, _fiber, _autoneg, _pause, _pauseAsym);
+        return new PortFeatures(_100gbFd, _100mbFd, _100mbHd, _10gbFd, _10mbFd, _10mbHd, _1gbFd,
+                _1gbHd, _1tbFd, _40gbFd, _autoneg, _copper, _fiber, _other, _pause, _pauseAsym);
     }
     
     private static MultipartReplyGroupFeaturesCase setGroupFeatures(ByteBuf rawMessage) {