osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

check_typed_item_calls.py: Substitute macros into item masks

This commit is contained in:
Martin Mathieson 2023-04-14 09:45:29 +00:00
parent aa036d07f7
commit fcc548c409
8 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-devicenet.c
View File

@ -46,8 +46,8 @@ void proto_reg_handoff_devicenet(void);
#define MESSAGE_GROUP_3_FRAG_MASK 0x80
#define MESSAGE_GROUP_3_XID_MASK 0x40
#define MESSAGE_GROUP_4_ID 0x7EF
#define MESSAGE_GROUP_4_MSG_MASK 0x03F
#define MESSAGE_GROUP_4_ID 0x07EF
#define MESSAGE_GROUP_4_MSG_MASK 0x003F
static int proto_devicenet = -1;

2
epan/dissectors/packet-dvb-s2-table.c
View File

@ -4153,7 +4153,7 @@ void proto_register_dvb_s2_table(void)
},
{&hf_dvb_s2_table_desc_sync_frame_nbr, {
"Descriptor SYNC frame number", "dvb-s2_table.desc.sync_frame_number",
FT_UINT8, BASE_DEC, NULL, DVB_S2_TABLE_DESC_SYNC_FRAME_NBR_MASK,
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL}
},
{&hf_dvb_s2_table_desc_sync_repeat_period, {

2
epan/dissectors/packet-hiqnet.c
View File

@ -36,7 +36,7 @@
#define HIQNET_SUBSCRIPTION_TYPE_MASK 0x07
#define HIQNET_SUBSCRIPTION_FLAGS_MASK 0x00000001
#define HIQNET_SUBSCRIPTION_FLAGS_MASK 0x0001
#define HIQNET_CATEGORIES_MASK 0x00004fff

6
epan/dissectors/packet-mpls-pm.c
View File

@ -932,7 +932,7 @@ proto_register_mpls_pm(void)
&hf_mpls_pm_dflags_x,
{
"Extended counter format indicator (X)", "mpls_pm.dflags.x",
FT_BOOLEAN, 4, TFS(&tfs_set_notset), MPLS_PM_DFLAGS_X,
FT_BOOLEAN, 8, TFS(&tfs_set_notset), MPLS_PM_DFLAGS_X,
NULL, HFILL
}
},
@ -940,7 +940,7 @@ proto_register_mpls_pm(void)
&hf_mpls_pm_dflags_b,
{
"Octet/Byte count indicator (B)", "mpls_pm.dflags.b",
FT_BOOLEAN, 4, TFS(&tfs_set_notset), MPLS_PM_DFLAGS_B,
FT_BOOLEAN, 8, TFS(&tfs_set_notset), MPLS_PM_DFLAGS_B,
NULL, HFILL
}
},
@ -949,7 +949,7 @@ proto_register_mpls_pm(void)
{
"Reserved",
"mpls_pm.dflags.res",
FT_BOOLEAN, 4, NULL, MPLS_PM_DFLAGS_RES,
FT_BOOLEAN, 8, NULL, MPLS_PM_DFLAGS_RES,
NULL, HFILL
}
},

2
epan/dissectors/packet-mtp3mg.c
View File

