openstack/os-ken
Code Issues Proposed changes

of10: change OFPMatch to support ipv4 src and dst mask when wildcards are omitted in __init__

Browse Source 
an example:
   match = OFPMatch(
          dl_type = 0x0800,
          nw_src = ipv4_bytes_to_int(ipv4_to_bin("192.168.0.1")),
	         nw_src_mask = 24
          )

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
Yuichi Sudo 2013-09-10 10:54:07 +09:00 committed by FUJITA Tomonori
parent 9eac763e38
commit fec3501c31
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ryu/ofproto/ofproto_v1_0_parser.py
View File

@ -110,7 +110,7 @@ class OFPMatch(StringifyMixin):
def __init__(self, wildcards=None, in_port=None, dl_src=None, dl_dst=None, def __init__(self, wildcards=None, in_port=None, dl_src=None, dl_dst=None,
dl_vlan=None, dl_vlan_pcp=None, dl_type=None, nw_tos=None, dl_vlan=None, dl_vlan_pcp=None, dl_type=None, nw_tos=None,
nw_proto=None, nw_src=None, nw_dst=None, nw_proto=None, nw_src=None, nw_dst=None,
tp_src=None, tp_dst=None): tp_src=None, tp_dst=None, nw_src_mask=32, nw_dst_mask=32):
super(OFPMatch, self).__init__() super(OFPMatch, self).__init__()
wc = ofproto_v1_0.OFPFW_ALL wc = ofproto_v1_0.OFPFW_ALL
if in_port is None: if in_port is None:
@ -170,14 +170,15 @@ class OFPMatch(StringifyMixin):
if nw_src is None: if nw_src is None:
self.nw_src = 0 self.nw_src = 0
else: else:
# mask is not supported wc &= (32 - nw_src_mask) << ofproto_v1_0.OFPFW_NW_SRC_SHIFT \
wc &= ~ofproto_v1_0.OFPFW_NW_SRC_MASK | ~ofproto_v1_0.OFPFW_NW_SRC_MASK
self.nw_src = nw_src self.nw_src = nw_src
if nw_dst is None: if nw_dst is None:
self.nw_dst = 0 self.nw_dst = 0
else: else:
wc &= ~ofproto_v1_0.OFPFW_NW_DST_MASK wc &= (32 - nw_dst_mask) << ofproto_v1_0.OFPFW_NW_DST_SHIFT \
| ~ofproto_v1_0.OFPFW_NW_DST_MASK
self.nw_dst = nw_dst self.nw_dst = nw_dst
if tp_src is None: if tp_src is None: