diff options
| author | Yuichi Sudo <sudo.yuichi@lab.ntt.co.jp> | 2013-09-10 10:54:07 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2013-09-14 08:01:34 +0900 |
| commit | fec3501c31f47d8c4320068110787e1873ae69c8 (patch) | |
| tree | 18a28d5f5770fb5ba591755afaec5edf0d0f3f9e | |
| parent | 9eac763e3801dca35d536f24ba61b29b78910faf (diff) | |
of10: change OFPMatch to support ipv4 src and dst mask when wildcards are omitted in __init__
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>
| -rw-r--r-- | ryu/ofproto/ofproto_v1_0_parser.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ryu/ofproto/ofproto_v1_0_parser.py b/ryu/ofproto/ofproto_v1_0_parser.py index edca8d28..9188ec1d 100644 --- a/ryu/ofproto/ofproto_v1_0_parser.py +++ b/ryu/ofproto/ofproto_v1_0_parser.py @@ -110,7 +110,7 @@ class OFPMatch(StringifyMixin): 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, 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__() wc = ofproto_v1_0.OFPFW_ALL if in_port is None: @@ -170,14 +170,15 @@ class OFPMatch(StringifyMixin): if nw_src is None: self.nw_src = 0 else: - # mask is not supported - wc &= ~ofproto_v1_0.OFPFW_NW_SRC_MASK + wc &= (32 - nw_src_mask) << ofproto_v1_0.OFPFW_NW_SRC_SHIFT \ + | ~ofproto_v1_0.OFPFW_NW_SRC_MASK self.nw_src = nw_src if nw_dst is None: self.nw_dst = 0 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 if tp_src is None: |