Merge "Quickfix - Vlan-vid match entry"

[openflowjava.git] / openflow-protocol-impl / src / main / java / org / opendaylight / openflowjava / protocol / impl / util / MatchSerializer.java

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 bfa45c81664997be3bf7366970c3db2c3070ef0f..bde832c0206aae3ab089da9dd8e00c51cbd5e56e 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
@@ -158,7 +158,7 @@ public class MatchSerializer {
             out.writeShort(EXPERIMENTER_CLASS_CODE);\r
         }\r
     }\r
-    \r
+\r
     private static void encodeRest(MatchEntries entry, ByteBuf out) {\r
         int fieldValue = 0;\r
         Class<? extends MatchField> field = entry.getOxmMatchField();\r
@@ -375,13 +375,13 @@ public class MatchSerializer {
             }\r
         }\r
     }\r
-    \r
+\r
     private static void writeOxmFieldAndLength(ByteBuf out, int fieldValue, int length) {\r
         int fieldAndMask = fieldValue << 1;\r
         out.writeByte(fieldAndMask);\r
         out.writeByte(length);\r
     }\r
-    \r
+\r
     private static void writeMetadataRelatedEntry(MatchEntries entry, ByteBuf out, int value) {\r
         int fieldValue = value << 1;\r
         if (entry.isHasMask()) {\r
@@ -397,7 +397,7 @@ public class MatchSerializer {
             out.writeBytes(entry.getAugmentation(MetadataMatchEntry.class).getMetadata());\r
         }\r
     }\r
-    \r
+\r
     private static void writeMacAddressRelatedEntry(MatchEntries entry, ByteBuf out, int value) {\r
         int fieldValue = value << 1;\r
         if (entry.isHasMask()) {\r
@@ -415,7 +415,7 @@ public class MatchSerializer {
             out.writeBytes(ByteBufUtils.macAddressToBytes(macAddress));\r
         }\r
     }\r
-    \r
+\r
     private static void writeIpv4AddressRelatedEntry(MatchEntries entry, ByteBuf out, int value) {\r
         int fieldValue = value << 1;\r
         if (entry.isHasMask()) {\r
@@ -431,7 +431,7 @@ public class MatchSerializer {
             writeIpv4Address(entry, out);\r
         }\r
     }\r
-    \r
+\r
     private static void writeIpv4Address(MatchEntries entry, ByteBuf out) {\r
         String[] addressGroups = entry.getAugmentation(Ipv4AddressMatchEntry.class).getIpv4Address().getValue().split("\\.");\r
         for (int i = 0; i < addressGroups.length; i++) {\r
@@ -466,7 +466,7 @@ public class MatchSerializer {
         for (int i = 0; i < addressGroups.length; i++) {\r
             if (addressGroups[i].equals("")){\r
                 countEmpty++;\r
-            } \r
+            }\r
         }\r
         String[] ready = new String[EncodeConstants.GROUPS_IN_IPV6_ADDRESS];\r
         switch (countEmpty) {\r
@@ -513,7 +513,7 @@ public class MatchSerializer {
         }\r
         return length;\r
     }\r
-    \r
+\r
     /**\r
      * Computes length of match (in bytes)\r
      * @param match\r
@@ -588,9 +588,9 @@ public class MatchSerializer {
                 } else if (field.isAssignableFrom(ArpTpa.class)) {\r
                     length += computePossibleMaskEntryLength(entry, EncodeConstants.SIZE_OF_INT_IN_BYTES);\r
                 } else if (field.isAssignableFrom(ArpSha.class)) {\r
-                    length += computePossibleMaskEntryLength(entry, EncodeConstants.SIZE_OF_LONG_IN_BYTES);\r
+                    length += computePossibleMaskEntryLength(entry, EncodeConstants.MAC_ADDRESS_LENGTH);\r
                 } else if (field.isAssignableFrom(ArpTha.class)) {\r
-                    length += computePossibleMaskEntryLength(entry, EncodeConstants.SIZE_OF_LONG_IN_BYTES);\r
+                    length += computePossibleMaskEntryLength(entry, EncodeConstants.MAC_ADDRESS_LENGTH);\r
                 } else if (field.isAssignableFrom(Ipv6Src.class)) {\r
                     length += computePossibleMaskEntryLength(entry, EncodeConstants.SIZE_OF_IPV6_ADDRESS_IN_BYTES);\r
                 } else if (field.isAssignableFrom(Ipv6Dst.class)) {\r
@@ -604,9 +604,9 @@ public class MatchSerializer {
                 } else if (field.isAssignableFrom(Ipv6NdTarget.class)) {\r
                     length += computePossibleMaskEntryLength(entry, EncodeConstants.SIZE_OF_IPV6_ADDRESS_IN_BYTES);\r
                 } else if (field.isAssignableFrom(Ipv6NdSll.class)) {\r
-                    length += computePossibleMaskEntryLength(entry, EncodeConstants.SIZE_OF_LONG_IN_BYTES);\r
+                    length += computePossibleMaskEntryLength(entry, EncodeConstants.MAC_ADDRESS_LENGTH);\r
                 } else if (field.isAssignableFrom(Ipv6NdTll.class)) {\r
-                    length += computePossibleMaskEntryLength(entry, EncodeConstants.SIZE_OF_LONG_IN_BYTES);\r
+                    length += computePossibleMaskEntryLength(entry, EncodeConstants.MAC_ADDRESS_LENGTH);\r
                 } else if (field.isAssignableFrom(MplsLabel.class)) {\r
                     length += EncodeConstants.SIZE_OF_INT_IN_BYTES;\r
                 } else if (field.isAssignableFrom(MplsTc.class)) {\r