@ -1271,7 +1271,7 @@ proto_register_mtp3mg(void)
NULL, HFILL }},
{ &hf_mtp3mg_tfc_itu_status,
{ "Status", "mtp3mg.status",
FT_UINT8, BASE_DEC, NULL, ITU_TFC_STATUS_MASK,
FT_UINT16, BASE_DEC, NULL, ITU_TFC_STATUS_MASK,
"Congestion status", HFILL }},
{ &hf_mtp3mg_chinese_apc,
{ "Affected Point Code", "mtp3mg.chinese_apc",

7
epan/dissectors/packet-vp8.c
View File

@ -339,10 +339,7 @@ The first three octets of an encoded VP8 frame are referred to as an
size2 = tvb_get_guint8(tvb, *offset + 2);
(*partition1_size) = size0 + (size1*8) + (size2*2048);
proto_tree_add_uint(vp8_payload_header_tree, hf_vp8_hdr_first_partition_size, tvb, *offset, 3, *partition1_size);
(*offset)++;
(*offset)++;
(*offset)++;
(*offset) += 3;
}
static void
@ -521,7 +518,7 @@ proto_register_vp8(void)
},
{ &hf_vp8_hdr_first_partition_size,
{ "First partition size", "vp8.hdr.partition_size",
FT_UINT8, BASE_DEC, NULL, BIT_PARTITION_SIZE_MASK,
FT_UINT24, BASE_DEC, NULL, BIT_PARTITION_SIZE_MASK,
NULL, HFILL }
},
{ &hf_vp8_keyframe_start_code,

36
tools/check_typed_item_calls.py
View File

@ -461,7 +461,7 @@ class Item:
previousItem = None
def __init__(self, filename, hf, filter, label, item_type, type_modifier, mask=None,
def __init__(self, filename, hf, filter, label, item_type, type_modifier, macros, mask=None,
check_mask=False, mask_exact_width=False, check_label=False, check_consecutive=False):
self.filename = filename
self.hf = hf
@ -473,7 +473,7 @@ class Item:
global warnings_found
self.set_mask_value()
self.set_mask_value(macros)
if check_consecutive:
if Item.previousItem and Item.previousItem.filter == filter:
@ -510,8 +510,8 @@ class Item:
if check_mask:
if self.mask_read and not mask in { 'NULL', '0x0', '0', '0x00'}:
self.check_contiguous_bits(mask)
self.check_num_digits(mask)
self.check_digits_all_zeros(mask)
self.check_num_digits(self.mask)
self.check_digits_all_zeros(self.mask)
def __str__(self):
@ -519,10 +519,14 @@ class Item:
def set_mask_value(self):
def set_mask_value(self, macros):
try:
self.mask_read = True
if any(not c in '0123456789abcdefABCDEFxX' for c in self.mask):
# Substitute mask if found as a macro..
if self.mask in macros:
self.mask = macros[self.mask]
elif any(not c in '0123456789abcdefABCDEFxX' for c in self.mask):
self.mask_read = False
self.mask_value = 0
return
@ -586,7 +590,7 @@ class Item:
# Its a problem is the mask_width is > field_width - some of the bits won't get looked at!?
mask_width = n-1-mask_start
if mask_width > field_width:
if field_width is not None and (mask_width > field_width):
# N.B. No call, so no line number.
print(self.filename + ':', self.hf, 'filter=', self.filter, self.item_type, 'so field_width=', field_width,
'but mask is', mask, 'which is', mask_width, 'bits wide!')
@ -599,7 +603,8 @@ class Item:
return
while n <= 63:
if self.check_bit(self.mask_value, n):
print('Warning:', self.filename, self.hf, 'filter=', self.filter, ' - mask with non-contiguous bits', mask)
print('Warning:', self.filename, self.hf, 'filter=', self.filter, ' - mask with non-contiguous bits',
mask, '(', hex(self.mask_value), ')')
warnings_found += 1
return
n += 1
@ -637,7 +642,10 @@ class Item:
if self.item_type in field_widths:
# Longer than it should be?
if len(mask)-2 > self.get_field_width_in_bits()/4:
width_in_bits = self.get_field_width_in_bits()
if width_in_bits is None:
return
if len(mask)-2 > width_in_bits/4:
extra_digits = mask[2:2+(len(mask)-2 - int(self.get_field_width_in_bits()/4))]
# Its definitely an error if any of these are non-zero, as they won't have any effect!
if extra_digits != '0'*len(extra_digits):
@ -856,7 +864,7 @@ def find_macros(filename):
# Look for hf items (i.e. full item to be registered) in a dissector file.
def find_items(filename, check_mask=False, mask_exact_width=False, check_label=False, check_consecutive=False):
def find_items(filename, macros, check_mask=False, mask_exact_width=False, check_label=False, check_consecutive=False):
is_generated = isGeneratedFile(filename)
items = {}
with open(filename, 'r') as f:
@ -869,11 +877,13 @@ def find_items(filename, check_mask=False, mask_exact_width=False, check_label=F
for m in matches:
# Store this item.
hf = m.group(1)
items[hf] = Item(filename, hf, filter=m.group(3), label=m.group(2), item_type=m.group(4), mask=m.group(7),
items[hf] = Item(filename, hf, filter=m.group(3), label=m.group(2), item_type=m.group(4),
type_modifier=m.group(5),
macros=macros,
mask=m.group(7),
check_mask=check_mask,
check_label=check_label,
mask_exact_width=mask_exact_width,
check_label=check_label,
check_consecutive=(not is_generated and check_consecutive))
return items
@ -1000,7 +1010,7 @@ def checkFile(filename, check_mask=False, mask_exact_width=False, check_label=Fa
macros = find_macros(filename)
# Find important parts of items.
items_defined = find_items(filename, check_mask, mask_exact_width, check_label, check_consecutive)
items_defined = find_items(filename, macros, check_mask, mask_exact_width, check_label, check_consecutive)
items_extern_declared = {}
items_declared = {}

6
tools/wireshark_words.txt
View File

@ -1781,3 +1781,9 @@ zbncp
zeroes
zigbee
zugtyp
rdtci
fixme
slaac
naptr
compilable
cipso