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

Fix some duplicate display filter names. 

svn path=/trunk/; revision=40592
This commit is contained in:
Chris Maynard 2012-01-19 21:57:24 +00:00
parent dea0a5d277
commit 436b44b99e
6 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4183,16 +4183,6 @@ void proto_register_gtpv2(void)
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL}
},
/*{ &hf_gtpv2_ck,
{"CK", "gtpv2.ck",
FT_UINT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL}
},
{ &hf_gtpv2_ik,
{"IK", "gtpv2.ik",
FT_UINT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL}
},*/
{ &hf_gtpv2_len_ms_classmark2,
{"Length of Mobile Station Classmark2", "gtpv2.len_ms_classmark2",
FT_UINT8, BASE_DEC, NULL, 0x0,
@ -4262,7 +4252,7 @@ void proto_register_gtpv2(void)
FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL}
},
{&hf_gtpv2_sv_emind,
{"EmInd(Emergency Indicator)", "gtpv2.sv_ics",
{"EmInd(Emergency Indicator)", "gtpv2.sv_emind",
FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL}
},
@ -5119,7 +5109,7 @@ void proto_register_gtpv2(void)
FT_BOOLEAN, 8, TFS(&tfs_allowed_not_allowed), 0x01,
NULL, HFILL }},
{ &hf_gtpv2_gena,
{ "GERAN", "gtpv2.mm_context.una",
{ "GERAN", "gtpv2.mm_context.gena",
FT_BOOLEAN, 8, TFS(&tfs_allowed_not_allowed), 0x02,
NULL, HFILL }
},

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

@ -705,7 +705,7 @@ proto_register_hdfs(void)
NULL, HFILL }
},
{ &hf_hdfs_flags,
{ "HDFS authentication type", "hdfs.auth",
{ "HDFS authentication type", "hdfs.auth_type",
FT_UINT8, BASE_DEC,
NULL, 0x0,
NULL, HFILL }

8
epan/dissectors/packet-homeplug.c
View File

@ -1683,12 +1683,12 @@ proto_register_homeplug(void)
},
{ &hf_homeplug_loader_lwnvm,
{ "Write NVM Data", "homeplug.loader.lrnvm",
{ "Write NVM Data", "homeplug.loader.lwnvm",
FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }
},
{ &hf_homeplug_loader_lreset,
{ "Reset", "homeplug.loader.mid",
{ "Reset", "homeplug.loader.lreset",
FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }
},
@ -1748,7 +1748,7 @@ proto_register_homeplug(void)
},
{ &hf_homeplug_loader_gnvmp,
{ "Get NVM Parameters", "homeplug.loader.nvmp",
{ "Get NVM Parameters", "homeplug.loader.gnvmp",
FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }
},
@ -1773,7 +1773,7 @@ proto_register_homeplug(void)
},
{ &hf_homeplug_loader_snvmp,
{ "Set NVM Parameters", "homeplug.loader.nvmp",
{ "Set NVM Parameters", "homeplug.loader.snvmp",
FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }
},

8
epan/dissectors/packet-isakmp.c
View File

@ -5250,7 +5250,7 @@ proto_register_isakmp(void)
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_isakmp_notify_data_ipcomp_transform_id,
{ "IPCOMP CPI", "isakmp.notify.data.ipcomp.cpi",
{ "IPCOMP Transform ID", "isakmp.notify.data.ipcomp.transform_id",
FT_UINT8, BASE_DEC, VALS(transform_id_ipcomp), 0x0,
NULL, HFILL }},
{ &hf_isakmp_notify_data_redirect_gw_ident_type,
@ -5388,11 +5388,11 @@ proto_register_isakmp(void)
FT_BYTES, BASE_NONE, NULL, 0x0,
"Identifies the specific security association(s) to delete", HFILL }},
{ &hf_isakmp_vid_bytes,
{ "Vendor ID", "isakmp.vid",
{ "Vendor ID", "isakmp.vid_bytes",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_isakmp_vid_string,
{ "Vendor ID", "isakmp.vid",
{ "Vendor ID", "isakmp.vid_string",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_isakmp_vid_cp_product,
@ -5526,7 +5526,7 @@ proto_register_isakmp(void)
FT_UINT16, BASE_HEX, NULL, 0x0,
"ISAKMP fragment packet-id", HFILL }},
{ &hf_isakmp_cisco_frag_seq,
{ "Frag seq", "isakmp.frag.packetid",
{ "Frag seq", "isakmp.frag.seq",
FT_UINT8, BASE_DEC, NULL, 0x0,
"ISAKMP fragment number", HFILL }},
{ &hf_isakmp_cisco_frag_last,

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

@ -1770,7 +1770,7 @@ void proto_register_isns(void)
NULL, HFILL }},
{ &hf_isns_dd_id_next_id,
{ "DD ID Next ID", "isns.index",
{ "DD ID Next ID", "isns.dd_id_next_id",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
@ -1790,7 +1790,7 @@ void proto_register_isns(void)
NULL, HFILL }},
{ &hf_isns_vendor_oui,
{ "Vendor OUI", "isns.index",
{ "Vendor OUI", "isns.vendor_oui",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},

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

@ -7734,7 +7734,7 @@ proto_register_isup(void)
NULL, HFILL }},
{ &hf_isup_forw_call_qor_attempt_indicator,
{ "Query on Release attempt indicator", "isup.forw_call_isdn_access_indicator",
{ "Query on Release attempt indicator", "isup.forw_call_qor_attempt_indicator",
FT_BOOLEAN, 16, TFS(&isup_ISDN_qor_attempt_ind_value), N_16BIT_MASK,
NULL, HFILL }},
@ -8249,7 +8249,7 @@ proto_register_isup(void)
NULL, HFILL }},
{ &hf_isup_dest_addr_len,
{ "Destination Address length", "isup.orig_addr_len",
{ "Destination Address length", "isup.dest_addr_len",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},