openstack
/
os-ken
Code Issues Proposed changes

ofproto_v1_5_parser: Missing trailing pads of OFPActionCopyField 

OpenFlow Spec 1.5 says OFPActionCopyField has the trailing paddings to
make the action a whole multiple of 8 bytes in length.

Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
IWASE Yusuke 2017-12-15 10:00:10 +09:00 committed by FUJITA Tomonori
parent aa9f3f483c
commit 4602651b2c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ryu/ofproto/ofproto_v1_5_parser.py
View File

@ -5964,14 +5964,16 @@ class OFPActionCopyField(OFPAction):
return cls(n_bits, src_offset, dst_offset, oxm_ids, type_, len_)
def serialize(self, buf, offset):
oxm_ids_buf = bytearray()
oxm_ids_buf = b''
for i in self.oxm_ids:
oxm_ids_buf += i.serialize()
self.len += len(oxm_ids_buf)
action_len = ofproto.OFP_ACTION_COPY_FIELD_SIZE + len(oxm_ids_buf)
self.len = utils.round_up(action_len, 8)
pad_len = self.len - action_len
msg_pack_into(ofproto.OFP_ACTION_COPY_FIELD_PACK_STR, buf,
offset, self.type, self.len,
self.n_bits, self.src_offset, self.dst_offset)
buf += oxm_ids_buf
buf += oxm_ids_buf + b'\x00' * pad_len
@OFPAction.register_action_type(ofproto.OFPAT_METER,