From 45608810709251652104e32b3fd8065b0d50d0aa Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Thu, 19 Jun 2014 15:39:39 -0400 Subject: Cleanup display filters reported by checkfiltername.pl Also ensured some files have their correct names at the top so they are more easily grepped Change-Id: Ib0f5ddf14eb1616a93dee496107dc0eb09048825 Reviewed-on: https://code.wireshark.org/review/2452 Reviewed-by: Michael Mann --- epan/dissectors/packet-assa_r3.c | 2 +- epan/dissectors/packet-bssap.c | 6 ++-- epan/dissectors/packet-dvb-ipdc.c | 2 +- epan/dissectors/packet-isakmp.c | 14 ++++----- epan/dissectors/packet-isup.c | 2 +- epan/dissectors/packet-mikey.c | 2 +- epan/dissectors/packet-mip6.c | 2 +- epan/dissectors/packet-mrp-mmrp.c | 2 +- epan/dissectors/packet-mrp-mvrp.c | 2 +- epan/dissectors/packet-netanalyzer.c | 34 +++++++++------------- epan/dissectors/packet-openflow_v1.c | 2 +- epan/dissectors/packet-openflow_v4.c | 2 +- epan/dissectors/packet-openflow_v5.c | 2 +- epan/dissectors/packet-pw-common.c | 2 +- epan/dissectors/packet-rmt-norm.c | 2 +- epan/dissectors/packet-sctp.c | 2 +- epan/dissectors/packet-sflow.c | 2 +- epan/dissectors/packet-sndcp.c | 20 ++++++------- epan/dissectors/packet-ssl.c | 7 ++--- epan/dissectors/packet-synphasor.c | 56 ++++++++++++++++++------------------ epan/dissectors/packet-tte-pcf.c | 24 ++++++---------- epan/dissectors/packet-zbee-aps.c | 4 +-- epan/dissectors/packet-zbee.h | 1 - 23 files changed, 87 insertions(+), 107 deletions(-) diff --git a/epan/dissectors/packet-assa_r3.c b/epan/dissectors/packet-assa_r3.c index 3dcbf82725..c161654287 100644 --- a/epan/dissectors/packet-assa_r3.c +++ b/epan/dissectors/packet-assa_r3.c @@ -10060,7 +10060,7 @@ void proto_register_r3 (void) { &ei_r3_response_hasdata_octet_2, { "r3.response_hasdata.octet_2_not_response_hasdata", PI_PROTOCOL, PI_WARN, "Octet 2 not RESPONSE_HASDATA", EXPFILL }}, { &ei_r3_response_hasdata_octet_3, { "r3.response_hasdata.octet_3_ge_upstreamcommand_last", PI_PROTOCOL, PI_WARN, "Octet 3 >= UPSTREAMCOMMAND_LAST", EXPFILL }}, { &ei_r3_firmwaredownload_action, { "r3.firmwaredownload.action.unknown", PI_PROTOCOL, PI_WARN, "Unknown Firmware download action", EXPFILL }}, - { &ei_r3_cmd_downloadfirmwaretimeout, { "r3.r3.command.downloadfirmwaretimeout", PI_UNDECODED, PI_WARN, "Download Firmware Timeout", EXPFILL }}, + { &ei_r3_cmd_downloadfirmwaretimeout, { "r3.command.downloadfirmwaretimeout", PI_UNDECODED, PI_WARN, "Download Firmware Timeout", EXPFILL }}, { &ei_r3_unknown_command_value, { "r3.command.unknown", PI_UNDECODED, PI_WARN, "Unknown command value", EXPFILL }}, }; diff --git a/epan/dissectors/packet-bssap.c b/epan/dissectors/packet-bssap.c index e309bf7ff3..3374933085 100644 --- a/epan/dissectors/packet-bssap.c +++ b/epan/dissectors/packet-bssap.c @@ -243,7 +243,7 @@ static value_string_ext bssap_plus_ie_id_values_ext = VALUE_STRING_EXT_INIT(bssa /* Initialize the protocol and registered fields */ static int proto_bssap = -1; -/*static int proto_bssap_plus = -1;*/ +static int proto_bssap_plus = -1; static int hf_bssap_pdu_type = -1; static int hf_bsap_pdu_type = -1; static int hf_bssap_dlci_cc = -1; @@ -2566,10 +2566,10 @@ proto_register_bssap(void) /* Register the protocol name and description */ proto_bssap = proto_register_protocol("BSSAP/BSAP", "BSSAP", "bssap"); - /*proto_bssap_plus = proto_register_protocol("BSSAP2", "BSSAP2", "bssap2");*/ + proto_bssap_plus = proto_register_protocol("BSSAP2", "BSSAP2", "bssap_plus"); register_dissector("bssap", dissect_bssap, proto_bssap); - register_dissector("bssap_plus", dissect_bssap_plus, proto_bssap); + register_dissector("bssap_plus", dissect_bssap_plus, proto_bssap_plus); /* Required function calls to register the header fields and subtrees used */ proto_register_field_array(proto_bssap, hf, array_length(hf)); diff --git a/epan/dissectors/packet-dvb-ipdc.c b/epan/dissectors/packet-dvb-ipdc.c index e14b96f476..0f77e57baa 100644 --- a/epan/dissectors/packet-dvb-ipdc.c +++ b/epan/dissectors/packet-dvb-ipdc.c @@ -78,7 +78,7 @@ proto_register_dvb_ipdc(void) #if 0 static hf_register_info hf[] = { {&hf_ipdc_esg_bootstrap_xml, - {"ESG Provider Discovery", "ipdc.bootstrap", + {"ESG Provider Discovery", "dvb_ipdc.bootstrap", FT_STRING, BASE_NONE, NULL, 0x0, "List of ESG Providers", HFILL}} }; #endif diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index 4f18eaa60d..20471aa2d5 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -5671,30 +5671,30 @@ proto_register_isakmp(void) {"Reassembled ISAKMP length", "isakmp.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL } }, { &hf_isakmp_certreq_authority_sig, - { "Certificate Authority Signature", "ike.certreq.authority.sig", + { "Certificate Authority Signature", "isakmp.ike.certreq.authority.sig", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_isakmp_certreq_authority_v1, - { "Certificate Authority Data", "ike.certreq.authority", + { "Certificate Authority Data", "isakmp.ike.certreq.authority", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_isakmp_certreq_authority_v2, - { "Certificate Authority Data", "ike.certreq.authority", + { "Certificate Authority Data", "isakmp.ike.certreq.authority", FT_BYTES, BASE_NONE, NULL, 0x0, "SHA-1 hash of the Certificate Authority", HFILL } }, { &hf_isakmp_nat_keepalive, - { "NAT Keepalive", "ike.nat_keepalive", + { "NAT Keepalive", "isakmp.ike.nat_keepalive", FT_NONE, BASE_NONE, NULL, 0x0, "NAT Keepalive packet", HFILL } }, { &hf_isakmp_nat_hash, - { "HASH of the address and port", "ike.nat_hash", + { "HASH of the address and port", "isakmp.ike.nat_hash", FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }}, { &hf_isakmp_nat_original_address_ipv4, - { "NAT Original IPv4 Address", "ike.nat_original_address_ipv4", + { "NAT Original IPv4 Address", "isakmp.ike.nat_original_address_ipv4", FT_IPv4, BASE_NONE, NULL, 0x00, NULL, HFILL }}, { &hf_isakmp_nat_original_address_ipv6, - { "NAT Original IPv6 Address", "ike.nat_original_address_ipv6", + { "NAT Original IPv6 Address", "isakmp.ike.nat_original_address_ipv6", FT_IPv6, BASE_NONE, NULL, 0x00, NULL, HFILL }}, diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index 6cfc6a4b9f..6884f1fc3e 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -11611,7 +11611,7 @@ proto_register_isup(void) NULL, HFILL }}, { &hf_bat_ase_biwfa, - { "Interworking Function Address(X.213 NSAP encoded)", "bat_ase_biwfa", + { "Interworking Function Address(X.213 NSAP encoded)", "bat_ase.biwfa", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-mikey.c b/epan/dissectors/packet-mikey.c index 8062e22fe4..04b64ba628 100644 --- a/epan/dissectors/packet-mikey.c +++ b/epan/dissectors/packet-mikey.c @@ -1446,7 +1446,7 @@ proto_register_mikey(void) FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_mikey_pl[PL_PKE], - { PL_PKE_TEXT, "mikey.", + { PL_PKE_TEXT, "mikey.pke", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_mikey_pl[PL_DH], diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c index 78e3b283d1..02f9e5aa06 100644 --- a/epan/dissectors/packet-mip6.c +++ b/epan/dissectors/packet-mip6.c @@ -4621,7 +4621,7 @@ proto_register_mip6(void) }, { &hf_mip6_opt_mng_mng_id, - { "Mobile Node Group Identifier", "mip6.mng._mng_id", + { "Mobile Node Group Identifier", "mip6.mng.mng_id", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-mrp-mmrp.c b/epan/dissectors/packet-mrp-mmrp.c index d9cc3e17c8..ec75791a75 100644 --- a/epan/dissectors/packet-mrp-mmrp.c +++ b/epan/dissectors/packet-mrp-mmrp.c @@ -393,7 +393,7 @@ proto_register_mrp_mmrp(void) FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_mmrp_three_packed_event, - { "Attribute Event", "mrp-msrp.three_packed_event", + { "Attribute Event", "mrp-mmrp.three_packed_event", FT_UINT8, BASE_DEC, VALS(three_packed_vals), 0x0, NULL, HFILL } }, { &hf_mmrp_end_mark, diff --git a/epan/dissectors/packet-mrp-mvrp.c b/epan/dissectors/packet-mrp-mvrp.c index 2f68a455d4..ce010f5ed5 100644 --- a/epan/dissectors/packet-mrp-mvrp.c +++ b/epan/dissectors/packet-mrp-mvrp.c @@ -394,7 +394,7 @@ proto_register_mrp_mvrp(void) FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_mvrp_three_packed_event, - { "Attribute Event", "mrp-msrp.three_packed_event", + { "Attribute Event", "mrp-mvrp.three_packed_event", FT_UINT8, BASE_DEC, VALS(three_packed_vals), 0x0, NULL, HFILL } }, { &hf_mvrp_end_mark, diff --git a/epan/dissectors/packet-netanalyzer.c b/epan/dissectors/packet-netanalyzer.c index 2821e3b7cf..bb9a149611 100644 --- a/epan/dissectors/packet-netanalyzer.c +++ b/epan/dissectors/packet-netanalyzer.c @@ -70,21 +70,13 @@ void proto_reg_handoff_netanalyzer(void); #define INFO_TYPE_OFFSET 18 #define MSK_RX_ERR 0x01 -#define TXT_RX_ERR "MII RX_ER error" #define MSK_ALIGN_ERR 0x02 -#define TXT_ALIGN_ERR "Alignment error" #define MSK_FCS_ERROR 0x04 -#define TXT_FCS_ERROR "FCS error" #define MSK_TOO_LONG 0x08 -#define TXT_TOO_LONG "Frame too long" #define MSK_SFD_ERROR 0x10 -#define TXT_SFD_ERROR "No valid SFD found" #define MSK_SHORT_FRAME 0x20 -#define TXT_SHORT_FRAME "Frame smaller 64 bytes" #define MSK_SHORT_PREAMBLE 0x40 -#define TXT_SHORT_PREAMBLE "Preamble shorter than 7 bytes" #define MSK_LONG_PREAMBLE 0x80 -#define TXT_LONG_PREAMBLE "Preamble longer than 7 bytes" static const char *msk_strings[] = { "MII RX_ER error", /* 0x01 */ @@ -395,44 +387,44 @@ void proto_register_netanalyzer(void) "Status of Ethernet frame", HFILL } }, { &hf_netanalyzer_status_rx_err, - { TXT_RX_ERR, "netanalyzer.packetstatus.rx_er", + { "MII RX_ER error", "netanalyzer.packetstatus.rx_er", FT_BOOLEAN, 8, NULL, MSK_RX_ERR, "RX_ER detected in frame", HFILL } }, { &hf_netanalyzer_status_align_err, - { TXT_ALIGN_ERR, "netanalyzer.packetstatus.alignment_error", + { "Alignment error", "netanalyzer.packetstatus.alignment_error", FT_BOOLEAN, 8, NULL, MSK_ALIGN_ERR, - "Alignment error detected in frame", HFILL } + NULL, HFILL } }, { &hf_netanalyzer_status_fcs, - { TXT_FCS_ERROR, "netanalyzer.packetstatus.fcs_error", + { "FCS error", "netanalyzer.packetstatus.fcs_error", FT_BOOLEAN, 8, NULL, MSK_FCS_ERROR, - "FCS error detected in frame", HFILL } + NULL, HFILL } }, { &hf_netanalyzer_status_too_long, - { TXT_TOO_LONG, "netanalyzer.packetstatus.too_long", + { "Frame too long", "netanalyzer.packetstatus.too_long", FT_BOOLEAN, 8, NULL, MSK_TOO_LONG, "Frame too long (capture truncated)", HFILL } }, { &hf_netanalyzer_status_sfd_error, - { TXT_SFD_ERROR, "netanalyzer.packetstatus.sfd_error", + { "No valid SFD found", "netanalyzer.packetstatus.sfd_error", FT_BOOLEAN, 8, NULL, MSK_SFD_ERROR, "SDF error detected in frame", HFILL } }, { &hf_netanalyzer_status_short_frame, - { TXT_SHORT_FRAME, "netanalyzer.packetstatus.short_frame", + { "Frame smaller 64 bytes", "netanalyzer.packetstatus.short_frame", FT_BOOLEAN, 8, NULL, MSK_SHORT_FRAME, - "Frame too short", HFILL } + NULL, HFILL } }, { &hf_netanalyzer_status_short_preamble, - { TXT_SHORT_PREAMBLE, "netanalyzer.packetstatus.short_preamble", + { "Preamble shorter than 7 bytes", "netanalyzer.packetstatus.short_preamble", FT_BOOLEAN, 8, NULL, MSK_SHORT_PREAMBLE, - "Preamble shorter than 7 bytes", HFILL } + NULL, HFILL } }, { &hf_netanalyzer_status_long_preamble, - { TXT_LONG_PREAMBLE, "netanalyzer.packetstatus.long_preamble", + { "Preamble longer than 7 bytes", "netanalyzer.packetstatus.long_preamble", FT_BOOLEAN, 8, NULL, MSK_LONG_PREAMBLE, - "Preamble longer than 7 bytes", HFILL } + NULL, HFILL } }, }; diff --git a/epan/dissectors/packet-openflow_v1.c b/epan/dissectors/packet-openflow_v1.c index 56b7f49f79..e0f1035e56 100644 --- a/epan/dissectors/packet-openflow_v1.c +++ b/epan/dissectors/packet-openflow_v1.c @@ -1,4 +1,4 @@ -/* packet-openflow.c +/* packet-openflow_v1.c * Routines for OpenFlow dissection * Copyright 2013, Anders Broman * Copyright 2013, Zoltan Lajos Kis diff --git a/epan/dissectors/packet-openflow_v4.c b/epan/dissectors/packet-openflow_v4.c index 71220c9d7d..7d295173f3 100644 --- a/epan/dissectors/packet-openflow_v4.c +++ b/epan/dissectors/packet-openflow_v4.c @@ -1,4 +1,4 @@ -/* packet-openflow.c +/* packet-openflow_v4.c * Routines for OpenFlow dissection * Copyright 2013, Anders Broman * Copyright 2013, Zoltan Lajos Kis diff --git a/epan/dissectors/packet-openflow_v5.c b/epan/dissectors/packet-openflow_v5.c index 5246f5a732..0f9e9fdbec 100644 --- a/epan/dissectors/packet-openflow_v5.c +++ b/epan/dissectors/packet-openflow_v5.c @@ -1,4 +1,4 @@ -/* packet-openflow.c +/* packet-openflow_v5.c * Routines for OpenFlow dissection * Copyright 2013, Anders Broman * Copyright 2013, Zoltan Lajos Kis diff --git a/epan/dissectors/packet-pw-common.c b/epan/dissectors/packet-pw-common.c index 32b6f81557..399da11c54 100644 --- a/epan/dissectors/packet-pw-common.c +++ b/epan/dissectors/packet-pw-common.c @@ -120,7 +120,7 @@ void proto_register_pw_padding(void) static gint *ett_array[] = { &ett }; - proto_pw_padding = proto_register_protocol("Pseudowire Padding","PW Padding","pwpadding"); + proto_pw_padding = proto_register_protocol("Pseudowire Padding","PW Padding","pw.padding"); proto_register_field_array(proto_pw_padding, hfpadding, array_length(hfpadding)); proto_register_subtree_array(ett_array, array_length(ett_array)); register_dissector("pw_padding", dissect_pw_padding, proto_pw_padding); diff --git a/epan/dissectors/packet-rmt-norm.c b/epan/dissectors/packet-rmt-norm.c index 8cc98078df..ba1d540b59 100644 --- a/epan/dissectors/packet-rmt-norm.c +++ b/epan/dissectors/packet-rmt-norm.c @@ -960,7 +960,7 @@ void proto_register_norm(void) }; static ei_register_info ei[] = { - { &ei_version1_only, { "alc.version1_only", PI_PROTOCOL, PI_WARN, "Sorry, this dissector supports ALC version 1 only", EXPFILL }} + { &ei_version1_only, { "norm.version1_only", PI_PROTOCOL, PI_WARN, "Sorry, this dissector supports NORM version 1 only", EXPFILL }} }; module_t *module; diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c index ed04b741c2..afdd0a5193 100644 --- a/epan/dissectors/packet-sctp.c +++ b/epan/dissectors/packet-sctp.c @@ -4706,7 +4706,7 @@ proto_register_sctp(void) static ei_register_info ei[] = { { &ei_sctp_tsn_retransmitted, { "sctp.retransmission.expert", PI_SEQUENCE, PI_NOTE, "Retransmitted TSN", EXPFILL }}, - { &ei_sctp_retransmitted_after_ack, { "retransmitted_after_ack.expert", PI_SEQUENCE, PI_WARN, "This TSN was acked prior to this retransmission (reneged ack?).", EXPFILL }}, + { &ei_sctp_retransmitted_after_ack, { "sctp.retransmitted_after_ack.expert", PI_SEQUENCE, PI_WARN, "This TSN was acked prior to this retransmission (reneged ack?).", EXPFILL }}, { &ei_sctp_tsn_retransmitted_more_than_twice, { "sctp.retransmission.more_than_twice", PI_SEQUENCE, PI_WARN, "This TSN was retransmitted more than 2 times.", EXPFILL }}, { &ei_sctp_parameter_padding, { "sctp.parameter_padding.expert", PI_MALFORMED, PI_NOTE, "The padding of this final parameter should be the padding of the chunk.", EXPFILL }}, { &ei_sctp_parameter_length, { "sctp.parameter_length.bad", PI_MALFORMED, PI_ERROR, "Parameter length bad", EXPFILL }}, diff --git a/epan/dissectors/packet-sflow.c b/epan/dissectors/packet-sflow.c index 53686c0a96..4b14b30182 100644 --- a/epan/dissectors/packet-sflow.c +++ b/epan/dissectors/packet-sflow.c @@ -3277,7 +3277,7 @@ proto_register_sflow(void) { NULL, HFILL } }, { &hf_sflow_5_extended_80211_rx_packet_duration, - { "Packet Duration (ms)", "sflow_5.rx.extended_80211.packet_duration", + { "Packet Duration (ms)", "sflow_5.extended_80211.rx.packet_duration", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-sndcp.c b/epan/dissectors/packet-sndcp.c index c19b48a110..caf8a2a375 100644 --- a/epan/dissectors/packet-sndcp.c +++ b/epan/dissectors/packet-sndcp.c @@ -470,70 +470,70 @@ proto_register_sndcp(void) */ { &hf_npdu_fragment_overlap, { "Fragment overlap", - "npdu.fragment.overlap", + "sndcp.npdu.fragment.overlap", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Fragment overlaps with other fragments", HFILL } }, { &hf_npdu_fragment_overlap_conflict, { "Conflicting data in fragment overlap", - "npdu.fragment.overlap.conflict", + "sndcp.npdu.fragment.overlap.conflict", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Overlapping fragments contained conflicting data", HFILL } }, { &hf_npdu_fragment_multiple_tails, { "Multiple tail fragments found", - "npdu.fragment.multipletails", + "sndcp.npdu.fragment.multipletails", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Several tails were found when defragmenting the packet", HFILL } }, { &hf_npdu_fragment_too_long_fragment, { "Fragment too long", - "npdu.fragment.toolongfragment", + "sndcp.npdu.fragment.toolongfragment", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Fragment contained data past end of packet", HFILL } }, { &hf_npdu_fragment_error, { "Defragmentation error", - "npdu.fragment.error", + "sndcp.npdu.fragment.error", FT_FRAMENUM, BASE_NONE, NULL, 0x0, "Defragmentation error due to illegal fragments", HFILL } }, { &hf_npdu_fragment_count, { "Fragment count", - "npdu.fragment.count", + "sndcp.npdu.fragment.count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_npdu_reassembled_in, { "Reassembled in", - "npdu.reassembled.in", + "sndcp.npdu.reassembled.in", FT_FRAMENUM, BASE_NONE, NULL, 0x0, "N-PDU fragments are reassembled in the given packet", HFILL } }, { &hf_npdu_reassembled_length, { "Reassembled N-PDU length", - "npdu.reassembled.length", + "sndcp.npdu.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x0, "The total length of the reassembled payload", HFILL } }, { &hf_npdu_fragment, { "N-PDU Fragment", - "npdu.fragment", + "sndcp.npdu.fragment", FT_FRAMENUM, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_npdu_fragments, { "N-PDU Fragments", - "npdu.fragments", + "sndcp.npdu.fragments", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL } diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index df86866212..9cafa6ec9a 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -308,9 +308,6 @@ static const fragment_items ssl_segment_items = { static SSL_COMMON_LIST_T(dissect_ssl3_hf); -/* These two "SSL segment data" items are factored out to obey DRY. */ -#define SSL_SEGMENT_DATA_TEXT "SSL segment data" - static void ssl_proto_tree_add_segment_data( proto_tree *tree, @@ -326,7 +323,7 @@ ssl_proto_tree_add_segment_data( offset, length, NULL, - "%s" SSL_SEGMENT_DATA_TEXT " (%u %s)", + "%sSSL segment data (%u %s)", prefix != NULL ? prefix : "", length, plurality(length, "byte", "bytes")); @@ -5517,7 +5514,7 @@ proto_register_ssl(void) "The payload of multiple reassembled SSL segments", HFILL }}, { &hf_ssl_segment_data, - { SSL_SEGMENT_DATA_TEXT, "ssl.segment.data", + { "SSL segment data", "ssl.segment.data", FT_BYTES, BASE_NONE, NULL, 0x00, "The payload of a single SSL segment", HFILL } }, diff --git a/epan/dissectors/packet-synphasor.c b/epan/dissectors/packet-synphasor.c index 5374844350..a6fd003aa4 100644 --- a/epan/dissectors/packet-synphasor.c +++ b/epan/dissectors/packet-synphasor.c @@ -1162,122 +1162,122 @@ void proto_register_synphasor(void) static hf_register_info hf[] = { /* Sync word */ { &hf_sync, - { "Synchronization word", PROTOCOL_ABBREV ".sync", FT_UINT16, BASE_HEX, + { "Synchronization word", "synphasor.sync", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, /* Flags in the Sync word */ { &hf_sync_frtype, - { "Frame Type", PROTOCOL_ABBREV ".frtype", FT_UINT16, BASE_HEX, + { "Frame Type", "synphasor.frtype", FT_UINT16, BASE_HEX, VALS(typenames), 0x0070, NULL, HFILL }}, { &hf_sync_version, - { "Version", PROTOCOL_ABBREV ".version", FT_UINT16, BASE_DEC, + { "Version", "synphasor.version", FT_UINT16, BASE_DEC, VALS(versionnames), 0x000F, NULL, HFILL }}, { &hf_frsize, - { "Framesize", PROTOCOL_ABBREV ".frsize", FT_UINT16, BASE_DEC, + { "Framesize", "synphasor.frsize", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_idcode, - { "PMU/DC ID number", PROTOCOL_ABBREV ".idcode", FT_UINT16, BASE_DEC, + { "PMU/DC ID number", "synphasor.idcode", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_soc, - { "SOC time stamp (UTC)", PROTOCOL_ABBREV ".soc", FT_STRINGZ, BASE_NONE, + { "SOC time stamp (UTC)", "synphasor.soc", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }}, /* Time quality flags in fracsec */ { &hf_timeqal_lsdir, - { "Leap second direction", PROTOCOL_ABBREV ".timeqal.lsdir", FT_BOOLEAN, 8, + { "Leap second direction", "synphasor.timeqal.lsdir", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }}, { &hf_timeqal_lsocc, - { "Leap second occurred", PROTOCOL_ABBREV ".timeqal.lsocc", FT_BOOLEAN, 8, + { "Leap second occurred", "synphasor.timeqal.lsocc", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }}, { &hf_timeqal_lspend, - { "Leap second pending", PROTOCOL_ABBREV ".timeqal.lspend", FT_BOOLEAN, 8, + { "Leap second pending", "synphasor.timeqal.lspend", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }}, { &hf_timeqal_timequalindic, - { "Time Quality indicator code", PROTOCOL_ABBREV ".timeqal.timequalindic", FT_UINT8, BASE_HEX, + { "Time Quality indicator code", "synphasor.timeqal.timequalindic", FT_UINT8, BASE_HEX, VALS(timequalcodes), 0x0F, NULL, HFILL }}, /* Fraction of second */ { &hf_fracsec, - { "Fraction of second (raw)", PROTOCOL_ABBREV ".fracsec", FT_UINT24, BASE_DEC, + { "Fraction of second (raw)", "synphasor.fracsec", FT_UINT24, BASE_DEC, NULL, 0x0, NULL, HFILL }}, /* Data types for configuration frames */ { &hf_conf_timebase, - { "Resolution of fractional second time stamp", PROTOCOL_ABBREV ".conf.timebase", FT_UINT24, BASE_DEC, + { "Resolution of fractional second time stamp", "synphasor.conf.timebase", FT_UINT24, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_conf_numpmu, - { "Number of PMU blocks included in the frame", PROTOCOL_ABBREV ".conf.numpmu", FT_UINT16, BASE_DEC, + { "Number of PMU blocks included in the frame", "synphasor.conf.numpmu", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, /* Bits in the FORMAT word */ { &hf_conf_formatb3, - { "FREQ/DFREQ format", PROTOCOL_ABBREV ".conf.dfreq_format", FT_BOOLEAN, 16, + { "FREQ/DFREQ format", "synphasor.conf.dfreq_format", FT_BOOLEAN, 16, TFS(&conf_formatb123names), 0x8, NULL, HFILL }}, { &hf_conf_formatb2, - { "Analog values format", PROTOCOL_ABBREV ".conf.analog_format", FT_BOOLEAN, 16, + { "Analog values format", "synphasor.conf.analog_format", FT_BOOLEAN, 16, TFS(&conf_formatb123names), 0x4, NULL, HFILL }}, { &hf_conf_formatb1, - { "Phasor format", PROTOCOL_ABBREV ".conf.phasor_format", FT_BOOLEAN, 16, + { "Phasor format", "synphasor.conf.phasor_format", FT_BOOLEAN, 16, TFS(&conf_formatb123names), 0x2, NULL, HFILL }}, { &hf_conf_formatb0, - { "Phasor notation", PROTOCOL_ABBREV ".conf.phasor_notation", FT_BOOLEAN, 16, + { "Phasor notation", "synphasor.conf.phasor_notation", FT_BOOLEAN, 16, TFS(&conf_formatb0names), 0x1, NULL, HFILL }}, { &hf_conf_fnom, - { "Nominal line freqency", PROTOCOL_ABBREV ".conf.fnom", FT_BOOLEAN, 16, + { "Nominal line freqency", "synphasor.conf.fnom", FT_BOOLEAN, 16, TFS(&conf_fnomnames), 0x0001, NULL, HFILL }}, { &hf_conf_cfgcnt, - { "Configuration change count", PROTOCOL_ABBREV ".conf.cfgcnt", FT_UINT16, BASE_DEC, + { "Configuration change count", "synphasor.conf.cfgcnt", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, /* Data types for data frames */ /* Flags in the STAT word */ { &hf_data_statb15, - { "Data valid", PROTOCOL_ABBREV ".data.valid", FT_BOOLEAN, 16, + { "Data valid", "synphasor.data.valid", FT_BOOLEAN, 16, TFS(&data_statb15names), 0x8000, NULL, HFILL }}, { &hf_data_statb14, - { "PMU error", PROTOCOL_ABBREV ".data.PMUerror", FT_BOOLEAN, 16, + { "PMU error", "synphasor.data.PMUerror", FT_BOOLEAN, 16, TFS(&data_statb14names), 0x4000, NULL, HFILL }}, { &hf_data_statb13, - { "Time synchronized", PROTOCOL_ABBREV ".data.sync", FT_BOOLEAN, 16, + { "Time synchronized", "synphasor.data.sync", FT_BOOLEAN, 16, TFS(&data_statb13names), 0x2000, NULL, HFILL }}, { &hf_data_statb12, - { "Data sorting", PROTOCOL_ABBREV ".data.sorting", FT_BOOLEAN, 16, + { "Data sorting", "synphasor.data.sorting", FT_BOOLEAN, 16, TFS(&data_statb12names), 0x1000, NULL, HFILL }}, { &hf_data_statb11, - { "Trigger detected", PROTOCOL_ABBREV ".data.trigger", FT_BOOLEAN, 16, + { "Trigger detected", "synphasor.data.trigger", FT_BOOLEAN, 16, TFS(&data_statb11names), 0x0800, NULL, HFILL }}, { &hf_data_statb10, - { "Configuration changed", PROTOCOL_ABBREV ".data.CFGchange", FT_BOOLEAN, 16, + { "Configuration changed", "synphasor.data.CFGchange", FT_BOOLEAN, 16, TFS(&data_statb10names), 0x0400, NULL, HFILL }}, { &hf_data_statb05to04, - { "Unlocked time", PROTOCOL_ABBREV ".data.t_unlock", FT_UINT16, BASE_HEX, + { "Unlocked time", "synphasor.data.t_unlock", FT_UINT16, BASE_HEX, VALS(data_statb05to04names), 0x0030, NULL, HFILL }}, { &hf_data_statb03to00, - { "Trigger reason", PROTOCOL_ABBREV ".data.trigger_reason", FT_UINT16, BASE_HEX, + { "Trigger reason", "synphasor.data.trigger_reason", FT_UINT16, BASE_HEX, VALS(data_statb03to00names), 0x000F, NULL, HFILL }}, /* Data type for command frame */ { &hf_command, - { "Command", PROTOCOL_ABBREV ".command", FT_UINT16, BASE_HEX, + { "Command", "synphasor.command", FT_UINT16, BASE_HEX, VALS(command_names), 0x000F, NULL, HFILL }} }; diff --git a/epan/dissectors/packet-tte-pcf.c b/epan/dissectors/packet-tte-pcf.c index 97be592f4c..23768529f8 100644 --- a/epan/dissectors/packet-tte-pcf.c +++ b/epan/dissectors/packet-tte-pcf.c @@ -42,7 +42,6 @@ void proto_reg_handoff_tte_pcf(void); /* Initialize the protocol and registered fields */ static int proto_tte_pcf = -1; -/* static int hf_tte_pcf = -1; */ static int hf_tte_pcf_ic = -1; static int hf_tte_pcf_mn = -1; /* static int hf_tte_pcf_res0 = -1; */ @@ -146,54 +145,47 @@ proto_register_tte_pcf(void) { static hf_register_info hf[] = { -#if 0 - { &hf_tte_pcf, - { "Protocol Control Frame", "tte.pcf", - FT_BYTES, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, -#endif { &hf_tte_pcf_ic, - { "Integration Cycle", "tte.pcf.ic", + { "Integration Cycle", "tte_pcf.ic", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_tte_pcf_mn, - { "Membership New", "tte.pcf.mn", + { "Membership New", "tte_pcf.mn", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, #if 0 { &hf_tte_pcf_res0, - { "Reserved 0", "tte.pcf.res0", + { "Reserved 0", "tte_pcf.res0", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, #endif { &hf_tte_pcf_sp, - { "Sync Priority", "tte.pcf.sp", + { "Sync Priority", "tte_pcf.sp", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_tte_pcf_sd, - { "Sync Domain", "tte.pcf.sd", + { "Sync Domain", "tte_pcf.sd", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_tte_pcf_type, - { "Type", "tte.pcf.type", + { "Type", "tte_pcf.type", FT_UINT8, BASE_HEX, VALS(pcf_type_str_vals), 0x0F, NULL, HFILL } }, #if 0 { &hf_tte_pcf_res1, - { "Reserved 1", "tte.pcf.res1", + { "Reserved 1", "tte_pcf.res1", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, #endif { &hf_tte_pcf_tc, - { "Transparent Clock", "tte.pcf.tc", + { "Transparent Clock", "tte_pcf.tc", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL } } diff --git a/epan/dissectors/packet-zbee-aps.c b/epan/dissectors/packet-zbee-aps.c index 5f907bb4e3..01c2800d28 100644 --- a/epan/dissectors/packet-zbee-aps.c +++ b/epan/dissectors/packet-zbee-aps.c @@ -2053,12 +2053,12 @@ void proto_register_zbee_aps(void) register_init_routine(proto_init_zbee_aps); /* Register the ZigBee Application Framework protocol with Wireshark. */ - proto_zbee_apf = proto_register_protocol("ZigBee Application Framework", "ZigBee APF", ZBEE_PROTOABBREV_APF); + proto_zbee_apf = proto_register_protocol("ZigBee Application Framework", "ZigBee APF", "zbee_apf"); proto_register_field_array(proto_zbee_apf, hf_apf, array_length(hf_apf)); proto_register_subtree_array(ett_apf, array_length(ett_apf)); /* Register the App dissector. */ - zbee_apf_handle = new_register_dissector(ZBEE_PROTOABBREV_APF, dissect_zbee_apf, proto_zbee_apf); + zbee_apf_handle = new_register_dissector("zbee_apf", dissect_zbee_apf, proto_zbee_apf); } /* proto_register_zbee_aps */ /*FUNCTION:------------------------------------------------------ diff --git a/epan/dissectors/packet-zbee.h b/epan/dissectors/packet-zbee.h index 375917af98..376c66a9dc 100644 --- a/epan/dissectors/packet-zbee.h +++ b/epan/dissectors/packet-zbee.h @@ -785,7 +785,6 @@ #define ZBEE_PROTOABBREV_NWK "zbee_nwk" #define ZBEE_PROTOABBREV_NWK_GP "zbee_nwk_gp" #define ZBEE_PROTOABBREV_APS "zbee_aps" -#define ZBEE_PROTOABBREV_APF "zbee_apf" #define ZBEE_PROTOABBREV_ZCL "zbee_zcl" #define ZBEE_PROTOABBREV_ZCL_APPLCTRL "zbee_zcl_general.applctrl" #define ZBEE_PROTOABBREV_ZCL_BASIC "zbee_zcl_general.basic" -- cgit v1.2.3