Added support for OF 1.0

[openflowjava.git] / openflow-protocol-impl / src / main / java / org / opendaylight / openflowjava / protocol / impl / deserialization / factories / PacketInMessageFactory.java

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PacketInMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PacketInMessageFactory.java
index e997becc2ec70c51bdefff8ee80ad63d78360d29..0042b155a3bd30da46364b43414b0211d97c2b8e 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PacketInMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PacketInMessageFactory.java
@@ -1,52 +1,60 @@
-package org.opendaylight.openflowjava.protocol.impl.deserialization.factories;\r
-\r
-import io.netty.buffer.ByteBuf;\r
-\r
-import java.math.BigInteger;\r
-\r
-import org.opendaylight.openflowjava.protocol.impl.deserialization.OFDeserializer;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.TableId;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PacketInMessage;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PacketInMessageBuilder;\r
-\r
-/**\r
- * @author michal.polkorab\r
- * @author timotej.kubas\r
- */\r
-public class PacketInMessageFactory implements OFDeserializer<PacketInMessage> {\r
-\r
-    private static PacketInMessageFactory instance;\r
-    private static final byte PADDING_IN_PACKET_IN_HEADER = 2;\r
-    \r
-    private PacketInMessageFactory() {\r
-        // Singleton\r
-    }\r
-    \r
-    /**\r
-     * @return singleton factory\r
-     */\r
-    public static PacketInMessageFactory getInstance(){\r
-        if(instance == null){\r
-            instance = new PacketInMessageFactory();\r
-        }\r
-        return instance;\r
-    }\r
-\r
-    @Override\r
-    public PacketInMessage bufferToMessage(ByteBuf rawMessage, short version) {\r
-        PacketInMessageBuilder builder = new PacketInMessageBuilder();\r
-        builder.setVersion(version);\r
-        builder.setXid(rawMessage.readUnsignedInt());\r
-        builder.setBufferId(rawMessage.readUnsignedInt());\r
-        builder.setTotalLen(rawMessage.readUnsignedShort());\r
-        builder.setReason(rawMessage.readUnsignedByte());\r
-        builder.setTableId(new TableId((long)rawMessage.readUnsignedByte()));\r
-        byte[] cookie = new byte[Long.SIZE/Byte.SIZE];\r
-        rawMessage.readBytes(cookie);\r
-        builder.setCookie(new BigInteger(cookie));\r
-        // TODO - implement match factories to finish this factory \r
-        rawMessage.skipBytes(PADDING_IN_PACKET_IN_HEADER);\r
-        builder.setData(rawMessage.readBytes(rawMessage.readableBytes()).array());\r
-        return builder.build();\r
-    }\r
-}\r
+/* Copyright (C)2013 Pantheon Technologies, s.r.o. All rights reserved. */
+package org.opendaylight.openflowjava.protocol.impl.deserialization.factories;
+
+import io.netty.buffer.ByteBuf;
+
+import java.math.BigInteger;
+
+import org.opendaylight.openflowjava.protocol.impl.deserialization.OFDeserializer;
+import org.opendaylight.openflowjava.protocol.impl.util.MatchDeserializer;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.TableId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PacketInMessage;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PacketInMessageBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @author michal.polkorab
+ * @author timotej.kubas
+ */
+public class PacketInMessageFactory implements OFDeserializer<PacketInMessage> {
+
+    private static PacketInMessageFactory instance;
+    private static final byte PADDING_IN_PACKET_IN_HEADER = 2;
+    
+    private static final Logger LOGGER = LoggerFactory
+            .getLogger(PacketInMessageFactory.class);
+    
+    private PacketInMessageFactory() {
+        // Singleton
+    }
+    
+    /**
+     * @return singleton factory
+     */
+    public static synchronized PacketInMessageFactory getInstance(){
+        if(instance == null){
+            instance = new PacketInMessageFactory();
+        }
+        return instance;
+    }
+
+    @Override
+    public PacketInMessage bufferToMessage(ByteBuf rawMessage, short version) {
+        PacketInMessageBuilder builder = new PacketInMessageBuilder();
+        builder.setVersion(version);
+        builder.setXid(rawMessage.readUnsignedInt());
+        builder.setBufferId(rawMessage.readUnsignedInt());
+        builder.setTotalLen(rawMessage.readUnsignedShort());
+        builder.setReason(rawMessage.readUnsignedByte());
+        builder.setTableId(new TableId((long)rawMessage.readUnsignedByte()));
+        byte[] cookie = new byte[Long.SIZE/Byte.SIZE];
+        rawMessage.readBytes(cookie);
+        builder.setCookie(new BigInteger(cookie));
+        builder.setMatch(MatchDeserializer.createMatch(rawMessage)); 
+        rawMessage.skipBytes(PADDING_IN_PACKET_IN_HEADER);
+        LOGGER.info("readablebytes: " + rawMessage.readableBytes());
+        builder.setData(rawMessage.readBytes(rawMessage.readableBytes()).array());
+        return builder.build();
+    }
+}