diff options
| author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2012-06-23 10:43:58 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2012-06-23 15:55:06 +0900 |
| commit | fcca4791c20181f3832b9ed66eb676cb455c7b92 (patch) | |
| tree | d9aa87e494978757fd5ed7124c3b725a2d4c8a52 | |
| parent | cb713e44b98088829dac9372becec6cda74e7385 (diff) | |
of1.2: add OXM_OF_IP_PROTO
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Reviewed-by: Simon Horman <horms@verge.net.au>
| -rw-r--r-- | ryu/ofproto/ofproto_v1_2_parser.py | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/ryu/ofproto/ofproto_v1_2_parser.py b/ryu/ofproto/ofproto_v1_2_parser.py index 0c530137..10a743e9 100644 --- a/ryu/ofproto/ofproto_v1_2_parser.py +++ b/ryu/ofproto/ofproto_v1_2_parser.py @@ -869,6 +869,7 @@ class Flow(object): self.vlan_pcp = 0 self.ip_dscp = 0 self.ip_ecn = 0 + self.ip_proto = 0 self.arp_op = 0 self.arp_spa = 0 self.arp_tpa = 0 @@ -948,6 +949,10 @@ class OFPMatch(object): self.fields.append( OFPMatchField.make(ofproto_v1_2.OXM_OF_IP_ECN)) + if self.wc.ft_test(ofproto_v1_2.OFPXMT_OFB_IP_PROTO): + self.fields.append( + OFPMatchField.make(ofproto_v1_2.OXM_OF_IP_PROTO)) + if self.wc.ft_test(ofproto_v1_2.OFPXMT_OFB_ARP_OP): self.fields.append( OFPMatchField.make(ofproto_v1_2.OXM_OF_ARP_OP)) @@ -1054,6 +1059,10 @@ class OFPMatch(object): self.wc.ft_set(ofproto_v1_2.OFPXMT_OFB_IP_ECN) self.flow.ip_ecn = ip_ecn + def set_ip_proto(self, ip_proto): + self.wc.ft_set(ofproto_v1_2.OFPXMT_OFB_IP_PROTO) + self.flow.ip_proto = ip_proto + def set_arp_opcode(self, arp_op): self.wc.ft_set(ofproto_v1_2.OFPXMT_OFB_ARP_OP) self.flow.arp_op = arp_op @@ -1284,6 +1293,19 @@ class MTIPECN(OFPMatchField): return MTIPECN(header) +@OFPMatchField.register_field_header([ofproto_v1_2.OXM_OF_IP_PROTO]) +class MTIPProto(OFPMatchField): + def __init__(self, header): + super(MTIPProto, self).__init__(header, '!B') + + def serialize(self, buf, offset, match): + self.put(buf, offset, match.flow.ip_proto) + + @classmethod + def parser(cls, header, buf, offset): + return MTIPProto(header) + + @OFPMatchField.register_field_header([ofproto_v1_2.OXM_OF_ARP_OP]) class MTArpOp(OFPMatchField): def __init__(self, header): |