diff options
author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2012-01-19 21:01:52 +0000 |
---|---|---|
committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2012-01-19 21:01:52 +0000 |
commit | dea0a5d277b260fafa2157b7233661099a582753 (patch) | |
tree | 02e86b9bf7628acd477b9231a8e7cbb68f24216a | |
parent | cb8805e543952f3c1ff3da9cf9735fe34a3fba51 (diff) |
Fix some duplicate display filter names.
svn path=/trunk/; revision=40591
-rw-r--r-- | epan/dissectors/packet-egd.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-fcswils.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-ff.c | 28 | ||||
-rw-r--r-- | epan/dissectors/packet-gdsdb.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-gtp.c | 32 |
5 files changed, 34 insertions, 34 deletions
diff --git a/epan/dissectors/packet-egd.c b/epan/dissectors/packet-egd.c index 61e4d1c234..4f2db96312 100644 --- a/epan/dissectors/packet-egd.c +++ b/epan/dissectors/packet-egd.c @@ -200,7 +200,7 @@ void proto_register_egd(void) NULL, HFILL } }, { &hf_egd_notime, - { "Timestamp", "egd.time", + { "Timestamp", "egd.notime", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL } diff --git a/epan/dissectors/packet-fcswils.c b/epan/dissectors/packet-fcswils.c index fec1afe218..014da02b3a 100644 --- a/epan/dissectors/packet-fcswils.c +++ b/epan/dissectors/packet-fcswils.c @@ -1952,13 +1952,13 @@ proto_register_fcswils (void) {"Class 2 Svc Param", "swils.elp.cls2p", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}}, { &hf_swils_elp_cls2_rcvsz, - {"Class 2 Frame Size", "swils.elp.cls1rsz", + {"Class 2 Frame Size", "swils.elp.cls2rsz", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}}, { &hf_swils_elp_cls3_svcp, {"Class 3 Svc Param", "swils.elp.cls3p", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}}, { &hf_swils_elp_cls3_rcvsz, - {"Class 3 Frame Size", "swils.elp.cls1rsz", + {"Class 3 Frame Size", "swils.elp.cls3rsz", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}}, { &hf_swils_elp_isl_fc_mode, {"ISL Flow Ctrl Mode", "swils.elp.fcmode", diff --git a/epan/dissectors/packet-ff.c b/epan/dissectors/packet-ff.c index 86102e5a37..525d9446d5 100644 --- a/epan/dissectors/packet-ff.c +++ b/epan/dissectors/packet-ff.c @@ -16157,7 +16157,7 @@ proto_register_ff(void) */ { &hf_ff_lr_get_info, { "LAN Redundancy Get Information", - "ff.lr.lr.get_info", + "ff.lr.get_info", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } }, @@ -16167,7 +16167,7 @@ proto_register_ff(void) */ { &hf_ff_lr_get_info_req, { "LAN Redundancy Get Information Request", - "ff.lr.lr.get_info.req", + "ff.lr.get_info.req", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } }, @@ -16177,7 +16177,7 @@ proto_register_ff(void) */ { &hf_ff_lr_get_info_rsp, { "LAN Redundancy Get Information Response", - "ff.lr.lr.get_info.rsp", + "ff.lr.get_info.rsp", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ff_lr_get_info_rsp_lr_attrs_ver, @@ -16232,7 +16232,7 @@ proto_register_ff(void) */ { &hf_ff_lr_get_info_err, { "LAN Redundancy Get Information Error", - "ff.lr.lr.get_info.err", + "ff.lr.get_info.err", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ff_lr_get_info_err_err_class, @@ -16259,7 +16259,7 @@ proto_register_ff(void) * 6.5.4.2. LAN Redundancy Put Information (Confirmed Service Id = 2) */ { &hf_ff_lr_put_info, - { "LAN Redundancy Put Information", "ff.lr.lr.put_info", + { "LAN Redundancy Put Information", "ff.lr.put_info", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } }, @@ -16268,7 +16268,7 @@ proto_register_ff(void) * 6.5.4.2.1. Request Message Parameters */ { &hf_ff_lr_put_info_req, - { "LAN Redundancy Put Information Request", "ff.lr.lr.put_info.req", + { "LAN Redundancy Put Information Request", "ff.lr.put_info.req", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ff_lr_put_info_req_lr_attrs_ver, @@ -16323,7 +16323,7 @@ proto_register_ff(void) */ { &hf_ff_lr_put_info_rsp, { "LAN Redundancy Put Information Response", - "ff.lr.lr.put_info.rsp", + "ff.lr.put_info.rsp", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ff_lr_put_info_rsp_lr_attrs_ver, @@ -16377,7 +16377,7 @@ proto_register_ff(void) * 6.5.4.2.3. Error Message Parameters */ { &hf_ff_lr_put_info_err, - { "LAN Redundancy Put Information Error", "ff.lr.lr.put_info.err", + { "LAN Redundancy Put Information Error", "ff.lr.put_info.err", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ff_lr_put_info_err_err_class, @@ -16405,7 +16405,7 @@ proto_register_ff(void) */ { &hf_ff_lr_get_statistics, { "LAN Redundancy Get Statistics", - "ff.lr.lr.get_statistics", + "ff.lr.get_statistics", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } }, @@ -16415,7 +16415,7 @@ proto_register_ff(void) */ { &hf_ff_lr_get_statistics_req, { "LAN Redundancy Get Statistics Request", - "ff.lr.lr.get_statistics.req", + "ff.lr.get_statistics.req", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } }, @@ -16425,7 +16425,7 @@ proto_register_ff(void) */ { &hf_ff_lr_get_statistics_rsp, { "LAN Redundancy Get Statistics Response", - "ff.lr.lr.get_statistics.rsp", + "ff.lr.get_statistics.rsp", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ff_lr_get_statistics_rsp_num_diag_svr_ind_recv_a, @@ -16469,7 +16469,7 @@ proto_register_ff(void) */ { &hf_ff_lr_get_statistics_err, { "LAN Redundancy Get Statistics Error", - "ff.lr.lr.get_statistics.err", + "ff.lr.get_statistics.err", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ff_lr_get_statistics_err_err_class, @@ -16496,7 +16496,7 @@ proto_register_ff(void) * 6.5.4.4 Diagnostic Message (Unconfirmed Service Id = 1) */ { &hf_ff_lr_diagnostic_msg, - { "Diagnostic Message", "ff.lr.lr.diagnostic_msg", + { "Diagnostic Message", "ff.lr.diagnostic_msg", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } }, @@ -16505,7 +16505,7 @@ proto_register_ff(void) * 6.5.4.4.1. Request Message Parameters */ { &hf_ff_lr_diagnostic_msg_req, - { "Diagnostic Message Request", "ff.lr.lr.diagnostic_msg", + { "Diagnostic Message Request", "ff.lr.diagnostic_msg_req", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ff_lr_diagnostic_msg_req_dev_idx, diff --git a/epan/dissectors/packet-gdsdb.c b/epan/dissectors/packet-gdsdb.c index 796316b6af..a7d8bef059 100644 --- a/epan/dissectors/packet-gdsdb.c +++ b/epan/dissectors/packet-gdsdb.c @@ -1561,7 +1561,7 @@ proto_register_gdsdb(void) NULL, HFILL } }, { &hf_gdsdb_info_incarnation, - { "Incarnation", "gdsdb.info.object", + { "Incarnation", "gdsdb.info.incarnation", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c index 5af95cea40..1e0caa139d 100644 --- a/epan/dissectors/packet-gtp.c +++ b/epan/dissectors/packet-gtp.c @@ -38,7 +38,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * Ref: 3GPP TS 29.060 + * Ref: 3GPP TS 29.060 * http://www.3gpp.org/ftp/Specs/html-info/29060.htm * GTP' 3GPP TS 32.295 */ @@ -3199,7 +3199,7 @@ static int decode_gtp_ptmsi(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, return 5; } -/* +/* * adjust - how many bytes before offset should be highlighted */ static int decode_qos_gprs(tvbuff_t * tvb, int offset, proto_tree * tree, const gchar * qos_str, guint8 adjust) @@ -4444,7 +4444,7 @@ static void decode_apn(tvbuff_t * tvb, int offset, guint16 length, proto_tree * } } -/* +/* * GPRS: 9.60 v7.6.0, chapter 7.9.20 * UMTS: 29.060 v4.0, chapter 7.7.29 PDP Context * TODO: unify addr functions @@ -5160,7 +5160,7 @@ static int decode_gtp_ran_tr_cont(tvbuff_t * tvb, int offset, packet_info * pinf next_tvb = tvb_new_subset(tvb, offset, length, length); if (bssgp_handle){ - col_set_fence(pinfo->cinfo, COL_INFO); + col_set_fence(pinfo->cinfo, COL_INFO); call_dissector(bssgp_handle, next_tvb, pinfo, ext_tree); } @@ -6273,7 +6273,7 @@ decode_gtp_rim_ra_disc(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, prot offset++; proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; - /* Octet 4 bits 4 - 1 is coded according to 3GPP TS 48.018 [20] + /* Octet 4 bits 4 - 1 is coded according to 3GPP TS 48.018 [20] * RIM Routing Information IE octet 3 bits 4 - 1. * Bits 8 - 5 are coded "0000". */ @@ -6831,14 +6831,14 @@ static void dissect_gtp_common(tvbuff_t * tvb, packet_info * pinfo, proto_tree * proto_tree_add_uint(flags_tree, hf_gtp_prime_flags_ver, tvb, 0, 1, gtp_hdr.flags); proto_tree_add_uint(flags_tree, hf_gtp_flags_pt, tvb, 0, 1, gtp_hdr.flags); proto_tree_add_uint(flags_tree, hf_gtp_flags_spare1, tvb, 0, 1, gtp_hdr.flags); - /* Bit 1 of octet 1 is not used in GTP' (except in v0), and it is marked '0' - * in the GTP' header. It is in use in GTP' v0 and distinguishes the used header-length. + /* Bit 1 of octet 1 is not used in GTP' (except in v0), and it is marked '0' + * in the GTP' header. It is in use in GTP' v0 and distinguishes the used header-length. * In the case of GTP' v0, this bit being marked one (1) indicates the usage of the 6 - * octets header. If the bit is set to '0' (usually the case) the 20-octet header is used. - * For all other versions of GTP', this bit is not used and is set to '0'. However, + * octets header. If the bit is set to '0' (usually the case) the 20-octet header is used. + * For all other versions of GTP', this bit is not used and is set to '0'. However, * this does not suggest the use of the 20-octet header, rather a shorter 6-octet header. */ - if(gtp_version==0){ + if(gtp_version==0){ proto_tree_add_item(flags_tree, hf_gtp_flags_hdr_length, tvb, 0, 1, ENC_BIG_ENDIAN); } }else{ @@ -7372,7 +7372,7 @@ void proto_register_gtp(void) NULL, HFILL} }, {&hf_gtp_cipher_algorithm, - {"Cipher Algorithm", "gtp.no_of_vectors", + {"Cipher Algorithm", "gtp.cipher_algorithm", FT_UINT8, BASE_DEC, VALS(gtp_cipher_algorithm), 0x07, NULL, HFILL} }, @@ -7382,12 +7382,12 @@ void proto_register_gtp(void) "CKSN/KSI", HFILL} }, {&hf_gtp_cksn, - {"Ciphering Key Sequence Number (CKSN)", "gtp.cksn_ksi", + {"Ciphering Key Sequence Number (CKSN)", "gtp.cksn", FT_UINT8, BASE_DEC, NULL, 0x07, "CKSN", HFILL} }, {&hf_gtp_ksi, - {"Key Set Identifier (KSI)", "gtp.cksn_ksi", + {"Key Set Identifier (KSI)", "gtp.ksi", FT_UINT8, BASE_DEC, NULL, 0x07, "KSI", HFILL} }, @@ -7479,7 +7479,7 @@ void proto_register_gtp(void) FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL}}, {&hf_gtp_cmn_flg_mbs_ran_pcd_rdy, - {"RAN Procedures Ready", "gtp.cmn_flg.ran_pcd_rd", + {"RAN Procedures Ready", "gtp.cmn_flg.mbs_ran_pcd_rdy", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL}}, {&hf_gtp_cmn_flg_mbs_cnt_inf, @@ -7495,11 +7495,11 @@ void proto_register_gtp(void) FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL}}, {&hf_gtp_cmn_flg_upgrd_qos_sup, - {"Upgrade QoS Supported", "gtp.cmn_flg.ran_pcd_rd", + {"Upgrade QoS Supported", "gtp.cmn_flg.upgrd_qos_sup", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL}}, {&hf_gtp_tmgi, - {"Temporary Mobile Group Identity (TMGI)", "gtp.cmn_flg.ran_pcd_rd", + {"Temporary Mobile Group Identity (TMGI)", "gtp.tmgi", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_gtp_no_of_mbms_sa_codes, |