fixed length of match entry for ethernet match (mac-address)

Change-Id: I59de33431401add466d0926dc928f8709c0e02b3
Signed-off-by: Michal Rehak <mirehak@cisco.com>

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/MatchSerializer.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/MatchSerializer.java
index 6e3edcf00149bc0170eb68c2eada21413df838da..cbaeb88c5f7c3f5c16aa92e3282eb7ca17ed1ec4 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/MatchSerializer.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/MatchSerializer.java
@@ -92,7 +92,8 @@ import org.slf4j.LoggerFactory;
  * @author timotej.kubas\r
  */\r
 public class MatchSerializer {\r
-    \r
+    /** MAC-address = 48b = 6B */\r
+    private static final int ETHERNET_MATCH_LENGTH = 6;\r
     private static final Logger LOGGER = LoggerFactory.getLogger(MatchSerializer.class);\r
 \r
     /**\r
@@ -402,12 +403,12 @@ public class MatchSerializer {
             fieldValue = fieldValue | 1;\r
             out.writeByte(fieldValue);\r
             byte[] mask = entry.getAugmentation(MaskMatchEntry.class).getMask();\r
-            out.writeByte((Integer.SIZE + Short.SIZE) / Byte.SIZE + mask.length); // 48 b + mask [OF 1.3.2 spec]\r
+            out.writeByte(ETHERNET_MATCH_LENGTH + mask.length); // 48 b + mask [OF 1.3.2 spec]\r
             out.writeBytes(entry.getAugmentation(MacAddressMatchEntry.class).getMacAddress().getValue().getBytes());\r
             out.writeBytes(mask);\r
         } else {\r
             out.writeByte(fieldValue);\r
-            out.writeByte((Integer.SIZE + Short.SIZE) / Byte.SIZE); // 48 b [OF 1.3.2 spec]\r
+            out.writeByte(ETHERNET_MATCH_LENGTH); // 48 b [OF 1.3.2 spec]\r
             out.writeBytes(entry.getAugmentation(MacAddressMatchEntry.class).getMacAddress().getValue().getBytes());\r
         }\r
     }\r
@@ -545,9 +546,9 @@ public class MatchSerializer {
                 } else if (field.isAssignableFrom(Metadata.class)) {\r
                     length += computePossibleMaskEntryLength(entry, Long.SIZE / Byte.SIZE);\r
                 } else if (field.isAssignableFrom(EthDst.class)) {\r
-                    length += computePossibleMaskEntryLength(entry, Long.SIZE / Byte.SIZE);\r
+                    length += computePossibleMaskEntryLength(entry, ETHERNET_MATCH_LENGTH);\r
                 } else if (field.isAssignableFrom(EthSrc.class)) {\r
-                    length += computePossibleMaskEntryLength(entry, Long.SIZE / Byte.SIZE);\r
+                    length += computePossibleMaskEntryLength(entry, ETHERNET_MATCH_LENGTH);\r
                 } else if (field.isAssignableFrom(EthType.class)) {\r
                     length += Short.SIZE / Byte.SIZE;\r
                 } else if (field.isAssignableFrom(VlanVid.class)) {\r