commit b73808cc3c603f1ff3cccf225c71ff2e76313308
author Rich Lane <rlane@bigswitch.com> Mon Mar 11 15:22:23 2013 -0700
committer Rich Lane <rlane@bigswitch.com> Tue Mar 12 10:45:56 2013 -0700
tree edf0dbed9a42596406cfe4b813d542b9faa21c39
parent 7c7342aacc146b200e3c4def63c5280ed7adb4b9

loxi-prep: move header fields into the message classes

src/python/of10/parse.py

diff --git a/src/python/of10/parse.py b/src/python/of10/parse.py
index 63d17c9..ac76a16 100644
--- a/src/python/of10/parse.py
+++ b/src/python/of10/parse.py
@@ -96,12 +96,13 @@
     """
     hdr = message.ofp_header()
     hdr.unpack(binary_string)
+    logging.info(hdr.show())
     # FIXME: Add error detection
     if not hdr.type in msg_type_subclassed:
         return msg_type_to_class_map[hdr.type]()
     if hdr.type == cstruct.OFPT_STATS_REQUEST:
         sub_hdr = message.ofp_stats_request()
-        sub_hdr.unpack(binary_string[cstruct.OFP_HEADER_BYTES:])
+        sub_hdr.unpack(binary_string)
         try:
             obj = stats_request_to_class_map[sub_hdr.stats_type]()
         except KeyError:
@@ -109,7 +110,7 @@
         return obj
     elif hdr.type == cstruct.OFPT_STATS_REPLY:
         sub_hdr = message.ofp_stats_reply()
-        sub_hdr.unpack(binary_string[cstruct.OFP_HEADER_BYTES:])
+        sub_hdr.unpack(binary_string)
         try:
             obj = stats_reply_to_class_map[sub_hdr.stats_type]()
         except KeyError:
@@ -117,7 +118,7 @@
         return obj
     elif hdr.type == cstruct.OFPT_ERROR:
         sub_hdr = message.ofp_error_msg()
-        sub_hdr.unpack(binary_string[cstruct.OFP_HEADER_BYTES:])
+        sub_hdr.unpack(binary_string)
         return error_to_class_map[sub_hdr.err_type]()
     else:
         parse_logger.error("Cannot parse pkt to message")