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

Fix some more wrong filter names. 

These are duplicates detected seen by running
check_typed_item_calls.py  --consecutive.

There are still quite a few more to go.
This commit is contained in:
Martin Mathieson 2020-09-28 18:20:09 +01:00
parent c69d8dd410
commit 8b4e0148a2
24 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7799,7 +7799,7 @@ proto_register_lustre(void)
{ &hf_lustre_lmv_mds_md_hash_type,
{ "Lmv Hash Type", "lustre.lmv_mds_md.hash_type", FT_UINT32, BASE_DEC, VALS(lmv_hash_type_vals), LMV_HASH_TYPE_MASK, NULL, HFILL }},
{ &hf_lustre_lmv_mds_md_status,
{ "Lmv Status", "lustre.lmv_mds_md.hash_type", FT_UINT32, BASE_HEX, NULL, ~LMV_HASH_TYPE_MASK, NULL, HFILL }},
{ "Lmv Status", "lustre.lmv_mds_md.status", FT_UINT32, BASE_HEX, NULL, ~LMV_HASH_TYPE_MASK, NULL, HFILL }},
{ &hf_lustre_lmv_mds_md_layout_version,
{ "Lmv Layout Ver", "lustre.lmv_mds_md.layout_version", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_lustre_lmv_mds_md_padding,

2
epan/dissectors/packet-mpeg-dsmcc.c
View File

@ -3231,7 +3231,7 @@ proto_register_dsmcc(void)
} },
{ &hf_dsmcc_un_sess_nsap_sel, {
"Selector (SEL)", "mpeg_dsmcc.un_sess.dsmcc_nsap_esi",
"Selector (SEL)", "mpeg_dsmcc.un_sess.dsmcc_nsap_sel",
FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL
} },
/* table J.3 NSAP - end */

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

@ -6444,7 +6444,7 @@ proto_register_mswsp(void)
{
&hf_mswsp_bool_options_cursor,
{
"Cursor", "mswsp.CPMCreateQuery.RowSetProperties.uBooleanOptions", FT_UINT32,
"Cursor", "mswsp.CPMCreateQuery.RowSetProperties.uBooleanOptions.cursor", FT_UINT32,
BASE_HEX, VALS(cursor_vals), 0x0000000007, "Cursor Type", HFILL
}
},
@ -6626,7 +6626,7 @@ proto_register_mswsp(void)
{
&hf_mswsp_ctablecolumn_valoffset,
{
"ValueOffset", "mswsp.ctablecolumn.valused",
"ValueOffset", "mswsp.ctablecolumn.valoffset",
FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL
}
},
@ -7279,7 +7279,7 @@ proto_register_mswsp(void)
{
&hf_mswsp_msg_cpmcreatequery_workid,
{
"WorkId", "mswsp.cpmcreatequery.trueseq",
"WorkId", "mswsp.cpmcreatequery.workid",
FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL
}
},

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

@ -7353,7 +7353,7 @@ proto_register_nas_5gs(void)
NULL, HFILL }
},
{ &hf_nas_5gs_mm_5g_128_ia3,
{ "128-5G-IA3","nas_5gs.mm.5g_128_ia4",
{ "128-5G-IA3","nas_5gs.mm.5g_128_ia3",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x10,
NULL, HFILL }
},

2
epan/dissectors/packet-nat-pmp.c
View File

@ -831,7 +831,7 @@ void proto_register_nat_pmp(void)
{ "IPv4 Prefix Count", "portcontrol.option.p64.ipv4_prefix_count", FT_UINT16, BASE_DEC,
NULL, 0x0, NULL, HFILL } },
{ &hf_option_p64_ipv4_prefix_length,
{ "IPv4 Prefix Length", "portcontrol.option.p64.ipv4_prefix_count", FT_UINT16, BASE_DEC,
{ "IPv4 Prefix Length", "portcontrol.option.p64.ipv4_prefix_length", FT_UINT16, BASE_DEC,
NULL, 0x0, NULL, HFILL } },
{ &hf_option_p64_ipv4_address,
{ "IPv4 Address", "portcontrol.option.p64.ipv4_address", FT_IPv4, BASE_NONE,

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

@ -2969,7 +2969,7 @@ proto_register_obex(void)
NULL, HFILL}
},
{ &hf_pbap_application_parameter_vcard_selector,
{ "vCard Selector", "obex.parameter.value.filter",
{ "vCard Selector", "obex.parameter.value.vcard_selector",
FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL}
},

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

@ -10185,7 +10185,7 @@ void proto_register_opa_mad(void)
FT_UINT16, BASE_CUSTOM, CF_FUNC(cf_opa_mad_linkwidth), 0x0, NULL, HFILL }
},
{ &hf_opa_PortStates_LinkWidthDowngradeRxActive, {
"LinkWidthDowngrade RxActive", "opa.portstates.linkwidthdowngradetxactive",
"LinkWidthDowngrade RxActive", "opa.portstates.linkwidthdowngraderxactive",
FT_UINT16, BASE_CUSTOM, CF_FUNC(cf_opa_mad_linkwidth), 0x0, NULL, HFILL }
},

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

