On Sun, Jun 10, 2012 at 09:37:07AM +0900, FUJITA Tomonori wrote: > Signed-off-by: FUJITA Tomonori <[email protected]> > --- > ryu/ofproto/nx_match.py | 40 ++++++++++++++++++++++++++++++++++++++++ > 1 files changed, 40 insertions(+), 0 deletions(-) > > diff --git a/ryu/ofproto/nx_match.py b/ryu/ofproto/nx_match.py > index e033a81..8192251 100644 > --- a/ryu/ofproto/nx_match.py > +++ b/ryu/ofproto/nx_match.py > @@ -49,6 +49,8 @@ ETH_TYPE_VLAN = 0x8100 > ETH_TYPE_IPV6 = 0x86dd > ETH_TYPE_LACP = 0x8809 > > +IPPROTO_ICMP = 1 > +
The patch itself looks good. Maybe we sould like toto move out those constants from nx_match.py because Those are not nx specific. thanks, > IP_ECN_MASK = 0x03 > IP_DSCP_MASK = 0xfc > > @@ -168,6 +170,12 @@ class ClsRule(object): > self.flow.nw_tos &= ~IP_DSCP_MASK > self.flow.nw_tos |= nw_dscp & IP_DSCP_MASK > > + def set_icmp_type(self, icmp_type): > + self.set_tp_src(icmp_type) > + > + def set_icmp_code(self, icmp_code): > + self.set_tp_dst(icmp_code) > + > def set_tun_id(self, tun_id): > self.set_tun_id_masked(tun_id, UINT64_MAX) > > @@ -472,6 +480,28 @@ class MFArpTha(MFField): > return self._put(buf, offset, rule.flow.arp_tha) > > > +@_register_make > +@_set_nxm_headers([ofproto_v1_0.NXM_OF_ICMP_TYPE]) > +class MFICMPType(MFField): > + @classmethod > + def make(cls): > + return cls(MF_PACK_STRING_8) > + > + def put(self, buf, offset, rule): > + return self._put(buf, offset, rule.flow.nw_src) > + > + > +@_register_make > +@_set_nxm_headers([ofproto_v1_0.NXM_OF_ICMP_CODE]) > +class MFICMPCode(MFField): > + @classmethod > + def make(cls): > + return cls(MF_PACK_STRING_8) > + > + def put(self, buf, offset, rule): > + return self._put(buf, offset, rule.flow.nw_dst) > + > + > def serialize_nxm_match(rule, buf, offset): > old_offset = offset > > @@ -513,6 +543,16 @@ def serialize_nxm_match(rule, buf, offset): > offset += nxm_put(buf, offset, ofproto_v1_0.NXM_NX_IP_TTL, rule) > if not rule.wc.wildcards & FWW_NW_PROTO: > offset += nxm_put(buf, offset, ofproto_v1_0.NXM_OF_IP_PROTO, rule) > + > + if not rule.wc.wildcards & FWW_NW_PROTO and (rule.flow.nw_proto > + == IPPROTO_ICMP): > + if rule.wc.tp_src_mask != 0: > + offset += nxm_put(buf, offset, ofproto_v1_0.NXM_OF_ICMP_TYPE, > rule) > + elif rule.wc.tp_dst_mask != 0: > + offset += nxm_put(buf, offset, ofproto_v1_0.NXM_OF_ICMP_CODE, > rule) > + else: > + pass > + > if rule.flow.tp_src != 0: > if rule.flow.nw_proto == 6: > if rule.wc.tp_src_mask == UINT16_MAX: > -- > 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 > -- yamahata ------------------------------------------------------------------------------ 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
