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

Rename some hf[] display filter names to fix dups. 

Change-Id: Ibe932bc37e03194f1801ec4eed4da1ff31370de3
Reviewed-on: https://code.wireshark.org/review/5535
Reviewed-by: Bill Meier <wmeier@newsguy.com>
This commit is contained in:
Bill Meier 2014-11-29 17:01:30 -05:00
parent 1aeab74d9d
commit e39938256b
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4884,7 +4884,7 @@ proto_register_btsdp(void)
NULL, HFILL }
},
{ &hf_wap_homepage_url,
{ "Homepage URL", "btsdp.wap.network_address",
{ "Homepage URL", "btsdp.wap.homepage_url",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL }
},
@ -4899,7 +4899,7 @@ proto_register_btsdp(void)
NULL, HFILL }
},
{ &hf_hdp_support_procedure_reserved_5_7,
{ "Support: Reserved", "btsdp.hdp.support.reserved",
{ "Support: Reserved_5_7", "btsdp.hdp.support.reserved_5_7",
FT_UINT8, BASE_HEX, NULL, 0xE0,
NULL, HFILL }
},

16
epan/dissectors/packet-ceph.c
View File

@ -7210,12 +7210,12 @@ proto_register_ceph(void)
"The port of the client as seen by the server.", HFILL
} },
{ &hf_addr_ipv4, {
"IPv4 Address", "ceph.client.ip",
"IPv4 Address", "ceph.client.ip4",
FT_IPv4, BASE_NONE, NULL, 0,
"The IP address of the client as seen by the server.", HFILL
} },
{ &hf_addr_ipv6, {
"IPv6 Address", "ceph.client.ip",
"IPv6 Address", "ceph.client.ipv6",
FT_IPv6, BASE_NONE, NULL, 0,
"The IP address of the client as seen by the server.", HFILL
} },
@ -7721,7 +7721,7 @@ proto_register_ceph(void)
NULL, HFILL
} },
{ &hf_pg_stat_lastepochclean, {
"Last Clean", "ceph.pg_stat.lastclean",
"Last Epoch Clean", "ceph.pg_stat.lastepochclean",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL
} },
@ -8750,7 +8750,7 @@ proto_register_ceph(void)
"Instructions to pass to the new target.", HFILL
} },
{ &hf_osd_redirect_osdinstr_data, {
"Data", "ceph.osd_redirect.osd_instructions",
"Data", "ceph.osd_redirect.osd_instructions_data",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL
} },
@ -9012,7 +9012,7 @@ proto_register_ceph(void)
NULL, HFILL
} },
{ &hf_paxos_ver, {
"Paxos Version", "ceph.data",
"Paxos Version", "ceph.paxos.ver",
FT_UINT64, BASE_DEC, NULL, 0,
NULL, HFILL
} },
@ -9497,7 +9497,7 @@ proto_register_ceph(void)
NULL, HFILL
} },
{ &hf_msg_osd_op_mtime, {
"Modification Time", "ceph.msg.osd_op",
"Modification Time", "ceph.msg.osd_op.mtime",
FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0,
NULL, HFILL
} },
@ -9597,7 +9597,7 @@ proto_register_ceph(void)
NULL, HFILL
} },
{ &hf_msg_osd_opreply_redirect, {
"Redirect", "ceph.msg.osd_opreply.user_ver",
"Redirect", "ceph.msg.osd_opreply.redirect",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL
} },
@ -9703,7 +9703,7 @@ proto_register_ceph(void)
} },
{ &hf_msg_poolop_crush_rule, {
"Crush Rule", "ceph.msg.poolop.crush_rule",
FT_INT16, BASE_DEC, NULL, 0,
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL
} },
{ &hf_msg_poolop_crush_rule8, {

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

@ -302,7 +302,7 @@ proto_register_mim(void)
0, "Destination Hierarchical MAC", HFILL }},
{ &hf_d_hmac_mc,
{ "MC Destination", "cfp.d_hmac",
{ "MC Destination", "cfp.d_hmac_mc",
FT_ETHER, BASE_NONE, NULL,
0, "Multicast Destination Address", HFILL }},

2
plugins/wimax/wimax_utils.c
View File

@ -1124,7 +1124,7 @@ void proto_register_wimax_utility_decoders(void)
},
{ /* Ethertype */
&hf_cst_pkt_class_rule_etype,
{"Ethertype", "wmx.cst.pkt_class_rule.ethertype", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}
{"Ethertype", "wmx.cst.pkt_class_rule.etype", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}
},
{ /* Eprot1 */
&hf_cst_pkt_class_rule_eprot1,