diff options
| -rw-r--r-- | ryu/ofproto/ofproto_v1_5_parser.py | 12 | ||||
| -rw-r--r-- | ryu/ofproto/oxm_fields.py | 3 |
2 files changed, 11 insertions, 4 deletions
diff --git a/ryu/ofproto/ofproto_v1_5_parser.py b/ryu/ofproto/ofproto_v1_5_parser.py index c89bc37a..1146e5ce 100644 --- a/ryu/ofproto/ofproto_v1_5_parser.py +++ b/ryu/ofproto/ofproto_v1_5_parser.py @@ -2183,6 +2183,10 @@ class OFPTableFeaturePropNextTables(OFPTableFeatureProp): # oxm_length always 0 # ovs: # seems in flux as of writing this [20141003] +# updtate: OVS checks the oxm_length strictly which contained in +# the OFPAT_COPY_FIELD action when using OpenFlow 1.5, so here composes the +# payload length as the oxm_length (if has mask, it will be doubled, still +# unclear though). class OFPOxmId(StringifyMixin): _PACK_STR = '!I' # oxm header _EXPERIMENTER_ID_PACK_STR = '!I' @@ -2220,10 +2224,10 @@ class OFPOxmId(StringifyMixin): return cls(type_=type_, hasmask=hasmask, length=length), rest def serialize(self): - # fixup - self.length = 0 # XXX see the comment on OFPOxmId - - (n, _v, _m) = ofproto.oxm_from_user(self.type, None) + n, t = ofproto.oxm_get_field_info_by_name(self.type) + if not self.length: + # XXX see the comment on OFPOxmId + self.length = t.size * 2 if self.hasmask else t.size oxm = (n << (1 + 8)) | (self.hasmask << 8) | self.length buf = bytearray() msg_pack_into(self._PACK_STR, buf, 0, oxm) diff --git a/ryu/ofproto/oxm_fields.py b/ryu/ofproto/oxm_fields.py index 0c5e4597..d2bea495 100644 --- a/ryu/ofproto/oxm_fields.py +++ b/ryu/ofproto/oxm_fields.py @@ -65,6 +65,7 @@ # +-------------------------------+---------------+ from ryu.ofproto.oxx_fields import ( + _get_field_info_by_name, _from_user, _from_user_header, _to_user, @@ -177,6 +178,8 @@ def generate(modname): num_to_field = dict((f.num, f) for f in mod.oxm_types) # create functions by using oxx_fields module. + add_attr('oxm_get_field_info_by_name', + functools.partial(_get_field_info_by_name, oxx, name_to_field)) add_attr('oxm_from_user', functools.partial(_from_user, oxx, name_to_field)) add_attr('oxm_from_user_header', |