@ -177,7 +177,7 @@ proto_register_rmcp(void)
FT_UINT8, BASE_HEX, NULL, 0,
"RMCP Version", HFILL }},
{ &hf_rmcp_reserved, {
"Reserved", "rmcp.version",
"Reserved", "rmcp.reserved",
FT_UINT8, BASE_HEX, NULL, 0,
"RMCP Reserved", HFILL }},
{ &hf_rmcp_sequence, {

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

@ -12762,15 +12762,15 @@ void proto_register_rtps(void) {
FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x0001, NULL, HFILL }
},
{ &hf_rtps_flag_memberflag_optional, {
"Optional", "rtps.flag.typeflags.key",
"Optional", "rtps.flag.typeflags.optional",
FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x0002, NULL, HFILL }
},
{ &hf_rtps_flag_memberflag_shareable, {
"Shareable", "rtps.flag.typeflags.key",
"Shareable", "rtps.flag.typeflags.shareable",
FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x0004, NULL, HFILL }
},
{ &hf_rtps_flag_memberflag_union_default, {
"Union default", "rtps.flag.typeflags.key",
"Union default", "rtps.flag.typeflags.union_default",
FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x0008, NULL, HFILL }
},
{ &hf_rtps_type_object_element_module_name,

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

@ -2963,7 +2963,7 @@ s7comm_szl_0131_0004_register(int proto)
{ "hoch (Maximum number of simultaneous upload procedures)", "s7comm.szl.0131.0004.hoch", FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_s7comm_szl_0131_0004_ver,
{ "ver (Maximum size (in bytes) of shiftable blocks in RUN)", "s7comm.szl.0131.0004.hoch", FT_UINT8, BASE_DEC, NULL, 0x0,
{ "ver (Maximum size (in bytes) of shiftable blocks in RUN)", "s7comm.szl.0131.0004.ver", FT_UINT8, BASE_DEC, NULL, 0x0,
"ver (Maximum size (in bytes) of shiftable blocks in RUN) With an S7-300, this size refers to the entire block,with the S7-400, it refers to the part of the block relevant to running the program.", HFILL }},
{ &hf_s7comm_szl_0131_0004_res,
{ "res (Reserved)", "s7comm.szl.0131.0004.res", FT_BYTES, BASE_NONE, NULL, 0x0,
@ -5681,7 +5681,7 @@ s7comm_szl_0424_0000_register(int proto)
{ "ereig", "s7comm.szl.0424.0000.ereig", FT_UINT16, BASE_HEX, NULL, 0x0,
"Event ID", HFILL }},
{ &hf_s7comm_szl_0424_0000_ae,
{ "ae", "s7comm.szl.0424.0000.ereig", FT_UINT8, BASE_HEX, NULL, 0x0,
{ "ae", "s7comm.szl.0424.0000.ae", FT_UINT8, BASE_HEX, NULL, 0x0,
"ae (B#16#FF)", HFILL }},
{ &hf_s7comm_szl_0424_0000_bzu_id,
{ "bzu-id", "s7comm.szl.0424.0000.bzu_id", FT_UINT8, BASE_HEX, NULL, 0x0,

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

@ -1953,7 +1953,7 @@ proto_register_stun(void)
32, TFS(&tfs_yes_no), 0x80000000, NULL, HFILL}
},
{ &hf_stun_att_address_rp_b,
{ "PSTN", "stun.att.address_rp.valid", FT_BOOLEAN,
{ "PSTN", "stun.att.address_rp.pstn", FT_BOOLEAN,
32, TFS(&tfs_yes_no), 0x40000000, NULL, HFILL}
},
{ &hf_stun_att_address_rp_rsv1,

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

@ -7448,7 +7448,7 @@ proto_register_tn3270(void)
},
{ &hf_tn3270_ua_yr,
{ "Distance between points in Y direction as a fraction",
"tn3270.ua_xr",
"tn3270.ua_yr",
FT_UINT32, BASE_HEX, NULL, 0x0,
"measured in UNITS, with 2-byte numerator and 2-byte denominator", HFILL }
},

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

@ -582,7 +582,7 @@ proto_register_tzsp(void)
NULL, 0, "DeviceName", HFILL }},
{ &hf_capture_location, {
"Capture Location", "tzsp.device_name", FT_STRING, STR_ASCII,
"Capture Location", "tzsp.capture_location", FT_STRING, STR_ASCII,
NULL, 0, "CaptureLocation", HFILL }},
{ &hf_capture_info, {

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

@ -4741,7 +4741,7 @@ proto_register_ua3g(void)
{ &hf_ua3g_ip_device_routing_start_rtp_parameter_ip, { "IP", "ua3g.ip.start_rtp.parameter.ip", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_ua3g_ip_device_routing_start_rtp_parameter_compressor, { "Compressor", "ua3g.ip.start_rtp.parameter.compressor", FT_UINT64, BASE_DEC|BASE_VAL64_STRING, VALS64(str_compressor_vals), 0x0, NULL, HFILL }},
{ &hf_ua3g_ip_device_routing_start_rtp_parameter_enabler, { "Enabler", "ua3g.ip.start_rtp.parameter.enabler", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_ua3g_ip_device_routing_start_rtp_parameter_send_qos, { "Must Send QOS Tickets", "ua3g.ip.start_rtp.parameter.enabler", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_ua3g_ip_device_routing_start_rtp_parameter_send_qos, { "Must Send QOS Tickets", "ua3g.ip.start_rtp.parameter.send_qos", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_ua3g_ip_device_routing_start_rtp_parameter_uint, { "Value", "ua3g.ip.start_rtp.parameter.uint", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_ua3g_ip_device_routing_start_rtp_parameter_dtmf_sending, { "Send DTMF", "ua3g.ip.start_rtp.parameter.dtmf_sending", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_ua3g_ip_device_routing_start_rtp_parameter_rfc2198, { "Enable RFC 2198", "ua3g.ip.start_rtp.parameter.rfc2198", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }},

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

@ -6946,7 +6946,7 @@ void proto_register_wassp(void)
{
&hf_wassp_apprules,
{
"Number of Application Rules", "wassp.mu", FT_UINT16, BASE_DEC, NULL,
"Number of Application Rules", "wassp.num_apprules", FT_UINT16, BASE_DEC, NULL,
0x00, "WASSP number of app rules", HFILL
}
},

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

@ -3285,7 +3285,7 @@ proto_register_wccp(void)
NULL, HFILL }
},
{ &hf_capability_transmit_t_lower_limit,
{ "Message interval lower limit in milliseconds", "wccp.capability.transmit_t.upper_limit", FT_UINT16, BASE_DEC, NULL, 0x0,
{ "Message interval lower limit in milliseconds", "wccp.capability.transmit_t.lower_limit", FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_capability_timer_scale_timeout_scale,

2
epan/dissectors/packet-wifi-nan.c
View File

@ -3492,7 +3492,7 @@ proto_register_nan(void)
{ &hf_nan_attr_availability_map_id,
{
"Map ID",
"nan.availability.ctr",
"nan.availability.map_id",
FT_UINT16, BASE_HEX_DEC, NULL, 0x00F, NULL, HFILL
}
},

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

@ -3847,7 +3847,7 @@ proto_register_wlccp(void)
},
{ &hf_80211_cap_privacy,
{ "Privacy flag", "wlccp.80211_cf_poll_req_flag",
{ "Privacy flag", "wlccp.80211_privacy",
FT_UINT16, BASE_DEC, NULL,
F_80211_PRIVACY, "Set on indicate confidentiality is required in the BSS", HFILL }
},

2
epan/dissectors/packet-zbee-nwk.c
View File

@ -2094,7 +2094,7 @@ void proto_register_zbee_nwk(void)
IEEE802154_CMD_CINFO_POWER_SRC, "Indicates this device is using AC/Mains power.", HFILL }},
{ &hf_zbee_nwk_cmd_cinfo_idle_rx,
{ "Rx On When Idle", "zbee_nwk.cmd.cinfo.power", FT_BOOLEAN, 8, NULL,
{ "Rx On When Idle", "zbee_nwk.cmd.cinfo.on_idle", FT_BOOLEAN, 8, NULL,
IEEE802154_CMD_CINFO_IDLE_RX,
"Indicates the receiver is active when the device is idle.", HFILL }},

4
epan/dissectors/packet-zbee-zcl-general.c
View File

@ -15232,7 +15232,7 @@ proto_register_zbee_zcl_gp(void)
{ "SecurityKeyType", "zbee_zcl_general.gp.pairing.opt.secur_key_type", FT_UINT24, BASE_HEX,
VALS(zbee_zcl_gp_secur_key_types), ZBEE_ZCL_GP_PAIRING_OPTION_SECUR_KEY_TYPE, NULL, HFILL }},
{ &hf_zbee_gp_cmd_pairing_opt_gpd_frame_cnt_present,
{ "Frame Counter present", "zbee_zcl_general.gp.pairing.opt.seq_num_cap", FT_BOOLEAN, 24,
{ "Frame Counter present", "zbee_zcl_general.gp.pairing.opt.frame_counter_present", FT_BOOLEAN, 24,
NULL, ZBEE_ZCL_GP_PAIRING_OPTION_GPD_FRAME_CNT_PRESENT, "GPD security Frame Counter present", HFILL }},
{ &hf_zbee_gp_cmd_pairing_opt_gpd_secur_key_present,
{ "Key present", "zbee_zcl_general.gp.pairing.opt.key_present", FT_BOOLEAN, 24,
@ -15383,7 +15383,7 @@ proto_register_zbee_zcl_gp(void)
{ "Number of Server clusters", "zbee_zcl_general.gp.pc.n_srv_clusters", FT_UINT8, BASE_DEC,
NULL, ZBEE_ZCL_GP_CLUSTER_LIST_LEN_SRV, NULL, HFILL }},
{ &hf_zbee_gp_n_cli_clusters,
{ "Number of Client clusters", "zbee_zcl_general.gp.pc.n_srv_clusters", FT_UINT8, BASE_DEC,
{ "Number of Client clusters", "zbee_zcl_general.gp.pc.n_clnt_clusters", FT_UINT8, BASE_DEC,
NULL, ZBEE_ZCL_GP_CLUSTER_LIST_LEN_CLI, NULL, HFILL }},
{ &hf_zbee_gp_gpd_cluster_id,
{ "Cluster ID", "zbee_zcl_general.gp.pc.cluster", FT_UINT8, BASE_HEX | BASE_RANGE_STRING, RVALS(zbee_aps_cid_names),

4
epan/dissectors/packet-zbee-zcl-se.c
View File

@ -14035,7 +14035,7 @@ proto_register_zbee_zcl_device_management(void)
0x0, NULL, HFILL } },
{ &hf_zbee_zcl_device_management_set_event_configuration_event_configuration_event_id,
{ "Event ID", "zbee_zcl_se.device_management.set_event_configuration.event_configuration.number_of_events", FT_UINT16, BASE_DEC, NULL,
{ "Event ID", "zbee_zcl_se.device_management.set_event_configuration.event_configuration.event_id", FT_UINT16, BASE_DEC, NULL,
0x0, NULL, HFILL } },
{ &hf_zbee_zcl_device_management_set_event_configuration_event_configuration_event_group_id,
@ -14468,7 +14468,7 @@ proto_register_zbee_zcl_events(void)
0x00, NULL, HFILL } },
{ &hf_zbee_zcl_events_get_event_log_event_offset,
{ "Event Offset", "zbee_zcl_se.events.get_event_log.number_of_events", FT_UINT16, BASE_DEC, NULL,
{ "Event Offset", "zbee_zcl_se.events.get_event_log.event_offset", FT_UINT16, BASE_DEC, NULL,
0x00, NULL, HFILL } },
{ &hf_zbee_zcl_events_clear_event_log_request_log_id,

2
epan/dissectors/packet-zbee-zdp.c
View File

@ -1441,7 +1441,7 @@ void proto_register_zbee_zdp(void)
"Indicates this device is using AC/Mains power.", HFILL }},
{ &hf_zbee_zdp_cinfo_idle_rx,
{ "Rx On When Idle", "zbee_zdp.cinfo.power", FT_BOOLEAN, 8, NULL, ZBEE_CINFO_IDLE_RX,
{ "Rx On When Idle", "zbee_zdp.cinfo.idle_rx", FT_BOOLEAN, 8, NULL, ZBEE_CINFO_IDLE_RX,
"Indicates the receiver is active when the device is idle.", HFILL }},
{ &hf_zbee_zdp_cinfo_security,

2
plugins/epan/gryphon/packet-gryphon.c
View File

@ -4372,7 +4372,7 @@ proto_register_gryphon(void)
{ "Context", "gryphon.cmd.context", FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_gryphon_cmd_ioctl_context,
{ "IOCTL Response", "gryphon.cmd.context", FT_UINT8, BASE_DEC, VALS(ioctls), 0x0,
{ "IOCTL Response", "gryphon.cmd.ioctl_response", FT_UINT8, BASE_DEC, VALS(ioctls), 0x0,
NULL, HFILL }},
{ &hf_gryphon_data,
{ "Data", "gryphon.data", FT_BYTES, BASE_NONE, NULL, 0x0,

2
plugins/epan/profinet/packet-dcerpc-pn-io.c
View File

@ -12252,7 +12252,7 @@ proto_register_pn_io (void)
NULL, HFILL }
},
{ &hf_pn_io_ar_arresource,
{ "ARresource", "pn_io.ar_arnumber",
{ "ARresource", "pn_io.ar_arresource",
FT_UINT16, BASE_HEX, VALS(pn_io_ar_arresource), 0x0018,
NULL, HFILL }
},