Signed-off-by: FUJITA Tomonori <[email protected]>
---
ryu/ofproto/ofproto_v1_2_parser.py | 72 ++++++++++++++++++++++++++++++++++++
1 files changed, 72 insertions(+), 0 deletions(-)
diff --git a/ryu/ofproto/ofproto_v1_2_parser.py
b/ryu/ofproto/ofproto_v1_2_parser.py
index 10a743e..82d6e69 100644
--- a/ryu/ofproto/ofproto_v1_2_parser.py
+++ b/ryu/ofproto/ofproto_v1_2_parser.py
@@ -870,6 +870,8 @@ class Flow(object):
self.ip_dscp = 0
self.ip_ecn = 0
self.ip_proto = 0
+ self.ipv4_src = 0
+ self.ipv4_dst = 0
self.arp_op = 0
self.arp_spa = 0
self.arp_tpa = 0
@@ -884,6 +886,8 @@ class FlowWildcards(object):
self.dl_dst_mask = 0
self.dl_src_mask = 0
self.vlan_vid_mask = 0
+ self.ipv4_src_mask = 0
+ self.ipv4_dst_mask = 0
self.arp_spa_mask = 0
self.arp_tpa_mask = 0
self.arp_sha_mask = 0
@@ -953,6 +957,22 @@ class OFPMatch(object):
self.fields.append(
OFPMatchField.make(ofproto_v1_2.OXM_OF_IP_PROTO))
+ if self.wc.ft_test(ofproto_v1_2.OFPXMT_OFB_IPV4_SRC):
+ if self.wc.ipv4_src_mask == UINT32_MAX:
+ self.fields.append(
+ OFPMatchField.make(ofproto_v1_2.OXM_OF_IPV4_SRC))
+ else:
+ self.fields.append(
+ OFPMatchField.make(ofproto_v1_2.OXM_OF_IPV4_SRC_W))
+
+ if self.wc.ft_test(ofproto_v1_2.OFPXMT_OFB_IPV4_DST):
+ if self.wc.ipv4_dst_mask == UINT32_MAX:
+ self.fields.append(
+ OFPMatchField.make(ofproto_v1_2.OXM_OF_IPV4_DST))
+ else:
+ self.fields.append(
+ OFPMatchField.make(ofproto_v1_2.OXM_OF_IPV4_DST_W))
+
if self.wc.ft_test(ofproto_v1_2.OFPXMT_OFB_ARP_OP):
self.fields.append(
OFPMatchField.make(ofproto_v1_2.OXM_OF_ARP_OP))
@@ -1063,6 +1083,22 @@ class OFPMatch(object):
self.wc.ft_set(ofproto_v1_2.OFPXMT_OFB_IP_PROTO)
self.flow.ip_proto = ip_proto
+ def set_ipv4_src(self, ipv4_src):
+ self.set_ipv4_src_masked(ipv4_src, UINT32_MAX)
+
+ def set_ipv4_src_masked(self, ipv4_src, mask):
+ self.wc.ft_set(ofproto_v1_2.OFPXMT_OFB_IPV4_SRC)
+ self.flow.ipv4_src = ipv4_src
+ self.wc.ipv4_src_mask = mask
+
+ def set_ipv4_dst(self, ipv4_dst):
+ self.set_ipv4_dst_masked(ipv4_dst, UINT32_MAX)
+
+ def set_ipv4_dst_masked(self, ipv4_dst, mask):
+ self.wc.ft_set(ofproto_v1_2.OFPXMT_OFB_IPV4_DST)
+ self.flow.ipv4_dst = ipv4_dst
+ self.wc.ipv4_dst_mask = mask
+
def set_arp_opcode(self, arp_op):
self.wc.ft_set(ofproto_v1_2.OFPXMT_OFB_ARP_OP)
self.flow.arp_op = arp_op
@@ -1306,6 +1342,42 @@ class MTIPProto(OFPMatchField):
return MTIPProto(header)
[email protected]_field_header([ofproto_v1_2.OXM_OF_IPV4_SRC,
+ ofproto_v1_2.OXM_OF_IPV4_SRC_W])
+class MTIPV4Src(OFPMatchField):
+ def __init__(self, header):
+ super(MTIPV4Src, self).__init__(header, '!I')
+
+ def serialize(self, buf, offset, match):
+ if self.header == ofproto_v1_2.OXM_OF_IPV4_SRC:
+ self.put(buf, offset, match.flow.ipv4_src)
+ else:
+ self.put_w(buf, offset, match.flow.ipv4_src,
+ match.wc.ipv4_src_mask)
+
+ @classmethod
+ def parser(cls, header, buf, offset):
+ return MTIPV4Src(header)
+
+
[email protected]_field_header([ofproto_v1_2.OXM_OF_IPV4_DST,
+ ofproto_v1_2.OXM_OF_IPV4_DST_W])
+class MTIPV4Dst(OFPMatchField):
+ def __init__(self, header):
+ super(MTIPV4Dst, self).__init__(header, '!I')
+
+ def serialize(self, buf, offset, match):
+ if self.header == ofproto_v1_2.OXM_OF_IPV4_DST:
+ self.put(buf, offset, match.flow.ipv4_dst)
+ else:
+ self.put_w(buf, offset, match.flow.ipv4_dst,
+ match.wc.ipv4_dst_mask)
+
+ @classmethod
+ def parser(cls, header, buf, offset):
+ return MTIPV4Dst(header)
+
+
@OFPMatchField.register_field_header([ofproto_v1_2.OXM_OF_ARP_OP])
class MTArpOp(OFPMatchField):
def __init__(self, header):
--
1.7.4.4
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Ryu-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ryu-devel
