update pyloxi to 46b7804026447644fec44c0ad517b41844eeb91b
diff --git a/src/python/loxi/of10/common.py b/src/python/loxi/of10/common.py
index 616cf75..28b079a 100644
--- a/src/python/loxi/of10/common.py
+++ b/src/python/loxi/of10/common.py
@@ -385,7 +385,7 @@
class match_v1(object):
- def __init__(self, wildcards=None, in_port=None, eth_src=None, eth_dst=None, vlan_vid=None, vlan_pcp=None, eth_type=None, ip_dscp=None, ip_proto=None, src_meta_id=None, dst_meta_id=None, ipv4_src=None, ipv4_dst=None, tcp_src=None, tcp_dst=None):
+ def __init__(self, wildcards=None, in_port=None, eth_src=None, eth_dst=None, vlan_vid=None, vlan_pcp=None, eth_type=None, ip_dscp=None, ip_proto=None, ipv4_src=None, ipv4_dst=None, tcp_src=None, tcp_dst=None):
if wildcards != None:
self.wildcards = wildcards
else:
@@ -422,14 +422,6 @@
self.ip_proto = ip_proto
else:
self.ip_proto = 0
- if src_meta_id != None:
- self.src_meta_id = src_meta_id
- else:
- self.src_meta_id = 0
- if dst_meta_id != None:
- self.dst_meta_id = dst_meta_id
- else:
- self.dst_meta_id = 0
if ipv4_src != None:
self.ipv4_src = ipv4_src
else:
@@ -460,8 +452,7 @@
packed.append(struct.pack("!H", self.eth_type))
packed.append(struct.pack("!B", self.ip_dscp))
packed.append(struct.pack("!B", self.ip_proto))
- packed.append(struct.pack("!B", self.src_meta_id))
- packed.append(struct.pack("!B", self.dst_meta_id))
+ packed.append('\x00' * 2)
packed.append(struct.pack("!L", self.ipv4_src))
packed.append(struct.pack("!L", self.ipv4_dst))
packed.append(struct.pack("!H", self.tcp_src))
@@ -485,8 +476,7 @@
obj.eth_type = reader.read("!H")[0]
obj.ip_dscp = reader.read("!B")[0]
obj.ip_proto = reader.read("!B")[0]
- obj.src_meta_id = reader.read("!B")[0]
- obj.dst_meta_id = reader.read("!B")[0]
+ reader.skip(2)
obj.ipv4_src = reader.read("!L")[0]
obj.ipv4_dst = reader.read("!L")[0]
obj.tcp_src = reader.read("!H")[0]
@@ -504,8 +494,6 @@
if self.eth_type != other.eth_type: return False
if self.ip_dscp != other.ip_dscp: return False
if self.ip_proto != other.ip_proto: return False
- if self.src_meta_id != other.src_meta_id: return False
- if self.dst_meta_id != other.dst_meta_id: return False
if self.ipv4_src != other.ipv4_src: return False
if self.ipv4_dst != other.ipv4_dst: return False
if self.tcp_src != other.tcp_src: return False
@@ -551,12 +539,6 @@
q.text("ip_proto = ");
q.text("%#x" % self.ip_proto)
q.text(","); q.breakable()
- q.text("src_meta_id = ");
- q.text("%#x" % self.src_meta_id)
- q.text(","); q.breakable()
- q.text("dst_meta_id = ");
- q.text("%#x" % self.dst_meta_id)
- q.text(","); q.breakable()
q.text("ipv4_src = ");
q.text(util.pretty_ipv4(self.ipv4_src))
q.text(","); q.breakable()
diff --git a/src/python/loxi/of10/const.py b/src/python/loxi/of10/const.py
index 0273c7a..1d29975 100644
--- a/src/python/loxi/of10/const.py
+++ b/src/python/loxi/of10/const.py
@@ -235,8 +235,6 @@
OFPFW_NW_DST_MASK = 1032192
OFPFW_DL_VLAN_PCP = 1048576
OFPFW_NW_TOS = 2097152
-OFPFW_SRC_META_ID = 4194304
-OFPFW_DST_META_ID = 8388608
OFPFW_ALL = 4194303
ofp_flow_wildcards_map = {
@@ -250,8 +248,6 @@
128: 'OFPFW_TP_DST',
1048576: 'OFPFW_DL_VLAN_PCP',
2097152: 'OFPFW_NW_TOS',
- 4194304: 'OFPFW_SRC_META_ID',
- 8388608: 'OFPFW_DST_META_ID',
}
# Identifiers from group ofp_hello_failed_code
diff --git a/src/python/loxi/of10/message.py b/src/python/loxi/of10/message.py
index e01c342..6e6649e 100644
--- a/src/python/loxi/of10/message.py
+++ b/src/python/loxi/of10/message.py
@@ -6281,8 +6281,8 @@
def parse_message(buf):
msg_ver, msg_type, msg_len, msg_xid = parse_header(buf)
- if msg_ver != const.OFP_VERSION and msg_type != ofp.OFPT_HELLO:
- raise loxi.ProtocolError("wrong OpenFlow version")
+ if msg_ver != const.OFP_VERSION and msg_type != const.OFPT_HELLO:
+ raise loxi.ProtocolError("wrong OpenFlow version (expected %d, got %d)" % (const.OFP_VERSION, msg_ver))
if len(buf) != msg_len:
raise loxi.ProtocolError("incorrect message size")
if msg_type in parsers:
@@ -6291,9 +6291,10 @@
raise loxi.ProtocolError("unexpected message type")
def parse_flow_mod(buf):
- if len(buf) < 56 + 2:
+ if len(buf) < 57 + 1:
raise loxi.ProtocolError("message too short")
- cmd, = struct.unpack_from("!H", buf, 56)
+ # Technically uint16_t for OF 1.0
+ cmd, = struct.unpack_from("!B", buf, 57)
if cmd in flow_mod_parsers:
return flow_mod_parsers[cmd](buf)
else: