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

Some more check_type_item_calls warnings.

This commit is contained in:
Martin Mathieson 2023-03-28 10:36:05 +01:00
parent a37881ad31
commit 399c04eafa
8 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/packet-h264.c
View File

@ -3503,17 +3503,17 @@ proto_register_h264(void)
},
{ &hf_h264_sei_ms_layer_desc_coded_height,
{ "Coded Height", "h264.sei.ms.layout.desc.coded_height",
FT_UINT8, BASE_DEC, NULL, 0x0,
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_h264_sei_ms_layer_desc_display_width,
{ "Display Width", "h264.sei.ms.layout.desc.display_width",
FT_UINT8, BASE_DEC, NULL, 0x0,
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_h264_sei_ms_layer_desc_display_height,
{ "Display Height", "h264.sei.ms.layout.desc.display_height",
FT_UINT8, BASE_DEC, NULL, 0x0,
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_h264_sei_ms_layer_desc_bitrate,

3
epan/dissectors/packet-nsh.c
View File

@ -76,13 +76,10 @@ static dissector_table_t subdissector_table;
static void
dissect_nsh_md_type_1(tvbuff_t *tvb, proto_tree *nsh_tree, int offset)
{
proto_tree_add_item(nsh_tree, hf_nsh_context_header, tvb, offset, 4, ENC_NA);
proto_tree_add_item(nsh_tree, hf_nsh_context_header, tvb, offset + 4, 4, ENC_NA);
proto_tree_add_item(nsh_tree, hf_nsh_context_header, tvb, offset + 8, 4, ENC_NA);
proto_tree_add_item(nsh_tree, hf_nsh_context_header, tvb, offset + 12, 4, ENC_NA);
}
/*

14
epan/dissectors/packet-oampdu.c
View File

@ -2207,7 +2207,7 @@ dissect_oampdu_vendor_specific(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
break;
case 0x05:
proto_item_append_text(dpoe_opcode_response, " Copy output field");
proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_result_rr_copy, tvb, offset+2, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(dpoe_opcode_response_tree, hf_oam_dpoe_user_port_object_result_rr_copy, tvb, offset+4, 4, ENC_BIG_ENDIAN);
break;
case 0x06:
proto_item_append_text(dpoe_opcode_response, " Delete field");
@ -3074,32 +3074,32 @@ proto_register_oampdu(void)
{ &hf_oam_dpoe_user_port_object_result_rr_copy,
{ "Field Code to set from field used in last clause of rule", "oampdu.user.port.object.result.rr.copy",
FT_UINT8, BASE_HEX, NULL, 0x0,
FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL } },
{ &hf_oam_dpoe_user_port_object_result_rr_delete,
{ "Field Code to remove from frame", "oampdu.user.port.object.result.rr.delete",
FT_UINT8, BASE_HEX, NULL, 0x0,
FT_UINT16, BASE_HEX, NULL, 0x0,
NULL, HFILL } },
{ &hf_oam_dpoe_user_port_object_result_rr_insert,
{ "Field Code to insert into frame", "oampdu.user.port.object.result.rr.insert",
FT_UINT8, BASE_HEX, NULL, 0x0,
FT_UINT16, BASE_HEX, NULL, 0x0,
NULL, HFILL } },
{ &hf_oam_dpoe_user_port_object_result_rr_replace,
{ "Field Code to replace", "oampdu.user.port.object.result.rr.replace",
FT_UINT8, BASE_HEX, NULL, 0x0,
FT_UINT16, BASE_HEX, NULL, 0x0,
NULL, HFILL } },
{ &hf_oam_dpoe_user_port_object_result_rr_cd,
{ "Field Code not to delete", "oampdu.user.port.object.result.rr.cd",
FT_UINT8, BASE_HEX, NULL, 0x0,
FT_UINT16, BASE_HEX, NULL, 0x0,
NULL, HFILL } },
{ &hf_oam_dpoe_user_port_object_result_rr_ci,
{ "Field Code not to insert", "oampdu.user.port.object.result.rr.ci",
FT_UINT8, BASE_HEX, NULL, 0x0,
FT_UINT16, BASE_HEX, NULL, 0x0,
NULL, HFILL } },
{ &hf_oam_dpoe_qc_ll_u,

4
epan/dissectors/packet-opa-mad.c
View File

@ -5564,7 +5564,7 @@ static gint parse_QuarantinedNodeRecord(proto_tree *parentTree, tvbuff_t *tvb, g
proto_tree_add_item(QuarantinedNodeRecord_header_tree, hf_opa_QuarantinedNodeRecord_QuarantineReasons, tvb, local_offset, 4, ENC_BIG_ENDIAN);
local_offset += 4;
proto_tree_add_item(QuarantinedNodeRecord_header_tree, hf_opa_QuarantinedNodeRecord_ExpectedNodeDesc, tvb, local_offset, 64, ENC_BIG_ENDIAN);
proto_tree_add_item(QuarantinedNodeRecord_header_tree, hf_opa_QuarantinedNodeRecord_ExpectedNodeDesc, tvb, local_offset, 64, ENC_NA);
local_offset += 64;
proto_tree_add_item(QuarantinedNodeRecord_header_tree, hf_opa_QuarantinedNodeRecord_ExpectedNodeGUID, tvb, local_offset, 8, ENC_BIG_ENDIAN);
local_offset += 8;
@ -13451,7 +13451,7 @@ void proto_register_opa_mad(void)
},
{ &hf_opa_QuarantinedNodeRecord_ExpectedNodeDesc, {
"Expected Node Desc", "opa.quarantinednoderecord.expectednodedesc",
FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }
FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
},
{ &hf_opa_QuarantinedNodeRecord_ExpectedNodeGUID, {
"Expected Node GUID", "opa.quarantinednoderecord.expectednodeguid",

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

@ -4437,7 +4437,7 @@ proto_register_ospf(void)
/* LS Types */
{&hf_ospf_ls_type,
{ "LS Type", "ospf.lsa", FT_UINT8, BASE_DEC,
{ "LS Type", "ospf.lsa", FT_UINT32, BASE_DEC,
VALS(ls_type_vals), 0x0, NULL, HFILL }},
{&hf_ospf_ls_age,
{"LS Age (seconds)", "ospf.lsa.age", FT_UINT16,

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

@ -5703,7 +5703,7 @@ proto_register_pcep(void)
},
{ &hf_pcep_association_id_extended_color,
{ "Color", "pcep.tlv.extended_association_id.color",
FT_UINT16, BASE_DEC, NULL, 0x0,
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_pcep_association_id_extended_ipv4_endpoint,

2
epan/dissectors/packet-rfid-felica.c
View File

@ -497,7 +497,7 @@ proto_register_felica(void)
/* Block ID */
{&hf_felica_block_nbr,
{ "Block Number", "felica.block.nbr",
FT_UINT8, BASE_DEC, NULL, 0x0,
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},

8
tools/check_typed_item_calls.py
View File

@ -249,7 +249,7 @@ class ProtoTreeAddItemCheck(APICheck):
'tds_get_char_encoding(tds_info)',
'info->encoding',
'item->encoding',
'DREP_ENC_INTEGER(drep)', 'string_encoding', 'item',
'DREP_ENC_INTEGER(drep)', 'string_encoding', 'item', 'type',
'dvb_enc_to_item_enc(encoding)',
'packet->enc',
'IS_EBCDIC(uCCS) ? ENC_EBCDIC : ENC_ASCII',
@ -260,7 +260,8 @@ class ProtoTreeAddItemCheck(APICheck):
'big_endian',
'hf_data_encoding',
'IS_EBCDIC(eStr) ? ENC_EBCDIC : ENC_ASCII',
'big_endian ? ENC_BIG_ENDIAN : ENC_LITTLE_ENDIAN' }:
'big_endian ? ENC_BIG_ENDIAN : ENC_LITTLE_ENDIAN',
'(skip == 1) ? ENC_BIG_ENDIAN : ENC_LITTLE_ENDIAN' }:
global warnings_found
print('Warning:', self.file + ':' + str(line_number),
@ -315,7 +316,8 @@ known_non_contiguous_fields = { 'wlan.fixed.capabilities.cfpoll.sta',
'hf_iax2_video_csub', # RFC 5456, table 8.7
'iax2.video.subclass',
'dnp3.al.ana.int',
'pwcesopsn.cw.lm'
'pwcesopsn.cw.lm',
'gsm_a.rr.format_id' # EN 301 503
}
##################################################################################################