From dcf6ddd8283f5ede4c5a1be51b1ba8968a0ab299 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 14 Oct 2014 12:28:38 +0900 Subject: [PATCH] oxm_fields: Avoid shadowing python builtin Signed-off-by: YAMAMOTO Takashi Signed-off-by: FUJITA Tomonori --- ryu/ofproto/oxm_fields.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ryu/ofproto/oxm_fields.py b/ryu/ofproto/oxm_fields.py index 2e58386b..6c1565ab 100644 --- a/ryu/ofproto/oxm_fields.py +++ b/ryu/ofproto/oxm_fields.py @@ -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)