aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--epan/dissectors/file-elf.c2
-rw-r--r--epan/dissectors/packet-dcerpc-spoolss.c2
-rw-r--r--epan/dissectors/packet-dtn.c4
-rw-r--r--epan/dissectors/packet-enip.c8
-rw-r--r--epan/dissectors/packet-extreme.c2
-rw-r--r--epan/dissectors/packet-h248_annex_c.c2
-rw-r--r--epan/dissectors/packet-h248_q1950.c4
-rw-r--r--epan/dissectors/packet-ieee80211-prism.c2
-rw-r--r--epan/dissectors/packet-nat-pmp.c2
-rw-r--r--epan/dissectors/packet-rfid-pn532.c2
-rw-r--r--epan/dissectors/packet-rtnet.c2
-rw-r--r--epan/dissectors/packet-wifi-p2p.c4
-rw-r--r--plugins/unistim/packet-unistim.c2
13 files changed, 19 insertions, 19 deletions
diff --git a/epan/dissectors/file-elf.c b/epan/dissectors/file-elf.c
index 6f5288709f..a5086f3df0 100644
--- a/epan/dissectors/file-elf.c
+++ b/epan/dissectors/file-elf.c
@@ -2123,7 +2123,7 @@ proto_register_elf(void)
"A 1 byte value that identifies the version number of the frame information structure. This value shall be 1.", HFILL }
},
{ &hf_elf_eh_frame_augmentation_string,
- { "Augmentation String", "elf.eh_frame.version",
+ { "Augmentation String", "elf.eh_frame.augmentation_string",
FT_STRINGZ, BASE_NONE, NULL, 0x00,
"This value is a NUL terminated string that identifies the augmentation to the CIE or to the FDEs associated with this CIE. A zero length string indicates that no augmentation data is present. The augmentation string is case sensitive.", HFILL }
},
diff --git a/epan/dissectors/packet-dcerpc-spoolss.c b/epan/dissectors/packet-dcerpc-spoolss.c
index 880a009e67..1345c4c688 100644
--- a/epan/dissectors/packet-dcerpc-spoolss.c
+++ b/epan/dissectors/packet-dcerpc-spoolss.c
@@ -7836,7 +7836,7 @@ proto_register_dcerpc_spoolss(void)
BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_notify_options_flags_refresh,
- { "Refresh", "spoolss.notify_options.flags", FT_BOOLEAN, 32,
+ { "Refresh", "spoolss.notify_options.flags.refresh", FT_BOOLEAN, 32,
TFS(&tfs_notify_options_flags_refresh),
PRINTER_NOTIFY_OPTIONS_REFRESH, NULL, HFILL }},
diff --git a/epan/dissectors/packet-dtn.c b/epan/dissectors/packet-dtn.c
index 9c72cf96fb..1b14ad69bf 100644
--- a/epan/dissectors/packet-dtn.c
+++ b/epan/dissectors/packet-dtn.c
@@ -2348,7 +2348,7 @@ proto_register_bundle(void)
FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL}
},
{&hf_bundle_creation_timestamp,
- {"Creation Timestamp", "bundle.primary.timestamp",
+ {"Creation Timestamp", "bundle.primary.creation_timestamp",
FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL}
},
{&hf_bundle_lifetime,
@@ -2392,7 +2392,7 @@ proto_register_bundle(void)
FT_UINT8, BASE_DEC, VALS(admin_record_type_vals), 0xF0, NULL, HFILL}
},
{&hf_bundle_admin_record_fragment,
- {"Administrative Record Type", "bundle.admin.record_type",
+ {"Administrative Record Fragment", "bundle.admin.record_fragment",
FT_BOOLEAN, 8, TFS(&tfs_yes_no), ADMIN_REC_FLAGS_FRAGMENT, NULL, HFILL}
},
{&hf_bundle_admin_statflags,
diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c
index cba9decc7f..297e391f51 100644
--- a/epan/dissectors/packet-enip.c
+++ b/epan/dissectors/packet-enip.c
@@ -3559,17 +3559,17 @@ proto_register_enip(void)
},
/* Link_Status/Neighbor_Status Status */
{ &hf_dlr_lnknbrstatus,
- { "Link/Neighbor Status", "enip.dlr.lnknbrstatus",
+ { "Link/Neighbor Status", "enip.dlr.lnknbrstatus.status",
FT_UINT8, BASE_HEX, NULL, 0,
"Link_Status/Neighbor_Status Status", HFILL }
},
{ &hf_dlr_lnknbrstatus_port1,
- { "Port 1 Active", "enip.dlr.lnknbrstatus",
+ { "Port 1 Active", "enip.dlr.lnknbrstatus.port1",
FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x01,
NULL, HFILL }
},
{ &hf_dlr_lnknbrstatus_port2,
- { "Port 2 Active", "enip.dlr.lnknbrstatus",
+ { "Port 2 Active", "enip.dlr.lnknbrstatus.port2",
FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x02,
NULL, HFILL }
},
@@ -3579,7 +3579,7 @@ proto_register_enip(void)
NULL, HFILL }
},
{ &hf_dlr_lnknbrstatus_frame_type,
- { "Link/Neighbor Status Flag", "enip.dlr.lnknbrstatus",
+ { "Link/Neighbor Status Frame Type", "enip.dlr.lnknbrstatus.frame_type",
FT_BOOLEAN, 8, TFS(&dlr_lnknbrstatus_frame_type_vals), 0x80,
NULL, HFILL }
},
diff --git a/epan/dissectors/packet-extreme.c b/epan/dissectors/packet-extreme.c
index 384acf9945..2e157b35e2 100644
--- a/epan/dissectors/packet-extreme.c
+++ b/epan/dissectors/packet-extreme.c
@@ -1421,7 +1421,7 @@ proto_register_edp(void)
0x0, NULL, HFILL }},
{ &hf_edp_elsm_subtype,
- { "Subtype", "edp.elsm.unknown", FT_UINT8, BASE_DEC, VALS(elsm_subtype_vals),
+ { "Subtype", "edp.elsm.subtype", FT_UINT8, BASE_DEC, VALS(elsm_subtype_vals),
0x0, NULL, HFILL }},
{ &hf_edp_elsm_magic,
diff --git a/epan/dissectors/packet-h248_annex_c.c b/epan/dissectors/packet-h248_annex_c.c
index e6faeaf6ea..c8170e3e68 100644
--- a/epan/dissectors/packet-h248_annex_c.c
+++ b/epan/dissectors/packet-h248_annex_c.c
@@ -1039,7 +1039,7 @@ void proto_register_h248_annex_c(void) {
FT_UINT32, BASE_DEC, NULL, 0,
"Jitter Buffer Size (ms)", HFILL }},
{ &hf_h248_pkg_annexc_propdelay,
- { "Propagation Delay", "h248.annexc.encrypt_type",
+ { "Propagation Delay", "h248.annexc.propdelay",
FT_UINT32, BASE_DEC, NULL, 0,
"Propagation Delay (ms)", HFILL }},
{ &hf_h248_pkg_annexc_rtp_payload,
diff --git a/epan/dissectors/packet-h248_q1950.c b/epan/dissectors/packet-h248_q1950.c
index 21446fc2d9..16e46399ad 100644
--- a/epan/dissectors/packet-h248_q1950.c
+++ b/epan/dissectors/packet-h248_q1950.c
@@ -499,7 +499,7 @@ void proto_register_q1950(void) {
FT_BYTES, BASE_NONE, NULL, 0, "This signal triggers the bearer control function to send bearer establishment signalling", HFILL }
},
{ &hf_h248_pkg_GB_ModBNC,
- { "Type", "h248.GB.BNCChang.Type",
+ { "Type", "h248.GB.BNCChang.ModBNC",
FT_BYTES, BASE_NONE, NULL, 0, "This signal triggers the bearer control function to send bearer modification", HFILL }
},
{ &hf_h248_pkg_GB_RelBNC,
@@ -515,7 +515,7 @@ void proto_register_q1950(void) {
FT_BYTES, BASE_NONE, NULL, 0, "The Release Cause is the value generated by the Released equipment", HFILL }
},
{ &hf_h248_pkg_GB_RelBNC_Reset,
- { "RelBNC", "h248.GB.BNCChang.RelBNC",
+ { "RelBNC", "h248.GB.BNCChang.RelBNC.Reset",
FT_BOOLEAN, BASE_NONE, NULL, 0x0, "This signal triggers the bearer control function to send bearer release", HFILL }
},
diff --git a/epan/dissectors/packet-ieee80211-prism.c b/epan/dissectors/packet-ieee80211-prism.c
index 7168d69a79..c88ca1aaec 100644
--- a/epan/dissectors/packet-ieee80211-prism.c
+++ b/epan/dissectors/packet-ieee80211-prism.c
@@ -503,7 +503,7 @@ static hf_register_info hf_prism[] = {
NULL, HFILL }},
{ &hf_ieee80211_prism_did,
- {"DID", "prism.did.type", FT_NONE, BASE_NONE, NULL, 0x0,
+ {"DID", "prism.did", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_ieee80211_prism_did_type,
diff --git a/epan/dissectors/packet-nat-pmp.c b/epan/dissectors/packet-nat-pmp.c
index 2ccbaefcc0..5467928207 100644
--- a/epan/dissectors/packet-nat-pmp.c
+++ b/epan/dissectors/packet-nat-pmp.c
@@ -706,7 +706,7 @@ void proto_register_nat_pmp(void)
{ "Option", "portcontrol.option", FT_NONE, BASE_NONE,
NULL, 0x0, NULL, HFILL } },
{ &hf_option_code,
- { "Option", "portcontrol.option", FT_UINT8, BASE_DEC,
+ { "Option", "portcontrol.option.code", FT_UINT8, BASE_DEC,
VALS(pcp_option_vals), 0x0, NULL, HFILL } },
{ &hf_option_reserved,
{ "Reserved", "portcontrol.option.reserved", FT_UINT8, BASE_DEC,
diff --git a/epan/dissectors/packet-rfid-pn532.c b/epan/dissectors/packet-rfid-pn532.c
index 6dc81c8e43..5ec0a8c89c 100644
--- a/epan/dissectors/packet-rfid-pn532.c
+++ b/epan/dissectors/packet-rfid-pn532.c
@@ -2067,7 +2067,7 @@ void proto_register_pn532(void)
{"Register Value", "pn532.register.value", FT_UINT8, BASE_HEX,
NULL, 0x00, NULL, HFILL}},
{&hf_pn532_field,
- {"Field", "pn532.register.value", FT_BOOLEAN, BASE_NONE,
+ {"Field", "pn532.field", FT_BOOLEAN, BASE_NONE,
TFS(&tfs_present_not_present), 0x00, "Field indicates if an external RF field is present and detected by the PN532", HFILL}},
{&hf_pn532_brrx,
{"Baudrate Rx", "pn532.brrx", FT_UINT8, BASE_HEX,
diff --git a/epan/dissectors/packet-rtnet.c b/epan/dissectors/packet-rtnet.c
index fc58d682e2..f8bbde6c95 100644
--- a/epan/dissectors/packet-rtnet.c
+++ b/epan/dissectors/packet-rtnet.c
@@ -1306,7 +1306,7 @@ proto_register_rtcfg(void) {
{ &hf_rtcfg_client_hw_address,
{ "Client Hardware Address",
- "rtcfg.client_ip_address",
+ "rtcfg.client_hw_address",
FT_BYTES, BASE_NONE, NULL, 0x00,
"RTcfg Client Hardware Address", HFILL }}
};
diff --git a/epan/dissectors/packet-wifi-p2p.c b/epan/dissectors/packet-wifi-p2p.c
index 561c4eb564..7fd7e11573 100644
--- a/epan/dissectors/packet-wifi-p2p.c
+++ b/epan/dissectors/packet-wifi-p2p.c
@@ -1238,7 +1238,7 @@ proto_register_p2p(void)
{ "Device Name attribute type", "wifi_p2p.dev_info.dev_name_type",
FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
{ &hf_p2p_attr_dev_info_dev_name_len,
- { "Device Name attribute length", "wifi_p2p.dev_info.dev_name",
+ { "Device Name attribute length", "wifi_p2p.dev_info.dev_name_len",
FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_p2p_attr_dev_info_dev_name,
{ "Device Name", "wifi_p2p.dev_info.dev_name",
@@ -1399,7 +1399,7 @@ proto_register_p2p(void)
{ "Device Name attribute type", "wifi_p2p.group_info.dev_name_type",
FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
{ &hf_p2p_attr_gi_dev_name_len,
- { "Device Name attribute length", "wifi_p2p.group_info.dev_name",
+ { "Device Name attribute length", "wifi_p2p.group_info.dev_name_len",
FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_p2p_attr_gi_dev_name,
{ "Device Name", "wifi_p2p.group_info.dev_name",
diff --git a/plugins/unistim/packet-unistim.c b/plugins/unistim/packet-unistim.c
index 9901cc8d27..82aa8ecd9a 100644
--- a/plugins/unistim/packet-unistim.c
+++ b/plugins/unistim/packet-unistim.c
@@ -4003,7 +4003,7 @@ proto_register_unistim(void){
BASE_HEX,VALS(expansion_phone_msgs),0x0,NULL,HFILL}
},
{ &hf_module_key_number,
- {"Module Key Number","unistim.expansion.phone",FT_INT32,
+ {"Module Key Number","unistim.module.key.number",FT_INT32,
BASE_DEC,NULL,0x0,NULL,HFILL}
},
{ &hf_expansion_softlabel_number,