aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorMartin Mathieson <martin.mathieson@keysight.com>2020-10-03 13:52:06 +0100
committerMartin Mathieson <martin.r.mathieson@googlemail.com>2020-10-03 22:11:32 +0000
commit607831d8706ae32781a4f9176f46cf72414d7b1e (patch)
treeb242d78204e3da0e79c395bd0a3608c6cfddb738 /epan
parent6136c719da4ec9b96c01adb4b0fd7f01af171688 (diff)
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.
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-3g-a11.c2
-rw-r--r--epan/dissectors/packet-acn.c2
-rw-r--r--epan/dissectors/packet-bthci_cmd.c2
-rw-r--r--epan/dissectors/packet-bthci_evt.c2
-rw-r--r--epan/dissectors/packet-capwap.c2
-rw-r--r--epan/dissectors/packet-dcerpc-fileexp.c2
-rw-r--r--epan/dissectors/packet-dcerpc-fldb.c4
-rw-r--r--epan/dissectors/packet-dcom-sysact.c4
-rw-r--r--epan/dissectors/packet-dis.c4
-rw-r--r--epan/dissectors/packet-dlt.c4
-rw-r--r--epan/dissectors/packet-drbd.c2
-rw-r--r--epan/dissectors/packet-dvb-s2-table.c8
-rw-r--r--epan/dissectors/packet-geonw.c2
-rw-r--r--epan/dissectors/packet-gsm_a_bssmap.c4
-rw-r--r--epan/dissectors/packet-gsm_a_common.c2
-rw-r--r--epan/dissectors/packet-gsm_a_dtap.c2
-rw-r--r--epan/dissectors/packet-gsm_rlcmac.c2
-rw-r--r--epan/dissectors/packet-gtpv2.c4
-rw-r--r--epan/dissectors/packet-gvcp.c2
-rw-r--r--epan/dissectors/packet-h248_annex_c.c2
-rw-r--r--epan/dissectors/packet-ieee17221.c2
-rw-r--r--epan/dissectors/packet-ieee1905.c4
-rw-r--r--epan/dissectors/packet-ieee80211-radiotap.c2
-rw-r--r--epan/dissectors/packet-ipmi-picmg.c2
-rw-r--r--epan/dissectors/packet-ipmi-transport.c2
-rw-r--r--epan/dissectors/packet-ipmi-vita.c2
-rw-r--r--epan/dissectors/packet-isis-lsp.c2
-rw-r--r--epan/dissectors/packet-isup.c2
-rw-r--r--epan/dissectors/packet-l2tp.c2
29 files changed, 39 insertions, 39 deletions
diff --git a/epan/dissectors/packet-3g-a11.c b/epan/dissectors/packet-3g-a11.c
index 0dd7ce238e..9377fda156 100644
--- a/epan/dissectors/packet-3g-a11.c
+++ b/epan/dissectors/packet-3g-a11.c
@@ -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 }
},
diff --git a/epan/dissectors/packet-acn.c b/epan/dissectors/packet-acn.c
index 556099e13b..d637385f12 100644
--- a/epan/dissectors/packet-acn.c
+++ b/epan/dissectors/packet-acn.c
@@ -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 }
},
diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c
index eaeaed538d..041e96586c 100644
--- a/epan/dissectors/packet-bthci_cmd.c
+++ b/epan/dissectors/packet-bthci_cmd.c
@@ -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 }
},
diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c
index a8f07df8a3..673b950644 100644
--- a/epan/dissectors/packet-bthci_evt.c
+++ b/epan/dissectors/packet-bthci_evt.c
@@ -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 }
},
diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c
index ed266e9930..100613c0c0 100644
--- a/epan/dissectors/packet-capwap.c
+++ b/epan/dissectors/packet-capwap.c
@@ -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 }
},
diff --git a/epan/dissectors/packet-dcerpc-fileexp.c b/epan/dissectors/packet-dcerpc-fileexp.c
index cd9d6361e4..a9066709ab 100644
--- a/epan/dissectors/packet-dcerpc-fileexp.c
+++ b/epan/dissectors/packet-dcerpc-fileexp.c
@@ -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}
},
diff --git a/epan/dissectors/packet-dcerpc-fldb.c b/epan/dissectors/packet-dcerpc-fldb.c
index f370edf385..805df1f3bc 100644
--- a/epan/dissectors/packet-dcerpc-fldb.c
+++ b/epan/dissectors/packet-dcerpc-fldb.c
@@ -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,
diff --git a/epan/dissectors/packet-dcom-sysact.c b/epan/dissectors/packet-dcom-sysact.c
index f0fa0dbb9e..42bcdc2dd2 100644
--- a/epan/dissectors/packet-dcom-sysact.c
+++ b/epan/dissectors/packet-dcom-sysact.c
@@ -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,
diff --git a/epan/dissectors/packet-dis.c b/epan/dissectors/packet-dis.c
index 39cea0c100..14e7a0108a 100644
--- a/epan/dissectors/packet-dis.c
+++ b/epan/dissectors/packet-dis.c
@@ -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}
},
diff --git a/epan/dissectors/packet-dlt.c b/epan/dissectors/packet-dlt.c
index 578911b890..5bf495f174 100644
--- a/epan/dissectors/packet-dlt.c
+++ b/epan/dissectors/packet-dlt.c
@@ -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",
diff --git a/epan/dissectors/packet-drbd.c b/epan/dissectors/packet-drbd.c
index 0de3485e61..616698de09 100644
--- a/epan/dissectors/packet-drbd.c
+++ b/epan/dissectors/packet-drbd.c
@@ -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 }},
diff --git a/epan/dissectors/packet-dvb-s2-table.c b/epan/dissectors/packet-dvb-s2-table.c
index 367288c06e..900ae8ec85 100644
--- a/epan/dissectors/packet-dvb-s2-table.c
+++ b/epan/dissectors/packet-dvb-s2-table.c
@@ -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}
},
diff --git a/epan/dissectors/packet-geonw.c b/epan/dissectors/packet-geonw.c
index 64adcfe30f..f99cd4f645 100644
--- a/epan/dissectors/packet-geonw.c
+++ b/epan/dissectors/packet-geonw.c
@@ -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,
diff --git a/epan/dissectors/packet-gsm_a_bssmap.c b/epan/dissectors/packet-gsm_a_bssmap.c
index 59df9ea670..f4e5683d16 100644
--- a/epan/dissectors/packet-gsm_a_bssmap.c
+++ b/epan/dissectors/packet-gsm_a_bssmap.c
@@ -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 }
},
diff --git a/epan/dissectors/packet-gsm_a_common.c b/epan/dissectors/packet-gsm_a_common.c
index 0db88bc29c..e01f99b520 100644
--- a/epan/dissectors/packet-gsm_a_common.c
+++ b/epan/dissectors/packet-gsm_a_common.c
@@ -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 }
},
diff --git a/epan/dissectors/packet-gsm_a_dtap.c b/epan/dissectors/packet-gsm_a_dtap.c
index 706b069e0f..bcc0b136e0 100644
--- a/epan/dissectors/packet-gsm_a_dtap.c
+++ b/epan/dissectors/packet-gsm_a_dtap.c
@@ -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 }
},
diff --git a/epan/dissectors/packet-gsm_rlcmac.c b/epan/dissectors/packet-gsm_rlcmac.c
index 14fa86c4bf..f5ce4f669c 100644
--- a/epan/dissectors/packet-gsm_rlcmac.c
+++ b/epan/dissectors/packet-gsm_rlcmac.c
@@ -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
}
diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c
index 50686ece4c..e636357890 100644
--- a/epan/dissectors/packet-gtpv2.c
+++ b/epan/dissectors/packet-gtpv2.c
@@ -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 }
},
diff --git a/epan/dissectors/packet-gvcp.c b/epan/dissectors/packet-gvcp.c
index 18841e69f8..6a17cff2ee 100644
--- a/epan/dissectors/packet-gvcp.c
+++ b/epan/dissectors/packet-gvcp.c
@@ -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
} },
diff --git a/epan/dissectors/packet-h248_annex_c.c b/epan/dissectors/packet-h248_annex_c.c
index f3558429ce..af3a2f7a74 100644
--- a/epan/dissectors/packet-h248_annex_c.c
+++ b/epan/dissectors/packet-h248_annex_c.c
@@ -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 }},
diff --git a/epan/dissectors/packet-ieee17221.c b/epan/dissectors/packet-ieee17221.c
index 9acfa4767c..50bbc7ab36 100644
--- a/epan/dissectors/packet-ieee17221.c
+++ b/epan/dissectors/packet-ieee17221.c
@@ -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,
diff --git a/epan/dissectors/packet-ieee1905.c b/epan/dissectors/packet-ieee1905.c
index d201fe8e2f..ec27301523 100644
--- a/epan/dissectors/packet-ieee1905.c
+++ b/epan/dissectors/packet-ieee1905.c
@@ -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,
diff --git a/epan/dissectors/packet-ieee80211-radiotap.c b/epan/dissectors/packet-ieee80211-radiotap.c
index 324fc4c5c6..a6489b87f6 100644
--- a/epan/dissectors/packet-ieee80211-radiotap.c
+++ b/epan/dissectors/packet-ieee80211-radiotap.c
@@ -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}},
};
diff --git a/epan/dissectors/packet-ipmi-picmg.c b/epan/dissectors/packet-ipmi-picmg.c
index d2fa16c3bf..349ca0e29f 100644
--- a/epan/dissectors/packet-ipmi-picmg.c
+++ b/epan/dissectors/packet-ipmi-picmg.c
@@ -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[] = {
diff --git a/epan/dissectors/packet-ipmi-transport.c b/epan/dissectors/packet-ipmi-transport.c
index feabe60617..7866e4ee5f 100644
--- a/epan/dissectors/packet-ipmi-transport.c
+++ b/epan/dissectors/packet-ipmi-transport.c
@@ -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",
diff --git a/epan/dissectors/packet-ipmi-vita.c b/epan/dissectors/packet-ipmi-vita.c
index 7147d0f227..cd9002d3e6 100644
--- a/epan/dissectors/packet-ipmi-vita.c
+++ b/epan/dissectors/packet-ipmi-vita.c
@@ -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",
diff --git a/epan/dissectors/packet-isis-lsp.c b/epan/dissectors/packet-isis-lsp.c
index 5ad31f3dc7..de5c076839 100644
--- a/epan/dissectors/packet-isis-lsp.c
+++ b/epan/dissectors/packet-isis-lsp.c
@@ -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}
},
diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c
index 82e1a97dff..0ba7acfdf5 100644
--- a/epan/dissectors/packet-isup.c
+++ b/epan/dissectors/packet-isup.c
@@ -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 }},
diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c
index 70af7d552c..207df7ab00 100644
--- a/epan/dissectors/packet-l2tp.c
+++ b/epan/dissectors/packet-l2tp.c
@@ -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,