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

Fix more 'type_item_calls' warnings

This commit is contained in:
Martin Mathieson 2023-05-04 00:46:17 +01:00
parent 6d466cab13
commit 417a10799b
17 changed files with 119 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
epan/dissectors/packet-dplay.c
View File

@ -65,24 +65,24 @@ static int hf_dplay_flags_optimize_latency = -1;
static int hf_dplay_flags_acqire_voice = -1;
static int hf_dplay_flags_no_sess_desc_changes = -1;
#define DPLAY_FLAG_NO_CREATE_PLAYERS 0x0001
#define DPLAY_FLAG_0002 0x0002
#define DPLAY_FLAG_MIGRATE_HOST 0x0004
#define DPLAY_FLAG_SHORT_PLAYER_MSG 0x0008
#define DPLAY_FLAG_IGNORED 0x0010
#define DPLAY_FLAG_CAN_JOIN 0x0020
#define DPLAY_FLAG_USE_PING 0x0040
#define DPLAY_FLAG_NO_P_UPD 0x0080
#define DPLAY_FLAG_USE_AUTH 0x0100
#define DPLAY_FLAG_PRIV_SESS 0x0200
#define DPLAY_FLAG_PASS_REQ 0x0400
#define DPLAY_FLAG_ROUTE 0x0800
#define DPLAY_FLAG_SRV_ONLY 0x1000
#define DPLAY_FLAG_RELIABLE 0x2000
#define DPLAY_FLAG_ORDER 0x4000
#define DPLAY_FLAG_OPT_LAT 0x8000
#define DPLAY_FLAG_ACQ_VOICE 0x10000
#define DPLAY_FLAG_NO_SESS_DESC_CHANGES 0x20000
#define DPLAY_FLAG_NO_CREATE_PLAYERS 0x00000001
#define DPLAY_FLAG_0002 0x00000002
#define DPLAY_FLAG_MIGRATE_HOST 0x00000004
#define DPLAY_FLAG_SHORT_PLAYER_MSG 0x00000008
#define DPLAY_FLAG_IGNORED 0x00000010
#define DPLAY_FLAG_CAN_JOIN 0x00000020
#define DPLAY_FLAG_USE_PING 0x00000040
#define DPLAY_FLAG_NO_P_UPD 0x00000080
#define DPLAY_FLAG_USE_AUTH 0x00000100
#define DPLAY_FLAG_PRIV_SESS 0x00000200
#define DPLAY_FLAG_PASS_REQ 0x00000400
#define DPLAY_FLAG_ROUTE 0x00000800
#define DPLAY_FLAG_SRV_ONLY 0x00001000
#define DPLAY_FLAG_RELIABLE 0x00002000
#define DPLAY_FLAG_ORDER 0x00004000
#define DPLAY_FLAG_OPT_LAT 0x00008000
#define DPLAY_FLAG_ACQ_VOICE 0x00010000
#define DPLAY_FLAG_NO_SESS_DESC_CHANGES 0x00020000
/* Session description structure fields */
static int hf_dplay_sess_desc_length = -1;
@ -122,10 +122,10 @@ static int hf_dplay_pp_sp_data = -1;
static int hf_dplay_pp_player_data = -1;
static int hf_dplay_pp_player_id = -1;
static int hf_dplay_pp_parent_id = -1;
#define DPLAY_PP_FLAG_SYSPLAYER 0x01
#define DPLAY_PP_FLAG_NAMESERVER 0x02
#define DPLAY_PP_FLAG_IN_GROUP 0x04
#define DPLAY_PP_FLAG_SENDING 0x08
#define DPLAY_PP_FLAG_SYSPLAYER 0x00000001
#define DPLAY_PP_FLAG_NAMESERVER 0x00000002
#define DPLAY_PP_FLAG_IN_GROUP 0x00000004
#define DPLAY_PP_FLAG_SENDING 0x00000008
/* SuperPackedPlayer structure fields */
static int hf_dplay_spp_size = -1;
@ -156,10 +156,10 @@ static int hf_dplay_spp_player_id = -1;
static int hf_dplay_spp_parent_id = -1;
static int hf_dplay_spp_shortcut_count = -1;
static int hf_dplay_spp_shortcut_id = -1;
#define DPLAY_SPP_FLAG_SYSPLAYER 0x01
#define DPLAY_SPP_FLAG_NAMESERVER 0x02
#define DPLAY_SPP_FLAG_IN_GROUP 0x04
#define DPLAY_SPP_FLAG_SENDING 0x08
#define DPLAY_SPP_FLAG_SYSPLAYER 0x00000001
#define DPLAY_SPP_FLAG_NAMESERVER 0x00000002
#define DPLAY_SPP_FLAG_IN_GROUP 0x00000004
#define DPLAY_SPP_FLAG_SENDING 0x00000008
/* SecurityDesc structure fields */
static int hf_dplay_sd_size = -1;
@ -181,9 +181,9 @@ static int hf_dplay_type_02_password = -1;
static int hf_enum_sess_flag_join = -1;
static int hf_enum_sess_flag_all = -1;
static int hf_enum_sess_flag_passwd = -1;
#define DPLAY_ENUM_SESS_FLAG_JOIN 0x0001
#define DPLAY_ENUM_SESS_FLAG_ALL 0x0002
#define DPLAY_ENUM_SESS_FLAG_PASSWD 0x0040
#define DPLAY_ENUM_SESS_FLAG_JOIN 0x00000001
#define DPLAY_ENUM_SESS_FLAG_ALL 0x00000002
#define DPLAY_ENUM_SESS_FLAG_PASSWD 0x00000040
/* Message Type 0x0005 data fields */
static int hf_dplay_type_05_flags = -1;
@ -192,11 +192,11 @@ static int hf_dplay_type_05_name_server = -1;
static int hf_dplay_type_05_local = -1;
static int hf_dplay_type_05_unknown = -1; /* unknown, but always set */
static int hf_dplay_type_05_secure = -1;
#define DPLAY_TYPE05_FLAG_SYSPLAYER 0x001
#define DPLAY_TYPE05_FLAG_NAMESERVER 0x002
#define DPLAY_TYPE05_FLAG_LOCAL 0x004
#define DPLAY_TYPE05_FLAG_UNKNOWN 0x008
#define DPLAY_TYPE05_FLAG_SECURE 0x200
#define DPLAY_TYPE05_FLAG_SYSPLAYER 0x00000001
#define DPLAY_TYPE05_FLAG_NAMESERVER 0x00000002
#define DPLAY_TYPE05_FLAG_LOCAL 0x00000004
#define DPLAY_TYPE05_FLAG_UNKNOWN 0x00000008
#define DPLAY_TYPE05_FLAG_SECURE 0x00000200
/* Message Type 0x0007 data fields */
static int hf_dplay_type_07_dpid = -1;

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

