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

Fix more filter field strings. 

These appear to be copy/paste errors detected by running
./tools/check_typed_item_calls.py --consecutive

Quite a few issues still remain after this batch.
This commit is contained in:
Martin Mathieson 2020-10-03 13:52:06 +01:00 committed by Martin Mathieson
parent 6136c719da
commit 607831d870
29 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/packet-3g-a11.c
View File

@ -2652,7 +2652,7 @@ proto_register_a11(void)
NULL, HFILL }
},
{ &hf_a11_max_num_serv_opt,
{ "Max number of service instances of Service Option", "a11.serviceoption",
{ "Max number of service instances of Service Option", "a11.max_serviceoptions",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }
},

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

@ -7735,7 +7735,7 @@ proto_register_acn(void)
/* DMX 2 First Property Address */
{ &hf_acn_dmx_2_first_property_address,
{ "First Property Address", "acn.dmx.start_code",
{ "First Property Address", "acn.dmx.first_property_address",
FT_UINT16, BASE_DEC_HEX, NULL, 0x0,
"DMX First Property Address", HFILL }
},

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

@ -6351,7 +6351,7 @@ proto_register_bthci_cmd(void)
"Number of IACs which are currently in use", HFILL }
},
{ &hf_bthci_cmd_iac_lap,
{ "IAC LAP", "bthci_cmd.num_curr_iac",
{ "IAC LAP", "bthci_cmd.num_iac_lap",
FT_UINT24, BASE_HEX, NULL, 0x0,
"LAP(s)used to create IAC", HFILL }
},

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

@ -7856,7 +7856,7 @@ proto_register_bthci_evt(void)
"Num of IACs currently in use to simultaneously listen", HFILL }
},
{ &hf_bthci_evt_iac_lap,
{ "IAC LAP", "bthci_evt.num_curr_iac",
{ "IAC LAP", "bthci_evt.iac_lap",
FT_UINT24, BASE_HEX, NULL, 0x0,
"LAP(s)used to create IAC", HFILL }
},

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

@ -4409,7 +4409,7 @@ proto_register_capwap_control(void)
NULL, HFILL }
},
{ &hf_capwap_msg_element_type_ieee80211_ie_wlan_id,
{ "WLAN ID", "capwap.control.message_element.ieee80211_ie.radio_id",
{ "WLAN ID", "capwap.control.message_element.ieee80211_ie.wlan_id",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},

2
epan/dissectors/packet-dcerpc-fileexp.c
View File

@ -4589,7 +4589,7 @@ proto_register_fileexp (void)
NULL, HFILL}
},
{ &hf_fileexp_bulkkeepalive_spare4,
{ "BulkKeepAlive spare4", "fileexp.bulkfetchkeepalive_spare2",
{ "BulkKeepAlive spare4", "fileexp.bulkfetchkeepalive_spare4",
FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL}
},

4
epan/dissectors/packet-dcerpc-fldb.c
View File

@ -1842,11 +1842,11 @@ proto_register_fldb (void)
{"Principal Name", "fldb.NameString_principal", FT_STRING, BASE_NONE,
NULL, 0x0, NULL, HFILL}},
{&hf_fldb_namestring,
{"Name string", "fldb.NameString_principal", FT_STRING, BASE_NONE, NULL,
{"Name string", "fldb.NameString", FT_STRING, BASE_NONE, NULL,
0x0, NULL, HFILL}},
#if 0
{&hf_dcerpc_error_status,
{"Error Status", "fldb.NameString_principal", FT_UINT32, BASE_DEC, NULL,
{"Error Status", "fldb.error_status", FT_UINT32, BASE_DEC, NULL,
0x0, NULL, HFILL}},
#endif
{&hf_error_st,

4
epan/dissectors/packet-dcom-sysact.c
View File

@ -1236,7 +1236,7 @@ proto_register_ISystemActivator (void)
{ &hf_sysact_spsysprop_cltimpersonating,
{ "ClientImpersonating", "isystemactivator.properties.spcl.cltimp", FT_UINT32, BASE_DEC_HEX, NULL, 0x0, NULL, HFILL }},
{ &hf_sysact_spsysprop_partitionid,
{ "PartitionIDPresent", "isystemactivator.properties.spcl.cltimp", FT_UINT32, BASE_DEC_HEX, NULL, 0x0, NULL, HFILL }},
{ "PartitionIDPresent", "isystemactivator.properties.spcl.partitionid", FT_UINT32, BASE_DEC_HEX, NULL, 0x0, NULL, HFILL }},
{ &hf_sysact_spsysprop_defauthlvl,
{ "DefaultAuthnLevel", "isystemactivator.properties.spcl.defauthlvl", FT_UINT32, BASE_DEC_HEX, NULL, 0x0, NULL, HFILL }},
{ &hf_sysact_spsysprop_partition,
@ -1264,7 +1264,7 @@ proto_register_ISystemActivator (void)
{ &hf_sysact_instninfo_actflags,
{ "ActivationFlags", "isystemactivator.properties.instninfo.actflags", FT_UINT32, BASE_DEC_HEX, VALS(instninfo_actflags), 0x0, NULL, HFILL }},
{ &hf_sysact_instninfo_issurrogate,
{ "FlagsSurrogate", "isystemactivator.properties.instninfo.actflags", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ "FlagsSurrogate", "isystemactivator.properties.instninfo.issurogate", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_sysact_instninfo_iidcount,
{ "InterfaceIdCount", "isystemactivator.properties.instninfo.iidcount", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_sysact_instninfo_instflags,

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

@ -8668,7 +8668,7 @@ void proto_register_dis(void)
NULL, HFILL }
},
{ &hf_dis_current_part,
{ "Current Part", "dis.num_parts",
{ "Current Part", "dis.current_part",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
@ -9498,7 +9498,7 @@ void proto_register_dis(void)
NULL, HFILL}
},
{ &hf_appearance_concealed_movement,
{"Concealed Movement", "dis.appearance.lifeform.concealed_stationary",
{"Concealed Movement", "dis.appearance.lifeform.concealed_movement",
FT_UINT32, BASE_DEC, VALS(appearance_concealed_movement_vals), 0x80000000,
NULL, HFILL}
},

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

@ -1156,7 +1156,7 @@ void proto_register_dlt(void) {
"With ECU ID", "dlt.header_type.with_ecu_id",
FT_BOOLEAN, 8, NULL, DLT_HDR_TYPE_WITH_ECU_ID, NULL, HFILL }},
{ &hf_dlt_ht_with_sessionid, {
"With Session ID", "dlt.header_type.with_ecu_id",
"With Session ID", "dlt.header_type.with_session_id",
FT_BOOLEAN, 8, NULL, DLT_HDR_TYPE_WITH_SESSION_ID, NULL, HFILL }},
{ &hf_dlt_ht_with_timestamp, {
"With Timestamp", "dlt.header_type.with_timestamp",
@ -1226,7 +1226,7 @@ void proto_register_dlt(void) {
"(uint16)", "dlt.data.uint16",
FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } },
{ &hf_dlt_uint32, {
"(uint32)", "dlt.data.uint16",
"(uint32)", "dlt.data.uint32",
FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } },
{ &hf_dlt_uint64, {
"(uint64)", "dlt.data.uint64",

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

@ -1136,7 +1136,7 @@ void proto_register_drbd(void)
{ &hf_drbd_current_uuid, { "Current UUID", "drbd.current_uuid", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }},
{ &hf_drbd_bitmap_uuid, { "Bitmap UUID", "drbd.bitmap_uuid", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }},
{ &hf_drbd_history_uuid_list, { "History UUIDs", "drbd.history_uuids", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_drbd_history_uuid, { "History UUID", "drbd.history_uuids", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }},
{ &hf_drbd_history_uuid, { "History UUID", "drbd.history_uuid", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }},
{ &hf_drbd_dirty_bits, { "Dirty bits", "drbd.dirty_bits", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }},
{ &hf_drbd_uuid_flags, { "UUID flags", "drbd.uuid_flags", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }},
{ &hf_drbd_node_mask, { "Nodes", "drbd.node_mask", FT_UINT64, BASE_CUSTOM, format_node_mask, 0x0, NULL, HFILL }},

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

@ -2516,7 +2516,7 @@ void proto_register_dvb_s2_table(void)
NULL, HFILL}
},
{&hf_dvb_s2_table_private, {
"Table private indicator", "dvb-s2_table.section",
"Table private indicator", "dvb-s2_table.private_indicator",
FT_UINT8, BASE_HEX, NULL, DVB_S2_TABLE_PRIVATE_MASK,
NULL, HFILL}
},
@ -3545,7 +3545,7 @@ void proto_register_dvb_s2_table(void)
NULL, HFILL}
},
{&hf_dvb_s2_table_pt_mapping_section, {
"Mapping section", "dvb-s2_table.pt.mapping_sections",
"Mapping section", "dvb-s2_table.pt.mapping_section",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL}
},
@ -3555,7 +3555,7 @@ void proto_register_dvb_s2_table(void)
NULL, HFILL}
},
{&hf_dvb_s2_table_pt_ms_inclusion_end, {
"Mapping section inclusion end", "dvb-s2_table.pt.ms.inclusion_start",
"Mapping section inclusion end", "dvb-s2_table.pt.ms.inclusion_end",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL}
},
@ -4386,7 +4386,7 @@ void proto_register_dvb_s2_table(void)
NULL, HFILL}
},
{&hf_dvb_s2_table_lls, {
"lower layer service", "dvb-s2_table.lls.index",
"lower layer service", "dvb-s2_table.lls",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL}
},

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

@ -3343,7 +3343,7 @@ proto_register_geonw(void)
BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_geonw_tsb,
{ "Topologically-Scoped Broadcast Packet", "geonw.gbc", FT_NONE,
{ "Topologically-Scoped Broadcast Packet", "geonw.tsb", FT_NONE,
BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_geonw_ls,

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

@ -8310,7 +8310,7 @@ proto_register_gsm_a_bssmap(void)
NULL, HFILL }
},
{ &hf_gsm_a_bssmap_channel_rate_and_type,
{ "Channel Rate and Type", "gsm_a.bssmap.perm_speech_v_ind",
{ "Channel Rate and Type", "gsm_a.bssmap.rate_and_type",
FT_UINT8, BASE_DEC, VALS(gsm_a_bssap_channel_rate_and_type_vals), 0x0,
NULL, HFILL }
},
@ -8325,7 +8325,7 @@ proto_register_gsm_a_bssmap(void)
NULL, HFILL }
},
{ &hf_gsm_a_bssmap_send_seqn,
{ "Send Sequence Number", "gsm_a.bssmap.reroute_rej_cause",
{ "Send Sequence Number", "gsm_a.bssmap.send_seqn",
FT_UINT8, BASE_HEX, NULL, 0xc0,
NULL, HFILL }
},

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

@ -4773,7 +4773,7 @@ proto_register_gsm_a_common(void)
NULL, HFILL }
},
{ &hf_gsm_a_geo_loc_inner_radius,
{ "Inner radius", "gsm_a.gad.altitude",
{ "Inner radius", "gsm_a.gad.inner_radius",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},

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

@ -7506,7 +7506,7 @@ proto_register_gsm_a_dtap(void)
NULL, HFILL }
},
{ &hf_gsm_a_dtap_enicm,
{ "ENICM", "gsm_a.dtap.mcat",
{ "ENICM", "gsm_a.dtap.enicm",
FT_BOOLEAN, 8, TFS(&gsm_a_dtap_enicm_value), 0x04,
NULL, HFILL }
},

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

@ -10875,7 +10875,7 @@ proto_register_gsm_rlcmac(void)
}
},
{ &hf_mobile_union,
{ "Mobile Allocation", "gsm_rlcmac.dl.bitmap",
{ "Mobile Allocation", "gsm_rlcmac.dl.mobile_allocation",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}

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

@ -10355,7 +10355,7 @@ void proto_register_gtpv2(void)
"Old Security Context Indicator", HFILL}
},
{ &hf_gtpv2_mm_context_nruna,
{ "NRUNA (NR-U in 5GS Not Allowed)", "gtpv2.mm_context.nrusrna",
{ "NRUNA (NR-U in 5GS Not Allowed)", "gtpv2.mm_context.nruna",
FT_BOOLEAN, 8, NULL, 0x10,
NULL, HFILL }
},
@ -11132,7 +11132,7 @@ void proto_register_gtpv2(void)
NULL, HFILL }
},
{ &hf_gtpv2_origination_ts,
{ "Origination Time Stamp", "gtpv2.ms_ts",
{ "Origination Time Stamp", "gtpv2.origination_ts",
FT_ABSOLUTE_TIME, ABSOLUTE_TIME_UTC, NULL, 0x0,
NULL, HFILL }
},

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

@ -4236,7 +4236,7 @@ void proto_register_gvcp(void)
/* GVCP_SC_GENDC_FLOW_MAPPING_TABLE_ADDRESS(0), 1, 2, 3 */
{ &hf_gvcp_sc_gendc_flow_mapping_table_address_v2_2,
{ "Stream Channel GenDC Flow Mapping Table Address", "gvcp.bootstrap.gendc.flowmappingtablesize",
{ "Stream Channel GenDC Flow Mapping Table Address", "gvcp.bootstrap.gendc.flowmappingtableaddress",
FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL
} },

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

@ -1319,7 +1319,7 @@ void proto_register_h248_annex_c(void) {
FT_UINT8, BASE_HEX, VALS(h248_pkg_annexc_tmrsr_values), 0,
"Transmission Medium Requirement Subrate", HFILL }},
{ &hf_h248_pkg_annexc_contcheck,
{ "Continuity Check", "h248.annexc.tmsr",
{ "Continuity Check", "h248.annexc.contcheck",
FT_UINT8, BASE_DEC, VALS(h248_pkg_annexc_contcheck_values), 0x0C,
NULL, HFILL }},

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

@ -5597,7 +5597,7 @@ proto_register_17221(void)
FT_BOOLEAN, 32, NULL, AECP_COUNTERS_VALID_LINK_UP, NULL, HFILL }
},
{ &hf_aecp_avb_interface_link_down_valid,
{"Link Down Valid", "ieee17221.flags.link_up_valid",
{"Link Down Valid", "ieee17221.flags.link_down_valid",
FT_BOOLEAN, 32, NULL, AECP_COUNTERS_VALID_LINK_DOWN, NULL, HFILL }
},
{ &hf_aecp_avb_interface_packets_tx_valid,

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

@ -8609,11 +8609,11 @@ proto_register_ieee1905(void)
0, NULL, HFILL }},
{ &hf_ieee1905_responder_al_mac_addr,
{ "Responder MAC address", "ieee1905.responder_mac_addr",
{ "Responder MAC address", "ieee1905.responder_al_mac_addr",
FT_ETHER, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_ieee1905_neighbor_al_mac_addr,
{ "Neighbor MAC address", "ieee1905.responder_mac_addr",
{ "Neighbor MAC address", "ieee1905.neighbor_al_mac_addr",
FT_ETHER, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_ieee1905_receiving_al_mac_addr,

2
epan/dissectors/packet-ieee80211-radiotap.c
View File

@ -4782,7 +4782,7 @@ void proto_register_radiotap(void)
IEEE80211_RADIOTAP_L_SIG_RATE_MASK, NULL, HFILL}},
{&hf_radiotap_l_sig_length,
{"length", "radiotap.l_sig.rate",
{"length", "radiotap.l_sig.length",
FT_UINT16, BASE_DEC, NULL,
IEEE80211_RADIOTAP_L_SIG_LENGTH_MASK, NULL, HFILL}},
};

2
epan/dissectors/packet-ipmi-picmg.c
View File

@ -3702,7 +3702,7 @@ proto_register_ipmi_picmg(void)
{ &hf_ipmi_picmg_2b_alarm_state,
{ "Alarm State",
"ipmi.picmg29.alrm.ctrl", FT_UINT8, BASE_HEX, VALS(picmg_2a_alarm_ctrls), 0, NULL, HFILL }},
"ipmi.picmg29.alrm.state", FT_UINT8, BASE_HEX, VALS(picmg_2a_alarm_ctrls), 0, NULL, HFILL }},
};
static gint *ett[] = {

2
epan/dissectors/packet-ipmi-transport.c
View File

@ -2765,7 +2765,7 @@ proto_register_ipmi_transport(void)
"ipmi.lan50.both", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
{ &hf_ipmi_trn_lan50_ipv6_alerting,
{ "Support IPv6 destinations for LAN Alerting",
"ipmi.lan50.both", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
"ipmi.lan50.ipv6_alerting", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
{ &hf_ipmi_trn_lan51_enables,
{ "Enables",

2
epan/dissectors/packet-ipmi-vita.c
View File

@ -424,7 +424,7 @@ static hf_register_info hf_ipmi_vita[] = {
{ "Tier Functionality", "ipmi.vita.ipmc.tier",
FT_UINT8, BASE_HEX, VALS(str_vita_ipmc_tiers), 0x3, NULL, HFILL }},
{ &hf_vita_layer,
{ "Layer Functionality", "ipmi.vita.ipmc.tier",
{ "Layer Functionality", "ipmi.vita.ipmc.layer",
FT_UINT8, BASE_HEX, VALS(str_vita_ipmc_layers), 0x30, NULL, HFILL }},
{ &hf_vita_ipmb,
{ "IPMB Capabilities", "ipmi.vita.ipmb",

2
epan/dissectors/packet-isis-lsp.c
View File

@ -4698,7 +4698,7 @@ proto_register_isis_lsp(void)
NULL, HFILL}
},
{ &hf_isis_lsp_sl_sub_tlv_flags_l,
{ "Flag L: Local", "isis.lsp.sl_sub_tlv.flags_v",
{ "Flag L: Local", "isis.lsp.sl_sub_tlv.flags_l",
FT_BOOLEAN, 8, TFS(&tfs_set_notset), 0x04,
NULL, HFILL}
},

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

@ -11510,7 +11510,7 @@ proto_register_isup(void)
NULL, HFILL }},
{ &hf_bat_ase_duration,
{ "Duration in ms", "bat_ase.signal_type",
{ "Duration in ms", "bat_ase.duration",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},

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

@ -3510,7 +3510,7 @@ proto_register_l2tp(void)
NULL, HFILL }},
{ &hf_l2tp_avp_csu_remote_session_id_v2,
{ "Remote Session ID", "l2tp.avp.csu.res", FT_UINT16, BASE_DEC_HEX, NULL, 0x0,
{ "Remote Session ID", "l2tp.avp.csu.remote_session_id", FT_UINT16, BASE_DEC_HEX, NULL, 0x0,
NULL, HFILL }},
{ &hf_l2tp_avp_csu_current_tx_speed_v2,