diff options
author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2012-01-19 20:19:28 +0000 |
---|---|---|
committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2012-01-19 20:19:28 +0000 |
commit | cb8805e543952f3c1ff3da9cf9735fe34a3fba51 (patch) | |
tree | 69589260bae36770f70658aba20bc4eb58aa3a76 | |
parent | 61b3c117a1eeccd2bbfa6681473d0e0e6316eb2d (diff) |
Fix some duplicate display filter names.
svn path=/trunk/; revision=40590
-rw-r--r-- | epan/dissectors/packet-cpha.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-dplay.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-dpnss.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-dsi.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-dtls.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-dtpt.c | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/epan/dissectors/packet-cpha.c b/epan/dissectors/packet-cpha.c index 99f00872c2..a3a06c723c 100644 --- a/epan/dissectors/packet-cpha.c +++ b/epan/dissectors/packet-cpha.c @@ -373,7 +373,7 @@ proto_register_cpha(void) { &hf_id_num, { "Number of IDs reported", "cpha.id_num", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}}, { &hf_report_code, - { "Report code", "cpha.id_num", FT_UINT16, BASE_DEC, VALS(report_code_vals), 0x0, NULL, HFILL}}, + { "Report code", "cpha.report_code", FT_UINT16, BASE_DEC, VALS(report_code_vals), 0x0, NULL, HFILL}}, { &hf_ha_mode, { "HA mode", "cpha.ha_mode", FT_UINT16, BASE_DEC, VALS(ha_mode_vals), 0x0, NULL, HFILL}}, { &hf_ha_time_unit, diff --git a/epan/dissectors/packet-dplay.c b/epan/dissectors/packet-dplay.c index 7d482f7546..17e1cbb7ed 100644 --- a/epan/dissectors/packet-dplay.c +++ b/epan/dissectors/packet-dplay.c @@ -1382,7 +1382,7 @@ void proto_register_dplay(void) { "PackedPlayer short name", "dplay.pp.short_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, { &hf_dplay_pp_long_name, - { "PackedPlayer long name", "dplay.pp.short_name", FT_STRING, BASE_NONE, + { "PackedPlayer long name", "dplay.pp.long_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, { &hf_dplay_pp_player_data, { "PackedPlayer player data", "dplay.pp.player_data", FT_BYTES, BASE_NONE, @@ -1453,7 +1453,7 @@ void proto_register_dplay(void) { "SuperPackedPlayer short name", "dplay.spp.short_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, { &hf_dplay_spp_long_name, - { "SuperPackedPlayer long name", "dplay.spp.short_name", FT_STRING, BASE_NONE, + { "SuperPackedPlayer long name", "dplay.spp.long_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, { &hf_dplay_spp_player_data_length, { "SuperPackedPlayer player data length", "dplay.spp.pd_length", FT_UINT32, BASE_HEX, @@ -1603,7 +1603,7 @@ void proto_register_dplay(void) { "Player ID", "dplay.type_0f.player_id", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}}, { &hf_dplay_type_0f_data_size, - { "Data Size", "dplay.multi.group_id", FT_UINT32, BASE_DEC, + { "Data Size", "dplay.type_0f.data_size", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, { &hf_dplay_type_0f_data_offset, { "Data Offset", "dplay.type_0f.data_offset", FT_UINT32, BASE_DEC, diff --git a/epan/dissectors/packet-dpnss.c b/epan/dissectors/packet-dpnss.c index 7336790896..7a558387dc 100644 --- a/epan/dissectors/packet-dpnss.c +++ b/epan/dissectors/packet-dpnss.c @@ -1588,7 +1588,7 @@ proto_register_dpnss(void) NULL, HFILL } }, { &hf_dpnss_sic_oct2_net_ind_clk, - { "Network Independent Clock", "dpnss.sic_oct2_sync_data_format", + { "Network Independent Clock", "dpnss.sic_oct2_net_ind_clk", FT_BOOLEAN, 8, TFS(&dpnss_sic_oct2_net_ind_clk_vals), 0x40, NULL, HFILL } }, diff --git a/epan/dissectors/packet-dsi.c b/epan/dissectors/packet-dsi.c index fff47f9e69..b90706d5e7 100644 --- a/epan/dissectors/packet-dsi.c +++ b/epan/dissectors/packet-dsi.c @@ -852,7 +852,7 @@ proto_register_dsi(void) FT_UINT16, BASE_DEC, NULL, 0xfff, "Number of minutes", HFILL }}, { &hf_dsi_attn_flag_bitmap, - { "Bitmap", "dsi.attn_flag.time", + { "Bitmap", "dsi.attn_flag.bitmap", FT_UINT16, BASE_HEX, NULL, 0xfff, "Attention extended bitmap", HFILL }}, diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c index 99e6460a7f..0026365158 100644 --- a/epan/dissectors/packet-dtls.c +++ b/epan/dissectors/packet-dtls.c @@ -2179,12 +2179,12 @@ proto_register_dtls(void) "Fragment length of handshake message", HFILL } }, { &hf_dtls_handshake_client_version, - { "Version", "dtls.handshake.version", + { "Version", "dtls.handshake.client_version", FT_UINT16, BASE_HEX, VALS(ssl_versions), 0x0, "Maximum version supported by client", HFILL } }, { &hf_dtls_handshake_server_version, - { "Version", "dtls.handshake.version", + { "Version", "dtls.handshake.server_version", FT_UINT16, BASE_HEX, VALS(ssl_versions), 0x0, "Version selected by server", HFILL } }, @@ -2369,7 +2369,7 @@ proto_register_dtls(void) FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_dtls_fragment_count, - { "Message fragment count", "dtls.fragment.error", + { "Message fragment count", "dtls.fragment.count", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL } }, { &hf_dtls_reassembled_in, diff --git a/epan/dissectors/packet-dtpt.c b/epan/dissectors/packet-dtpt.c index 3ea5f1a4ed..d002d61f2b 100644 --- a/epan/dissectors/packet-dtpt.c +++ b/epan/dissectors/packet-dtpt.c @@ -1124,7 +1124,7 @@ proto_register_dtpt(void) FT_BYTES, BASE_NONE, NULL, 0x0, "Blob Data Block", HFILL }}, { &hf_dtpt_connect_addr, - { "Address", "dtpt.blob.data", + { "Address", "dtpt.connect_addr", FT_UINT32, BASE_DEC, NULL, 0x0, "Connect to Address", HFILL }}, }; |