@ -53901,13 +53901,13 @@ proto_register_ieee80211(void)
{&hf_ieee80211_eht_phy_bits_64_71_rx_1024_qam_wid_bw_dl_ofdma_sup,
{"Rx 1024-QAM In Wider Bandwidth DL OFDMA Support",
"wlan.eht.phy_capabilities.bits_64_71.rx_1024_qam_in_wider_bw_dl_ofdma",
FT_BOOLEAN, 24, TFS(&tfs_supported_not_supported),
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported),
0x01, NULL, HFILL }},
{&hf_ieee80211_eht_phy_bits_64_71_rx_4096_qam_wid_bw_dl_ofdma_sup,
{"Rx 4096-QAM In Wider Bandwidth DL OFDMA SUpport",
"wlan.eht.phy_capabilities.bits_64_71.rx_4096_qam_in_wider_bw_dl_ofdma",
FT_BOOLEAN, 24, TFS(&tfs_supported_not_supported),
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported),
0x02, NULL, HFILL }},
{&hf_ieee80211_eht_phy_bits_64_71_reserved,

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

@ -120,15 +120,15 @@ static const value_string auth_vals[] = {
#define OSPF_V2_OPTIONS_DC 0x20
#define OSPF_V2_OPTIONS_O 0x40
#define OSPF_V2_OPTIONS_DN 0x80
#define OSPF_V3_OPTIONS_V6 0x01
#define OSPF_V3_OPTIONS_E 0x02
#define OSPF_V3_OPTIONS_MC 0x04
#define OSPF_V3_OPTIONS_N 0x08
#define OSPF_V3_OPTIONS_R 0x10
#define OSPF_V3_OPTIONS_DC 0x20
#define OSPF_V3_OPTIONS_AF 0x0100
#define OSPF_V3_OPTIONS_L 0x0200
#define OSPF_V3_OPTIONS_AT 0x0400
#define OSPF_V3_OPTIONS_V6 0x000001
#define OSPF_V3_OPTIONS_E 0x000002
#define OSPF_V3_OPTIONS_MC 0x000004
#define OSPF_V3_OPTIONS_N 0x000008
#define OSPF_V3_OPTIONS_R 0x000010
#define OSPF_V3_OPTIONS_DC 0x000020
#define OSPF_V3_OPTIONS_AF 0x000100
#define OSPF_V3_OPTIONS_L 0x000200
#define OSPF_V3_OPTIONS_AT 0x000400
/* Bitmask definitions for the informational capabilities bits. */
#define OSPF_RI_OPTIONS_GRC 0x80

20
epan/dissectors/packet-ptp.c
View File

@ -278,13 +278,13 @@ static int proto_ptp = -1;
/**********************************************************/
/* flag-field-mask-definitions */
/**********************************************************/
#define PTP_FLAGS_LI61_BITMASK 0x01
#define PTP_FLAGS_LI59_BITMASK 0x02
#define PTP_FLAGS_BOUNDARY_CLOCK_BITMASK 0x04
#define PTP_FLAGS_ASSIST_BITMASK 0x08
#define PTP_FLAGS_EXT_SYNC_BITMASK 0x10
#define PTP_FLAGS_PARENT_STATS_BITMASK 0x20
#define PTP_FLAGS_SYNC_BURST_BITMASK 0x40
#define PTP_FLAGS_LI61_BITMASK 0x0001
#define PTP_FLAGS_LI59_BITMASK 0x0002
#define PTP_FLAGS_BOUNDARY_CLOCK_BITMASK 0x0004
#define PTP_FLAGS_ASSIST_BITMASK 0x0008
#define PTP_FLAGS_EXT_SYNC_BITMASK 0x0010
#define PTP_FLAGS_PARENT_STATS_BITMASK 0x0020
#define PTP_FLAGS_SYNC_BURST_BITMASK 0x0040
/* END flag-field-mask-definitions */
@ -884,9 +884,9 @@ static gint ett_ptp_time2 = -1;
/**********************************************************/
/* Message Interval Request flag-field-mask-definitions */
/**********************************************************/
#define PTP_AS_FLAGS_COMP_NEIGHBOR_RATE_RATIO_BITMASK 0x0002
#define PTP_AS_FLAGS_COMP_MEAN_LINK_DELAY_BITMASK 0x0004
#define PTP_AS_FLAGS_ONE_STEP_RECEIVE_CAPABLE 0x0008
#define PTP_AS_FLAGS_COMP_NEIGHBOR_RATE_RATIO_BITMASK 0x02
#define PTP_AS_FLAGS_COMP_MEAN_LINK_DELAY_BITMASK 0x04
#define PTP_AS_FLAGS_ONE_STEP_RECEIVE_CAPABLE 0x08
/* Offsets for PTP_V2_Management (=MM) messages */
#define PTP_V2_MM_TARGETPORTIDENTITY_OFFSET 34

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

@ -353,7 +353,7 @@ proto_register_scte35_time_signal(void)
NULL, 0x7E, NULL, HFILL}},
{&hf_time_pts,
{"PTS Time", "scte35_time.splice.pts", FT_UINT64, BASE_DEC,
NULL, G_GUINT64_CONSTANT(0x1FFFFFFFF), NULL, HFILL}},
NULL, G_GUINT64_CONSTANT(0x01FFFFFFFF), NULL, HFILL}},
};
proto_scte35_time = proto_register_protocol("SCTE-35 Time Signal", "SCTE35 TS", "scte35_time");

