oxm_fields: Avoid shadowing python builtin

Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
YAMAMOTO Takashi 2014-10-14 12:28:38 +09:00 committed by FUJITA Tomonori
parent 6fb4550337
commit dcf6ddd828

View File

@ -222,7 +222,7 @@ def parse(mod, buf, offset):
hdr_len = struct.calcsize(hdr_pack_str)
oxm_type = header >> 9 # class|field
oxm_hasmask = mod.oxm_tlv_header_extract_hasmask(header)
len = mod.oxm_tlv_header_extract_length(header)
oxm_len = mod.oxm_tlv_header_extract_length(header)
oxm_class = oxm_type >> 7
if oxm_class == OFPXMC_EXPERIMENTER:
exp_hdr_pack_str = '!I' # experimenter_id
@ -243,7 +243,7 @@ def parse(mod, buf, offset):
num = oxm_type
exp_hdr_len = 0
value_offset = offset + hdr_len + exp_hdr_len
value_len = len - exp_hdr_len
value_len = oxm_len - exp_hdr_len
value_pack_str = '!%ds' % value_len
assert struct.calcsize(value_pack_str) == value_len
(value, ) = struct.unpack_from(value_pack_str, buf, value_offset)