Merge into master from pull request #359:
Add OFPortDesc helper methods (https://github.com/floodlight/loxigen/pull/359)
diff --git a/java_gen/java_model.py b/java_gen/java_model.py
index 79cea7a..c8f70e6 100644
--- a/java_gen/java_model.py
+++ b/java_gen/java_model.py
@@ -587,6 +587,8 @@
if not find(lambda x: x.name == "mask", self.ir_model_members):
virtual_members.append(
JavaVirtualMember(self, "mask", find(lambda x: x.name == "value", self.ir_model_members).java_type))
+ elif self.name =="OFErrorMsg":
+ virtual_members += [ JavaVirtualMember(self, "data", java_type.error_cause_data) ]
if not find(lambda m: m.name == "version", self.ir_model_members):
virtual_members.append(JavaVirtualMember(self, "version", java_type.of_version))
diff --git a/wireshark_gen/templates/openflow.lua b/wireshark_gen/templates/openflow.lua
index ef826c1..f96fccf 100644
--- a/wireshark_gen/templates/openflow.lua
+++ b/wireshark_gen/templates/openflow.lua
@@ -159,8 +159,8 @@
local msg_len = buf(offset+2,2):uint()
-- Detect obviously broken messages
- if msg_version == 0 or msg_version > 4 then break end
- if msg_type > 29 then break end
+ if msg_version == 0 or msg_version > 5 then break end
+ if msg_type > 34 then break end
if msg_len < 8 then break end
if offset + msg_len > buf:len() then