24
epan/dissectors/packet-sflow.c
View File

@ -3179,62 +3179,62 @@ proto_register_sflow(void) {
},
{ &hf_sflow_245_ip_tcp_flag_cwr,
{ "TCP Flag (CWR)", "sflow_245.ip.tcp_flag.cwr",
FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x80,
FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x00000080,
NULL, HFILL }
},
{ &hf_sflow_245_ip_tcp_flag_ece,
{ "TCP Flag (ECE)", "sflow_245.ip.tcp_flag.ece",
FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x40,
FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x00000040,
NULL, HFILL }
},
{ &hf_sflow_245_ip_tcp_flag_urg,
{ "TCP Flag (URG)", "sflow_245.ip.tcp_flag.urg",
FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x20,
FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x00000020,
NULL, HFILL }
},
{ &hf_sflow_245_ip_tcp_flag_ack,
{ "TCP Flag (ACK)", "sflow_245.ip.tcp_flag.ack",
FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x10,
FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x00000010,
NULL, HFILL }
},
{ &hf_sflow_245_ip_tcp_flag_psh,
{ "TCP Flag (PSH)", "sflow_245.ip.tcp_flag.psh",
FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x08,
FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x00000008,
NULL, HFILL }
},
{ &hf_sflow_245_ip_tcp_flag_rst,
{ "TCP Flag (RST)", "sflow_245.ip.tcp_flag.rst",
FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x04,
FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x00000004,
NULL, HFILL }
},
{ &hf_sflow_245_ip_tcp_flag_syn,
{ "TCP Flag (SYN)", "sflow_245.ip.tcp_flag.syn",
FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x02,
FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x00000002,
NULL, HFILL }
},
{ &hf_sflow_245_ip_tcp_flag_fin,
{ "TCP Flag (FIN)", "sflow_245.ip.tcp_flag.fin",
FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x01,
FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x00000001,
NULL, HFILL }
},
{ &hf_sflow_245_ipv4_delay,
{ "Delay", "sflow_245.ipv4_delay",
FT_BOOLEAN, 32, TFS(&tfs_low_normal), 0x10,
FT_BOOLEAN, 32, TFS(&tfs_low_normal), 0x00000010,
NULL, HFILL }
},
{ &hf_sflow_245_ipv4_throughput,
{ "Throughput", "sflow_245.ipv4_throughput",
FT_BOOLEAN, 32, TFS(&tfs_high_normal), 0x08,
FT_BOOLEAN, 32, TFS(&tfs_high_normal), 0x00000008,
NULL, HFILL }
},
{ &hf_sflow_245_ipv4_reliability,
{ "Reliability", "sflow_245.ipv4_reliability",
FT_BOOLEAN, 32, TFS(&tfs_high_normal), 0x04,
FT_BOOLEAN, 32, TFS(&tfs_high_normal), 0x00000004,
NULL, HFILL }
},
{ &hf_sflow_245_ipv4_cost,
{ "Cost (RFC1349)", "sflow_245.ipv4_cost",
FT_BOOLEAN, 32, TFS(&tfs_minimize_monetary_normal), 0x02,
FT_BOOLEAN, 32, TFS(&tfs_minimize_monetary_normal), 0x00000002,
NULL, HFILL }
},
{ &hf_sflow_245_ipv6_priority,

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

@ -2677,8 +2677,8 @@ dissect_negprot_capabilities(tvbuff_t *tvb, proto_tree *parent_tree, int offset)
return mask;
}
#define RAWMODE_READ 0x01
#define RAWMODE_WRITE 0x02
#define RAWMODE_READ 0x0001
#define RAWMODE_WRITE 0x0002
static const true_false_string tfs_rm_read = {
"Read Raw is supported",
"Read Raw is not supported"

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

@ -3397,8 +3397,8 @@ dissect_smb2_capabilities(proto_tree *parent_tree, tvbuff_t *tvb, int offset)
#define NEGPROT_SIGN_REQ 0x0002
#define NEGPROT_SIGN_ENABLED 0x0001
#define NEGPROT_SIGN_REQ 0x02
#define NEGPROT_SIGN_ENABLED 0x01
static int
dissect_smb2_secmode(proto_tree *parent_tree, tvbuff_t *tvb, int offset)

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

@ -3889,13 +3889,13 @@ proto_register_someip(void) {
FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_someip_tp_flags,
{ "Flags", "someip.tp.flags",
FT_UINT8, BASE_HEX, NULL, SOMEIP_TP_OFFSET_MASK_FLAGS, NULL, HFILL }},
FT_UINT32, BASE_HEX, NULL, SOMEIP_TP_OFFSET_MASK_FLAGS, NULL, HFILL }},
{ &hf_someip_tp_reserved,
{ "Reserved", "someip.tp.flags.reserved",
FT_UINT8, BASE_HEX, NULL, SOMEIP_TP_OFFSET_MASK_RESERVED, NULL, HFILL }},
FT_UINT32, BASE_HEX, NULL, SOMEIP_TP_OFFSET_MASK_RESERVED, NULL, HFILL }},
{ &hf_someip_tp_more_segments,
{ "More Segments", "someip.tp.flags.more_segments",
FT_BOOLEAN, 8, NULL, SOMEIP_TP_OFFSET_MASK_MORE_SEGMENTS, NULL, HFILL }},
FT_BOOLEAN, 32, NULL, SOMEIP_TP_OFFSET_MASK_MORE_SEGMENTS, NULL, HFILL }},
{&hf_someip_tp_fragments,
{"SOME/IP-TP segments", "someip.tp.fragments",

12
epan/dissectors/packet-tds.c
View File

@ -279,9 +279,9 @@
#define TDS_SP_PREPEXECRPC 14
#define TDS_SP_UNPREPARE 15
#define TDS_RPC_OPT_WITH_RECOMP 0x01
#define TDS_RPC_OPT_NO_METADATA 0x02
#define TDS_RPC_OPT_REUSE_METADATA 0x04
#define TDS_RPC_OPT_WITH_RECOMP 0x0001
#define TDS_RPC_OPT_NO_METADATA 0x0002
#define TDS_RPC_OPT_REUSE_METADATA 0x0004
#define TDS_RPC_PARAMETER_STATUS_BY_REF 0x01
#define TDS_RPC_PARAMETER_STATUS_DEFAULT 0x02
@ -8671,7 +8671,7 @@ proto_register_tds(void)
},
{ &hf_tds_doneinproc_status,
{ "Status flags", "tds.doneinproc.status",
FT_UINT16, BASE_HEX, NULL, 0x0177,
FT_UINT16, BASE_HEX, NULL, 0x01ff,
NULL, HFILL }
},
{ &hf_tds_doneinproc_curcmd,
@ -9943,12 +9943,12 @@ proto_register_tds(void)
},
{ &hf_tds_rpc_parameter_status_by_ref,
{ "By reference", "tds.rpc.parameter.status.by_ref",
FT_BOOLEAN, 16, NULL, TDS_RPC_PARAMETER_STATUS_BY_REF,
FT_BOOLEAN, 8, NULL, TDS_RPC_PARAMETER_STATUS_BY_REF,
NULL, HFILL }
},
{ &hf_tds_rpc_parameter_status_default,
{ "Default value", "tds.rpc.parameter.status.default",
FT_BOOLEAN, 16, NULL, TDS_RPC_PARAMETER_STATUS_DEFAULT,
FT_BOOLEAN, 8, NULL, TDS_RPC_PARAMETER_STATUS_DEFAULT,
NULL, HFILL }
},
{ &hf_tds_rpc_parameter_value,

10
epan/dissectors/packet-uds.c
View File

@ -219,11 +219,11 @@ void proto_reg_handoff_uds(void);
#define UDS_RFT_MODE_READ_DIR 0x05
#define UDS_RFT_MODE_RESUME_FILE 0x06
#define UDS_SDT_ADMIN_PARAM_REQ 0x01
#define UDS_SDT_ADMIN_PARAM_PRE_ESTABL_KEY 0x08
#define UDS_SDT_ADMIN_PARAM_ENCRYPTED 0x10
#define UDS_SDT_ADMIN_PARAM_SIGNED 0x20
#define UDS_SDT_ADMIN_PARAM_SIGN_ON_RESP_REQ 0x40
#define UDS_SDT_ADMIN_PARAM_REQ 0x0001
#define UDS_SDT_ADMIN_PARAM_PRE_ESTABL_KEY 0x0008
#define UDS_SDT_ADMIN_PARAM_ENCRYPTED 0x0010
#define UDS_SDT_ADMIN_PARAM_SIGNED 0x0020
#define UDS_SDT_ADMIN_PARAM_SIGN_ON_RESP_REQ 0x0040
#define UDS_CDTCS_ACTIONS_ON 1
#define UDS_CDTCS_ACTIONS_OFF 2

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

@ -1260,7 +1260,7 @@ proto_register_vines_arp(void)
{ &hf_vines_arp_packet_type,
{ "Packet Type", "vines_arp.packet_type",
FT_UINT8, BASE_HEX, VALS(vines_arp_packet_type_vals), 0x0,
FT_UINT16, BASE_HEX, VALS(vines_arp_packet_type_vals), 0x0,
NULL, HFILL }},
{ &hf_vines_arp_address,

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

@ -4500,7 +4500,7 @@ proto_register_vnc(void)
},
{ &hf_vnc_mirrorlink_pixel_format,
{ "Pixel Format", "vnc.mirrorlink_pixel_format",
FT_UINT16, BASE_HEX, NULL, 0x0,
FT_UINT32, BASE_HEX, NULL, 0x0,
"Pixel format support", HFILL }
},
{ &hf_vnc_mirrorlink_display_width,

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

@ -43,7 +43,7 @@ void proto_register_vp8(void);
#define BIT_2BYTE_NO_MASK 0xFFFF
#define BIT_3BYTE_NO_MASK 0xFFFFFF
#define BIT_EXT_PICTURE_MASK 0x7FFF
#define BIT_PARTITION_SIZE_MASK 0xE0FFFF
#define BIT_PARTITION_SIZE_MASK 0xFFFFE0
static dissector_handle_t vp8_handle;

18
plugins/epan/wimaxmacphy/packet-wimaxmacphy.c
View File

@ -2660,7 +2660,7 @@ proto_register_wimaxmacphy(void)
{
"Initial Frame Number (from PHY)",
"wimaxmacphy.prim_initial_frame_number",
FT_UINT8,
FT_UINT24,
BASE_DEC,
NULL,
0x0,
@ -2868,10 +2868,10 @@ proto_register_wimaxmacphy(void)
{
"Current Frame Number (lsb)",
"wimaxmacphy.prim_current_frame_number",
FT_UINT8,
FT_UINT16,
BASE_DEC,
NULL,
0xf0,
0x00f0,
NULL,
HFILL
}
@ -2881,10 +2881,10 @@ proto_register_wimaxmacphy(void)
{
"ACID for HARQ data bursts",
"wimaxmacphy.prim_acid_for_harq_data_bursts",
FT_UINT8,
FT_UINT16,
BASE_DEC,
NULL,
0x0f,
0x000f,
NULL,
HFILL
}
@ -3401,7 +3401,7 @@ proto_register_wimaxmacphy(void)
{
"Number of Zone Descriptors",
"wimaxmacphy.number_of_zone_descriptors",
FT_UINT8,
FT_UINT24,
BASE_DEC,
NULL,
0x0,
@ -5186,10 +5186,10 @@ proto_register_wimaxmacphy(void)
{
"ACID",
"wimaxmacphy.sub_burst_harq_ack_acid",
FT_UINT8,
FT_UINT32,
BASE_DEC,
NULL,
0xf0,
0x000000f0,
NULL,
HFILL
}
@ -5202,7 +5202,7 @@ proto_register_wimaxmacphy(void)
FT_UINT32,
BASE_HEX,
NULL,
0x0fff,
0x00000fff,
NULL,
HFILL
}

29
tools/check_typed_item_calls.py
View File

@ -328,7 +328,9 @@ known_non_contiguous_fields = { 'wlan.fixed.capabilities.cfpoll.sta',
'dnp3.al.ana.int',
'pwcesopsn.cw.lm',
'gsm_a.rr.format_id', # EN 301 503
'siii.mst.phase' # comment in code seems convinced
'siii.mst.phase', # comment in code seems convinced
'xmcp.type.class',
'xmcp.type.method'
}
##################################################################################################
@ -450,7 +452,9 @@ def is_ignored_consecutive_filter(filter):
re.compile(r'^bthfp.chld.mode'),
re.compile(r'^nat-pmp.pml'),
re.compile(r'^isystemactivator.actproperties.ts.hdr'),
re.compile(r'^rtpdump.txt_addr')
re.compile(r'^rtpdump.txt_addr'),
re.compile(r'^unistim.vocoder.id'),
re.compile(r'^mac.ueid')
]
for patt in ignore_patterns:
@ -653,20 +657,21 @@ class Item:
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):
print('Error:', self.filename, self.hf, 'filter=', self.filter, self.mask, "with len is", len(mask)-2,
print('Error:', self.filename, self.hf, 'filter=', self.filter, 'mask', self.mask, "with len is", len(mask)-2,
"but type", self.item_type, " indicates max of", int(self.get_field_width_in_bits()/4),
"and extra digits are non-zero (" + extra_digits + ")")
errors_found += 1
else:
# Has extra leading zeros, still confusing, so warn.
print('Warning:', self.filename, self.hf, 'filter=', self.filter, self.mask, "with len", len(mask)-2,
print('Warning:', self.filename, self.hf, 'filter=', self.filter, 'mask', self.mask, "with len", len(mask)-2,
"but type", self.item_type, " indicates max of", int(self.get_field_width_in_bits()/4))
warnings_found += 1
# Strict/fussy check - expecting mask length to match field width exactly!
# Currently only doing for FT_BOOLEAN
# Currently only doing for FT_BOOLEAN, and don't expect to be in full for 64-bit fields!
if self.mask_exact_width:
if self.item_type == 'FT_BOOLEAN' and len(mask)-2 != int(self.get_field_width_in_bits()/4):
ideal_mask_width = int(self.get_field_width_in_bits()/4)
if self.item_type == 'FT_BOOLEAN' and ideal_mask_width < 16 and len(mask)-2 != ideal_mask_width:
print('Warning:', self.filename, self.hf, 'filter=', self.filter, 'mask', self.mask, "with len", len(mask)-2,
"but type", self.item_type, "|", self.type_modifier, " indicates should be", int(self.get_field_width_in_bits()/4))
warnings_found += 1
@ -982,9 +987,9 @@ def is_dissector_file(filename):
return p.match(filename)
def findDissectorFilesInFolder(folder, dissector_files=None, recursive=False):
if dissector_files is None:
dissector_files = []
def findDissectorFilesInFolder(folder, recursive=False):
dissector_files = []
if recursive:
for root, subfolders, files in os.walk(folder):
for f in files:
@ -1084,8 +1089,6 @@ files = []
if args.file:
# Add specified file(s)
for f in args.file:
if not f.startswith('epan'):
f = os.path.join('epan', 'dissectors', f)
if not os.path.isfile(f):
print('Chosen file', f, 'does not exist.')
exit(1)
@ -1125,8 +1128,8 @@ elif args.open:
files.append(f)
else:
# Find all dissector files.
files = findDissectorFilesInFolder(os.path.join('epan', 'dissectors'))
files = findDissectorFilesInFolder(os.path.join('plugins', 'epan'), recursive=True, dissector_files=files)
files = findDissectorFilesInFolder(os.path.join('epan', 'dissectors'))
files += findDissectorFilesInFolder(os.path.join('plugins', 'epan'), recursive=True)
# If scanning a subset of files, list them here.

10
tools/check_val_to_str.py
View File

@ -72,9 +72,9 @@ def is_dissector_file(filename):
p = re.compile(r'.*packet-.*\.c')
return p.match(filename)
def findDissectorFilesInFolder(folder, dissector_files=None, recursive=False):
if dissector_files is None:
dissector_files = []
def findDissectorFilesInFolder(folder, recursive=False):
dissector_files = []
if recursive:
for root, subfolders, files in os.walk(folder):
for f in files:
@ -192,8 +192,8 @@ elif args.open:
files.append(f)
else:
# Find all dissector files from folder.
files = findDissectorFilesInFolder(os.path.join('epan', 'dissectors'))
files = findDissectorFilesInFolder(os.path.join('plugins', 'epan'), recursive=True, dissector_files=files)
files = findDissectorFilesInFolder(os.path.join('epan', 'dissectors'))
files += findDissectorFilesInFolder(os.path.join('plugins', 'epan'), recursive=True)
# If scanning a subset of files, list them here.