osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix some duplicate display filter names. 

svn path=/trunk/; revision=40586
This commit is contained in:
Chris Maynard 2012-01-19 19:15:13 +00:00
parent 8e4aab0ed8
commit c2208aa172
5 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/packet-bgp.c
View File

@ -3714,10 +3714,10 @@ proto_register_bgp(void)
{ "Restart Timers", "bgp.cap.gr.timers", FT_UINT16, BASE_HEX,
NULL, 0x0, NULL, HFILL }},
{ &hf_bgp_cap_gr_timers_restart_flag,
{ "Restart", "bgp.cap.gr.timers.restart", FT_BOOLEAN, 16,
{ "Restart", "bgp.cap.gr.timers.restart_flag", FT_BOOLEAN, 16,
TFS(&tfs_yes_no), 0x8000, NULL, HFILL }},
{ &hf_bgp_cap_gr_timers_restart_time,
{ "Time", "bgp.cap.gr.timers.restart", FT_UINT16, BASE_DEC,
{ "Time", "bgp.cap.gr.timers.restart_time", FT_UINT16, BASE_DEC,
NULL, 0x0FFF, "in us", HFILL }},
{ &hf_bgp_cap_gr_afi,
{ "AFI", "bgp.cap.gr.afi", FT_UINT16, BASE_DEC,
@ -3759,7 +3759,7 @@ proto_register_bgp(void)
{ "Type", "bgp.cap.orf.type", FT_UINT8, BASE_DEC,
VALS(orf_type_vals), 0x0, NULL, HFILL }},
{ &hf_bgp_cap_orf_sendreceive,
{ "Send Receive", "bgp.cap.orf.type", FT_UINT8, BASE_DEC,
{ "Send Receive", "bgp.cap.orf.sendreceive", FT_UINT8, BASE_DEC,
VALS(orf_send_recv_vals), 0x0, NULL, HFILL }},
{ &hf_bgp_aggregator_as,
{ "Aggregator AS", "bgp.aggregator_as", FT_UINT16, BASE_DEC,

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

@ -2253,7 +2253,7 @@ proto_register_bssap(void)
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_bssap_channel_needed_ie,
{ "Channel needed IE", "bssap.cell_global_id_ie",
{ "Channel needed IE", "bssap.channel_needed_ie",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_bssap_dlink_tnl_pld_cntrl_amd_inf_ie,
@ -2337,11 +2337,11 @@ proto_register_bssap(void)
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_bssap_service_area_id_ie,
{ "Service area identification IE", "bssap.mobile_stn_cls_mrk1_ie",
{ "Service area identification IE", "bssap.service_area_id_ie",
FT_NONE, BASE_NONE, NULL, 0,
"Mobile station classmark 1", HFILL }},
{ &hf_bssap_sgsn_nr_ie,
{ "SGSN number IE", "bssap.imsi_ie",
{ "SGSN number IE", "bssap.sgsn_nr_ie",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_bssap_tmsi_ie,
@ -2367,7 +2367,7 @@ proto_register_bssap(void)
NULL, HFILL }},
{ &hf_bssap_call_priority,
{ "eMLPP Priority", "bssap.gprs_loc_upd_type",
{ "eMLPP Priority", "bssap.call_priority",
FT_UINT8, BASE_DEC, VALS(bssap_call_priority_values), 0x07,
NULL, HFILL}},
{ &hf_bssap_gprs_loc_upd_type,
@ -2375,7 +2375,7 @@ proto_register_bssap(void)
FT_UINT8, BASE_DEC, VALS(bssap_plus_GPRS_loc_upd_type_values), 0x0,
NULL, HFILL}},
{ &hf_bssap_Gs_cause,
{ "Gs cause", "bssap.gprs_loc_upd_type",
{ "Gs cause", "bssap.Gs_cause",
FT_UINT8, BASE_DEC, VALS(bssap_Gs_cause_values), 0x0,
NULL, HFILL}},
{ &hf_bssap_imei,
@ -2423,7 +2423,7 @@ proto_register_bssap(void)
FT_UINT8, BASE_DEC, VALS(bssap_tom_prot_disc_values), 0x78,
NULL, HFILL}},
{ &hf_bssap_e_bit,
{ "E: Cipher Request", "bssap.tmsi_status",
{ "E: Cipher Request", "bssap.e_bit",
FT_BOOLEAN, 8, TFS(&bssap_E_flag), 0x04,
NULL, HFILL }},
{ &hf_bssap_tunnel_prio,
@ -2443,7 +2443,7 @@ proto_register_bssap(void)
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL}},
{ &hf_bssap_cell_global_id,
{ "Cell global identity", "bssap.plmn_id",
{ "Cell global identity", "bssap.cell_global_id",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL}},
};

12
epan/dissectors/packet-bssgp.c
View File

@ -6370,7 +6370,7 @@ proto_register_bssgp(void)
"Cell Identity", HFILL }
},
{ &hf_bssgp_flush_action,
{ "Action", "bssgp.ci",
{ "Action", "bssgp.flush_action",
FT_UINT8, BASE_DEC, VALS(bssgp_flush_action_vals), 0x0,
NULL, HFILL }
},
@ -6490,13 +6490,13 @@ proto_register_bssgp(void)
NULL, HFILL }
},
{ &hf_bssgp_r_default_ms,
{ "R_default_MS(x 100 or in increments as defined by the Flow Control Granularity IE)", "bssgp.r",
{ "R_default_MS(x 100 or in increments as defined by the Flow Control Granularity IE)", "bssgp.r_default_ms",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_bssgp_suspend_ref_no,
{ "Suspend Reference Number", "bssgp.r_default_ms",
{ "Suspend Reference Number", "bssgp.suspend_ref_no",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
@ -6588,7 +6588,7 @@ proto_register_bssgp(void)
},
{ &hf_bssgp_precedence,
{ "Precedence", "bssgp.a_bit",
{ "Precedence", "bssgp.precedence",
FT_UINT8, BASE_DEC, NULL, 0x07,
NULL, HFILL }
},
@ -6663,12 +6663,12 @@ proto_register_bssgp(void)
NULL, HFILL }
},
{ &hf_bssgp_ul_tfi,
{ "UPLINK_TFI", "bssgp.global_tfi",
{ "UPLINK_TFI", "bssgp.ul_tfi",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_bssgp_dl_tfi,
{ "DOWNLINK_TFI", "bssgp.global_tfi",
{ "DOWNLINK_TFI", "bssgp.dl_tfi",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},

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

@ -1578,7 +1578,7 @@ proto_register_cast(void)
},
{ &hf_cast_callingParty,
{ "Calling Party", "cast.callingPartyName",
{ "Calling Party", "cast.callingParty",
FT_STRING, BASE_NONE, NULL, 0x0,
"The passed number of the calling party.",
HFILL }

22
epan/dissectors/packet-cfm.c
View File

@ -1518,11 +1518,11 @@ void proto_register_cfm(void)
BASE_DEC, NULL, 0x0, NULL, HFILL }
},
{ &hf_cfm_maid_md_name_string,
{ "MD Name (String)", "cfm.maid.md.name", FT_STRING,
{ "MD Name (String)", "cfm.maid.md.name.string", FT_STRING,
BASE_NONE, NULL, 0x0, NULL, HFILL }
},
{ &hf_cfm_maid_md_name_hex,
{ "MD Name", "cfm.maid.md.name", FT_BYTES,
{ "MD Name", "cfm.maid.md.name.hex", FT_BYTES,
BASE_NONE, NULL, 0x0, NULL, HFILL }
},
{ &hf_cfm_maid_md_name_mac,
@ -1542,11 +1542,11 @@ void proto_register_cfm(void)
BASE_DEC, NULL, 0x0, NULL, HFILL }
},
{ &hf_cfm_maid_ma_name_string,
{ "Short MA Name", "cfm.maid.ma.name", FT_STRING,
{ "Short MA Name", "cfm.maid.ma.name.string", FT_STRING,
BASE_NONE, NULL, 0x0, NULL, HFILL }
},
{ &hf_cfm_maid_ma_name_hex,
{ "Short MA Name", "cfm.maid.ma.name", FT_BYTES,
{ "Short MA Name", "cfm.maid.ma.name.hex", FT_BYTES,
BASE_NONE, NULL, 0x0, NULL, HFILL }
},
{ &hf_cfm_maid_padding,
@ -1648,11 +1648,11 @@ void proto_register_cfm(void)
BASE_NONE, NULL, 0x0, NULL, HFILL }
},
{ &hf_cfm_flags_ais_lck_Reserved,
{ "Reserved", "cfm.flags.reserved", FT_UINT8,
{ "Reserved", "cfm.flags.ais_lck_Reserved", FT_UINT8,
BASE_DEC, NULL, 0xF8, NULL, HFILL }
},
{ &hf_cfm_flags_ais_lck_Period,
{ "Period", "cfm.flags.period", FT_UINT8,
{ "Period", "cfm.flags.ais_lck_Period", FT_UINT8,
BASE_DEC, VALS(aislckperiodtypes), 0x07, NULL, HFILL }
},
@ -1791,7 +1791,7 @@ void proto_register_cfm(void)
BASE_NONE, NULL, 0x0, NULL, HFILL }
},
{ &hf_cfm_exm_exr_data,
{ "EXM/EXR data", "cfm.mcc.data", FT_BYTES,
{ "EXM/EXR data", "cfm.exm_exr.data", FT_BYTES,
BASE_NONE, NULL, 0x0, NULL, HFILL }
},
@ -1807,7 +1807,7 @@ void proto_register_cfm(void)
BASE_NONE, NULL, 0x0, NULL, HFILL }
},
{ &hf_cfm_vsm_vsr_data,
{ "VSM/VSR data", "cfm.mcc.data", FT_BYTES,
{ "VSM/VSR data", "cfm.vsm_vsr.data", FT_BYTES,
BASE_NONE, NULL, 0x0, NULL, HFILL }
},
@ -1918,15 +1918,15 @@ void proto_register_cfm(void)
BASE_NONE, NULL, 0x0, NULL, HFILL }
},
{ &hf_tlv_reply_ing_egr_portid_length,
{ "Chassis ID Length", "cfm.tlv.chassis.id.length", FT_UINT8,
{ "Chassis ID Length", "cfm.tlv.reply.ing.egr.portid.length", FT_UINT8,
BASE_DEC, NULL, 0x0, NULL, HFILL}
},
{ &hf_tlv_reply_ing_egr_portid_subtype,
{ "Chassis ID Sub-type", "cfm.tlv.chassis.id.subtype", FT_UINT8,
{ "Chassis ID Sub-type", "cfm.tlv.reply.ing.egr.portid.subtype", FT_UINT8,
BASE_DEC, NULL, 0x0, NULL, HFILL}
},
{ &hf_tlv_reply_ing_egr_portid,
{ "Chassis ID", "cfm.tlv.chassis.id", FT_BYTES,
{ "Chassis ID", "cfm.tlv.reply.ing.egr.portid", FT_BYTES,
BASE_NONE, NULL, 0x0, NULL, HFILL}
},